set the default db.h to 4.4 addresses #49

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

include/db.h

@@ -9,10 +9,10 @@ extern "C" {
 #endif
 #define TOKUDB 1
 #define DB_VERSION_MAJOR 4
-#define DB_VERSION_MINOR 1
-#define DB_VERSION_PATCH 25
+#define DB_VERSION_MINOR 4
+#define DB_VERSION_PATCH 20
 #ifndef _TOKUDB_WRAP_H
-#define DB_VERSION_STRING "Tokutek: TokuDB 4.1.25"
+#define DB_VERSION_STRING "Tokutek: TokuDB 4.4.20"
 #else
 #define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
 #endif
@@ -30,8 +30,8 @@ typedef enum {
  DB_BTREE=1
 } DBTYPE;
 #ifndef _TOKUDB_WRAP_H
-#define DB_VERB_DEADLOCK 2
-#define DB_VERB_RECOVERY 4
+#define DB_VERB_DEADLOCK 1
+#define DB_VERB_RECOVERY 2
 #define DB_VERB_REPLICATION 8
 #define DB_VERB_WAITSFOR 16
 #define DB_DBT_MALLOC 4
@@ -41,39 +41,39 @@ typedef enum {
 #define DB_ARCH_ABS 1
 #define DB_ARCH_LOG 4
 #define DB_CREATE 1
-#define DB_EXCL 2048
-#define DB_PRIVATE 262144
+#define DB_EXCL 8192
+#define DB_PRIVATE 1048576
 #define DB_RDONLY 16
 #define DB_RECOVER 32
 #define DB_THREAD 64
 #define DB_TXN_NOSYNC 256
 #define DB_LOCK_DEFAULT 1
-#define DB_LOCK_OLDEST 6
-#define DB_LOCK_RANDOM 7
-#define DB_DUP 2
-#define DB_DUPSORT 4
-#define DB_NOOVERWRITE 23
-#define DB_INIT_LOCK 4096
-#define DB_INIT_LOG 8192
-#define DB_INIT_MPOOL 16384
-#define DB_INIT_TXN 32768
-#define DB_USE_ENVIRON 512
-#define DB_USE_ENVIRON_ROOT 1024
-#define DB_KEYEMPTY -30998
-#define DB_KEYEXIST -30997
-#define DB_LOCK_DEADLOCK -30996
-#define DB_NOTFOUND -30991
+#define DB_LOCK_OLDEST 7
+#define DB_LOCK_RANDOM 8
+#define DB_DUP 16384
+#define DB_DUPSORT 32768
+#define DB_NOOVERWRITE 22
+#define DB_INIT_LOCK 16384
+#define DB_INIT_LOG 32768
+#define DB_INIT_MPOOL 65536
+#define DB_INIT_TXN 262144
+#define DB_USE_ENVIRON 2048
+#define DB_USE_ENVIRON_ROOT 4096
+#define DB_KEYEMPTY -30997
+#define DB_KEYEXIST -30996
+#define DB_LOCK_DEADLOCK -30995
+#define DB_NOTFOUND -30989
 #define DB_BADFORMAT -30500
 #define DB_DELETE_ANY 65536
-#define DB_FIRST 10
-#define DB_GET_BOTH 11
-#define DB_LAST 18
-#define DB_NEXT 19
-#define DB_NEXT_DUP 20
-#define DB_PREV 27
-#define DB_SET 30
-#define DB_SET_RANGE 32
-#define DB_RMW 1073741824
+#define DB_FIRST 9
+#define DB_GET_BOTH 10
+#define DB_LAST 17
+#define DB_NEXT 18
+#define DB_NEXT_DUP 19
+#define DB_PREV 25
+#define DB_SET 28
+#define DB_SET_RANGE 30
+#define DB_RMW 536870912
 #endif
 /* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/
 #ifdef _TOKUDB_WRAP_H
@@ -87,53 +87,54 @@ struct __toku_db_btree_stat {
 };
 struct __toku_db_env {
   struct __toku_db_env_internal *i;
-  void* __toku_dummy0[8];
-  void *app_private; /* 32-bit offset=36 size=4, 64=bit offset=72 size=8 */
-  void* __toku_dummy1[35];
-  char __toku_dummy2[64];
-  int  (*close) (DB_ENV *, u_int32_t); /* 32-bit offset=244 size=4, 64=bit offset=424 size=8 */
+  void* __toku_dummy0[10];
+  void *app_private; /* 32-bit offset=44 size=4, 64=bit offset=88 size=8 */
+  void* __toku_dummy1[48];
+  char __toku_dummy2[128];
+  int  (*close) (DB_ENV *, u_int32_t); /* 32-bit offset=368 size=4, 64=bit offset=608 size=8 */
   void* __toku_dummy3[2];
-  void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=256 size=4, 64=bit offset=448 size=8 */
-  void* __toku_dummy4[1];
-  int  (*open) (DB_ENV *, const char *, u_int32_t, int); /* 32-bit offset=264 size=4, 64=bit offset=464 size=8 */
-  void* __toku_dummy5[1];
-  int  (*set_data_dir) (DB_ENV *, const char *); /* 32-bit offset=272 size=4, 64=bit offset=480 size=8 */
-  void* __toku_dummy6[3];
-  void (*set_errcall) (DB_ENV *, void (*)(const char *, char *)); /* 32-bit offset=288 size=4, 64=bit offset=512 size=8 */
-  void* __toku_dummy7[1];
-  void (*set_errpfx) (DB_ENV *, const char *); /* 32-bit offset=296 size=4, 64=bit offset=528 size=8 */
+  void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=380 size=4, 64=bit offset=632 size=8 */
+  void* __toku_dummy4[41];
+  int  (*log_archive) (DB_ENV *, char **[], u_int32_t); /* 32-bit offset=548 size=4, 64=bit offset=968 size=8 */
+  void* __toku_dummy5[2];
+  int  (*log_flush) (DB_ENV *, const DB_LSN *); /* 32-bit offset=560 size=4, 64=bit offset=992 size=8 */
+  void* __toku_dummy6[25];
+  int  (*open) (DB_ENV *, const char *, u_int32_t, int); /* 32-bit offset=664 size=4, 64=bit offset=1200 size=8 */
+  void* __toku_dummy7[12];
+  int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int); /* 32-bit offset=716 size=4, 64=bit offset=1304 size=8 */
+  int  (*set_data_dir) (DB_ENV *, const char *); /* 32-bit offset=720 size=4, 64=bit offset=1312 size=8 */
   void* __toku_dummy8[1];
-  int  (*set_flags) (DB_ENV *, u_int32_t, int); /* 32-bit offset=304 size=4, 64=bit offset=544 size=8 */
-  void* __toku_dummy9[4];
-  int  (*set_tmp_dir) (DB_ENV *, const char *); /* 32-bit offset=324 size=4, 64=bit offset=584 size=8 */
-  int  (*set_verbose) (DB_ENV *, u_int32_t, int); /* 32-bit offset=328 size=4, 64=bit offset=592 size=8 */
+  void (*set_errcall) (DB_ENV *, void (*)(const char *, char *)); /* 32-bit offset=728 size=4, 64=bit offset=1328 size=8 */
+  void* __toku_dummy9[1];
+  void (*set_errpfx) (DB_ENV *, const char *); /* 32-bit offset=736 size=4, 64=bit offset=1344 size=8 */
   void* __toku_dummy10[1];
-  int  (*set_lg_bsize) (DB_ENV *, u_int32_t); /* 32-bit offset=336 size=4, 64=bit offset=608 size=8 */
-  int  (*set_lg_dir) (DB_ENV *, const char *); /* 32-bit offset=340 size=4, 64=bit offset=616 size=8 */
-  int  (*set_lg_max) (DB_ENV *, u_int32_t); /* 32-bit offset=344 size=4, 64=bit offset=624 size=8 */
-  void* __toku_dummy11[1];
-  int  (*log_archive) (DB_ENV *, char **[], u_int32_t); /* 32-bit offset=352 size=4, 64=bit offset=640 size=8 */
-  void* __toku_dummy12[2];
-  int  (*log_flush) (DB_ENV *, const DB_LSN *); /* 32-bit offset=364 size=4, 64=bit offset=664 size=8 */
-  void* __toku_dummy13[4];
-  int  (*set_lk_detect) (DB_ENV *, u_int32_t); /* 32-bit offset=384 size=4, 64=bit offset=704 size=8 */
-  int  (*set_lk_max) (DB_ENV *, u_int32_t); /* 32-bit offset=388 size=4, 64=bit offset=712 size=8 */
-  void* __toku_dummy14[15];
-  int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int); /* 32-bit offset=452 size=4, 64=bit offset=840 size=8 */
-  void* __toku_dummy15[21];
-  int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t); /* 32-bit offset=540 size=4, 64=bit offset=1016 size=8 */
-  int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t); /* 32-bit offset=544 size=4, 64=bit offset=1024 size=8 */
-  void* __toku_dummy16[2];
-  int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t); /* 32-bit offset=556 size=4, 64=bit offset=1048 size=8 */
-  void* __toku_dummy17[2]; /* Padding at the end */ 
-  char __toku_dummy18[8];  /* Padding at the end */ 
+  int  (*set_flags) (DB_ENV *, u_int32_t, int); /* 32-bit offset=744 size=4, 64=bit offset=1360 size=8 */
+  void* __toku_dummy11[2];
+  int  (*set_lg_bsize) (DB_ENV *, u_int32_t); /* 32-bit offset=756 size=4, 64=bit offset=1384 size=8 */
+  int  (*set_lg_dir) (DB_ENV *, const char *); /* 32-bit offset=760 size=4, 64=bit offset=1392 size=8 */
+  void* __toku_dummy12[1];
+  int  (*set_lg_max) (DB_ENV *, u_int32_t); /* 32-bit offset=768 size=4, 64=bit offset=1408 size=8 */
+  void* __toku_dummy13[2];
+  int  (*set_lk_detect) (DB_ENV *, u_int32_t); /* 32-bit offset=780 size=4, 64=bit offset=1432 size=8 */
+  int  (*set_lk_max) (DB_ENV *, u_int32_t); /* 32-bit offset=784 size=4, 64=bit offset=1440 size=8 */
+  void* __toku_dummy14[18];
+  int  (*set_tmp_dir) (DB_ENV *, const char *); /* 32-bit offset=860 size=4, 64=bit offset=1592 size=8 */
+  void* __toku_dummy15[2];
+  int  (*set_verbose) (DB_ENV *, u_int32_t, int); /* 32-bit offset=872 size=4, 64=bit offset=1616 size=8 */
+  void* __toku_dummy16[1];
+  int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t); /* 32-bit offset=880 size=4, 64=bit offset=1632 size=8 */
+  int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t); /* 32-bit offset=884 size=4, 64=bit offset=1640 size=8 */
+  void* __toku_dummy17[1];
+  int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t); /* 32-bit offset=892 size=4, 64=bit offset=1656 size=8 */
+  void* __toku_dummy18[2]; /* Padding at the end */ 
+  char __toku_dummy19[16];  /* Padding at the end */ 
 };
 struct __toku_db_key_range {
   double less; /* 32-bit offset=0 size=8, 64=bit offset=0 size=8 */
   double equal; /* 32-bit offset=8 size=8, 64=bit offset=8 size=8 */
   double greater; /* 32-bit offset=16 size=8, 64=bit offset=16 size=8 */
-  void* __toku_dummy0[126]; /* Padding at the end */ 
-  char __toku_dummy1[48];  /* Padding at the end */ 
+  void* __toku_dummy0[194]; /* Padding at the end */ 
+  char __toku_dummy1[120];  /* Padding at the end */ 
 };
 struct __toku_db_lsn {
   char __toku_dummy0[8];  /* Padding at the end */ 
@@ -143,49 +144,53 @@ 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[39];
   char __toku_dummy2[96];
-  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];
-  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 */
+  int (*associate) (DB*, DB_TXN*, DB*, int(*)(DB*, const DBT*, const DBT*, DBT*), u_int32_t); /* 32-bit offset=276 size=4, 64=bit offset=456 size=8 */
+  int (*close) (DB*, u_int32_t); /* 32-bit offset=280 size=4, 64=bit offset=464 size=8 */
+  void* __toku_dummy3[1];
+  int (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t); /* 32-bit offset=288 size=4, 64=bit offset=480 size=8 */
+  int (*del) (DB *, DB_TXN *, DBT *, u_int32_t); /* 32-bit offset=292 size=4, 64=bit offset=488 size=8 */
   void* __toku_dummy4[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_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 (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=384 size=4, 64=bit offset=672 size=8 */
-  void* __toku_dummy9[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 */ 
+  int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=308 size=4, 64=bit offset=520 size=8 */
+  void* __toku_dummy5[24];
+  int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t); /* 32-bit offset=408 size=4, 64=bit offset=720 size=8 */
+  int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int); /* 32-bit offset=412 size=4, 64=bit offset=728 size=8 */
+  int (*pget) (DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t); /* 32-bit offset=416 size=4, 64=bit offset=736 size=8 */
+  int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=420 size=4, 64=bit offset=744 size=8 */
+  int (*remove) (DB *, const char *, const char *, u_int32_t); /* 32-bit offset=424 size=4, 64=bit offset=752 size=8 */
+  int (*rename) (DB *, const char *, const char *, const char *, u_int32_t); /* 32-bit offset=428 size=4, 64=bit offset=760 size=8 */
+  void* __toku_dummy6[2];
+  int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=440 size=4, 64=bit offset=784 size=8 */
+  void* __toku_dummy7[3];
+  int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=456 size=4, 64=bit offset=816 size=8 */
+  void* __toku_dummy8[5];
+  int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=480 size=4, 64=bit offset=864 size=8 */
+  void* __toku_dummy9[6];
+  int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=508 size=4, 64=bit offset=920 size=8 */
+  void* __toku_dummy10[6];
+  int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=536 size=4, 64=bit offset=976 size=8 */
+  void* __toku_dummy11[4];
+  int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t); /* 32-bit offset=556 size=4, 64=bit offset=1016 size=8 */
+  void* __toku_dummy12[5]; /* Padding at the end */ 
+  char __toku_dummy13[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 */
-  char __toku_dummy0[4];
-  DB_LSN lsn; /* 32-bit offset=8 size=8, 64=bit offset=8 size=8 */
+  void* __toku_dummy0[2];
+  char __toku_dummy1[4];
+  DB_LSN lsn; /* 32-bit offset=16 size=8, 64=bit offset=24 size=8 */
+  char __toku_dummy2[184];  /* Padding at the end */ 
 };
 struct __toku_db_txn {
   struct __toku_db_txn_internal *i;
-  void* __toku_dummy0[12];
-  char __toku_dummy1[24];
-  int (*abort) (DB_TXN *); /* 32-bit offset=76 size=4, 64=bit offset=128 size=8 */
-  int (*commit) (DB_TXN*, u_int32_t); /* 32-bit offset=80 size=4, 64=bit offset=136 size=8 */
-  void* __toku_dummy2[1];
-  u_int32_t (*id) (DB_TXN *); /* 32-bit offset=88 size=4, 64=bit offset=152 size=8 */
-  void* __toku_dummy3[3]; /* Padding at the end */ 
+  void* __toku_dummy0[21];
+  char __toku_dummy1[8];
+  int (*abort) (DB_TXN *); /* 32-bit offset=96 size=4, 64=bit offset=184 size=8 */
+  int (*commit) (DB_TXN*, u_int32_t); /* 32-bit offset=100 size=4, 64=bit offset=192 size=8 */
+  void* __toku_dummy2[2];
+  u_int32_t (*id) (DB_TXN *); /* 32-bit offset=112 size=4, 64=bit offset=216 size=8 */
+  void* __toku_dummy3[5]; /* Padding at the end */ 
 };
 struct __toku_db_txn_stat {
   void* __toku_dummy0[1];
@@ -205,7 +210,7 @@ struct __toku_dbc {
   int (*c_del) (DBC *, u_int32_t); /* 32-bit offset=196 size=4, 64=bit offset=288 size=8 */
   void* __toku_dummy3[1];
   int (*c_get) (DBC *, DBT *, DBT *, u_int32_t); /* 32-bit offset=204 size=4, 64=bit offset=304 size=8 */
-  void* __toku_dummy4[11]; /* Padding at the end */ 
+  void* __toku_dummy4[10]; /* Padding at the end */ 
 };
 struct __toku_dbt {
   void*data; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */