← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.cc

Merge in encapsulation of the table message from the main class.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
218
218
 */
219
219
bool TableShare::fieldInPrimaryKey(Field *in_field) const
220
220
{
221
 
  assert(_table_message != NULL);
 
221
  assert(getTableMessage());
222
222
 
223
 
  size_t num_indexes= _table_message->indexes_size();
 
223
  size_t num_indexes= getTableMessage()->indexes_size();
224
224
 
225
225
  for (size_t x= 0; x < num_indexes; ++x)
226
226
  {
227
 
    const message::Table::Index &index= _table_message->indexes(x);
 
227
    const message::Table::Index &index= getTableMessage()->indexes(x);
228
228
    if (index.is_primary())
229
229
    {
230
230
      size_t num_parts= index.index_part_size();
560
560
TableShare::~TableShare() 
561
561
{
562
562
  storage_engine= NULL;
563
 
 
564
563
  delete _table_message;
565
564
  _table_message= NULL;
566
565
 
582
581
  table_name.str=    db.str + db.length + 1;
583
582
  table_name.length= strlen(table_name.str);
584
583
 
585
 
  _table_message->set_name(identifier_arg.getTableName());
586
 
  _table_message->set_schema(identifier_arg.getSchemaName());
 
584
  getTableMessage()->set_name(identifier_arg.getTableName());
 
585
  getTableMessage()->set_schema(identifier_arg.getSchemaName());
587
586
}
588
587
 
589
588
int TableShare::inner_parse_table_proto(Session& session, message::Table &table)
599
598
    return ER_CORRUPT_TABLE_DEFINITION;
600
599
  }
601
600
 
602
 
  setTableProto(new(nothrow) message::Table(table));
 
601
  setTableMessage(table);
603
602
 
604
603
  storage_engine= plugin::StorageEngine::findByName(session, table.engine().name());
605
604
  assert(storage_engine); // We use an assert() here because we should never get this far and still have no suitable engine.
1215
1214
                         charset,
1216
1215
                         MTYP_TYPENR(unireg_type),
1217
1216
                         ((field_type == DRIZZLE_TYPE_ENUM) ?  &intervals[interval_nr++] : (TYPELIB*) 0),
1218
 
                         getTableProto()->field(fieldnr).name().c_str());
 
1217
                         getTableMessage()->field(fieldnr).name().c_str());
1219
1218
 
1220
1219
    _fields[fieldnr]= f;
1221
1220