← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_share.cc

  • Committer: David Shrewsbury
  • Date: 2010-10-05 20:38:57 UTC
  • mto: (1814.1.4 build)
  • mto: This revision was merged to the branch mainline in revision 1816.
  • Revision ID: shrewsbury.dave@gmail.com-20101005203857-v2xvi0zblliyxxf8
Add options to proto files for use when generating Java source files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_share.cc
1
 
/* -*- mode: c++; c-basic-offset: 2; i/dent-tabs-mode: nil; -*-
 
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
4
 *  Copyright (C) 2010 Brian Aker
44
44
#include "drizzled/internal/my_pthread.h"
45
45
#include "drizzled/plugin/event_observer.h"
46
46
 
47
 
#include "drizzled/table.h"
48
 
#include "drizzled/table/shell.h"
49
 
 
50
47
#include "drizzled/session.h"
51
48
 
52
49
#include "drizzled/charset.h"
70
67
#include "drizzled/field/decimal.h"
71
68
#include "drizzled/field/real.h"
72
69
#include "drizzled/field/double.h"
73
 
#include "drizzled/field/int32.h"
74
 
#include "drizzled/field/int64.h"
 
70
#include "drizzled/field/long.h"
 
71
#include "drizzled/field/int64_t.h"
75
72
#include "drizzled/field/num.h"
76
73
#include "drizzled/field/timestamp.h"
77
74
#include "drizzled/field/datetime.h"
78
75
#include "drizzled/field/varstring.h"
79
 
#include "drizzled/field/uuid.h"
80
 
 
81
 
#include "drizzled/definition/cache.h"
82
76
 
83
77
using namespace std;
84
78
 
86
80
{
87
81
 
88
82
extern size_t table_def_size;
 
83
static TableDefinitionCache table_def_cache;
89
84
 
90
85
/*****************************************************************************
91
86
  Functions to handle table definition cach (TableShare)
92
87
 *****************************************************************************/
93
88
 
 
89
 
 
90
// @todo switch this a boost::thread one only call.
 
91
void TableShare::cacheStart(void)
 
92
{
 
93
  /* 
 
94
   * This is going to overalloc a bit - as rehash sets the number of
 
95
   * buckets, not the number of elements. BUT, it'll allow us to not need
 
96
   * to rehash later on as the unordered_map grows.
 
97
 */
 
98
  table_def_cache.rehash(table_def_size);
 
99
}
 
100
 
 
101
 
 
102
/**
 
103
 * @TODO This should return size_t
 
104
 */
 
105
uint32_t cached_table_definitions(void)
 
106
{
 
107
  return static_cast<uint32_t>(table_def_cache.size());
 
108
}
 
109
 
 
110
 
94
111
/*
95
112
  Mark that we are not using table share anymore.
96
113
 
106
123
void TableShare::release(TableShare *share)
107
124
{
108
125
  bool to_be_deleted= false;
109
 
  safe_mutex_assert_owner(table::Cache::singleton().mutex().native_handle);
110
 
 
111
 
  share->lock();
112
 
  if (!--share->ref_count)
113
 
  {
114
 
    to_be_deleted= true;
115
 
  }
116
 
  share->unlock();
117
 
 
118
 
  if (to_be_deleted)
119
 
  {
120
 
    definition::Cache::singleton().erase(share->getCacheKey());
121
 
  }
122
 
}
123
 
 
124
 
void TableShare::release(TableShare::shared_ptr &share)
125
 
{
126
 
  bool to_be_deleted= false;
127
 
  safe_mutex_assert_owner(table::Cache::singleton().mutex().native_handle);
128
 
 
129
 
  share->lock();
130
 
  if (!--share->ref_count)
131
 
  {
132
 
    to_be_deleted= true;
133
 
  }
134
 
  share->unlock();
135
 
 
136
 
  if (to_be_deleted)
137
 
  {
138
 
    definition::Cache::singleton().erase(share->getCacheKey());
139
 
  }
140
 
}
141
 
 
142
 
void TableShare::release(const TableIdentifier &identifier)
143
 
{
144
 
  TableShare::shared_ptr share= definition::Cache::singleton().find(identifier.getKey());
145
 
  if (share)
146
 
  {
 
126
  safe_mutex_assert_owner(LOCK_open.native_handle);
 
127
 
 
128
  share->lock();
 
129
  if (!--share->ref_count)
 
130
  {
 
131
    to_be_deleted= true;
 
132
  }
 
133
 
 
134
  if (to_be_deleted)
 
135
  {
 
136
    TableIdentifier identifier(share->getSchemaName(), share->getTableName());
 
137
    plugin::EventObserver::deregisterTableEvents(*share);
 
138
   
 
139
    TableDefinitionCache::iterator iter= table_def_cache.find(identifier.getKey());
 
140
    if (iter != table_def_cache.end())
 
141
    {
 
142
      table_def_cache.erase(iter);
 
143
      delete share;
 
144
    }
 
145
    return;
 
146
  }
 
147
  share->unlock();
 
148
}
 
149
 
 
150
void TableShare::release(TableIdentifier &identifier)
 
151
{
 
152
  TableDefinitionCache::iterator iter= table_def_cache.find(identifier.getKey());
 
153
  if (iter != table_def_cache.end())
 
154
  {
 
155
    TableShare *share= (*iter).second;
147
156
    share->version= 0;                          // Mark for delete
148
157
    if (share->ref_count == 0)
149
158
    {
150
 
      definition::Cache::singleton().erase(identifier.getKey());
 
159
      share->lock();
 
160
      plugin::EventObserver::deregisterTableEvents(*share);
 
161
      table_def_cache.erase(identifier.getKey());
 
162
      delete share;
151
163
    }
152
164
  }
153
165
}
154
166
 
155
167
 
156
 
static TableShare::shared_ptr foundTableShare(TableShare::shared_ptr share)
 
168
static TableShare *foundTableShare(TableShare *share)
157
169
{
158
170
  /*
159
171
    We found an existing table definition. Return it if we didn't get
166
178
    /* Table definition contained an error */
