Commit d5153759 authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul

up

git-svn-id: file:///svn/tokudb@518 c7de825b-a66e-492c-adef-691d508d4ae1
parent 8d5fe7bd
...@@ -9,11 +9,12 @@ extern "C" { ...@@ -9,11 +9,12 @@ extern "C" {
#endif #endif
#define DB_VERSION_MAJOR 4 #define DB_VERSION_MAJOR 4
#define DB_VERSION_MINOR 1 #define DB_VERSION_MINOR 1
#define DB_VERSION_PATCH 24 #define DB_VERSION_PATCH 25
#ifndef _TOKUDB_WRAP_H #ifndef _TOKUDB_WRAP_H
#define DB_VERSION_STRING "Tokutek: TokuDB 4.1.24" #define DB_VERSION_STRING "Tokutek: TokuDB 4.1.25"
#else
#define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
#endif #endif
#ifndef _TOKUDB_WRAP_H
typedef struct __toku_db_btree_stat DB_BTREE_STAT; typedef struct __toku_db_btree_stat DB_BTREE_STAT;
typedef struct __toku_db_env DB_ENV; typedef struct __toku_db_env DB_ENV;
typedef struct __toku_db_key_range DB_KEY_RANGE; typedef struct __toku_db_key_range DB_KEY_RANGE;
...@@ -27,6 +28,7 @@ typedef struct __toku_dbt DBT; ...@@ -27,6 +28,7 @@ typedef struct __toku_dbt DBT;
typedef enum { typedef enum {
DB_BTREE=1 DB_BTREE=1
} DBTYPE; } DBTYPE;
#ifndef _TOKUDB_WRAP_H
#define DB_VERB_DEADLOCK 2 #define DB_VERB_DEADLOCK 2
#define DB_VERB_RECOVERY 4 #define DB_VERB_RECOVERY 4
#define DB_VERB_REPLICATION 8 #define DB_VERB_REPLICATION 8
...@@ -47,6 +49,7 @@ typedef enum { ...@@ -47,6 +49,7 @@ typedef enum {
#define DB_LOCK_OLDEST 6 #define DB_LOCK_OLDEST 6
#define DB_LOCK_RANDOM 7 #define DB_LOCK_RANDOM 7
#define DB_DUP 2 #define DB_DUP 2
#define DB_DUPSORT 4
#define DB_NOOVERWRITE 23 #define DB_NOOVERWRITE 23
#define DB_INIT_LOCK 4096 #define DB_INIT_LOCK 4096
#define DB_INIT_LOG 8192 #define DB_INIT_LOG 8192
...@@ -79,50 +82,52 @@ struct __toku_db_btree_stat { ...@@ -79,50 +82,52 @@ struct __toku_db_btree_stat {
}; };
struct __toku_db_env { struct __toku_db_env {
struct __toku_db_env_internal *i; struct __toku_db_env_internal *i;
void* __toku_dummy0[45]; void* __toku_dummy0[8];
char __toku_dummy1[64]; void *app_private; /* 32-bit offset=36 size=4, 64=bit offset=72 size=8 */
int (*close) (DB_ENV *, u_int32_t); /* 32-bit offset=248 size=4, 64=bit offset=432 size=8 */ void* __toku_dummy1[35];
void* __toku_dummy2[2]; char __toku_dummy2[64];
void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=260 size=4, 64=bit offset=456 size=8 */ int (*close) (DB_ENV *, u_int32_t); /* 32-bit offset=244 size=4, 64=bit offset=424 size=8 */
void* __toku_dummy3[1]; void* __toku_dummy3[2];
int (*open) (DB_ENV *, const char *, u_int32_t, int); /* 32-bit offset=268 size=4, 64=bit offset=472 size=8 */ void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=256 size=4, 64=bit offset=448 size=8 */
void* __toku_dummy4[1]; void* __toku_dummy4[1];
int (*set_data_dir) (DB_ENV *, const char *); /* 32-bit offset=276 size=4, 64=bit offset=488 size=8 */ 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[3]; void* __toku_dummy5[1];
void (*set_errcall) (DB_ENV *, void (*)(const char *, char *)); /* 32-bit offset=292 size=4, 64=bit offset=520 size=8 */ int (*set_data_dir) (DB_ENV *, const char *); /* 32-bit offset=272 size=4, 64=bit offset=480 size=8 */
void* __toku_dummy6[1]; void* __toku_dummy6[3];
void (*set_errpfx) (DB_ENV *, const char *); /* 32-bit offset=300 size=4, 64=bit offset=536 size=8 */ 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* __toku_dummy7[1];
int (*set_flags) (DB_ENV *, u_int32_t, int); /* 32-bit offset=308 size=4, 64=bit offset=552 size=8 */ void (*set_errpfx) (DB_ENV *, const char *); /* 32-bit offset=296 size=4, 64=bit offset=528 size=8 */
void* __toku_dummy8[5]; void* __toku_dummy8[1];
int (*set_tmp_dir) (DB_ENV *, const char *); /* 32-bit offset=332 size=4, 64=bit offset=600 size=8 */ int (*set_flags) (DB_ENV *, u_int32_t, int); /* 32-bit offset=304 size=4, 64=bit offset=544 size=8 */
int (*set_verbose) (DB_ENV *, u_int32_t, int); /* 32-bit offset=336 size=4, 64=bit offset=608 size=8 */ void* __toku_dummy9[4];
void* __toku_dummy9[1]; int (*set_tmp_dir) (DB_ENV *, const char *); /* 32-bit offset=324 size=4, 64=bit offset=584 size=8 */
int (*set_lg_bsize) (DB_ENV *, u_int32_t); /* 32-bit offset=344 size=4, 64=bit offset=624 size=8 */ int (*set_verbose) (DB_ENV *, u_int32_t, int); /* 32-bit offset=328 size=4, 64=bit offset=592 size=8 */
int (*set_lg_dir) (DB_ENV *, const char *); /* 32-bit offset=348 size=4, 64=bit offset=632 size=8 */
int (*set_lg_max) (DB_ENV *, u_int32_t); /* 32-bit offset=352 size=4, 64=bit offset=640 size=8 */
void* __toku_dummy10[1]; void* __toku_dummy10[1];
int (*log_archive) (DB_ENV *, char **[], u_int32_t); /* 32-bit offset=360 size=4, 64=bit offset=656 size=8 */ int (*set_lg_bsize) (DB_ENV *, u_int32_t); /* 32-bit offset=336 size=4, 64=bit offset=608 size=8 */
void* __toku_dummy11[2]; int (*set_lg_dir) (DB_ENV *, const char *); /* 32-bit offset=340 size=4, 64=bit offset=616 size=8 */
int (*log_flush) (DB_ENV *, const DB_LSN *); /* 32-bit offset=372 size=4, 64=bit offset=680 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_dummy12[4]; void* __toku_dummy11[1];
int (*set_lk_detect) (DB_ENV *, u_int32_t); /* 32-bit offset=392 size=4, 64=bit offset=720 size=8 */ int (*log_archive) (DB_ENV *, char **[], u_int32_t); /* 32-bit offset=352 size=4, 64=bit offset=640 size=8 */
int (*set_lk_max) (DB_ENV *, u_int32_t); /* 32-bit offset=396 size=4, 64=bit offset=728 size=8 */ void* __toku_dummy12[2];
void* __toku_dummy13[15]; int (*log_flush) (DB_ENV *, const DB_LSN *); /* 32-bit offset=364 size=4, 64=bit offset=664 size=8 */
int (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int); /* 32-bit offset=460 size=4, 64=bit offset=856 size=8 */ void* __toku_dummy13[4];
void* __toku_dummy14[21]; int (*set_lk_detect) (DB_ENV *, u_int32_t); /* 32-bit offset=384 size=4, 64=bit offset=704 size=8 */
int (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t); /* 32-bit offset=548 size=4, 64=bit offset=1032 size=8 */ int (*set_lk_max) (DB_ENV *, u_int32_t); /* 32-bit offset=388 size=4, 64=bit offset=712 size=8 */
int (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t); /* 32-bit offset=552 size=4, 64=bit offset=1040 size=8 */ void* __toku_dummy14[15];
void* __toku_dummy15[2]; int (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int); /* 32-bit offset=452 size=4, 64=bit offset=840 size=8 */
int (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t); /* 32-bit offset=564 size=4, 64=bit offset=1064 size=8 */ void* __toku_dummy15[21];
void* __toku_dummy16[2]; /* Padding at the end */ int (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t); /* 32-bit offset=540 size=4, 64=bit offset=1016 size=8 */
char __toku_dummy17[8]; /* Padding at the end */ 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 */
}; };
struct __toku_db_key_range { struct __toku_db_key_range {
double less; /* 32-bit offset=0 size=8, 64=bit offset=0 size=8 */ 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 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 */ double greater; /* 32-bit offset=16 size=8, 64=bit offset=16 size=8 */
void* __toku_dummy0[128]; /* Padding at the end */ void* __toku_dummy0[126]; /* Padding at the end */
char __toku_dummy1[48]; /* Padding at the end */ char __toku_dummy1[48]; /* Padding at the end */
}; };
struct __toku_db_lsn { struct __toku_db_lsn {
...@@ -132,28 +137,33 @@ struct __toku_db { ...@@ -132,28 +137,33 @@ struct __toku_db {
struct __toku_db_internal *i; struct __toku_db_internal *i;
void* __toku_dummy0[3]; void* __toku_dummy0[3];
void *app_private; /* 32-bit offset=16 size=4, 64=bit offset=32 size=8 */ void *app_private; /* 32-bit offset=16 size=4, 64=bit offset=32 size=8 */
void* __toku_dummy1[39]; DB_ENV *dbenv; /* 32-bit offset=20 size=4, 64=bit offset=40 size=8 */
void* __toku_dummy1[35];
char __toku_dummy2[96]; char __toku_dummy2[96];
int (*close) (DB*, u_int32_t); /* 32-bit offset=272 size=4, 64=bit offset=448 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=276 size=4, 64=bit offset=456 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=280 size=4, 64=bit offset=464 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_dummy3[3];
int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=296 size=4, 64=bit offset=496 size=8 */ int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t); /* 32-bit offset=284 size=4, 64=bit offset=472 size=8 */
void* __toku_dummy4[4]; void* __toku_dummy4[4];
int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t); /* 32-bit offset=316 size=4, 64=bit offset=536 size=8 */ 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=320 size=4, 64=bit offset=544 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=324 size=4, 64=bit offset=552 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=328 size=4, 64=bit offset=560 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=332 size=4, 64=bit offset=568 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[11]; void* __toku_dummy5[5];
int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=380 size=4, 64=bit offset=664 size=8 */ 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[3]; void* __toku_dummy6[5];
int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=396 size=4, 64=bit offset=696 size=8 */ int (*set_flags) (DB *, u_int32_t); /* 32-bit offset=368 size=4, 64=bit offset=640 size=8 */
void* __toku_dummy7[2]; void* __toku_dummy7[1];
int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t); /* 32-bit offset=408 size=4, 64=bit offset=720 size=8 */ int (*set_pagesize) (DB *, u_int32_t); /* 32-bit offset=376 size=4, 64=bit offset=656 size=8 */
int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *)); /* 32-bit offset=412 size=4, 64=bit offset=728 size=8 */ void* __toku_dummy8[1];
void* __toku_dummy8[15]; /* Padding at the end */ int (*stat) (DB *, void *, u_int32_t); /* 32-bit offset=384 size=4, 64=bit offset=672 size=8 */
char __toku_dummy9[8]; /* Padding at the end */ 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 */
}; };
struct __toku_db_txn_active { struct __toku_db_txn_active {
u_int32_t txnid; /* 32-bit offset=0 size=4, 64=bit offset=0 size=4 */ u_int32_t txnid; /* 32-bit offset=0 size=4, 64=bit offset=0 size=4 */
...@@ -181,13 +191,13 @@ struct __toku_db_txn_stat { ...@@ -181,13 +191,13 @@ struct __toku_db_txn_stat {
}; };
struct __toku_dbc { struct __toku_dbc {
struct __toku_dbc_internal *i; struct __toku_dbc_internal *i;
void* __toku_dummy0[24]; void* __toku_dummy0[20];
char __toku_dummy1[104]; char __toku_dummy1[104];
int (*c_close) (DBC *); /* 32-bit offset=204 size=4, 64=bit offset=304 size=8 */ int (*c_close) (DBC *); /* 32-bit offset=188 size=4, 64=bit offset=272 size=8 */
void* __toku_dummy2[1]; void* __toku_dummy2[1];
int (*c_del) (DBC *, u_int32_t); /* 32-bit offset=212 size=4, 64=bit offset=320 size=8 */ int (*c_del) (DBC *, u_int32_t); /* 32-bit offset=196 size=4, 64=bit offset=288 size=8 */
void* __toku_dummy3[1]; void* __toku_dummy3[1];
int (*c_get) (DBC *, DBT *, DBT *, u_int32_t); /* 32-bit offset=220 size=4, 64=bit offset=336 size=8 */ 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[11]; /* Padding at the end */
}; };
struct __toku_dbt { struct __toku_dbt {
...@@ -195,8 +205,7 @@ struct __toku_dbt { ...@@ -195,8 +205,7 @@ struct __toku_dbt {
u_int32_t size; /* 32-bit offset=4 size=4, 64=bit offset=8 size=4 */ u_int32_t size; /* 32-bit offset=4 size=4, 64=bit offset=8 size=4 */
u_int32_t ulen; /* 32-bit offset=8 size=4, 64=bit offset=12 size=4 */ u_int32_t ulen; /* 32-bit offset=8 size=4, 64=bit offset=12 size=4 */
char __toku_dummy0[8]; char __toku_dummy0[8];
void*app_private; /* 32-bit offset=20 size=4, 64=bit offset=24 size=8 */ u_int32_t flags; /* 32-bit offset=20 size=4, 64=bit offset=24 size=4 */
u_int32_t flags; /* 32-bit offset=24 size=4, 64=bit offset=32 size=4 */
/* 4 more bytes of alignment in the 64-bit case. */ /* 4 more bytes of alignment in the 64-bit case. */
}; };
#ifdef _TOKUDB_WRAP_H #ifdef _TOKUDB_WRAP_H
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment