← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/schema_engine.cc

  • Committer: Lee Bieber
  • Date: 2011-01-25 17:15:03 UTC
  • mfrom: (1994.4.55 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2115.
  • Revision ID: kalebral@gmail.com-20110125171503-zyx91pfdyyw9lty5
Merge Marisa - 684803: Need to update Drizzledump documentation with migration conversions / caveats
Merge Marisa - 686641: Need to document removal of multi-table update/delete from Drizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/schema_engine.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
21
 
 
22
 
#include <drizzled/session.h>
23
 
 
24
 
#include <drizzled/global_charset_info.h>
25
 
#include <drizzled/charset.h>
26
 
#include <drizzled/transaction_services.h>
27
 
 
28
 
#include <drizzled/plugin/storage_engine.h>
29
 
#include <drizzled/plugin/authorization.h>
 
20
#include "config.h"
 
21
 
 
22
#include "drizzled/session.h"
 
23
 
 
24
#include "drizzled/global_charset_info.h"
 
25
#include "drizzled/charset.h"
 
26
#include "drizzled/transaction_services.h"
 
27
 
 
28
#include "drizzled/plugin/storage_engine.h"
 
29
#include "drizzled/plugin/authorization.h"
30
30
 
31
31
namespace drizzled
32
32
{
58
58
  std::for_each(StorageEngine::getSchemaEngines().begin(), StorageEngine::getSchemaEngines().end(),
59
59
           AddSchemaNames(schemas));
60
60
 
61
 
  plugin::Authorization::pruneSchemaNames(*session.user(), schemas);
 
61
  plugin::Authorization::pruneSchemaNames(session.user(), schemas);
62
62
}
63
63
 
64
64
class StorageEngineGetSchemaDefinition: public std::unary_function<StorageEngine *, bool>
76
76
 
77
77
  result_type operator() (argument_type engine)
78
78
  {
79
 
    schema_proto= engine->doGetSchemaDefinition(identifier);
80
 
    return schema_proto;
 
79
    return engine->doGetSchemaDefinition(identifier, schema_proto);
81
80
  }
82
81
};
83
82
 
84
83
/*
85
84
  Return value is "if parsed"
86
85
*/
87
 
message::schema::shared_ptr StorageEngine::getSchemaDefinition(const drizzled::identifier::Table &identifier)
 
86
bool StorageEngine::getSchemaDefinition(const drizzled::identifier::Table &identifier, message::schema::shared_ptr &proto)
88
87
{
89
 
  return StorageEngine::getSchemaDefinition(identifier);
 
88
  return StorageEngine::getSchemaDefinition(identifier, proto);
90
89
}
91
90
 
92
 
message::schema::shared_ptr StorageEngine::getSchemaDefinition(const identifier::Schema &identifier)
 
91
bool StorageEngine::getSchemaDefinition(const identifier::Schema &identifier, message::schema::shared_ptr &proto)
93
92
{
94
 
  message::schema::shared_ptr proto;
95
 
 
96
93
  EngineVector::iterator iter=
97
94
    std::find_if(StorageEngine::getSchemaEngines().begin(), StorageEngine::getSchemaEngines().end(),
98
95
                 StorageEngineGetSchemaDefinition(identifier, proto));
99
96
 
100
97
  if (iter != StorageEngine::getSchemaEngines().end())
101
98
  {
102
 
    return proto;
 
99
    return true;
103
100
  }
104
101
 
105
 
  return message::schema::shared_ptr();
 
102
  return false;
106
103
}
107
104
 
108
105
bool StorageEngine::doesSchemaExist(const identifier::Schema &identifier)
109
106
{
110
107
  message::schema::shared_ptr proto;
111
108
 
112
 
  return StorageEngine::getSchemaDefinition(identifier);
 
109
  return StorageEngine::getSchemaDefinition(identifier, proto);
113
110
}
114
111
 
115
112
 
116
113
const CHARSET_INFO *StorageEngine::getSchemaCollation(const identifier::Schema &identifier)
117
114
{
118
115
  message::schema::shared_ptr schmema_proto;
119
 
 
120
 
  schmema_proto= StorageEngine::getSchemaDefinition(identifier);
121
 
 
122
 
  if (schmema_proto && schmema_proto->has_collation())
 
116
  bool found;
 
117
 
 
118
  found= StorageEngine::getSchemaDefinition(identifier, schmema_proto);
 
119
 
 
120
  if (found && schmema_proto->has_collation())
123
121
  {
124
122
    const std::string buffer= schmema_proto->collation();
125
123
    const CHARSET_INFO* cs= get_charset_by_name(buffer.c_str());
129
127
      std::string path;
130
128
      identifier.getSQLPath(path);
131
129
 
132
 
      errmsg_printf(error::ERROR,
 
130
      errmsg_printf(ERRMSG_LVL_ERROR,
133
131
                    _("Error while loading database options: '%s':"), path.c_str());
134
 
      errmsg_printf(error::ERROR, ER(ER_UNKNOWN_COLLATION), buffer.c_str());
 
132
      errmsg_printf(ERRMSG_LVL_ERROR, ER(ER_UNKNOWN_COLLATION), buffer.c_str());
135
133
 
136
134
      return default_charset_info;
137
135
    }
228
226
       it++)
229
227
  {
230
228
    boost::mutex::scoped_lock scopedLock(table::Cache::singleton().mutex());
231
 
 
232
 
    message::table::shared_ptr message= StorageEngine::getTableMessage(session, *it, false);
233
 
    if (not message)
234
 
    {
235
 
      my_error(ER_TABLE_DROP, *it);
236
 
      return false;
237
 
    }
238
 
 
239
229
    table::Cache::singleton().removeTable(&session, *it,
240
230
                                          RTFC_WAIT_OTHER_THREAD_FLAG |
241
231
                                          RTFC_CHECK_KILLED_FLAG);
244
234
      my_error(ER_TABLE_DROP, *it);
245
235
      return false;
246
236
    }
247
 
    transaction_services.dropTable(session, *it, *message, true);
 
237
    transaction_services.dropTable(session, *it, true);
248
238
    deleted++;
249
239
  }
250
240
 
251
241
  return true;
252
242
}
253
243
 
254
 
bool StorageEngine::dropSchema(Session::reference session,
255
 
                               identifier::Schema::const_reference identifier,
256
 
                               message::schema::const_reference schema_message)
 
244
bool StorageEngine::dropSchema(Session::reference session, identifier::Schema::const_reference identifier)
257
245
{
258
246
  uint64_t deleted= 0;
259
247
  bool error= false;
260
248
  identifier::Table::vector dropped_tables;
 
249
  message::Schema schema_proto;
261
250
 
262
251
  do
263
252
  {
305
294
    {
306
295
      /* We've already verified that the schema does exist, so safe to log it */
307
296
      TransactionServices &transaction_services= TransactionServices::singleton();
308
 
      transaction_services.dropSchema(session, identifier, schema_message);
 
297
      transaction_services.dropSchema(session, identifier);
309
298
    }
310
299
  } while (0);
311
300