← Back to branch summary

~ubuntu-branches/ubuntu/vivid/drizzle/vivid-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Tobias Frost
  • Date: 2013-08-22 20:18:31 UTC
  • mto: (20.1.1 sid)
  • mto: This revision was merged to the branch mainline in revision 21.
  • Revision ID: package-import@ubuntu.com-20130822201831-gn3ozsh7o7wmc5tk
Tags: upstream-7.2.3
Import upstream version 7.2.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.h
231
231
private:
232
232
  identifier::Table::Key private_key_for_cache; // This will not exist in the final design.
233
233
  std::vector<char> private_normalized_path; // This will not exist in the final design.
234
 
  str_ref db;                        /* Pointer to db */
235
 
  str_ref table_name;                /* Table name (for open) */
 
234
  drizzled::identifier::Table *table_identifier;
236
235
  str_ref path; /* Path to table (from datadir) */
237
236
  str_ref normalized_path;              /* unpack_filename(path) */
238
237
 
261
260
 
262
261
  str_ref getTableNameRef() const
263
262
  {
264
 
    return table_name;
 
263
    return str_ref(table_identifier->getTableName());
265
264
  }
266
265
 
267
266
  const char *getTableName() const
268
267
  {
269
 
    return table_name.data();
 
268
    return table_identifier->getTableName().c_str();
270
269
  }
271
270
 
272
271
  str_ref getSchemaNameRef() const
273
272
  {
274
 
    return db;
 
273
    return str_ref(table_identifier->getSchemaName());
275
274
  }
276
275
 
277
276
  const char *getSchemaName() const
278
277
  {
279
 
    return db.data();
 
278
    return table_identifier->getSchemaName().c_str();
 
279
  }
 
280
 
 
281
  const drizzled::identifier::Table &getTableIdentifier() const
 
282
  {
 
283
    return *table_identifier;
280
284
  }
281
285
 
282
286
  uint32_t   block_size;                   /* create information */