multi-bdb update. addresses #197

git-svn-id: file:///svn/tokudb@1202 c7de825b-a66e-492c-adef-691d508d4ae1

buildheader/db.h_4_1

@@ -43,6 +43,7 @@ typedef enum {
 #define DB_ARCH_ABS 1
 #define DB_ARCH_LOG 4
 #define DB_CREATE 1
+#define DB_CXX_NO_EXCEPTIONS 2
 #define DB_EXCL 2048
 #define DB_PRIVATE 262144
 #define DB_RDONLY 16
@@ -155,34 +156,36 @@ struct __toku_db {
   void* __toku_dummy0[3];
   void *app_private; /* 32-bit offset=16 size=4, 64=bit offset=32 size=8 */
   DB_ENV *dbenv; /* 32-bit offset=20 size=4, 64=bit offset=40 size=8 */
-  void* __toku_dummy1[34];
+  void* __toku_dummy1[29];
   char __toku_dummy2[96];
+  void *api_internal; /* 32-bit offset=236 size=4, 64=bit offset=376 size=8 */
+  void* __toku_dummy3[4];
   int (*associate) (DB*, DB_TXN*, DB*, int(*)(DB*, const DBT*, const DBT*, DBT*), u_int32_t); /* 32-bit offset=256 size=4, 64=bit offset=416 size=8 */
   int (*close) (DB*, u_int32_t); /* 32-bit offset=260 size=4, 64=bit offset=424 size=8 */
   int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t); /* 32-bit offset=264 size=4, 64=bit offset=432 size=8 */
   int (*del) (DB *, DB_TXN *, DBT *, u_int32_t); /* 32-bit offset=268 size=4, 64=bit offset=440 size=8 */
-  void* __toku_dummy3[3];
+  void* __toku_dummy4[3];
   int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=284 size=4, 64=bit offset=472 size=8 */
   int (*pget) (DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t); /* 32-bit offset=288 size=4, 64=bit offset=480 size=8 */
-  void* __toku_dummy4[3];
+  void* __toku_dummy5[3];
   int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t); /* 32-bit offset=304 size=4, 64=bit offset=512 size=8 */
   int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int); /* 32-bit offset=308 size=4, 64=bit offset=520 size=8 */
   int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=312 size=4, 64=bit offset=528 size=8 */
   int (*remove) (DB *, const char *, const char *, u_int32_t); /* 32-bit offset=316 size=4, 64=bit offset=536 size=8 */
   int (*rename) (DB *, const char *, const char *, const char *, u_int32_t); /* 32-bit offset=320 size=4, 64=bit offset=544 size=8 */
-  void* __toku_dummy5[5];
-  int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=344 size=4, 64=bit offset=592 size=8 */
   void* __toku_dummy6[5];
+  int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=344 size=4, 64=bit offset=592 size=8 */
+  void* __toku_dummy7[5];
   int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=368 size=4, 64=bit offset=640 size=8 */
-  void* __toku_dummy7[1];
-  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=376 size=4, 64=bit offset=656 size=8 */
   void* __toku_dummy8[1];
+  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=376 size=4, 64=bit offset=656 size=8 */
+  void* __toku_dummy9[1];
   int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=384 size=4, 64=bit offset=672 size=8 */
-  void* __toku_dummy9[2];
+  void* __toku_dummy10[2];
   int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t); /* 32-bit offset=396 size=4, 64=bit offset=696 size=8 */
   int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=400 size=4, 64=bit offset=704 size=8 */
