← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

  • Committer: David Shrewsbury
  • Date: 2010-10-11 17:20:14 UTC
  • mfrom: (1838 trunk-drizzle)
  • mto: (1838.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1839.
  • Revision ID: shrewsbury.dave@gmail.com-20101011172014-sij1m2doi2fl2duo
Merge from trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
30
30
#include "drizzled/records.h"
31
31
#include "drizzled/internal/iocache.h"
32
32
#include "drizzled/transaction_services.h"
33
 
#include "drizzled/filesort.h"
34
33
 
35
34
namespace drizzled
36
35
{
57
56
  ha_rows       deleted= 0;
58
57
  uint32_t usable_index= MAX_KEY;
59
58
  Select_Lex   *select_lex= &session->lex->select_lex;
60
 
  Session::killed_state_t killed_status= Session::NOT_KILLED;
 
59
  Session::killed_state killed_status= Session::NOT_KILLED;
61
60
 
62
61
  if (session->openTablesLock(table_list))
63
62
  {
72
71
  table->map=1;
73
72
 
74
73
  if (mysql_prepare_delete(session, table_list, &conds))
75
 
  {
76
 
    DRIZZLE_DELETE_DONE(1, 0);
77
 
    return true;
78
 
  }
 
74
    goto err;
79
75
 
80
76
  /* check ORDER BY even if it can be ignored */
81
77
  if (order && order->elements)
89
85
 
90
86
      if (select_lex->setup_ref_array(session, order->elements) ||
91
87
          setup_order(session, select_lex->ref_pointer_array, &tables,
92
 
                    fields, all_fields, (Order*) order->first))
93
 
      {
94
 
        delete select;
95
 
        free_underlaid_joins(session, &session->lex->select_lex);
96
 
        DRIZZLE_DELETE_DONE(1, 0);
97
 
 
98
 
        return true;
99
 
      }
 
88
                    fields, all_fields, (order_st*) order->first))
 
89
    {
 
90
      delete select;
 
91
      free_underlaid_joins(session, &session->lex->select_lex);
 
92
      goto err;
 
93
    }
100
94
  }
101
95
 
102
96
  const_cond= (!conds || conds->const_item());
163
157
  table->quick_keys.reset();            // Can't use 'only index'
164
158
  select= optimizer::make_select(table, 0, 0, conds, 0, &error);
165
159
  if (error)
166
 
  {
167
 
    DRIZZLE_DELETE_DONE(1, 0);
168
 
    return true;
169
 
  }
170
 
 
 
160
    goto err;
171
161
  if ((select && select->check_quick(session, false, limit)) || !limit)
172
162
  {
173
163
    delete select;
201
191
    ha_rows examined_rows;
202
192
 
203
193
    if ((!select || table->quick_keys.none()) && limit != HA_POS_ERROR)
204
 
      usable_index= optimizer::get_index_for_order(table, (Order*)(order->first), limit);
 
194
      usable_index= optimizer::get_index_for_order(table, (order_st*)(order->first), limit);
205
195
 
206
196
    if (usable_index == MAX_KEY)
207
197
    {
208
 
      FileSort filesort(*session);
209
198
      table->sort.io_cache= new internal::IO_CACHE;
210
199
 
211
200
 
212
 
      if (not (sortorder= make_unireg_sortorder((Order*) order->first, &length, NULL)) ||
213
 
          (table->sort.found_records = filesort.run(table, sortorder, length,
214
 
                                                    select, HA_POS_ERROR, 1,
215
 
                                                    examined_rows)) == HA_POS_ERROR)
 
201
      if (!(sortorder= make_unireg_sortorder((order_st*) order->first,
 
202
                                             &length, NULL)) ||
 
203
          (table->sort.found_records = filesort(session, table, sortorder, length,
 
204
                                                select, HA_POS_ERROR, 1,
 
205
                                                &examined_rows))
 
206
          == HA_POS_ERROR)
216
207
      {
217
208
        delete select;
218
209
        free_underlaid_joins(session, &session->lex->select_lex);
219
 
 
220
 
        DRIZZLE_DELETE_DONE(1, 0);
221
 
        return true;
 
210
        goto err;
222
211
      }
223
212
      /*
224
213
        Filesort has already found and selected the rows we want to delete,
235
224
  {
236
225
    delete select;
237
226
    free_underlaid_joins(session, select_lex);
238
 
    DRIZZLE_DELETE_DONE(1, 0);
239
 
    return true;
 
227
    goto err;
240
228
  }
241
229
 
242
230
  if (usable_index==MAX_KEY)
252
240
 
253
241
  table->mark_columns_needed_for_delete();
254
242
 
255
 
  while (!(error=info.read_record(&info)) && !session->getKilled() &&
 
243
  while (!(error=info.read_record(&info)) && !session->killed &&
256
244
         ! session->is_error())
257
245
  {
258
246
    // session->is_error() is tested to disallow delete row on error
285
273
    else
286
274
      table->cursor->unlock_row();  // Row failed selection, release lock on it
287
275
  }
288
 
  killed_status= session->getKilled();
 
276
  killed_status= session->killed;
289
277
  if (killed_status != Session::NOT_KILLED || session->is_error())
290
278
    error= 1;                                   // Aborted
291
279
 
336
324
    session->my_ok((ha_rows) session->row_count_func);
337
325
  }
338
326
  session->status_var.deleted_row_count+= deleted;
339
 
 
340
327
  return (error >= 0 || session->is_error());
 
328
 
 
329
err:
 
330
  DRIZZLE_DELETE_DONE(1, 0);
 
331
  return true;
341
332
}
342
333
 
343
334