← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_engine/schema.cc

  • Committer: Brian Aker
  • Date: 2011-01-13 05:06:32 UTC
  • mto: (2079.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110113050632-92b0129n2urv5v0w
Fix for test on drop (error message change).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_engine/schema.cc
80
80
    if (not entry->filename.compare(GLOBAL_TEMPORARY_EXT))
81
81
      continue;
82
82
 
83
 
    identifier::Schema filename(entry->filename);
 
83
    SchemaIdentifier filename(entry->filename);
84
84
    if (readSchemaFile(filename, schema_message))
85
85
    {
86
 
      identifier::Schema schema_identifier(schema_message.name());
 
86
      SchemaIdentifier schema_identifier(schema_message.name());
87
87
 
88
88
      pair<SchemaCache::iterator, bool> ret=
89
89
        schema_cache.insert(make_pair(schema_identifier.getPath(), new message::Schema(schema_message)));
97
97
  mutex.unlock();
98
98
}
99
99
 
100
 
void Schema::doGetSchemaIdentifiers(identifier::Schema::vector &set_of_names)
 
100
void Schema::doGetSchemaIdentifiers(SchemaIdentifier::vector &set_of_names)
101
101
{
102
102
  mutex.lock_shared();
103
103
  {
105
105
         iter != schema_cache.end();
106
106
         iter++)
107
107
    {
108
 
      set_of_names.push_back(identifier::Schema((*iter).second->name()));
 
108
      set_of_names.push_back(SchemaIdentifier((*iter).second->name()));
109
109
    }
110
110
  }
111
111
  mutex.unlock_shared();
112
112
}
113
113
 
114
 
bool Schema::doGetSchemaDefinition(const identifier::Schema &schema_identifier, message::schema::shared_ptr &schema_message)
 
114
bool Schema::doGetSchemaDefinition(const SchemaIdentifier &schema_identifier, message::schema::shared_ptr &schema_message)
115
115
{
116
116
  mutex.lock_shared();
117
117
  SchemaCache::iterator iter= schema_cache.find(schema_identifier.getPath());
130
130
 
131
131
bool Schema::doCreateSchema(const drizzled::message::Schema &schema_message)
132
132
{
133
 
  identifier::Schema schema_identifier(schema_message.name());
 
133
  SchemaIdentifier schema_identifier(schema_message.name());
134
134
 
135
135
  if (mkdir(schema_identifier.getPath().c_str(), 0777) == -1)
136
136
    return false;
158
158
  return true;
159
159
}
160
160
 
161
 
bool Schema::doDropSchema(const identifier::Schema &schema_identifier)
 
161
bool Schema::doDropSchema(const SchemaIdentifier &schema_identifier)
162
162
{
163
163
  message::schema::shared_ptr schema_message;
164
164
 
200
200
 
201
201
bool Schema::doAlterSchema(const drizzled::message::Schema &schema_message)
202
202
{
203
 
  identifier::Schema schema_identifier(schema_message.name());
 
203
  SchemaIdentifier schema_identifier(schema_message.name());
204
204
 
205
205
  if (access(schema_identifier.getPath().c_str(), F_OK))
206
206
    return false;
230
230
 
231
231
  @note we do the rename to make it crash safe.
232
232
*/
233
 
bool Schema::writeSchemaFile(const identifier::Schema &schema_identifier, const message::Schema &db)
 
233
bool Schema::writeSchemaFile(const SchemaIdentifier &schema_identifier, const message::Schema &db)
234
234
{
235
235
  char schema_file_tmp[FN_REFLEN];
236
236
  string schema_file(schema_identifier.getPath());
296
296
}
297
297
 
298
298
 
299
 
bool Schema::readSchemaFile(const drizzled::identifier::Schema &schema_identifier, drizzled::message::Schema &schema)
 
299
bool Schema::readSchemaFile(const drizzled::SchemaIdentifier &schema_identifier, drizzled::message::Schema &schema)
300
300
{
301
301
  string db_opt_path(schema_identifier.getPath());
302
302
 
333
333
}
334
334
 
335
335
void Schema::doGetTableIdentifiers(drizzled::CachedDirectory&,
336
 
                                   const drizzled::identifier::Schema&,
337
 
                                   drizzled::identifier::Table::vector&)
 
336
                                   const drizzled::SchemaIdentifier&,
 
337
                                   drizzled::TableIdentifier::vector&)
338
338
{
339
339
}