← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
1351
1351
  void close_old_data_files(bool morph_locks= false,
1352
1352
                            bool send_refresh= false);
1353
1353
  void close_open_tables();
 
1354
  void close_data_files_and_morph_locks(TableIdentifier &identifier);
1354
1355
  void close_data_files_and_morph_locks(const char *db, const char *table_name);
1355
1356
 
1356
1357
private:
1408
1409
  Table *openTable(TableList *table_list, bool *refresh, uint32_t flags= 0);
1409
1410
 
1410
1411
  void unlink_open_table(Table *find);
1411
 
  void drop_open_table(Table *table, const char *db_name,
1412
 
                       const char *table_name);
 
1412
  void drop_open_table(Table *table, TableIdentifier &identifier);
1413
1413
  void close_cached_table(Table *table);
1414
1414
 
1415
1415
  /* Create a lock in the cache */
1418
1418
  bool lock_table_name_if_not_cached(const char *db,
1419
1419
                                     const char *table_name, Table **table);
1420
1420
 
1421
 
  typedef std::map <std::string, message::Table> TableMessageCache;
 
1421
  typedef drizzled::hash_map<std::string, message::Table> TableMessageCache;
1422
1422
  TableMessageCache table_message_cache;
1423
1423
 
1424
1424
  bool storeTableMessage(TableIdentifier &identifier, message::Table &table_message);
1425
1425
  bool removeTableMessage(TableIdentifier &identifier);
1426
1426
  bool getTableMessage(TableIdentifier &identifier, message::Table &table_message);
1427
1427
  bool doesTableMessageExist(TableIdentifier &identifier);
 
1428
  bool renameTableMessage(TableIdentifier &from, TableIdentifier &to);
1428
1429
 
1429
1430
  /* Work with temporary tables */
1430
1431
  Table *find_temporary_table(TableList *table_list);
1431
1432
  Table *find_temporary_table(const char *db, const char *table_name);
 
1433
  Table *find_temporary_table(TableIdentifier &identifier);
 
1434
 
1432
1435
  void doGetTableNames(CachedDirectory &directory,
1433
1436
                       const std::string& db_name,
1434
1437
                       std::set<std::string>& set_of_names);
 
1438
  void doGetTableNames(const std::string& db_name,
 
1439
                       std::set<std::string>& set_of_names);
 
1440
 
1435
1441
  int doGetTableDefinition(drizzled::TableIdentifier &identifier,
1436
1442
                           message::Table &table_proto);
1437
1443
  bool doDoesTableExist(TableIdentifier &identifier);