-  void* __toku_dummy10[15]; /* Padding at the end */ 
-  char __toku_dummy11[8];  /* Padding at the end */ 
+  void* __toku_dummy11[15]; /* Padding at the end */ 
+  char __toku_dummy12[8];  /* Padding at the end */ 
 };
 struct __toku_db_txn_active {
   u_int32_t txnid; /* 32-bit offset=0 size=4, 64=bit offset=0 size=4 */

buildheader/db.h_4_3

@@ -43,6 +43,7 @@ typedef enum {
 #define DB_ARCH_ABS 1
 #define DB_ARCH_LOG 4
 #define DB_CREATE 1
+#define DB_CXX_NO_EXCEPTIONS 2
 #define DB_EXCL 4096
 #define DB_PRIVATE 1048576
 #define DB_RDONLY 16
@@ -161,39 +162,41 @@ struct __toku_db {
   void* __toku_dummy0[3];
   void *app_private; /* 32-bit offset=16 size=4, 64=bit offset=32 size=8 */
   DB_ENV *dbenv; /* 32-bit offset=20 size=4, 64=bit offset=40 size=8 */
-  void* __toku_dummy1[37];
+  void* __toku_dummy1[32];
   char __toku_dummy2[96];
+  void *api_internal; /* 32-bit offset=248 size=4, 64=bit offset=400 size=8 */
+  void* __toku_dummy3[4];
   int (*associate) (DB*, DB_TXN*, DB*, int(*)(DB*, const DBT*, const DBT*, DBT*), u_int32_t); /* 32-bit offset=268 size=4, 64=bit offset=440 size=8 */
   int (*close) (DB*, u_int32_t); /* 32-bit offset=272 size=4, 64=bit offset=448 size=8 */
   int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t); /* 32-bit offset=276 size=4, 64=bit offset=456 size=8 */
   int (*del) (DB *, DB_TXN *, DBT *, u_int32_t); /* 32-bit offset=280 size=4, 64=bit offset=464 size=8 */
-  void* __toku_dummy3[4];
+  void* __toku_dummy4[4];
   int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=300 size=4, 64=bit offset=504 size=8 */
   int (*pget) (DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t); /* 32-bit offset=304 size=4, 64=bit offset=512 size=8 */
-  void* __toku_dummy4[7];
+  void* __toku_dummy5[7];
   int (*get_flags) (DB *, u_int32_t *); /* 32-bit offset=336 size=4, 64=bit offset=576 size=8 */
-  void* __toku_dummy5[2];
+  void* __toku_dummy6[2];
   int (*get_pagesize) (DB *, u_int32_t *); /* 32-bit offset=348 size=4, 64=bit offset=600 size=8 */
-  void* __toku_dummy6[3];
+  void* __toku_dummy7[3];
   int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t); /* 32-bit offset=364 size=4, 64=bit offset=632 size=8 */
   int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int); /* 32-bit offset=368 size=4, 64=bit offset=640 size=8 */
   int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=372 size=4, 64=bit offset=648 size=8 */
   int (*remove) (DB *, const char *, const char *, u_int32_t); /* 32-bit offset=376 size=4, 64=bit offset=656 size=8 */
   int (*rename) (DB *, const char *, const char *, const char *, u_int32_t); /* 32-bit offset=380 size=4, 64=bit offset=664 size=8 */
-  void* __toku_dummy7[4];
+  void* __toku_dummy8[4];
   int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=400 size=4, 64=bit offset=704 size=8 */
-  void* __toku_dummy8[5];
+  void* __toku_dummy9[5];
   int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=424 size=4, 64=bit offset=752 size=8 */
-  void* __toku_dummy9[4];
+  void* __toku_dummy10[4];
   int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=444 size=4, 64=bit offset=792 size=8 */
-  void* __toku_dummy10[1];
+  void* __toku_dummy11[1];
   int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=452 size=4, 64=bit offset=808 size=8 */
-  void* __toku_dummy11[3];
+  void* __toku_dummy12[3];
   int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t); /* 32-bit offset=468 size=4, 64=bit offset=840 size=8 */
-  void* __toku_dummy12[1];
+  void* __toku_dummy13[1];
   int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=476 size=4, 64=bit offset=856 size=8 */
