← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cursor.cc

Style changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cursor.cc
35
35
#include "drizzled/cost_vect.h"
36
36
#include "drizzled/session.h"
37
37
#include "drizzled/sql_base.h"
 
38
#include "drizzled/transaction_services.h"
38
39
#include "drizzled/replication_services.h"
39
40
#include "drizzled/lock.h"
40
41
#include "drizzled/item/int.h"
738
739
    /** 
739
740
     * Trigger post-truncate notification to plugins... 
740
741
     *
741
 
     * @todo Make ReplicationServices generic to AfterTriggerServices
 
742
     * @todo Make TransactionServices generic to AfterTriggerServices
742
743
     * or similar...
743
744
     */
744
745
    Session *const session= table->in_use;
745
 
    ReplicationServices &replication_services= ReplicationServices::singleton();
746
 
    replication_services.truncateTable(session, table);
 
746
    TransactionServices &transaction_services= TransactionServices::singleton();
 
747
    transaction_services.truncateTable(session, table);
747
748
  }
748
749
 
749
750
  return result;
1345
1346
                                    const unsigned char *before_record,
1346
1347
                                    const unsigned char *after_record)
1347
1348
{
 
1349
  TransactionServices &transaction_services= TransactionServices::singleton();
1348
1350
  ReplicationServices &replication_services= ReplicationServices::singleton();
1349
1351
  Session *const session= table->in_use;
1350
1352
 
1351
 
  if (table->s->tmp_table || ! replication_services.isActive())
 
1353
  if (table->s->tmp_table || not replication_services.isActive())
1352
1354
    return false;
1353
1355
 
1354
1356
  bool result= false;
1365
1367
     * CREATE TABLE will commit the transaction containing
1366
1368
     * it).
1367
1369
     */
1368
 
    result= replication_services.insertRecord(session, table);
 
1370
    result= transaction_services.insertRecord(session, table);
1369
1371
    break;
1370
1372
  case SQLCOM_REPLACE:
1371
1373
  case SQLCOM_REPLACE_SELECT:
1389
1391
     */
1390
1392
    if (after_record == NULL)
1391
1393
    {
1392
 
      replication_services.deleteRecord(session, table);
 
1394
      transaction_services.deleteRecord(session, table);
1393
1395
      /* 
1394
1396
       * We set the "current" statement message to NULL.  This triggers
1395
1397
       * the replication services component to generate a new statement
1396
1398
       * message for the inserted record which will come next.
1397
1399
       */
1398
 
      replication_services.finalizeStatement(*session->getStatementMessage(), session);
 
1400
      transaction_services.finalizeStatementMessage(*session->getStatementMessage(), session);
1399
1401
    }
1400
1402
    else
1401
1403
    {
1402
1404
      if (before_record == NULL)
1403
 
        result= replication_services.insertRecord(session, table);
 
1405
        result= transaction_services.insertRecord(session, table);
1404
1406
      else
1405
 
        replication_services.updateRecord(session, table, before_record, after_record);
 
1407
        transaction_services.updateRecord(session, table, before_record, after_record);
1406
1408
    }
1407
1409
    break;
1408
1410
  case SQLCOM_INSERT:
1414
1416
     * an update.
1415
1417
     */
1416
1418
    if (before_record == NULL)
1417
 
      result= replication_services.insertRecord(session, table);
 
1419
      result= transaction_services.insertRecord(session, table);
1418
1420
    else
1419
 
      replication_services.updateRecord(session, table, before_record, after_record);
 
1421
      transaction_services.updateRecord(session, table, before_record, after_record);
1420
1422
    break;
1421
1423
 
1422
1424
  case SQLCOM_UPDATE:
1423
 
    replication_services.updateRecord(session, table, before_record, after_record);
 
1425
    transaction_services.updateRecord(session, table, before_record, after_record);
1424
1426
    break;
1425
1427
 
1426
1428
  case SQLCOM_DELETE:
1427
 
    replication_services.deleteRecord(session, table);
 
1429
    transaction_services.deleteRecord(session, table);
1428
1430
    break;
1429
1431
  default:
1430
1432
    break;