← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/concurrent.cc

  • Committer: Brian Aker
  • Date: 2011-02-17 10:09:00 UTC
  • mfrom: (2173.2.1 clean-include-usuage)
  • Revision ID: brian@tangent.org-20110217100900-4tpuxxzdl1sj00sh
Merge Monty for headers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/concurrent.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
 
21
#include <config.h>
22
22
 
23
23
#include <sys/types.h>
24
24
#include <sys/stat.h>
25
25
#include <fcntl.h>
26
26
 
27
 
#include "drizzled/session.h"
28
 
#include "plugin/myisam/myisam.h"
29
 
#include "drizzled/plugin/transactional_storage_engine.h"
30
 
 
31
 
#include "drizzled/table.h"
 
27
#include <drizzled/session.h>
 
28
#include <plugin/myisam/myisam.h>
 
29
#include <drizzled/plugin/transactional_storage_engine.h>
 
30
 
 
31
#include <drizzled/table/instance.h>
 
32
 
 
33
#include <drizzled/table.h>
32
34
 
33
35
namespace drizzled
34
36
{
66
68
  if (session->getKilled())
67
69
    return true;
68
70
 
69
 
  TableIdentifier identifier(table_list->getSchemaName(), table_list->getTableName());
 
71
  identifier::Table identifier(table_list->getSchemaName(), table_list->getTableName());
70
72
  if (open_unireg_entry(session, table_list->getTableName(), identifier))
71
73
  {
72
74
    intern_close_table();
119
121
 
120
122
int table::Concurrent::open_unireg_entry(Session *session,
121
123
                                         const char *alias,
122
 
                                         TableIdentifier &identifier)
 
124
                                         identifier::Table &identifier)
123
125
{
124
126
  int error;
125
127
  TableShare::shared_ptr share;
127
129
 
128
130
  safe_mutex_assert_owner(table::Cache::singleton().mutex().native_handle());
129
131
retry:
130
 
  if (not (share= TableShare::getShareCreate(session,
131
 
                                             identifier,
132
 
                                             error)))
 
132
  if (not (share= table::instance::Shared::make_shared(session,
 
133
                                                       identifier,
 
134
                                                       error)))
133
135
  {
134
136
    return 1;
135
137
  }
148
150
      share->resetVersion();                        // Mark share as old
149
151
      if (discover_retry_count++)               // Retry once
150
152
      {
151
 
        TableShare::release(share);
 
153
        table::instance::release(share);
152
154
        return 1;
153
155
      }
154
156
 
173
175
      */
174
176
      if (share->getTableCount() != 1)
175
177
      {
176
 
        TableShare::release(share);
 
178
        table::instance::release(share);
177
179
        return 1;
178
180
      }
 
181
 
179
182
      /* Free share and wait until it's released by all threads */
180
 
      TableShare::release(share);
 
183
      table::instance::release(share);
181
184
 
182
185
      if (not session->getKilled())
183
186
      {
185
188
        session->clear_error();                 // Clear error message
186
189
        goto retry;
187
190
      }
 
191
 
188
192
      return 1;
189
193
    }
190
194
 
191
 
    TableShare::release(share);
 
195
    table::instance::release(share);
192
196
 
193
197
    return 1;
194
198
  }
204
208
  // delete if this happens.
205
209
  if (getShare()->getType() == message::Table::STANDARD)
206
210
  {
207
 
    TableShare::release(getMutableShare());
 
211
    table::instance::release(getMutableShare());
208
212
  }
209
213
  else
210
214
  {