167
179
    share->open_table_error(share->error, share->open_errno, share->errarg);
168
180
 
169
 
    return TableShare::shared_ptr();
 
181
    return NULL;
170
182
  }
171
183
 
172
184
  share->incrementTableCount();
189
201
  If it doesn't exist, create a new from the table definition file.
190
202
 
191
203
  NOTES
192
 
  We must have wrlock on table::Cache::singleton().mutex() when we come here
 
204
  We must have wrlock on LOCK_open when we come here
193
205
  (To be changed later)
194
206
 
195
207
  RETURN
197
209
#  Share for table
198
210
*/
199
211
 
200
 
TableShare::shared_ptr TableShare::getShareCreate(Session *session, 
201
 
                                                  const TableIdentifier &identifier,
202
 
                                                  int &in_error)
 
212
TableShare *TableShare::getShareCreate(Session *session, 
 
213
                                       TableIdentifier &identifier,
 
214
                                       int *error)
203
215
{
204
 
  TableShare::shared_ptr share;
 
216
  TableShare *share= NULL;
205
217
 
206
 
  in_error= 0;
 
218
  *error= 0;
207
219
 
208
220
  /* Read table definition from cache */
209
 
  if ((share= definition::Cache::singleton().find(identifier.getKey())))
 
221
  TableDefinitionCache::iterator iter= table_def_cache.find(identifier.getKey());
 
222
  if (iter != table_def_cache.end())
 
223
  {
 
224
    share= (*iter).second;
210
225
    return foundTableShare(share);
211
 
 
212
 
  share.reset(new TableShare(message::Table::STANDARD, identifier));
213
 
  
 
226
  }
 
227
 
 
228
  if (not (share= new TableShare(message::Table::STANDARD, identifier)))
 
229
  {
 
230
    return NULL;
 
231
  }
 
232
 
 
233
  /*
 
234
    Lock mutex to be able to read table definition from file without
 
235
    conflicts
 
236
  */
 
237
  share->lock();
 
238
 
 
239
  /**
 
240
   * @TODO: we need to eject something if we exceed table_def_size
 
241
 */
 
242
  pair<TableDefinitionCache::iterator, bool> ret=
 
243
    table_def_cache.insert(make_pair(identifier.getKey(), share));
 
244
  if (ret.second == false)
 
245
  {
 
246
    delete share;
 
247
 
 
248
    return NULL;
 
249
  }
 
250
 
214
251
  if (share->open_table_def(*session, identifier))
215
252
  {
216
 
    in_error= share->error;
 
253
    *error= share->error;
 
254
    table_def_cache.erase(identifier.getKey());
 
255
    delete share;
217
256
 
218
 
    return TableShare::shared_ptr();
 
257
    return NULL;
219
258
  }
220
259
  share->ref_count++;                           // Mark in use
221
260
  
222
261
  plugin::EventObserver::registerTableEvents(*share);
223
 
 
224
 
  bool ret= definition::Cache::singleton().insert(identifier.getKey(), share);
225
 
 
226
 
  if (not ret)
227
 
    return TableShare::shared_ptr();
 
262
  
 
263
  share->unlock();
228
264
 
229
265
  return share;
230
266
}
231
267
 
 
268
 
 
269
/*
 
270
  Check if table definition exits in cache
 
271
 
 
272
  SYNOPSIS
 
273
  get_cached_table_share()
 
274
  db                    Database name
 
275
  table_name            Table name
 
276
 
 
277
  RETURN
 
278
  0  Not cached
 
279
#  TableShare for table
 
280
*/
 
281
TableShare *TableShare::getShare(TableIdentifier &identifier)
 
282
{
 
283
  safe_mutex_assert_owner(LOCK_open.native_handle);
 
284
 
 
285
  TableDefinitionCache::iterator iter= table_def_cache.find(identifier.getKey());
 
286
  if (iter != table_def_cache.end())
 
287
  {
 
288
    return (*iter).second;
 
289
  }
 
290
  else
 
291
  {
 
292
    return NULL;
 
293
  }
 
294
}
 
295
 
232
296
static enum_field_types proto_field_type_to_drizzle_type(uint32_t proto_field_type)
233
297
{
234
298
  enum_field_types field_type;
265
329
  case message::Table::Field::BLOB:
266
330
    field_type= DRIZZLE_TYPE_BLOB;
267
331
    break;
268
 
  case message::Table::Field::UUID:
269
 
    field_type= DRIZZLE_TYPE_UUID;
270
 
    break;
271
332
  default:
272
 
    assert(0);
273
 
    abort(); // Programming error
 
333
    field_type= DRIZZLE_TYPE_LONG; /* Set value to kill GCC warning */
 
334
    assert(1);
274
335
  }
275
336
 
276
337
  return field_type;
304
365
                                 default_value->length());
305
366
    break;
306
367
  case DRIZZLE_TYPE_NULL:
307
 
    assert(0);
308
 
    abort();
 
368
    assert(false);
309
369
  case DRIZZLE_TYPE_TIMESTAMP:
310
370
  case DRIZZLE_TYPE_DATETIME:
