← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Lee Bieber
  • Date: 2011-04-18 21:48:09 UTC
  • mfrom: (2280.2.3 build)
  • Revision ID: kalebral@gmail.com-20110418214809-dsdfrc8f90a9p2x1
Merge Olaf - code refactor and pruning dead functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
65
65
#include <drizzled/select_to_file.h>
66
66
#include <drizzled/session.h>
67
67
#include <drizzled/session/cache.h>
68
 
#include <drizzled/session/property_map.h>
69
68
#include <drizzled/session/state.h>
70
69
#include <drizzled/session/table_messages.h>
71
70
#include <drizzled/session/times.h>
84
83
#include <drizzled/util/backtrace.h>
85
84
#include <drizzled/util/find_ptr.h>
86
85
#include <drizzled/util/functors.h>
 
86
#include <drizzled/util/storable.h>
87
87
#include <plugin/myisam/myisam.h>
88
88
 
89
89
#include <algorithm>
153
153
class Session::impl_c
154
154
{
155
155
public:
156
 
  typedef session::PropertyMap properties_t;
 
156
  typedef boost::unordered_map<std::string, util::Storable*, util::insensitive_hash, util::insensitive_equal_to> properties_t;
157
157
  typedef std::map<std::string, plugin::EventObserverList*> schema_event_observers_t;
158
158
 
159
159
  impl_c(Session& session) :
162
162
  {
163
163
  }
164
164
 
 
165
  ~impl_c()
 
166
  {
 
167
    BOOST_FOREACH(properties_t::reference it, properties)
 
168
      delete it.second;
 
169
  }
 
170
 
165
171
  Diagnostics_area diagnostics;
166
172
  /**
167
173
    The lex to hold the parsed tree of conventional (non-prepared) queries.
2031
2037
 
2032
2038
drizzled::util::Storable* Session::getProperty0(const std::string& arg)
2033
2039
{
2034
 
  return impl_->properties.getProperty(arg);
 
2040
  return impl_->properties[arg];
2035
2041
}
2036
2042
 
2037
2043
void Session::setProperty0(const std::string& arg, drizzled::util::Storable* value)
2038
2044
{
2039
 
  impl_->properties.setProperty(arg, value);
 
2045
  // assert(not _properties.count(arg));
 
2046
  impl_->properties[arg]= value;
2040
2047
}
2041
2048
 
2042
2049
plugin::EventObserverList* Session::getSchemaObservers(const std::string &db_name)