Commit 377446fa authored by unknown's avatar unknown
Browse files

WL#3337 (Event scheduler new architecture) 

This is the first cut of separating Event_scheduler in two
classes which are more specialized.
Inheritance was used to separate methods and member variables.
Still Event_scheduler is a child of Event_queue. This dependency
will be removed soon.


sql/event_data_objects.cc:
  add comments
sql/event_db_repository.cc:
  coding style
sql/event_db_repository.h:
  add a call, will be implemented later
sql/event_queue.cc:
  Event_queue, still as super-class of Event_scheduler
sql/event_queue.h:
  Event_queue as super-class of Event_scheduler. Trying to
  separate the two classes
sql/event_scheduler.cc:
  Event_scheduler as child class of Event_queue.
  Trying to separate both classes.
sql/event_scheduler.h:
  Event_scheduler as child class of Event_queue.
  Trying to separate both classes.
sql/events.cc:
  Don't allocate on the stack the scheduler but on the heap.
  The exact way it is done will be changed, that's ok for now.
parent 8d961c45

sql/event_data_objects.cc

+20 −0
Original line number Diff line number Diff line
@@ -25,6 +25,19 @@ 
#define EVEX_MAX_INTERVAL_VALUE 2147483647L





/*

  Returns a new instance



  SYNOPSIS

    Event_parse_data::new_instance()



  RETURN VALUE

    Address or NULL in case of error

  

  NOTE

    Created on THD's mem_root

*/



Event_parse_data *

Event_parse_data::new_instance(THD *thd)

{
@@ -32,6 +45,13 @@ Event_parse_data::new_instance(THD *thd) 
}





/*

  Constructor



  SYNOPSIS

    Event_parse_data::Event_parse_data()

*/



Event_parse_data::Event_parse_data()

{

  item_execute_at= item_expression= item_starts= item_ends= NULL;

sql/event_db_repository.cc

+1 −0
Original line number Diff line number Diff line
@@ -1297,3 +1297,4 @@ Event_db_repository::load_named_event(THD *thd, LEX_STRING dbname, LEX_STRING na 


  DBUG_RETURN(OP_OK);

}

sql/event_db_repository.h

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ class Event_db_repository 
  int

  table_scan_all_for_i_s(THD *thd, TABLE *schema_table, TABLE *event_table);



  static bool

  check_system_tables(THD *thd);



  MEM_ROOT repo_root;



  /* Prevent use of these */

sql/event_queue.cc

+841 −0

File changed.

Preview size limit exceeded, changes collapsed.

sql/event_queue.h

+103 −1
Original line number Diff line number Diff line
@@ -16,5 +16,107 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



class sp_name;

class Event_timed;

class Event_db_repository;



class THD;

typedef bool * (*event_timed_identifier_comparator)(Event_timed*, Event_timed*);



class Event_scheduler;



class Event_queue

{

public:

  Event_queue();



  static void

  init_mutexes();

  

  static void

  destroy_mutexes();

  

  bool

  init(Event_db_repository *db_repo);

  

  void

  deinit();



  /* Methods for queue management follow */



  int

  create_event(THD *thd, Event_parse_data *et, bool check_existence);



  int

  update_event(THD *thd, Event_parse_data *et, LEX_STRING *new_schema,

               LEX_STRING *new_name);



  bool

  drop_event(THD *thd, sp_name *name);



  int

  drop_schema_events(THD *thd, LEX_STRING schema);



  int

  drop_user_events(THD *thd, LEX_STRING *definer)

  { DBUG_ASSERT(0); return 0;}



  uint

  events_count();



  uint

  events_count_no_lock();



  static bool

  check_system_tables(THD *thd);



  void

  recalculate_queue(THD *thd);

  

  void

  empty_queue();



///////////////protected

  Event_timed *

  find_event(LEX_STRING db, LEX_STRING name, bool remove_from_q);



  int

  load_events_from_db(THD *thd);



  void

  drop_matching_events(THD *thd, LEX_STRING pattern,

                       bool (*)(Event_timed *,LEX_STRING *));



  /* LOCK_event_queue is the mutex which protects the access to the queue. */

  pthread_mutex_t LOCK_event_queue;



  Event_db_repository *db_repository;



  /* The MEM_ROOT of the object */

  MEM_ROOT scheduler_root;



  /* The sorted queue with the Event_timed objects */

  QUEUE queue;

  

  uint mutex_last_locked_at_line;

  uint mutex_last_unlocked_at_line;

  const char* mutex_last_locked_in_func;

  const char* mutex_last_unlocked_in_func;

  bool mutex_queue_data_locked;



  /* helper functions for working with mutexes & conditionals */

  void

  lock_data(const char *func, uint line);



  void

  unlock_data(const char *func, uint line);



  static void

  on_queue_change();

protected:

  /* Singleton instance */

  static Event_scheduler *singleton;



};



#endif /* _EVENT_QUEUE_H_ */