311
371
  case DRIZZLE_TYPE_DATE:
312
372
  case DRIZZLE_TYPE_ENUM:
313
 
  case DRIZZLE_TYPE_UUID:
314
373
    default_item= new Item_string(default_value->c_str(),
315
374
                                  default_value->length(),
316
375
                                  system_charset_info);
361
420
      size_t num_parts= index.index_part_size();
362
421
      for (size_t y= 0; y < num_parts; ++y)
363
422
      {
364
 
        if (index.index_part(y).fieldnr() == in_field->position())
 
423
        if (index.index_part(y).fieldnr() == in_field->field_index)
365
424
          return true;
366
425
      }
367
426
    }
369
428
  return false;
370
429
}
371
430
 
372
 
TableShare::TableShare(const TableIdentifier::Type type_arg) :
 
431
const TableDefinitionCache &TableShare::getCache()
 
432
{
 
433
  return table_def_cache;
 
434
}
 
435
 
 
436
TableShare::TableShare(TableIdentifier::Type type_arg) :
373
437
  table_category(TABLE_UNKNOWN_CATEGORY),
 
438
  open_count(0),
374
439
  found_next_number_field(NULL),
375
440
  timestamp_field(NULL),
376
441
  key_info(NULL),
377
442
  mem_root(TABLE_ALLOC_BLOCK_SIZE),
378
 
  all_set(),
379
443
  block_size(0),
380
444
  version(0),
381
445
  timestamp_offset(0),
398
462
  uniques(0),
399
463
  null_fields(0),
400
464
  blob_fields(0),
401
 
  has_variable_width(false),
 
465
  timestamp_field_offset(0),
 
466
  varchar_fields(0),
402
467
  db_create_options(0),
403
468
  db_options_in_use(0),
404
469
  db_record_offset(0),
410
475
  error(0),
411
476
  open_errno(0),
412
477
  errarg(0),
 
478
  column_bitmap_size(0),
413
479
  blob_ptr_size(0),
414
480
  db_low_byte_first(false),
 
481
  name_lock(false),
 
482
  replace_with_name_lock(false),
 
483
  waiting_on_cond(false),
415
484
  keys_in_use(0),
416
485
  keys_for_keyread(0),
417
486
  event_observers(NULL)
425
494
 
426
495
  if (type_arg == message::Table::INTERNAL)
427
496
  {
428
 
    TableIdentifier::build_tmptable_filename(private_key_for_cache.vectorPtr());
429
 
    init(private_key_for_cache.vector(), private_key_for_cache.vector());
 
497
    TableIdentifier::build_tmptable_filename(private_key_for_cache);
 
498
    init(&private_key_for_cache[0], &private_key_for_cache[0]);
430
499
  }
431
500
  else
432
501
  {
434
503
  }
435
504
}
436
505
 
437
 
TableShare::TableShare(const TableIdentifier &identifier, const TableIdentifier::Key &key) :// Used by placeholder
 
506
TableShare::TableShare(TableIdentifier &identifier, const TableIdentifier::Key &key) :// Used by placeholder
438
507
  table_category(TABLE_UNKNOWN_CATEGORY),
 
508
  open_count(0),
439
509
  found_next_number_field(NULL),
440
510
  timestamp_field(NULL),
441
511
  key_info(NULL),
442
512
  mem_root(TABLE_ALLOC_BLOCK_SIZE),
443
 
  all_set(),
444
513
  block_size(0),
445
514
  version(0),
446
515
  timestamp_offset(0),
463
532
  uniques(0),
464
533
  null_fields(0),
465
534
  blob_fields(0),
466
 
  has_variable_width(false),
 
535
  timestamp_field_offset(0),
 
536
  varchar_fields(0),
467
537
  db_create_options(0),
468
538
  db_options_in_use(0),
469
539
  db_record_offset(0),
475
545
  error(0),
476
546
  open_errno(0),
477
547
  errarg(0),
 
548
  column_bitmap_size(0),
478
549
  blob_ptr_size(0),
479
550
  db_low_byte_first(false),
 
551
  name_lock(false),
 
552
  replace_with_name_lock(false),
 
553
  waiting_on_cond(false),
480
554
  keys_in_use(0),
481
555
  keys_for_keyread(0),
482
556
  event_observers(NULL)
492
566
  table_category=         TABLE_CATEGORY_TEMPORARY;
493
567
  tmp_table=              message::Table::INTERNAL;
494
568
 
495
 
  db.str= const_cast<char *>(private_key_for_cache.vector());
496
 
  db.length= strlen(private_key_for_cache.vector());
 
569
  db.str= &private_key_for_cache[0];
 
570
  db.length= strlen(&private_key_for_cache[0]);
497
571
 
498
 
  table_name.str= const_cast<char *>(private_key_for_cache.vector()) + strlen(private_key_for_cache.vector()) + 1;
 
572
  table_name.str= &private_key_for_cache[0] + strlen(&private_key_for_cache[0]) + 1;
499
573
  table_name.length= strlen(table_name.str);
500
574
  path.str= (char *)"";
501
575
  normalized_path.str= path.str;
502
576
  path.length= normalized_path.length= 0;
503
 
 
504
 
  std::string tb_name(identifier.getTableName());
505
 
  std::transform(tb_name.begin(), tb_name.end(), tb_name.begin(), ::tolower);
506
 
  assert(strcmp(tb_name.c_str(), table_name.str) == 0);
507
 
 
 
577
  assert(strcmp(identifier.getTableName().c_str(), table_name.str) == 0);
508
578
  assert(strcmp(identifier.getSchemaName().c_str(), db.str) == 0);