-  void* __toku_dummy13[23]; /* Padding at the end */ 
-  char __toku_dummy14[8];  /* Padding at the end */ 
+  void* __toku_dummy14[23]; /* Padding at the end */ 
+  char __toku_dummy15[8];  /* Padding at the end */ 
 };
 struct __toku_db_txn_active {
   u_int32_t txnid; /* 32-bit offset=0 size=4, 64=bit offset=0 size=4 */

buildheader/db.h_4_5

@@ -43,6 +43,7 @@ typedef enum {
 #define DB_ARCH_ABS 1
 #define DB_ARCH_LOG 4
 #define DB_CREATE 1
+#define DB_CXX_NO_EXCEPTIONS 1
 #define DB_EXCL 16384
 #define DB_PRIVATE 2097152
 #define DB_RDONLY 32
@@ -160,40 +161,42 @@ struct __toku_db {
   void* __toku_dummy0[3];
   void *app_private; /* 32-bit offset=16 size=4, 64=bit offset=32 size=8 */
   DB_ENV *dbenv; /* 32-bit offset=20 size=4, 64=bit offset=40 size=8 */
-  void* __toku_dummy1[42];
+  void* __toku_dummy1[37];
   char __toku_dummy2[96];
+  void *api_internal; /* 32-bit offset=268 size=4, 64=bit offset=440 size=8 */
+  void* __toku_dummy3[4];
   int (*associate) (DB*, DB_TXN*, DB*, int(*)(DB*, const DBT*, const DBT*, DBT*), u_int32_t); /* 32-bit offset=288 size=4, 64=bit offset=480 size=8 */
   int (*close) (DB*, u_int32_t); /* 32-bit offset=292 size=4, 64=bit offset=488 size=8 */
-  void* __toku_dummy3[1];
+  void* __toku_dummy4[1];
   int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t); /* 32-bit offset=300 size=4, 64=bit offset=504 size=8 */
   int (*del) (DB *, DB_TXN *, DBT *, u_int32_t); /* 32-bit offset=304 size=4, 64=bit offset=512 size=8 */
-  void* __toku_dummy4[3];
+  void* __toku_dummy5[3];
   int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=320 size=4, 64=bit offset=544 size=8 */
-  void* __toku_dummy5[8];
+  void* __toku_dummy6[8];
   int (*get_flags) (DB *, u_int32_t *); /* 32-bit offset=356 size=4, 64=bit offset=616 size=8 */
-  void* __toku_dummy6[6];
+  void* __toku_dummy7[6];
   int (*get_pagesize) (DB *, u_int32_t *); /* 32-bit offset=384 size=4, 64=bit offset=672 size=8 */
-  void* __toku_dummy7[8];
+  void* __toku_dummy8[8];
   int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t); /* 32-bit offset=420 size=4, 64=bit offset=744 size=8 */
   int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int); /* 32-bit offset=424 size=4, 64=bit offset=752 size=8 */
   int (*pget) (DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t); /* 32-bit offset=428 size=4, 64=bit offset=760 size=8 */
   int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=432 size=4, 64=bit offset=768 size=8 */
   int (*remove) (DB *, const char *, const char *, u_int32_t); /* 32-bit offset=436 size=4, 64=bit offset=776 size=8 */
   int (*rename) (DB *, const char *, const char *, const char *, u_int32_t); /* 32-bit offset=440 size=4, 64=bit offset=784 size=8 */
-  void* __toku_dummy8[2];
+  void* __toku_dummy9[2];
   int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=452 size=4, 64=bit offset=808 size=8 */
-  void* __toku_dummy9[3];
+  void* __toku_dummy10[3];
   int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=468 size=4, 64=bit offset=840 size=8 */
-  void* __toku_dummy10[5];
+  void* __toku_dummy11[5];
   int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=492 size=4, 64=bit offset=888 size=8 */
-  void* __toku_dummy11[6];
-  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=520 size=4, 64=bit offset=944 size=8 */
   void* __toku_dummy12[6];
+  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=520 size=4, 64=bit offset=944 size=8 */
+  void* __toku_dummy13[6];
   int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=548 size=4, 64=bit offset=1000 size=8 */
