← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/transaction_log/transaction_log_applier.cc

  • Committer: Brian Aker
  • Date: 2010-04-12 19:28:43 UTC
  • mfrom: (1455.5.1 bug561739)
  • Revision ID: brian@gaz-20100412192843-mu6gouk7pq74drts
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/transaction_log/transaction_log_applier.cc
59
59
 
60
60
TransactionLogApplier *transaction_log_applier= NULL; /* The singleton transaction log applier */
61
61
 
62
 
extern TransactionLogIndex *transaction_log_index;
63
 
 
64
62
TransactionLogApplier::TransactionLogApplier(const string name_arg,
65
63
                                             TransactionLog *in_transaction_log,
 
64
                                             TransactionLogIndex *in_transaction_log_index,
66
65
                                             uint32_t in_num_write_buffers) :
67
66
  plugin::TransactionApplier(name_arg),
68
 
  transaction_log(*in_transaction_log),  
69
 
  transaction_log_ptr(in_transaction_log),
 
67
  transaction_log(in_transaction_log),
 
68
  transaction_log_index(in_transaction_log_index),
70
69
  num_write_buffers(in_num_write_buffers),
71
70
  write_buffers()
72
71
{
86
85
           write_buffers.end(),
87
86
           DeletePtr());
88
87
  write_buffers.clear();
89
 
  delete transaction_log_ptr;
 
88
  delete transaction_log;
 
89
  delete transaction_log_index;
90
90
}
91
91
 
92
92
WriteBuffer *TransactionLogApplier::getWriteBuffer(const Session &session)
106
106
  write_buffer->lock();
107
107
  write_buffer->resize(entry_size);
108
108
  uint8_t *bytes= write_buffer->getRawBytes();
109
 
  bytes= transaction_log.packTransactionIntoLogEntry(to_apply,
 
109
  bytes= transaction_log->packTransactionIntoLogEntry(to_apply,
110
110
                                                     bytes,
111
111
                                                     &checksum);
112
112
 
113
 
  off_t written_to= transaction_log.writeEntry(bytes, entry_size);
 
113
  off_t written_to= transaction_log->writeEntry(bytes, entry_size);
114
114
  write_buffer->unlock();
115
115
 
116
116
  /* Add an entry to the index describing what was just applied */