509
579
}
510
580
 
511
581
 
512
582
TableShare::TableShare(const TableIdentifier &identifier) : // Just used during createTable()
513
583
  table_category(TABLE_UNKNOWN_CATEGORY),
 
584
  open_count(0),
514
585
  found_next_number_field(NULL),
515
586
  timestamp_field(NULL),
516
587
  key_info(NULL),
517
588
  mem_root(TABLE_ALLOC_BLOCK_SIZE),
518
 
  all_set(),
519
589
  block_size(0),
520
590
  version(0),
521
591
  timestamp_offset(0),
538
608
  uniques(0),
539
609
  null_fields(0),
540
610
  blob_fields(0),
541
 
  has_variable_width(false),
 
611
  timestamp_field_offset(0),
 
612
  varchar_fields(0),
542
613
  db_create_options(0),
543
614
  db_options_in_use(0),
544
615
  db_record_offset(0),
550
621
  error(0),
551
622
  open_errno(0),
552
623
  errarg(0),
 
624
  column_bitmap_size(0),
553
625
  blob_ptr_size(0),
554
626
  db_low_byte_first(false),
 
627
  name_lock(false),
 
628
  replace_with_name_lock(false),
 
629
  waiting_on_cond(false),
555
630
  keys_in_use(0),
556
631
  keys_for_keyread(0),
557
632
  event_observers(NULL)
570
645
  {
571
646
    table_category=         TABLE_CATEGORY_TEMPORARY;
572
647
    tmp_table=              message::Table::INTERNAL;
573
 
    db.str= const_cast<char *>(private_key_for_cache.vector());
574
 
    db.length= strlen(private_key_for_cache.vector());
 
648
    db.str= &private_key_for_cache[0];
 
649
    db.length= strlen(&private_key_for_cache[0]);
575
650
    table_name.str= db.str + 1;
576
651
    table_name.length= strlen(table_name.str);
577
652
    path.str= &private_normalized_path[0];
584
659
/*
585
660
  Used for shares that will go into the cache.
586
661
*/
587
 
TableShare::TableShare(const TableIdentifier::Type type_arg,
588
 
                       const TableIdentifier &identifier,
 
662
TableShare::TableShare(TableIdentifier::Type type_arg,
 
663
                       TableIdentifier &identifier,
589
664
                       char *path_arg,
590
665
                       uint32_t path_length_arg) :
591
666
  table_category(TABLE_UNKNOWN_CATEGORY),
 
667
  open_count(0),
592
668
  found_next_number_field(NULL),
593
669
  timestamp_field(NULL),
594
670
  key_info(NULL),
595
671
  mem_root(TABLE_ALLOC_BLOCK_SIZE),
596
 
  all_set(),
597
672
  block_size(0),
598
673
  version(0),
599
674
  timestamp_offset(0),
616
691
  uniques(0),
617
692
  null_fields(0),
618
693
  blob_fields(0),
619
 
  has_variable_width(false),
 
694
  timestamp_field_offset(0),
 
695
  varchar_fields(0),
620
696
  db_create_options(0),
621
697
  db_options_in_use(0),
622
698
  db_record_offset(0),
628
704
  error(0),
629
705
  open_errno(0),
630
706
  errarg(0),
 
707
  column_bitmap_size(0),
631
708
  blob_ptr_size(0),
632
709
  db_low_byte_first(false),
 
710
  name_lock(false),
 
711
  replace_with_name_lock(false),
 
712
  waiting_on_cond(false),
633
713
  keys_in_use(0),
634
714
  keys_for_keyread(0),
635
715
  event_observers(NULL)
648
728
    Let us use the fact that the key is "db/0/table_name/0" + optional
649
729
    part for temporary tables.
650
730
  */
651
 
  db.str= const_cast<char *>(private_key_for_cache.vector());
 
731
  db.str= &private_key_for_cache[0];
652
732
  db.length=         strlen(db.str);
653
733
  table_name.str=    db.str + db.length + 1;
654
734
  table_name.length= strlen(table_name.str);
673
753
  else
674
754
  {
675
755
    assert(0); // We should throw here.
676
 
    abort();
677
756
  }
678
757
}
679
758
 
696
775
{
697
776
  assert(ref_count == 0);
698
777
 
 
778
  /*
 
779
    If someone is waiting for this to be deleted, inform it about this.
 
780
    Don't do a delete until we know that no one is refering to this anymore.
 
781
  */
 
782
  if (tmp_table == message::Table::STANDARD)
 
783
  {
 
784
    /* share->mutex is locked in release_table_share() */
 
785
    while (waiting_on_cond)
 
786
    {
 
787
      cond.notify_all();
 
788
      boost::mutex::scoped_lock scoped(mutex, boost::adopt_lock_t());
 
789
      cond.wait(scoped);
 
790
      scoped.release();
 
791
    }
 
792
    /* No thread refers to this anymore */
 
793
    mutex.unlock();
 
794
  }
 
795
 
699
796
  storage_engine= NULL;
700
797
 
701
798
  delete table_proto;
702
799
  table_proto= NULL;
703
800
 
704
 
  plugin::EventObserver::deregisterTableEvents(*this);
705
 
 
706
801
  mem_root.free_root(MYF(0));                 // Free's share
707
802
}
708
803
 
709
 
void TableShare::setIdentifier(const TableIdentifier &identifier_arg)
 
804
void TableShare::setIdentifier(TableIdentifier &identifier_arg)
710
805
{
 
806
  private_key_for_cache.clear();
711
807
  private_key_for_cache= identifier_arg.getKey();
712
808
 
713
809
  /*
714
810
    Let us use the fact that the key is "db/0/table_name/0" + optional
715
811
    part for temporary tables.
716
812
  */
717
 
  db.str= const_cast<char *>(private_key_for_cache.vector());
 
813
  db.str= &private_key_for_cache[0];
718
814
  db.length=         strlen(db.str);
719
815
  table_name.str=    db.str + db.length + 1;
720
816
  table_name.length= strlen(table_name.str);
759
855
 
760
856
  table_charset= get_charset(table_options.collation_id());
761
857
 
762
 
  if (! table_charset)
 
858
  if (!table_charset)
763
859
  {
764
860
    char errmsg[100];
765
861
    snprintf(errmsg, sizeof(errmsg),
934
1030
  uint32_t local_null_fields= 0;
935
1031
  reclength= 0;
936
1032
 
937
 
  std::vector<uint32_t> field_offsets;
938
 
  std::vector<uint32_t> field_pack_length;
 
1033
  vector<uint32_t> field_offsets;
 
1034
  vector<uint32_t> field_pack_length;
939
1035
 
940
1036
  field_offsets.resize(fields);
941
1037
  field_pack_length.resize(fields);
1135
1231
        unireg_type= Field::TIMESTAMP_DN_FIELD;
1136
1232
      }
1137
1233
      else
1138
 
      {
1139
 
        assert(0); // Invalid update value.
1140
 
        abort();
1141
 
      }
 
1234
        assert(1); // Invalid update value.
1142
1235
    }
1143
1236
    else if (pfield.has_options() &&
1144
1237
             pfield.options().has_update_expression() &&
1231
1324
    }
1232
1325
 
1233
1326
 
1234
 
    blob_ptr_size= portable_sizeof_char_ptr;
 
1327
    Table temp_table; /* Use this so that BLOB DEFAULT '' works */
 
1328
    temp_table.setShare(this);
 
1329
    temp_table.in_use= &session;
 
1330
    temp_table.getMutableShare()->db_low_byte_first= true; //Cursor->low_byte_first();
 
1331
    temp_table.getMutableShare()->blob_ptr_size= portable_sizeof_char_ptr;
1235
1332
 
1236
1333
    uint32_t field_length= 0; //Assignment is for compiler complaint.
1237
1334
 
1315
1412
    case DRIZZLE_TYPE_LONGLONG:
1316
1413
      field_length= MAX_BIGINT_WIDTH;
1317
1414
      break;
1318
 
    case DRIZZLE_TYPE_UUID:
1319
 
      field_length= field::Uuid::max_string_length();
1320
 
      break;
1321
1415
    case DRIZZLE_TYPE_NULL:
1322
1416
      abort(); // Programming error
1323
1417
    }
1324
1418
 
1325
 
    assert(enum_field_types_size == 12);
1326
 
 
1327
1419
    Field* f= make_field(record + field_offsets[fieldnr] + data_offset,
1328
 
                         field_length,
1329
 
                         pfield.constraints().is_nullable(),
1330
 
                         null_pos,
1331
 
                         null_bit_pos,
1332
 
                         decimals,
1333
 
                         field_type,
1334
 
                         charset,
1335
 
                         MTYP_TYPENR(unireg_type),
1336
 
                         ((field_type == DRIZZLE_TYPE_ENUM) ?  &intervals[interval_nr++] : (TYPELIB*) 0),
1337
 
                         getTableProto()->field(fieldnr).name().c_str());
 
1420
                                field_length,
 
1421
                                pfield.constraints().is_nullable(),
 
1422
                                null_pos,
 
1423
                                null_bit_pos,
 
1424
                                decimals,
 
1425
                                field_type,
 
1426
                                charset,
 
1427
                                (Field::utype) MTYP_TYPENR(unireg_type),
 
1428
                                ((field_type == DRIZZLE_TYPE_ENUM) ?
 
1429
                                 &intervals[interval_nr++]
 
1430
                                 : (TYPELIB*) 0),
 
1431
                                getTableProto()->field(fieldnr).name().c_str());
