← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Barry.Leslie at PrimeBase
  • Date: 2010-05-06 14:23:27 UTC
  • mto: This revision was merged to the branch mainline in revision 1544.
  • Revision ID: barry.leslie@primebase.com-20100506142327-hg5wnvqgn5bc6lw3
Renamed the 'Event' plugin to 'EventObserver' plugin along with some internal class renames to make things clearer.
Unless I really need a pointer to an object I now always pass things by reference.
'Post' event observers can now report a failure the same as 'Pre' event observers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
53
53
#include "drizzled/db.h"
54
54
 
55
55
#include <drizzled/table_proto.h>
56
 
#include <drizzled/plugin/event.h>
 
56
#include <drizzled/plugin/event_observer.h>
57
57
 
58
58
static bool shutdown_has_begun= false; // Once we put in the container for the vector/etc for engines this will go away.
59
59
 
102
102
  int error;
103
103
  setTransactionReadWrite(session);
104
104
 
105
 
  if (unlikely(plugin::Event::preRenameTableDo(&session, &from, &to)))
106
 
    error= ER_EVENT_PLUGIN;
 
105
  if (unlikely(plugin::EventObserver::preRenameTableDo(session, from, to)))
 
106
  {
 
107
    error= ER_EVENT_OBSERVER_PLUGIN;
 
108
  }
107
109
  else
108
110
  {
109
111
    error =  doRenameTable(session, from, to);
110
 
    plugin::Event::postRenameTableDo(&session, &from, &to, error);
 
112
    if (unlikely(plugin::EventObserver::postRenameTableDo(session, from, to, error)))
 
113
    {
 
114
      error= ER_EVENT_OBSERVER_PLUGIN;
 
115
    }
111
116
  }
112
117
  
113
118
  return error;
475
480
 
476
481
  engine.setTransactionReadWrite(session);
477
482
  
478
 
  plugin::Event::preDropTableDo(&session, &identifier);
479
 
  error= engine.doDropTable(session, identifier);
480
 
  plugin::Event::postDropTableDo(&session, &identifier, error);
 
483
  if (unlikely(plugin::EventObserver::preDropTableDo(session, identifier)))
 
484
  {
 
485
    error= ER_EVENT_OBSERVER_PLUGIN;
 
486
  }
 
487
  else
 
488
  {
 
489
    error= engine.doDropTable(session, identifier);
 
490
    if (unlikely(plugin::EventObserver::postDropTableDo(session, identifier, error)))
 
491
    {
 
492
      error= ER_EVENT_OBSERVER_PLUGIN;
 
493
    }
 
494
  }
 
495
 
481
496
 
482
497
  return error;
483
498
}