← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2009-08-21 06:18:23 UTC
  • mfrom: (1115.3.12 captain)
  • Revision ID: brian@gaz-20090821061823-ljcpbpvun22lsvem
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1148
1148
  if (!(bitmaps= (my_bitmap_map*) alloc_root(&share->mem_root,
1149
1149
                                             share->column_bitmap_size)))
1150
1150
    goto err;
1151
 
  bitmap_init(&share->all_set, bitmaps, share->fields);
1152
 
  bitmap_set_all(&share->all_set);
 
1151
  share->all_set.init(bitmaps, share->fields);
 
1152
  share->all_set.setAll();
1153
1153
 
1154
1154
  if (handler_file)
1155
1155
    delete handler_file;
1415
1415
  bitmap_size= share->column_bitmap_size;
1416
1416
  if (!(bitmaps= (unsigned char*) alloc_root(&outparam->mem_root, bitmap_size*3)))
1417
1417
    goto err;
1418
 
  bitmap_init(&outparam->def_read_set,
1419
 
              (my_bitmap_map*) bitmaps, share->fields);
1420
 
  bitmap_init(&outparam->def_write_set,
1421
 
              (my_bitmap_map*) (bitmaps+bitmap_size), share->fields);
1422
 
  bitmap_init(&outparam->tmp_set,
1423
 
              (my_bitmap_map*) (bitmaps+bitmap_size*2), share->fields);
 
1418
  outparam->def_read_set.init((my_bitmap_map*) bitmaps, share->fields);
 
1419
  outparam->def_write_set.init((my_bitmap_map*) (bitmaps+bitmap_size), share->fields);
 
1420
  outparam->tmp_set.init((my_bitmap_map*) (bitmaps+bitmap_size*2), share->fields);
1424
1421
  outparam->default_column_bitmaps();
1425
1422
 
1426
1423
  /* The table struct is now initialized;  Open the table */
1738
1735
{
1739
1736
  uint32_t field_count= s->fields;
1740
1737
 
1741
 
  bitmap_init(&this->def_read_set, (my_bitmap_map*) bitmaps, field_count);
1742
 
  bitmap_init(&this->tmp_set, (my_bitmap_map*) (bitmaps+ bitmap_buffer_size(field_count)), field_count);
 
1738
  this->def_read_set.init((my_bitmap_map*) bitmaps, field_count);
 
1739
  this->tmp_set.init((my_bitmap_map*) (bitmaps+ bitmap_buffer_size(field_count)), field_count);
1743
1740
 
1744
1741
  /* write_set and all_set are copies of read_set */
1745
1742
  def_write_set= def_read_set;
1746
1743
  s->all_set= def_read_set;
1747
 
  bitmap_set_all(&this->s->all_set);
 
1744
  this->s->all_set.setAll();
1748
1745
  default_column_bitmaps();
1749
1746
}
1750
1747
 
1896
1893
    bitmap_clear_all(&table->def_read_set);
1897
1894
    bitmap_clear_all(&table->def_write_set);
1898
1895
  */
1899
 
  memset(def_read_set.bitmap, 0, s->column_bitmap_size*2);
 
1896
  def_read_set.clearAll();
 
1897
  def_write_set.clearAll();
1900
1898
  column_bitmaps_set(&def_read_set, &def_write_set);
1901
1899
}
1902
1900
 
1934
1932
 
1935
1933
void Table::mark_columns_used_by_index(uint32_t index)
1936
1934
{
1937
 
  MY_BITMAP *bitmap= &tmp_set;
 
1935
  MyBitmap *bitmap= &tmp_set;
1938
1936
 
1939
1937
  (void) file->extra(HA_EXTRA_KEYREAD);
1940
 
  bitmap_clear_all(bitmap);
 
1938
  bitmap->clearAll();
1941
1939
  mark_columns_used_by_index_no_reset(index, bitmap);
1942
1940
  column_bitmaps_set(bitmap, bitmap);
1943
1941
  return;
1975
1973
}
1976
1974
 
1977
1975
void Table::mark_columns_used_by_index_no_reset(uint32_t index,
1978
 
                                                MY_BITMAP *bitmap)
 
1976
                                                MyBitmap *bitmap)
1979
1977
{
1980
1978
  KEY_PART_INFO *key_part= key_info[index].key_part;
1981
1979
  KEY_PART_INFO *key_part_end= (key_part +
1982
1980
                                key_info[index].key_parts);
1983
1981
  for (;key_part != key_part_end; key_part++)
1984
 
    bitmap_set_bit(bitmap, key_part->fieldnr-1);
 
1982
    bitmap->setBit(key_part->fieldnr-1);
1985
1983
}
1986
1984
 
1987
1985
 
3346
3344
  return true;
3347
3345
}
3348
3346
 
3349
 
my_bitmap_map *Table::use_all_columns(MY_BITMAP *bitmap)
 
3347
my_bitmap_map *Table::use_all_columns(MyBitmap *bitmap)
3350
3348
{
3351
 
  my_bitmap_map *old= bitmap->bitmap;
3352
 
  bitmap->bitmap= s->all_set.bitmap;
 
3349
  my_bitmap_map *old= bitmap->getBitmap();
 
3350
  bitmap->setBitmap(s->all_set.getBitmap());
3353
3351
  return old;
3354
3352
}
3355
3353
 
3356
3354
void Table::restore_column_map(my_bitmap_map *old)
3357
3355
{
3358
 
  read_set->bitmap= old;
 
3356
  read_set->setBitmap(old);
3359
3357
}
3360
3358
 
3361
3359
uint32_t Table::find_shortest_key(const key_map *usable_keys)