1338
1432
 
1339
1433
    field[fieldnr]= f;
1340
1434
 
1341
 
    // Insert post make_field code here.
1342
 
    switch (field_type)
1343
 
    {
1344
 
    case DRIZZLE_TYPE_BLOB:
1345
 
    case DRIZZLE_TYPE_VARCHAR:
1346
 
    case DRIZZLE_TYPE_DOUBLE:
1347
 
    case DRIZZLE_TYPE_DECIMAL:
1348
 
    case DRIZZLE_TYPE_TIMESTAMP:
1349
 
    case DRIZZLE_TYPE_DATETIME:
1350
 
    case DRIZZLE_TYPE_DATE:
1351
 
    case DRIZZLE_TYPE_ENUM:
1352
 
    case DRIZZLE_TYPE_LONG:
1353
 
    case DRIZZLE_TYPE_LONGLONG:
1354
 
    case DRIZZLE_TYPE_NULL:
1355
 
    case DRIZZLE_TYPE_UUID:
1356
 
      break;
1357
 
    }
1358
 
 
1359
 
    // This needs to go, we should be setting the "use" on the field so that
1360
 
    // it does not reference the share/table.
1361
 
    table::Shell temp_table(*this); /* Use this so that BLOB DEFAULT '' works */
1362
 
    temp_table.in_use= &session;
1363
 
 
1364
1435
    f->init(&temp_table); /* blob default values need table obj */
1365
1436
 
1366
1437
    if (! (f->flags & NOT_NULL_FLAG))
1385
1456
        return local_error;
1386
1457
      }
