← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/savepoint.cc

Reworked getTableNames() interface. Way simpler, less mallocs....

Added a straight vector<> for use with storage engines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/savepoint.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2009 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2009 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
22
 
#include "drizzled/show.h"
23
 
#include "drizzled/session.h"
24
 
#include "drizzled/statement/savepoint.h"
25
 
#include "drizzled/transaction_services.h"
26
 
#include "drizzled/named_savepoint.h"
27
 
 
28
 
#include <string>
29
 
#include <deque>
30
 
 
31
 
using namespace std;
32
 
 
33
 
namespace drizzled
34
 
{
 
21
#include <drizzled/server_includes.h>
 
22
#include <drizzled/show.h>
 
23
#include <drizzled/session.h>
 
24
#include <drizzled/statement/savepoint.h>
 
25
 
 
26
using namespace drizzled;
35
27
 
36
28
bool statement::Savepoint::execute()
37
29
{
38
 
  if (! (getSession()->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
 
30
  if (! (session->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
39
31
  {
40
 
    /* AUTOCOMMIT is on and not in a BEGIN */
41
 
    getSession()->my_ok();
 
32
    session->my_ok();
42
33
  }
43
34
  else
44
35
  {
45
 
    /*
46
 
     * If AUTOCOMMIT is off and resource contexts are empty then we need
47
 
     * to start a transaction. It will be empty when SAVEPOINT starts the
48
 
     * transaction. Table affecting statements do this work in lockTables()
49
 
     * by calling startStatement().
50
 
     */
51
 
    if ( (getSession()->options & OPTION_NOT_AUTOCOMMIT) &&
52
 
         (getSession()->transaction.all.getResourceContexts().empty() == true) )
 
36
    SAVEPOINT **sv, *newsv;
 
37
    for (sv= &session->transaction.savepoints; *sv; sv= &(*sv)->prev)
53
38
    {
54
 
      if (getSession()->startTransaction() == false)
55
 
      {
 
39
      if (my_strnncoll(system_charset_info,
 
40
                       (unsigned char *) session->lex->ident.str, 
 
41
                       session->lex->ident.length,
 
42
                       (unsigned char *) (*sv)->name, 
 
43
                       (*sv)->length) == 0)
56
44
        return false;
57
 
      }
58
 
    }
59
 
 
 
45
    }
 
46
    if (*sv) /* old savepoint of the same name exists */
 
47
    {
 
48
      newsv= *sv;
 
49
      ha_release_savepoint(session, *sv); // it cannot fail
 
50
      *sv= (*sv)->prev;
 
51
    }
 
52
    else if ((newsv= (SAVEPOINT *) alloc_root(&session->transaction.mem_root,
 
53
                                              savepoint_alloc_size)) == 0)
 
54
    {
 
55
      my_error(ER_OUT_OF_RESOURCES, MYF(0));
 
56
      return false;
 
57
    }
 
58
    newsv->name= strmake_root(&session->transaction.mem_root,
 
59
                              session->lex->ident.str, 
 
60
                              session->lex->ident.length);
 
61
    newsv->length= session->lex->ident.length;
60
62
    /*
61
 
     * Look through the savepoints.  If we find one with
62
 
     * the same name, delete it.
 
63
       if we'll get an error here, don't add new savepoint to the list.
 
64
       we'll lose a little bit of memory in transaction mem_root, but it'll
 
65
       be free'd when transaction ends anyway
63
66
     */
64
 
    TransactionServices &transaction_services= TransactionServices::singleton();
65
 
    deque<NamedSavepoint> &savepoints= getSession()->transaction.savepoints;
66
 
    deque<NamedSavepoint>::iterator iter;
67
 
 
68
 
    for (iter= savepoints.begin();
69
 
         iter != savepoints.end();
70
 
         ++iter)
71
 
    {
72
 
      NamedSavepoint &sv= *iter;
73
 
      const string &sv_name= sv.getName();
74
 
      if (my_strnncoll(system_charset_info,
75
 
                       (unsigned char *) getSession()->lex->ident.str,
76
 
                       getSession()->lex->ident.length,
77
 
                       (unsigned char *) sv_name.c_str(),
78
 
                       sv_name.size()) == 0)
79
 
        break;
80
 
    }
81
 
    if (iter != savepoints.end())
82
 
    {
83
 
      NamedSavepoint &sv= *iter;
84
 
      (void) transaction_services.releaseSavepoint(*getSession(), sv);
85
 
      savepoints.erase(iter);
86
 
    }
87
 
    
88
 
    NamedSavepoint newsv(getSession()->lex->ident.str, getSession()->lex->ident.length);
89
 
 
90
 
    if (transaction_services.setSavepoint(*getSession(), newsv))
 
67
    if (ha_savepoint(session, newsv))
91
68
    {
92
69
      return true;
93
70
    }
94
71
    else
95
72
    {
96
 
      savepoints.push_front(newsv);
97
 
      getSession()->my_ok();
 
73
      newsv->prev= session->transaction.savepoints;
 
74
      session->transaction.savepoints= newsv;
 
75
      session->my_ok();
98
76
    }
99
77
  }
100
78
  return false;
101
79
}
102
 
 
103
 
} /* namespace drizzled */