~drizzle-trunk/drizzle/development

Viewing changes to drizzled/identifier/table.h

Committer: Stewart Smith
Date: 2011-12-27 05:13:55 UTC
mto: This revision was merged to the branch mainline in revision 2484.
Revision ID: stewart@flamingspork.com-20111227051355-ekct91ewmatpjx8i

ensure that Table::Key has the CATALOG along with SCHEMA and TABLE_NAME in it. Modify the (not so great) code in Table and TableShare to handle this too. This is one of the precursors for proper CATALOG support.

files modified:
drizzled/identifier/table.cc

drizzled/identifier/table.h

drizzled/table/instance/base.cc

Show diffs side-by-side

added added

removed removed

drizzled/identifier/table.h

return key_buffer;

}

void set(size_t resize_arg, const std::string &a, const std::string &b);

void set(size_t resize_arg, const std::string &a, const std::string &b, const std::string &c);

friend bool operator==(const Key &left, const Key &right)

{

123

124

size_t getKeySize() const

125

{

126

return getSchemaName().size() + getTableName().size() + 2;

126

return getCatalogName().size() + getSchemaName().size() + getTableName().size() + 3;

127

}

128

129

public:

Older »