1387
1458
    }
1388
 
    else if (f->real_type() == DRIZZLE_TYPE_ENUM && (f->flags & NOT_NULL_FLAG))
 
1459
    else if (f->real_type() == DRIZZLE_TYPE_ENUM &&
 
1460
             (f->flags & NOT_NULL_FLAG))
1389
1461
    {
1390
1462
      f->set_notnull();
1391
1463
      f->store((int64_t) 1, true);
1399
1471
    f->setTable(NULL);
1400
1472
    f->orig_table= NULL;
1401
1473
 
1402
 
    f->setPosition(fieldnr);
 
1474
    f->field_index= fieldnr;
1403
1475
    f->comment= comment;
1404
1476
    if (! default_value &&
1405
1477
        ! (f->unireg_check==Field::NEXT_NUMBER) &&
1412
1484
    if (f->unireg_check == Field::NEXT_NUMBER)
1413
1485
      found_next_number_field= &(field[fieldnr]);
1414
1486
 
 
1487
    if (timestamp_field == f)
 
1488
      timestamp_field_offset= fieldnr;
 
1489
 
1415
1490
    if (use_hash) /* supposedly this never fails... but comments lie */
1416
1491
    {
1417
1492
      const char *local_field_name= field[fieldnr]->field_name;
1418
1493
      name_hash.insert(make_pair(local_field_name, &(field[fieldnr])));
1419
1494
    }
 
1495
 
1420
1496
  }
1421
1497
 
1422
1498
  keyinfo= key_info;
1441
1517
    We need to set the unused bits to 1. If the number of bits is a multiple
1442
1518
    of 8 there are no unused bits.
1443
1519
  */
 
1520
 
1444
1521
  if (null_count & 7)
1445
1522
    *(record + null_count / 8)|= ~(((unsigned char) 1 << (null_count & 7)) - 1);
1446
1523
 
1606
1683
 
1607
1684
  if (blob_fields)
1608
1685
  {
 
1686
    uint32_t k, *save;
 
1687
 
1609
1688
    /* Store offsets to blob fields to find them fast */
1610
1689
    blob_field.resize(blob_fields);
1611
 
    uint32_t *save= &blob_field[0];
1612
 
    uint32_t k= 0;
 
1690
    save= &blob_field[0];
 
1691
    k= 0;
1613
1692
    for (Fields::iterator iter= field.begin(); iter != field.end()-1; iter++, k++)
1614
1693
    {
1615
1694
      if ((*iter)->flags & BLOB_FLAG)
1617
1696
    }
1618
1697
  }
1619
1698
 
1620
 
  all_set.clear();
1621
 
  all_set.resize(fields);
1622
 
  all_set.set();
 
1699
  db_low_byte_first= true; // @todo Question this.
 
1700
  column_bitmap_size= bitmap_buffer_size(fields);
 
1701
 
 
1702
  all_bitmap.resize(column_bitmap_size);
 
1703
  all_set.init(&all_bitmap[0], fields);
 
1704
  all_set.setAll();
1623
1705
 
1624
1706
  return local_error;
1625
1707
}
1650
1732
 
1651
1733
  NOTES
1652
1734
  This function is called when the table definition is not cached in
1653
 
  definition::Cache::singleton().getCache()
 
1735
  table_def_cache
1654
1736
  The data is returned in 'share', which is alloced by
1655
1737
  alloc_table_share().. The code assumes that share is initialized.
1656
1738
 
1664
1746
  6    Unknown .frm version
1665
1747
*/
1666
1748
 
1667
 
int TableShare::open_table_def(Session& session, const TableIdentifier &identifier)
 
1749
int TableShare::open_table_def(Session& session, TableIdentifier &identifier)
1668
1750
{
1669
1751
  int local_error;
1670
1752
  bool error_given;
1672
1754
  local_error= 1;
1673
1755
  error_given= 0;
1674
1756
 
1675
 
  message::table::shared_ptr table;
 
1757
  message::Table table;
1676
1758
 
1677
1759
  local_error= plugin::StorageEngine::getTableDefinition(session, identifier, table);
1678
1760
 
1685
1767
    }
1686
1768
    else
1687
1769
    {
1688
 
      if (not table->IsInitialized())
 
1770
      if (not table.IsInitialized())
1689
1771
      {
1690
1772
        local_error= 4;
1691
1773
      }
1693
1775
    goto err_not_open;
1694
1776
  }
1695
1777
 
1696
 
  local_error= parse_table_proto(session, *table);
 
1778
  local_error= parse_table_proto(session, table);
1697
1779
 
1698
1780
  setTableCategory(TABLE_CATEGORY_USER);
1699
1781
 
1731
1813
  5    Error (see open_table_error: charset unavailable)
1732
1814
  7    Table definition has changed in engine
1733
1815
*/
 
1816
 
1734
1817
int TableShare::open_table_from_share(Session *session,
1735
1818
                                      const TableIdentifier &identifier,
1736
1819
                                      const char *alias,
1737
1820
                                      uint32_t db_stat, uint32_t ha_open_flags,
1738
1821
                                      Table &outparam)