-  void* __toku_dummy13[4];
+  void* __toku_dummy14[4];
   int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t); /* 32-bit offset=568 size=4, 64=bit offset=1040 size=8 */
-  void* __toku_dummy14[5]; /* Padding at the end */ 
-  char __toku_dummy15[16];  /* Padding at the end */ 
+  void* __toku_dummy15[5]; /* Padding at the end */ 
+  char __toku_dummy16[16];  /* Padding at the end */ 
 };
 struct __toku_db_txn_active {
   u_int32_t txnid; /* 32-bit offset=0 size=4, 64=bit offset=0 size=4 */

buildheader/db.h_4_6

@@ -43,6 +43,7 @@ typedef enum {
 #define DB_ARCH_ABS 1
 #define DB_ARCH_LOG 4
 #define DB_CREATE 1
+#define DB_CXX_NO_EXCEPTIONS 1
 #define DB_EXCL 16384
 #define DB_PRIVATE 8388608
 #define DB_RDONLY 32
@@ -163,40 +164,42 @@ struct __toku_db {
   char __toku_dummy1[8];
   void *app_private; /* 32-bit offset=20 size=4, 64=bit offset=32 size=8 */
   DB_ENV *dbenv; /* 32-bit offset=24 size=4, 64=bit offset=40 size=8 */
-  void* __toku_dummy2[47];
+  void* __toku_dummy2[42];
   char __toku_dummy3[80];
+  void *api_internal; /* 32-bit offset=276 size=4, 64=bit offset=464 size=8 */
+  void* __toku_dummy4[4];
   int (*associate) (DB*, DB_TXN*, DB*, int(*)(DB*, const DBT*, const DBT*, DBT*), u_int32_t); /* 32-bit offset=296 size=4, 64=bit offset=504 size=8 */
   int (*close) (DB*, u_int32_t); /* 32-bit offset=300 size=4, 64=bit offset=512 size=8 */
-  void* __toku_dummy4[1];
+  void* __toku_dummy5[1];
   int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t); /* 32-bit offset=308 size=4, 64=bit offset=528 size=8 */
   int (*del) (DB *, DB_TXN *, DBT *, u_int32_t); /* 32-bit offset=312 size=4, 64=bit offset=536 size=8 */
-  void* __toku_dummy5[4];
+  void* __toku_dummy6[4];
   int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=332 size=4, 64=bit offset=576 size=8 */
-  void* __toku_dummy6[8];
+  void* __toku_dummy7[8];
   int (*get_flags) (DB *, u_int32_t *); /* 32-bit offset=368 size=4, 64=bit offset=648 size=8 */
-  void* __toku_dummy7[7];
+  void* __toku_dummy8[7];
   int (*get_pagesize) (DB *, u_int32_t *); /* 32-bit offset=400 size=4, 64=bit offset=712 size=8 */
-  void* __toku_dummy8[9];
+  void* __toku_dummy9[9];
   int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t); /* 32-bit offset=440 size=4, 64=bit offset=792 size=8 */
   int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int); /* 32-bit offset=444 size=4, 64=bit offset=800 size=8 */
   int (*pget) (DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t); /* 32-bit offset=448 size=4, 64=bit offset=808 size=8 */
   int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=452 size=4, 64=bit offset=816 size=8 */
   int (*remove) (DB *, const char *, const char *, u_int32_t); /* 32-bit offset=456 size=4, 64=bit offset=824 size=8 */
   int (*rename) (DB *, const char *, const char *, const char *, u_int32_t); /* 32-bit offset=460 size=4, 64=bit offset=832 size=8 */
-  void* __toku_dummy9[2];
+  void* __toku_dummy10[2];
   int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=472 size=4, 64=bit offset=856 size=8 */
-  void* __toku_dummy10[3];
+  void* __toku_dummy11[3];
   int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=488 size=4, 64=bit offset=888 size=8 */
-  void* __toku_dummy11[5];
+  void* __toku_dummy12[5];
   int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=512 size=4, 64=bit offset=936 size=8 */
