← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/definition/cache.cc

  • Committer: Brian Aker
  • Date: 2011-01-13 07:03:39 UTC
  • mfrom: (2077.1.3 drizzle)
  • Revision ID: brian@gir-3-20110113070339-bnfp4yvngb6frhru
Merge in all of the fixes for definition to instance.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/definition/cache.cc
27
27
#include "drizzled/session.h"
28
28
#include "drizzled/identifier/table.h"
29
29
#include "drizzled/definition/cache.h"
30
 
#include "drizzled/definition/table.h"
 
30
 
 
31
#include "drizzled/table/instance.h"
31
32
 
32
33
namespace drizzled {
33
34
 
34
35
namespace definition {
35
36
 
36
 
TableShare::shared_ptr Cache::find(const TableIdentifier::Key &key)
 
37
table::instance::Shared::shared_ptr Cache::find(const TableIdentifier::Key &key)
37
38
{
38
39
  boost::mutex::scoped_lock scopedLock(_mutex);
39
40
 
43
44
    return (*iter).second;
44
45
  }
45
46
 
46
 
  return TableShare::shared_ptr();
 
47
  return table::instance::Shared::shared_ptr();
47
48
}
48
49
 
49
50
void Cache::erase(const TableIdentifier::Key &key)
53
54
  cache.erase(key);
54
55
}
55
56
 
56
 
bool Cache::insert(const TableIdentifier::Key &key, TableShare::shared_ptr share)
 
57
bool Cache::insert(const TableIdentifier::Key &key, table::instance::Shared::shared_ptr share)
57
58
{
58
59
  boost::mutex::scoped_lock scopedLock(_mutex);
59
60
  std::pair<Map::iterator, bool> ret=
62
63
  return ret.second;
63
64
}
64
65
 
65
 
void Cache::CopyFrom(drizzled::TableShare::vector &vector)
 
66
void Cache::CopyFrom(drizzled::table::instance::Shared::vector &vector)
66
67
{
67
68
  boost::mutex::scoped_lock scopedLock(_mutex);
68
69