1739
1822
{
 
1823
  int local_error;
 
1824
  uint32_t records, bitmap_size;
1740
1825
  bool error_reported= false;
1741
 
  int ret= open_table_from_share_inner(session, alias, db_stat, outparam);
1742
 
 
1743
 
  if (not ret)
1744
 
    ret= open_table_cursor_inner(identifier, db_stat, ha_open_flags, outparam, error_reported);
1745
 
 
1746
 
  if (not ret)
1747
 
    return ret;
1748
 
 
1749
 
  if (not error_reported)
1750
 
    open_table_error(ret, errno, 0);
1751
 
 
1752
 
  delete outparam.cursor;
1753
 
  outparam.cursor= 0;                           // For easier error checking
1754
 
  outparam.db_stat= 0;
1755
 
  outparam.getMemRoot()->free_root(MYF(0));       // Safe to call on zeroed root
1756
 
  outparam.clearAlias();
1757
 
 
1758
 
  return ret;
1759
 
}
1760
 
 
1761
 
int TableShare::open_table_from_share_inner(Session *session,
1762
 
                                            const char *alias,
1763
 
                                            uint32_t db_stat,
1764
 
                                            Table &outparam)
1765
 
{
1766
 
  int local_error;
1767
 
  uint32_t records;
1768
 
  unsigned char *record= NULL;
 
1826
  unsigned char *record, *bitmaps;
1769
1827
  Field **field_ptr;
1770
1828
 
1771
1829
  /* Parsing of partitioning information from .frm needs session->lex set up. */
1774
1832
  local_error= 1;
1775
1833
  outparam.resetTable(session, this, db_stat);
1776
1834
 
1777
 
  outparam.setAlias(alias);
 
1835
  if (not (outparam.alias= strdup(alias)))
 
1836
    goto err;
1778
1837
 
1779
1838
  /* Allocate Cursor */
1780
 
  if (not (outparam.cursor= db_type()->getCursor(outparam)))
1781
 
    return local_error;
 
1839
  if (not (outparam.cursor= db_type()->getCursor(*this)))
 
1840
    goto err;
1782
1841
 
1783
1842
  local_error= 4;
1784
1843
  records= 0;
1788
1847
  records++;
1789
1848
 
1790
1849
  if (!(record= (unsigned char*) outparam.alloc_root(rec_buff_length * records)))
1791
 
    return local_error;
 
1850
    goto err;
1792
1851
 
1793
1852
  if (records == 0)
1794
1853
  {
1804
1863
      outparam.record[1]= outparam.getInsertRecord();   // Safety
1805
1864
  }
1806
1865
 
1807
 
#ifdef HAVE_VALGRIND
 
1866
#ifdef HAVE_purify
1808
1867
  /*
1809
1868
    We need this because when we read var-length rows, we are not updating
1810
1869
    bytes after end of varchar
1824
1883
 
1825
1884
  if (!(field_ptr = (Field **) outparam.alloc_root( (uint32_t) ((fields+1)* sizeof(Field*)))))
1826
1885
  {
1827
 
    return local_error;
 
1886
    goto err;
1828
1887
  }
1829
1888
 
1830
1889
  outparam.setFields(field_ptr);
1837
1896
  for (uint32_t i= 0 ; i < fields; i++, field_ptr++)
1838
1897
  {
1839
1898
    if (!((*field_ptr)= field[i]->clone(outparam.getMemRoot(), &outparam)))
1840
 
      return local_error;
 
1899
      goto err;
1841
1900
  }
1842
1901
  (*field_ptr)= 0;                              // End marker
1843
1902
 
1845
1904
    outparam.found_next_number_field=
1846
1905
      outparam.getField(positionFields(found_next_number_field));
1847
1906
  if (timestamp_field)
1848
 
    outparam.timestamp_field= (Field_timestamp*) outparam.getField(timestamp_field->position());
 
1907
    outparam.timestamp_field= (Field_timestamp*) outparam.getField(timestamp_field_offset);
 
1908
 
1849
1909
 
1850
1910
  /* Fix key->name and key_part->field */
1851
1911
  if (key_parts)
1855
1915
    uint32_t n_length;
1856
1916
    n_length= keys*sizeof(KeyInfo) + key_parts*sizeof(KeyPartInfo);
1857
1917
    if (!(local_key_info= (KeyInfo*) outparam.alloc_root(n_length)))
1858
 
      return local_error;
 
1918
      goto err;
1859
1919
    outparam.key_info= local_key_info;
1860
1920
    key_part= (reinterpret_cast<KeyPartInfo*> (local_key_info+keys));
1861
1921
 
1894
1954
 
1895
1955
  /* Allocate bitmaps */
1896
1956
 
1897
 
  outparam.def_read_set.resize(fields);
1898
 
  outparam.def_write_set.resize(fields);
1899
 
  outparam.tmp_set.resize(fields);
 
1957
  bitmap_size= column_bitmap_size;
 
1958
  if (!(bitmaps= (unsigned char*) outparam.alloc_root(bitmap_size*3)))
 
1959
  {
 
1960
    goto err;
 
1961
  }
 
1962
  outparam.def_read_set.init((my_bitmap_map*) bitmaps, fields);
 
1963
  outparam.def_write_set.init((my_bitmap_map*) (bitmaps+bitmap_size), fields);
 
1964
  outparam.tmp_set.init((my_bitmap_map*) (bitmaps+bitmap_size*2), fields);
1900
1965
  outparam.default_column_bitmaps();
1901
1966
 
1902
 
  return 0;
1903
 
}
1904
 
 
1905
 
int TableShare::open_table_cursor_inner(const TableIdentifier &identifier,
1906
 
                                        uint32_t db_stat, uint32_t ha_open_flags,
1907
 
                                        Table &outparam,
1908
 
                                        bool &error_reported)
1909
 