-  void* __toku_dummy12[7];
-  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=544 size=4, 64=bit offset=1000 size=8 */
   void* __toku_dummy13[7];
+  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=544 size=4, 64=bit offset=1000 size=8 */
+  void* __toku_dummy14[7];
   int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=576 size=4, 64=bit offset=1064 size=8 */
-  void* __toku_dummy14[4];
+  void* __toku_dummy15[4];
   int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t); /* 32-bit offset=596 size=4, 64=bit offset=1104 size=8 */
-  void* __toku_dummy15[5]; /* Padding at the end */ 
-  char __toku_dummy16[16];  /* Padding at the end */ 
+  void* __toku_dummy16[5]; /* Padding at the end */ 
+  char __toku_dummy17[16];  /* Padding at the end */ 
 };
 struct __toku_db_txn_active {
   u_int32_t txnid; /* 32-bit offset=0 size=4, 64=bit offset=0 size=4 */

buildheader/sample_offsets_32_4_5.h

@@ -44,6 +44,7 @@ struct fieldinfo db_lsn_fields32[] = {
 struct fieldinfo db_fields32[] = {
   {"void *app_private", 16, 4},
   {"DB_ENV *dbenv", 20, 4},
+  {"void *api_internal", 268, 4},
   {"int (*associate) (DB*, DB_TXN*, DB*, int(*)(DB*, const DBT*, const DBT*, DBT*), u_int32_t)", 288, 4},
   {"int (*close) (DB*, u_int32_t)", 292, 4},
   {"int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t)", 300, 4},

buildheader/sample_offsets_32_4_6.h

@@ -44,6 +44,7 @@ struct fieldinfo db_lsn_fields32[] = {
 struct fieldinfo db_fields32[] = {
   {"void *app_private", 20, 4},
   {"DB_ENV *dbenv", 24, 4},
+  {"void *api_internal", 276, 4},
   {"int (*associate) (DB*, DB_TXN*, DB*, int(*)(DB*, const DBT*, const DBT*, DBT*), u_int32_t)", 296, 4},
   {"int (*close) (DB*, u_int32_t)", 300, 4},
   {"int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t)", 308, 4},

buildheader/sample_offsets_64_4_1.h

@@ -43,6 +43,7 @@ struct fieldinfo db_lsn_fields64[] = {
 struct fieldinfo db_fields64[] = {
   {"void *app_private", 32, 8},
   {"DB_ENV *dbenv", 40, 8},
+  {"void *api_internal", 376, 8},
   {"int (*associate) (DB*, DB_TXN*, DB*, int(*)(DB*, const DBT*, const DBT*, DBT*), u_int32_t)", 416, 8},
   {"int (*close) (DB*, u_int32_t)", 424, 8},
   {"int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t)", 432, 8},

buildheader/sample_offsets_64_4_5.h

@@ -44,6 +44,7 @@ struct fieldinfo db_lsn_fields64[] = {
 struct fieldinfo db_fields64[] = {
   {"void *app_private", 32, 8},
   {"DB_ENV *dbenv", 40, 8},
+  {"void *api_internal", 440, 8},
   {"int (*associate) (DB*, DB_TXN*, DB*, int(*)(DB*, const DBT*, const DBT*, DBT*), u_int32_t)", 480, 8},
   {"int (*close) (DB*, u_int32_t)", 488, 8},
   {"int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t)", 504, 8},

buildheader/sample_offsets_64_4_6.h

@@ -44,6 +44,7 @@ struct fieldinfo db_lsn_fields64[] = {
 struct fieldinfo db_fields64[] = {
   {"void *app_private", 32, 8},
   {"DB_ENV *dbenv", 40, 8},
+  {"void *api_internal", 464, 8},
   {"int (*associate) (DB*, DB_TXN*, DB*, int(*)(DB*, const DBT*, const DBT*, DBT*), u_int32_t)", 504, 8},
   {"int (*close) (DB*, u_int32_t)", 512, 8},
   {"int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t)", 528, 8},