← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.h
295
295
  }
296
296
 
297
297
public:
 
298
  str_ref getTableNameRef() const
 
299
  {
 
300
    return table_name;
 
301
  }
298
302
 
299
303
  const char *getTableName() const
300
304
  {
301
305
    return table_name.str;
302
306
  }
303
307
 
304
 
  uint32_t getTableNameSize() const
305
 
  {
306
 
    return table_name.length;
307
 
  }
308
 
 
309
 
  const std::string &getTableName(std::string &name_arg) const
310
 
  {
311
 
    name_arg.assign(table_name.str, table_name.length);
312
 
    return name_arg;
 
308
  str_ref getSchemaNameRef() const
 
309
  {
 
310
    return db;
313
311
  }
314
312
 
315
313
  const char *getSchemaName() const
317
315
    return db.str;
318
316
  }
319
317
 
320
 
  size_t getSchemaNameSize() const
321
 
  {
322
 
    return db.length;
323
 
  }
324
 
 
325
 
  const std::string &getSchemaName(std::string &schema_name_arg) const
326
 
  {
327
 
    schema_name_arg.assign(db.str, db.length);
328
 
    return schema_name_arg;
329
 
  }
330
 
 
331
318
  uint32_t   block_size;                   /* create information */
332
319
 
333
320
private:
628
615
 
629
616
public:
630
617
 
631
 
  static TableShare::shared_ptr getShareCreate(Session *session, 
632
 
                                               const identifier::Table &identifier,
633
 
                                               int &error);
 
618
  static TableShare::shared_ptr getShareCreate(Session*, const identifier::Table&, int &error);
634
619
 
635
620
  friend std::ostream& operator<<(std::ostream& output, const TableShare &share)
636
621
  {
637
 
    output << "TableShare:(";
638
 
    output <<  share.getSchemaName();
639
 
    output << ", ";
640
 
    output << share.getTableName();
641
 
    output << ", ";
642
 
    output << share.getTableTypeAsString();
643
 
    output << ", ";
644
 
    output << share.getPath();
645
 
    output << ")";
646
 
 
647
 
    return output;  // for multiple << operators.
 
622
    return output << "TableShare:(" <<  share.getSchemaNameRef() << ", " << share.getTableName() << ", " << share.getTableTypeAsString() << ", " << share.getPath() << ")";
648
623
  }
649
624
 
650
625
protected: