Commit 974eecc2 authored by unknown's avatar unknown
Browse files

WL#3337 (Event scheduler new architecture) 

This patch introduces specialized Event data objects
Event_basic as parent.
Event_queue_element used for queue storage
Event_timed used for SHOW EVENTS/ I_S.EVENTS / SHOW CREATE EVENT
Event_job_data using during execution.
Methods were moved out of Event_timed to other classes.

This patch also introduces Events::LOCK_event_metadata.
This patch gives new implementation of Events::dump_internal_status().
Now both the Event_scheduler and Event_queue return information during
their ::dump_internal_status().

Shortened a bit the runtime for executing events test cases.


mysql-test/r/events.result:
  update results
mysql-test/r/events_bugs.result:
  update results
mysql-test/r/events_logs_tests.result:
  update results
mysql-test/r/events_scheduling.result:
  update results
mysql-test/t/events.test:
  update test
  make --sleep more appropriate . saving some time could mean failure on loaded boxes though :(
  add tests for previously uncovered branches.
mysql-test/t/events_bugs.test:
  update test
  make --sleep more appropriate . saving some time could mean failure on loaded boxes though :(
  add tests for previously uncovered branches.
mysql-test/t/events_logs_tests.test:
  make the test shorter by time
mysql-test/t/events_scheduling.test:
  when selecting always use ORDER BY
mysql-test/t/events_stress.test:
  sleep 2.5secs for shorter stress test
sql/event_data_objects.cc:
  Event_timed is no more used during execution.
  Event_timed is no more used during in the memory queue.
  Event_timed is only used for SHOW CREATE EVENT/ I_S.EVENTS/ SHOW EVENTS
  Event_basic is the parent of almost all Event data objects.
  Event_basic -> Event_queue_element (used for the memory queue) -> Event_timed
  Event_basic -> Event_job_data (the object used for execution)
  Sql_alloc -> Event_parse_data (used during parsing)
sql/event_data_objects.h:
  Event_timed is no more used during execution.
  Event_timed is no more used during in the memory queue.
  Event_timed is only used for SHOW CREATE EVENT/ I_S.EVENTS/ SHOW EVENTS
  Event_basic is the parent of almost all Event data objects.
  Event_basic -> Event_queue_element (used for the memory queue) -> Event_timed
  Event_basic -> Event_job_data (the object used for execution)
  Sql_alloc -> Event_parse_data (used during parsing)
sql/event_db_repository.cc:
  Cosmetics.
  load_named_event now uses Event_basic, for polymorphism
  find_event uses Event_basic, to be polymorphic.
  use Field **fields= table->field and then index fields[...]
  Add documentation.
  Fix documentation.
sql/event_db_repository.h:
  Event_db_repository depends only on Event_basic's interface
sql/event_queue.cc:
  Cosmetics.
  Don't use Event_timed for the queue and giving back object for execution.
  Event_queue_element is for the queue, Event_job_data is for execution.
  Add Event_queue::dump_internal_status() for SHOW SCHEDULER STATUS command
sql/event_queue.h:
  Cosmetics.
  Don't use Event_timed for the queue and giving back object for execution.
  Event_queue_element is for the queue, Event_job_data is for execution.
  Add Event_queue::dump_internal_status() for SHOW SCHEDULER STATUS command
sql/event_scheduler_ng.cc:
  Add back Event_scheduler::cond_wait()
  Add back Event_scheduler::dump_internal_status()
  Using Event_job_data for execution. Make the scheduler thread unkillable (thd->command= COM_DAEMON).
  Add a lot of documentation.
sql/event_scheduler_ng.h:
  Add back Event_scheduler::cond_wait()
  Add back Event_scheduler::dump_internal_status()
  Using Event_job_data for execution.
sql/events.cc:
  Documentation
  Add LOCK_event_metadata
sql/events.h:
  Change the signature of Events::drop_event() not to use sp_name but LEX_STRING
sql/share/errmsg.txt:
  Fix error message
sql/sql_parse.cc:
  Events::drop_event() has new signature
parent b9a7fe27

mysql-test/r/events.result

+6 −3
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ events_test event_starts_test root@localhost RECURRING NULL 20 SECOND # # ENABLE 
DROP EVENT event_starts_test;

create table test_nested(a int);

create event e_43 on schedule every 1 second do set @a = 5;

set global event_scheduler = 1;

alter event e_43 do alter event e_43 do set @a = 4;

ERROR HY000: Recursivity of EVENT DDL statements is forbidden when body is present

alter event e_43 do
@@ -207,6 +206,10 @@ ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND' 
SHOW EVENTS;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

drop event root22;

create event root23 on schedule every -100 year do select 1;

ERROR HY000: INTERVAL is either not positive or too big

create event root23 on schedule every 222222222222222222222 year do select 1;

ERROR HY000: INTERVAL is either not positive or too big

drop event root6;

drop event root7;

drop event root8;
@@ -342,7 +345,7 @@ create event закачка on schedule every 10 hour do select get_lock("test_l 
"Should have only 2 processes: the scheduler and the locked event"

select /*2*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Waiting for next activation	NULL

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

root	localhost	events_test	Connect	User lock	select get_lock("test_lock2", 20)

"Release the mutex, the event worker should finish."

"Release the mutex, the event worker should finish."
@@ -358,7 +361,7 @@ create event закачка21 on schedule every 10 hour do select get_lock("test 
"Should have only 3 processes: the scheduler, our conn and the locked event"

select /*3*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Waiting for next activation	NULL

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

root	localhost	events_test	Connect	User lock	select get_lock("test_lock2_1", 20)

set global event_scheduler=2;

"Should have only our process now:"

mysql-test/r/events_bugs.result

+32 −16
Original line number Diff line number Diff line
@@ -24,8 +24,19 @@ create event e_55 on schedule every 10 hour starts 99990101000000 do drop table 
ERROR HY000: Incorrect STARTS value: '99990101000000'

create event e_55 on schedule every 10 minute ends 99990101000000 do drop table t;

ERROR HY000: ENDS is either invalid or before STARTS

create event e_55 on schedule at 10000101000000 do drop table t;

ERROR HY000: Activation (AT) time is in the past

create event e_55 on schedule at 20000101000000 do drop table t;

ERROR HY000: Activation (AT) time is in the past

create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 do drop table t' at line 1

create event e_55 on schedule at 20200101000000 ends 10000101000000 do drop table t;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ends 10000101000000 do drop table t' at line 1

create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000101000000 do drop table t;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 ends 10000101000000 do drop table t' at line 1

create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t;

ERROR HY000: Incorrect STARTS value: '10000101000000'

set global event_scheduler=2;

"Wait a bit to settle down"

delete from mysql.event;

set global event_scheduler= 1;

set @old_sql_mode:=@@sql_mode;
@@ -41,7 +52,7 @@ end| 
"Now if everything is fine the event has compiled and is locked

select /*1*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Waiting for next activation	NULL

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

root	localhost	events_test	Connect	User lock	select get_lock('test_bug16407', 60)

select release_lock('test_bug16407');

release_lock('test_bug16407')
@@ -57,6 +68,11 @@ select event_schema, event_name, sql_mode from information_schema.events order b 
event_schema	event_name	sql_mode

events_test	e_16407	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER

drop event e_16407;

set sql_mode="ansi";

select get_lock('ee_16407_2', 60);

get_lock('ee_16407_2', 60)

1

set global event_scheduler= 1;

"Another sql_mode test"

set sql_mode="traditional";

create table events_smode_test(ev_name char(10), a date) engine=myisam;
@@ -64,6 +80,7 @@ create table events_smode_test(ev_name char(10), a date) engine=myisam; 
create event ee_16407_2 on schedule every 60 second do

begin

select get_lock('ee_16407_2', 60) /*ee_16407_2*/;

select release_lock('ee_16407_2');

insert into events_test.events_smode_test values('ee_16407_2','1980-19-02');

end|

insert into events_smode_test values ('test','1980-19-02')|
@@ -72,6 +89,7 @@ ERROR 22007: Incorrect date value: '1980-19-02' for column 'a' at row 1 
create event ee_16407_3 on schedule every 60 second do

begin

select get_lock('ee_16407_2', 60) /*ee_16407_3*/;

select release_lock('ee_16407_2');

insert into events_test.events_smode_test values ('ee_16407_3','1980-02-19');

insert into events_test.events_smode_test values ('ee_16407_3','1980-02-29');

end|
@@ -80,6 +98,7 @@ set sql_mode=""| 
create event ee_16407_4 on schedule every 60 second do

begin

select get_lock('ee_16407_2', 60) /*ee_16407_4*/;

select release_lock('ee_16407_2');

insert into events_test.events_smode_test values ('ee_16407_4','10-11-1956');

end|

select event_schema, event_name, sql_mode from information_schema.events order by event_schema, event_name;
@@ -87,14 +106,9 @@ event_schema event_name sql_mode 
events_test	ee_16407_2	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER

events_test	ee_16407_3	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER

events_test	ee_16407_4	

set sql_mode="ansi";

select get_lock('ee_16407_2', 60);

get_lock('ee_16407_2', 60)

1

set global event_scheduler= 1;

select /*2*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Waiting for next activation	NULL

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_2', 60) /*ee_16407_2*/

root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_2', 60) /*ee_16407_3*/

root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_2', 60) /*ee_16407_4*/
@@ -103,7 +117,7 @@ release_lock('ee_16407_2') 
1

select /*3*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Waiting for next activation	NULL

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

set global event_scheduler= 2;

select * from events_smode_test order by ev_name, a;

ev_name	a
@@ -121,28 +135,30 @@ drop event ee_16407_3; 
drop event ee_16407_4;

"And now one last test regarding sql_mode and call of SP from an event"

delete from events_smode_test;

set sql_mode='ansi';

select get_lock('ee_16407_5', 60);

get_lock('ee_16407_5', 60)

1

set global event_scheduler= 1;

set sql_mode='traditional';

create procedure ee_16407_5_pendant() begin insert into events_test.events_smode_test values('ee_16407_5','2001-02-29'); end|

create procedure ee_16407_6_pendant() begin insert into events_test.events_smode_test values('ee_16407_6','2004-02-29'); end|

create event ee_16407_5 on schedule every 60 second do

begin

select get_lock('ee_16407_5', 60) /*ee_16407_5*/;

select release_lock('ee_16407_5');

call events_test.ee_16407_5_pendant();

end|

create event ee_16407_6 on schedule every 60 second do

begin

select get_lock('ee_16407_5', 60) /*ee_16407_6*/;

select release_lock('ee_16407_5');

call events_test.ee_16407_6_pendant();

end|

set sql_mode='ansi';

select get_lock('ee_16407_5', 60);

get_lock('ee_16407_5', 60)

1

set global event_scheduler= 1;

"Should have 2 locked processes"

select /*4*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Waiting for next activation	NULL

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_5', 60) /*ee_16407_5*/

root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_5', 60) /*ee_16407_6*/

select release_lock('ee_16407_5');
@@ -151,7 +167,7 @@ release_lock('ee_16407_5') 
"Should have 0 processes locked"

select /*5*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Waiting for next activation	NULL

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

select * from events_smode_test order by ev_name, a;

ev_name	a

ee_16407_6	2004-02-29

mysql-test/r/events_logs_tests.result

+5 −5
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ SELECT user_host, argument FROM mysql.general_log WHERE argument LIKE '%alabala% 
END|

"Check General Query Log"

SET GLOBAL event_scheduler=2;

create event log_general on schedule every 1 minute do SELect 'alabala', sleep(3) from dual;

create event log_general on schedule every 1 minute do SELect 'alabala', sleep(1) from dual;

TRUNCATE mysql.general_log;

"1 row, the current statement!"

call select_general_log();
@@ -19,7 +19,7 @@ SET GLOBAL event_scheduler=1; 
"Should see 3 rows - the 'SELect' is in the middle. The other two are selects from general_log"

call select_general_log();

user_host	argument

USER_HOST	SELect 'alabala', sleep(3) from dual

USER_HOST	SELect 'alabala', sleep(1) from dual

DROP PROCEDURE select_general_log;

DROP EVENT log_general;

SET GLOBAL event_scheduler=2;
@@ -49,13 +49,13 @@ USER_HOST SLEEPVAL events_test SELECT SLEEP(2) 
SET SESSION long_query_time=300;

"Make it quite long"

TRUNCATE mysql.slow_log;

SET SESSION long_query_time=1;

CREATE TABLE slow_event_test (slo_val tinyint, val tinyint);

"This won't go to the slow log"

CREATE EVENT long_event ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(3);

SELECT * FROM slow_event_test;

slo_val	val

SET SESSION long_query_time=1;

SET GLOBAL event_scheduler=1;

CREATE EVENT long_event ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(1.5);

"Sleep some more time than the actual event run will take"

SHOW VARIABLES LIKE 'event_scheduler';

Variable_name	Value
@@ -64,7 +64,7 @@ event_scheduler 1 
SELECT * FROM slow_event_test;

slo_val	val

4	0

"Check slow log. Should not see anything because 3 is under the threshold of 4 for GLOBAL, though over SESSION which is 2"

"Check slow log. Should not see anything because 1.5 is under the threshold of 300 for GLOBAL, though over SESSION which is 2"

SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;

user_host	query_time	db	sql_text

"This should go to the slow log"

mysql-test/r/events_scheduling.result

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ DROP EVENT start_n_end; 
DROP EVENT only_one_time;

ERROR HY000: Unknown event 'only_one_time'

"Should be preserved"

SELECT EVENT_NAME, STATUS FROM INFORMATION_SCHEMA.EVENTS;

SELECT EVENT_NAME, STATUS FROM INFORMATION_SCHEMA.EVENTS ORDER BY EVENT_NAME;

EVENT_NAME	STATUS

E19170	ENABLED

two_time	DISABLED

mysql-test/t/events.test

+10 −6
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ CREATE EVENT e_x2 ON SCHEDULE EVERY 1 SECOND DO DROP TABLE x_table; 
connection default;

SHOW DATABASES LIKE 'db_x';

SET GLOBAL event_scheduler=1;

--sleep 1.5

--sleep 0.8

SHOW DATABASES LIKE 'db_x';

SHOW TABLES FROM db_x;

SET GLOBAL event_scheduler=2;
@@ -83,7 +83,6 @@ DROP EVENT event_starts_test; 
#

create table test_nested(a int);

create event e_43 on schedule every 1 second do set @a = 5;

set global event_scheduler = 1;

--error 1562

alter event e_43 do alter event e_43 do set @a = 4;

delimiter |;
@@ -94,7 +93,7 @@ begin 
end|

delimiter ;|

set global event_scheduler = 1;

--sleep 1

--sleep 3

select db, name, body, status, interval_field, interval_value from mysql.event;

drop event e_43;

drop table test_nested;
@@ -102,7 +101,7 @@ drop table test_nested; 
--echo "Let's check whether we can use non-qualified names"

create table non_qualif(a int);

create event non_qualif_ev on schedule every 10 minute do insert into non_qualif values (800219);

--sleep 1

--sleep 0.5

select * from non_qualif;

drop event non_qualif_ev;

drop table non_qualif;
@@ -165,6 +164,10 @@ show create event root22; 
--error ER_NOT_SUPPORTED_YET

SHOW EVENTS;

drop event root22;

--error ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG

create event root23 on schedule every -100 year do select 1;

--error ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG

create event root23 on schedule every 222222222222222222222 year do select 1;

drop event root6;

drop event root7;

drop event root8;
@@ -294,7 +297,7 @@ select get_lock("test_lock2", 20); 
--echo "Create an event which tries to acquire a mutex. The event locks on the mutex"

create event закачка on schedule every 10 hour do select get_lock("test_lock2", 20);

--echo "Let some time pass to the event starts"

--sleep 1

--sleep 0.5

--echo "Should have only 2 processes: the scheduler and the locked event"

select /*2*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;--echo "Release the mutex, the event worker should finish."

--echo "Release the mutex, the event worker should finish."
@@ -312,10 +315,11 @@ drop event закачка; 
set global event_scheduler=1;

select get_lock("test_lock2_1", 20);

create event закачка21 on schedule every 10 hour do select get_lock("test_lock2_1", 20);

--sleep 1

--sleep 0.5

--echo "Should have only 3 processes: the scheduler, our conn and the locked event"

select /*3*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

set global event_scheduler=2;

--sleep 0.3

--echo "Should have only our process now:"

select /*4*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

drop event закачка21;