Commit a5dfeb02 authored by unknown's avatar unknown
Browse files

WL #3337 (Event scheduler new architecture) 

Cut Nr. 8.

All tests pass.

Separated Event_scheduler into Event_queue and Event_scheduler.
Added new Event_scheduler_ng which is the new scheduler and is used
system-wide. Will be moved to the event_scheduler.cc in the future.
Using Event_timed in Event_queue as well as cloned during execution.
Next step is to have Event_worker_data which will be used during execution
and will take ::compile()/::execute() out of Event_timed.


mysql-test/r/events.result:
  update result
mysql-test/r/events_bugs.result:
  update result
mysql-test/r/ps_1general.result:
  update result
mysql-test/r/skip_name_resolve.result:
  update result
mysql-test/r/sp-threads.result:
  update result
mysql-test/r/sp_notembedded.result:
  update result
mysql-test/r/status.result:
  update result
mysql-test/t/events_stress.test:
  Make event_stress a bit longer
sql/Makefile.am:
  Add new event_scheduler_ng.h/cc . These are only to be in the experimental
  clone. Later their content will be moved to event_scheduler.h/cc
sql/event_data_objects.cc:
  Allocate strings memory on own memory root, instead
  on the schedulers. Thus don't "leak" memory. This should
  fix bug#18683 memory leak in event scheduler
sql/event_data_objects.h:
  add mem_root
  add THD - this is only temporal, will be moved to class Event_job_data
  once Event_job_data is responsible for the execution.
sql/event_db_repository.cc:
  Remove unused code.
  Cosmetic changes
sql/event_queue.cc:
  Now use the Event_scheduler_ng (NextGen)
sql/event_queue.h:
  Now use the Event_scheduler_ng (NextGen)
sql/event_scheduler.cc:
  This file is no more used, but will be soon.
sql/event_scheduler.h:
  This file is no more used but will be soon
sql/events.cc:
  Now use the Event_scheduler_ng (NextGen)
sql/events.h:
  Now use the Event_scheduler_ng (NextGen)
sql/mysqld.cc:
  Make it again possible to kill the scheduler thread
sql/set_var.cc:
  Now use the Event_scheduler_ng (NextGen)
sql/share/errmsg.txt:
  Shorten the message.
sql/sql_show.cc:
  Loading is on a own root, then don't use thd->mem_root
parent 377446fa

mysql-test/r/events.result

+2 −4
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ root@localhost закачка events_test 
"Should be only 1 process"

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	Suspended	NULL

select release_lock("test_lock1");

release_lock("test_lock1")

1
@@ -343,7 +342,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	Sleeping	NULL

event_scheduler	localhost	NULL	Connect	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."
@@ -359,13 +358,12 @@ 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	Sleeping	NULL

event_scheduler	localhost	NULL	Connect	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:"

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	Suspended	NULL

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

drop event закачка21;

create table t_16 (s1 int);

mysql-test/r/events_bugs.result

+5 −5
Original line number Diff line number Diff line
@@ -41,7 +41,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	Sleeping	NULL

event_scheduler	localhost	NULL	Connect	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')
@@ -94,7 +94,7 @@ get_lock('ee_16407_2', 60) 
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	Sleeping	NULL

event_scheduler	localhost	NULL	Connect	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 +103,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	Sleeping	NULL

event_scheduler	localhost	NULL	Connect	Waiting for next activation	NULL

set global event_scheduler= 2;

select * from events_smode_test order by ev_name, a;

ev_name	a
@@ -142,7 +142,7 @@ 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	Sleeping	NULL

event_scheduler	localhost	NULL	Connect	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 +151,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	Sleeping	NULL

event_scheduler	localhost	NULL	Connect	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/ps_1general.result

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ t9 MyISAM 10 Dynamic 2 216 432 # 2048 0 NULL # # # latin1_swedish_ci NULL 
prepare stmt4 from ' show status like ''Threads_running'' ';

execute stmt4;

Variable_name	Value

Threads_running	2

Threads_running	1

prepare stmt4 from ' show variables like ''sql_mode'' ';

execute stmt4;

Variable_name	Value

mysql-test/r/skip_name_resolve.result

+0 −1
Original line number Diff line number Diff line
@@ -10,6 +10,5 @@ user() 
#

show processlist;

Id	User	Host	db	Command	Time	State	Info

<id>	event_scheduler	<host>	NULL	<command>	<time>	<state>	<info>

<id>	root	<host>	test	<command>	<time>	<state>	<info>

<id>	root	<host>	test	<command>	<time>	<state>	<info>

mysql-test/r/sp-threads.result

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ lock tables t2 write; 
 call bug9486();

show processlist;

Id	User	Host	db	Command	Time	State	Info

#	event_scheduler	localhost	NULL	Connect	#	Suspended	NULL

#	root	localhost	test	Sleep	#		NULL

#	root	localhost	test	Query	#	Locked	update t1, t2 set val= 1 where id1=id2

#	root	localhost	test	Query	#	NULL	show processlist