{
1910
1967
  /* The table struct is now initialized;  Open the table */
1911
 
  int local_error= 2;
 
1968
  local_error= 2;
1912
1969
  if (db_stat)
1913
1970
  {
1914
1971
    assert(!(db_stat & HA_WAIT_IF_LOCKED));
1915
1972
    int ha_err;
1916
1973
 
1917
 
    if ((ha_err= (outparam.cursor->ha_open(identifier,
1918
 
                                           (db_stat & HA_READ_ONLY ? O_RDONLY : O_RDWR),
1919
 
                                           (db_stat & HA_OPEN_TEMPORARY ? HA_OPEN_TMP_TABLE : HA_OPEN_IGNORE_IF_LOCKED) | ha_open_flags))))
 
1974
    if ((ha_err= (outparam.cursor->ha_open(identifier, &outparam,
 
1975
                          (db_stat & HA_READ_ONLY ? O_RDONLY : O_RDWR),
 
1976
                          (db_stat & HA_OPEN_TEMPORARY ? HA_OPEN_TMP_TABLE : HA_OPEN_IGNORE_IF_LOCKED) | ha_open_flags))))
1920
1977
    {
1921
1978
      switch (ha_err)
1922
1979
      {
1943
2000
          local_error= 7;
1944
2001
        break;
1945
2002
      }
1946
 
      return local_error;
 
2003
      goto err;
1947
2004
    }
1948
2005
  }
1949
2006
 
 
2007
#if defined(HAVE_purify)
 
2008
  memset(bitmaps, 0, bitmap_size*3);
 
2009
#endif
 
2010
 
1950
2011
  return 0;
 
2012
 
 
2013
err:
 
2014
  if (!error_reported)
 
2015
    open_table_error(local_error, errno, 0);
 
2016
 
 
2017
  delete outparam.cursor;
 
2018
  outparam.cursor= 0;                           // For easier error checking
 
2019
  outparam.db_stat= 0;
 
2020
  outparam.getMemRoot()->free_root(MYF(0));       // Safe to call on zeroed root
 
2021
  free((char*) outparam.alias);
 
2022
 
 
2023
  return (local_error);
1951
2024
}
1952
2025
 
1953
2026
/* error message when opening a form cursor */
2037
2110
  case DRIZZLE_TYPE_DATE:
2038
2111
  case DRIZZLE_TYPE_DATETIME:
2039
2112
  case DRIZZLE_TYPE_TIMESTAMP:
2040
 
  case DRIZZLE_TYPE_UUID:
2041
2113
    field_charset= &my_charset_bin;
2042
2114
  default: break;
2043
2115
  }
2053
2125
                                 interval,
2054
2126
                                 field_charset);
2055
2127
  case DRIZZLE_TYPE_VARCHAR:
2056
 
    setVariableWidth();
2057
2128
    return new (&mem_root) Field_varstring(ptr,field_length,
2058
 
                                      ha_varchar_packlength(field_length),
 
2129
                                      HA_VARCHAR_PACKLENGTH(field_length),
2059
2130
                                      null_pos,null_bit,
2060
2131
                                      field_name,
 
2132
                                      this,
2061
2133
                                      field_charset);
2062
2134
  case DRIZZLE_TYPE_BLOB:
2063
2135
    return new (&mem_root) Field_blob(ptr,
2065
2137
                                 null_bit,
2066
2138
                                 field_name,
2067
2139
                                 this,
 
2140
                                 calc_pack_length(DRIZZLE_TYPE_LONG, 0),
2068
2141
                                 field_charset);
2069
2142
  case DRIZZLE_TYPE_DECIMAL:
2070
2143
    return new (&mem_root) Field_decimal(ptr,
2086
2159
                                   decimals,
2087
2160
                                   false,
2088
2161
                                   false /* is_unsigned */);
2089
 
  case DRIZZLE_TYPE_UUID:
2090
 
    return new (&mem_root) field::Uuid(ptr,
2091
 
                                       field_length,
2092
 
                                       null_pos,
2093
 
                                       null_bit,
2094
 
                                       field_name);
2095
2162
  case DRIZZLE_TYPE_LONG:
2096
 
    return new (&mem_root) field::Int32(ptr,
2097
 
                                        field_length,
2098
 
                                        null_pos,
2099
 
                                        null_bit,
2100
 
                                        unireg_check,
2101
 
                                        field_name);
 
2163
    return new (&mem_root) Field_long(ptr,
 
2164
                                 field_length,
 
2165
                                 null_pos,
 
2166
                                 null_bit,
 
2167
                                 unireg_check,
 
2168
                                 field_name,
 
2169
                                 false,
 
2170
                                 false /* is_unsigned */);
2102
2171
  case DRIZZLE_TYPE_LONGLONG:
2103
 
    return new (&mem_root) field::Int64(ptr,
2104
 
                                        field_length,
2105
 
                                        null_pos,
2106
 
                                        null_bit,
2107
 
                                        unireg_check,
2108
 
                                        field_name);
 
2172
    return new (&mem_root) Field_int64_t(ptr,
 
2173
                                    field_length,
 
2174
                                    null_pos,
 
2175
                                    null_bit,
 
2176
                                    unireg_check,
 
2177
                                    field_name,
 
2178
                                    false,
 
2179
                                    false /* is_unsigned */);
2109
2180
  case DRIZZLE_TYPE_TIMESTAMP:
2110
2181
    return new (&mem_root) Field_timestamp(ptr,
2111
2182
                                      field_length,
2132
2203
                                 field_length,
2133
2204
                                 field_name,
2134
2205
                                 field_charset);
 
2206
  default: // Impossible (Wrong version)
 
2207
    break;
2135
2208
  }
2136
 
  assert(0);
2137
 
  abort();
 
2209
  return 0;
2138
2210
}
2139
2211
 
2140
2212