← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_range_select.cc

Remove dead memset call.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_range_select.cc
24
24
#include "drizzled/sql_bitmap.h"
25
25
#include "drizzled/internal/m_string.h"
26
26
#include <fcntl.h>
27
 
#include "drizzled/memory/multi_malloc.h"
28
27
 
29
28
using namespace std;
30
29
 
39
38
                                              memory::Root *parent_alloc,
40
39
                                              bool *create_error)
41
40
  :
42
 
    mrr_flags(0),
43
 
    alloc(),
44
41
    cursor(NULL),
45
42
    ranges(),
46
43
    in_ror_merged_scan(false),
52
49
    last_range(NULL),
53
50
    qr_traversal_ctx(),
54
51
    mrr_buf_size(0),
55
 
    mrr_buf_desc(NULL),
56
52
    key_parts(NULL),
57
 
    dont_free(false)
 
53
    dont_free(false),
 
54
    mrr_flags(0),
 
55
    alloc()
58
56
{
59
57
  my_bitmap_map *bitmap= NULL;
60
58
 
66
64
 
67
65
  /* 'session' is not accessible in QuickRangeSelect::reset(). */
68
66
  mrr_buf_size= session->variables.read_rnd_buff_size;
69
 
  mrr_buf_desc= NULL;
70
67
 
71
68
  if (! no_alloc && ! parent_alloc)
72
69
  {
89
86
     same time we destroy the mem_root.
90
87
   */
91
88
 
92
 
  bitmap= reinterpret_cast<my_bitmap_map*>(memory::sql_alloc(head->s->column_bitmap_size));
 
89
  bitmap= reinterpret_cast<my_bitmap_map*>(memory::sql_alloc(head->getShare()->column_bitmap_size));
93
90
  if (! bitmap)
94
91
  {
95
92
    column_bitmap.setBitmap(NULL);
97
94
  }
98
95
  else
99
96
  {
100
 
    column_bitmap.init(bitmap, head->s->fields);
 
97
    column_bitmap.init(bitmap, head->getShare()->sizeFields());
101
98
  }
102
99
}
103
100
 
106
103
{
107
104
  if (cursor->inited != Cursor::NONE)
108
105
    cursor->ha_index_or_rnd_end();
109
 
  return (cursor->ha_index_init(index, 1));
 
106
  return (cursor->startIndexScan(index, 1));
110
107
}
111
108
 
112
109
 
138
135
      }
139
136
    }
140
137
    delete_dynamic(&ranges); /* ranges are allocated in alloc */
141
 
    free_root(&alloc,MYF(0));
 
138
    alloc.free_root(MYF(0));
142
139
  }
143
140
  head->column_bitmaps_set(save_read_set, save_write_set);
144
 
  assert(mrr_buf_desc == NULL);
145
 
  if (mrr_buf_desc)
146
 
  {
147
 
    free(mrr_buf_desc);
148
 
  }
149
141
}
150
142
 
151
143
 
244
236
    optimizer::QuickRange *tmp= *((optimizer::QuickRange**)ranges.buffer);
245
237
    if ((tmp->flag & (EQ_RANGE | NULL_RANGE)) == EQ_RANGE)
246
238
    {
247
 
      KEY *key=head->key_info+index;
 
239
      KeyInfo *key=head->key_info+index;
248
240
      return ((key->flags & (HA_NOSAME)) == HA_NOSAME &&
249
241
              key->key_length == tmp->min_length);
250
242
    }
255
247
 
256
248
int optimizer::QuickRangeSelect::reset()
257
249
{
258
 
  uint32_t buf_size= 0;
259
 
  unsigned char *mrange_buff= NULL;
260
250
  int error= 0;
261
 
  HANDLER_BUFFER empty_buf;
262
251
  last_range= NULL;
263
252
  cur_range= (optimizer::QuickRange**) ranges.buffer;
264
253
 
265
 
  if (cursor->inited == Cursor::NONE && (error= cursor->ha_index_init(index, 1)))
 
254
  if (cursor->inited == Cursor::NONE && (error= cursor->startIndexScan(index, 1)))
266
255
  {
267
256
    return error;
268
257
  }
269
258
 
270
 
  /* Allocate buffer if we need one but haven't allocated it yet */
271
 
  if (mrr_buf_size && ! mrr_buf_desc)
272
 
  {
273
 
    buf_size= mrr_buf_size;
274
 
    while (buf_size && ! memory::multi_malloc(false,
275
 
                                              &mrr_buf_desc,
276
 
                                              sizeof(*mrr_buf_desc),
277
 
                                              &mrange_buff,
278
 
                                              buf_size,
279
 
                                              NULL))
280
 
    {
281
 
      /* Try to shrink the buffers until both are 0. */
282
 
      buf_size/= 2;
283
 
    }
284
 
    if (! mrr_buf_desc)
285
 
    {
286
 
      return HA_ERR_OUT_OF_MEM;
287
 
    }
288
 
 
289
 
    /* Initialize the Cursor buffer. */
290
 
    mrr_buf_desc->buffer= mrange_buff;
291
 
    mrr_buf_desc->buffer_end= mrange_buff + buf_size;
292
 
    mrr_buf_desc->end_of_used_area= mrange_buff;
293
 
  }
294
 
 
295
 
  if (! mrr_buf_desc)
296
 
  {
297
 
    empty_buf.buffer= NULL;
298
 
    empty_buf.buffer_end= NULL;
299
 
    empty_buf.end_of_used_area= NULL;
300
 
  }
 
259
  /*
 
260
    (in the past) Allocate buffer if we need one but haven't allocated it yet 
 
261
    There is a later assert in th code that hoped to catch random free() that might
 
262
    have done this.
 
263
  */
 
264
  assert(not (mrr_buf_size));
301
265
 
302
266
  if (sorted)
303
267
  {
310
274
  error= cursor->multi_range_read_init(&seq_funcs,
311
275
                                       (void*) this,
312
276
                                       ranges.elements,
313
 
                                       mrr_flags,
314
 
                                       mrr_buf_desc ? mrr_buf_desc : &empty_buf);
 
277
                                       mrr_flags);
315
278
  return error;
316
279
}
317
280
 
473
436
 
474
437
void optimizer::QuickRangeSelect::add_info_string(String *str)
475
438
{
476
 
  KEY *key_info= head->key_info + index;
 
439
  KeyInfo *key_info= head->key_info + index;
477
440
  str->append(key_info->name);
478
441
}
479
442
 
483
446
{
484
447
  char buf[64];
485
448
  uint32_t length;
486
 
  KEY *key_info= head->key_info + index;
 
449
  KeyInfo *key_info= head->key_info + index;
487
450
  key_names->append(key_info->name);
488
451
  length= internal::int64_t2str(max_used_key_length, buf, 10) - buf;
489
452
  used_lengths->append(buf, length);