mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 07:44:22 +01:00
3c39b0d831
This patch implements the idea of the bug report by making Event_queue unaware of Event_db_repository by making a higher level class - Events, which is aware of most of all classes, responsible for passing all data needed for adding/updating/deleting an event to/from the queue. Introduces few new classes : - Event_worker_thread - Event_queue_element_for_exec sql/event_data_objects.cc: Introduced a new class Event_queue_element_for_exec According to Konstantin it should be named Event_name and hold only two LEX_STRINGs but `dropped` is not saved on disk and will require additional logic in Event_worker_thread class, after loading to compute whether the event should be dropped or not. It's easier just to pass this flag around. Removed Event_queue_element::drop(). This method was a source of a race condition. At the place where the event should be dropped we call Events::drop_event() which is the only code-flow for dropping. In addition, because ::drop_event() holds Events::LOCK_metadata there is no source of race conditions. Before this patch dropping from ::drop() wasn't under LOCK_metadata and races were possible. Because Events::open_event_table was removed as a method, provisionally events_event_db_repository was exported from events.cc till a solution is build where Event_queue_element does not access directly mysql.event. sql/event_data_objects.h: New class Event_queue_element_for_exec added which is returned from Event_queue::get_top_if_time() and passed through Event_scheduler to Event_worker_thread. There by using the (db)name Event_job_data is instanciated and executed. Dropped Event_queue_element::drop() thd was moved out of Event_job_data as it is now part of Event_queue_element_for_exec sql/event_queue.cc: Removed dependency of Event_queue on Event_db_repository. The instantiation of Event_job_data was moved to class Event_worker_thread In place is a return of an object of Event_queue_element_for_exec is used later for instantiating Event_job_data. The `dropped` flag of Event_queue_element is passed over Event_queue_element_for_exec to the code in Event_worker_thread. sql/event_queue.h: Removed dependency of Event_queue on Event_db_repository Removed dependency on Event_scheduler sql/event_scheduler.cc: Added class Event_worker_thread, which is used during the execution of an event. It has a static init() method to get a pointer to Event_db_repository to be used for instantiation of Event_job_data object. This object it then executed. sql/event_scheduler.h: Added class Event_worker_thread, which is used during the execution of an event. sql/events.cc: Removed Events::open_event_table() because it was a product of a bad architecture. sql/events.h: Removed friend definition, unneeded. Fixed Events::drop_event() to have the previous signature without bool only_from_disk sql/sql_parse.cc: Fix call
113 lines
2.7 KiB
C++
113 lines
2.7 KiB
C++
#ifndef _EVENT_QUEUE_H_
|
|
#define _EVENT_QUEUE_H_
|
|
/* Copyright (C) 2004-2006 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
class Event_basic;
|
|
class Event_queue_element;
|
|
class Event_queue_element_for_exec;
|
|
|
|
class THD;
|
|
|
|
class Event_queue
|
|
{
|
|
public:
|
|
Event_queue();
|
|
|
|
void
|
|
init_mutexes();
|
|
|
|
void
|
|
deinit_mutexes();
|
|
|
|
bool
|
|
init_queue(THD *thd);
|
|
|
|
void
|
|
deinit_queue();
|
|
|
|
/* Methods for queue management follow */
|
|
|
|
void
|
|
create_event(THD *thd, Event_queue_element *new_element);
|
|
|
|
void
|
|
update_event(THD *thd, LEX_STRING dbname, LEX_STRING name,
|
|
Event_queue_element *new_element);
|
|
|
|
void
|
|
drop_event(THD *thd, LEX_STRING dbname, LEX_STRING name);
|
|
|
|
void
|
|
drop_schema_events(THD *thd, LEX_STRING schema);
|
|
|
|
void
|
|
recalculate_activation_times(THD *thd);
|
|
|
|
bool
|
|
get_top_for_execution_if_time(THD *thd,
|
|
Event_queue_element_for_exec **event_name);
|
|
|
|
|
|
void
|
|
dump_internal_status();
|
|
|
|
void
|
|
empty_queue();
|
|
protected:
|
|
void
|
|
find_n_remove_event(LEX_STRING db, LEX_STRING name);
|
|
|
|
|
|
void
|
|
drop_matching_events(THD *thd, LEX_STRING pattern,
|
|
bool (*)(LEX_STRING, Event_basic *));
|
|
|
|
|
|
void
|
|
dbug_dump_queue(time_t now);
|
|
|
|
/* LOCK_event_queue is the mutex which protects the access to the queue. */
|
|
pthread_mutex_t LOCK_event_queue;
|
|
pthread_cond_t COND_queue_state;
|
|
|
|
/* The sorted queue with the Event_queue_element objects */
|
|
QUEUE queue;
|
|
|
|
TIME next_activation_at;
|
|
|
|
uint mutex_last_locked_at_line;
|
|
uint mutex_last_unlocked_at_line;
|
|
uint mutex_last_attempted_lock_at_line;
|
|
const char* mutex_last_locked_in_func;
|
|
const char* mutex_last_unlocked_in_func;
|
|
const char* mutex_last_attempted_lock_in_func;
|
|
bool mutex_queue_data_locked;
|
|
bool mutex_queue_data_attempting_lock;
|
|
bool waiting_on_cond;
|
|
|
|
/* helper functions for working with mutexes & conditionals */
|
|
void
|
|
lock_data(const char *func, uint line);
|
|
|
|
void
|
|
unlock_data(const char *func, uint line);
|
|
|
|
void
|
|
cond_wait(THD *thd, struct timespec *abstime, const char* msg,
|
|
const char *func, uint line);
|
|
};
|
|
|
|
#endif /* _EVENT_QUEUE_H_ */
|