Commit 8eb4977f authored by Rich Prohaska's avatar Rich Prohaska

add bdb-4.5. addresses #104

git-svn-id: file:///svn/tokudb@898 c7de825b-a66e-492c-adef-691d508d4ae1
parent 6a846a87
......@@ -17,8 +17,8 @@ MYSQL_H = -I$(BDBDIR)/db-4.1.25/build_unix/
CFLAGS = -Wall -W -O2 -Werror -g
runs: runs_mysql runs_installed
samples: sample_offsets_4_6 sample_offsets_4_4 sample_offsets_4_3 sample_offsets_4_1
hs: db.h_4_6 db.h_4_4 db.h_4_3 db.h_4_1
samples: sample_offsets_4_6 sample_offsets_4_5 sample_offsets_4_4 sample_offsets_4_3 sample_offsets_4_1
hs: db.h_4_6 db.h_4_5 db.h_4_4 db.h_4_3 db.h_4_1
# the mysql versions use the header in the mysql distribution.
runs_mysql: ./sample_offsets_mysql
./sample_offsets_mysql
......@@ -52,6 +52,14 @@ sample_offsets_4_4: sample_offsets.c
$(CC) $(CFLAGS) -I. -I$(BDBDIR)/db-4.4.20/build_unix $< -o $@
./sample_offsets_4_4
make_db_h_4_5.o: make_db_h.c sample_offsets_32_4_5.h sample_offsets_64_4_5.h
$(CC) $(CFLAGS) -I. -I$(BDBDIR)/db-4.5.20/build_unix $< -c -o $@ -DUSE_MAJOR=4 -DUSE_MINOR=5
db.h_4_5: make_db_h_4_5
./make_db_h_4_5 > $@
sample_offsets_4_5: sample_offsets.c
$(CC) $(CFLAGS) -I. -I$(BDBDIR)/db-4.5.20/build_unix $< -o $@
./sample_offsets_4_5
make_db_h_4_6.o: make_db_h.c sample_offsets_32_4_6.h sample_offsets_64_4_6.h
$(CC) $(CFLAGS) -I. -I$(BDBDIR)/db-4.6.19/build_unix $< -c -o $@ -DUSE_MAJOR=4 -DUSE_MINOR=6
db.h_4_6: make_db_h_4_6
......
......@@ -64,12 +64,14 @@ typedef enum {
#define DB_KEYEXIST -30997
#define DB_LOCK_DEADLOCK -30996
#define DB_NOTFOUND -30991
#define DB_SECONDARY_BAD -30981
#define DB_DONOTINDEX -30999
#define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536
#define DB_FIRST 10
#define DB_GET_BOTH 11
#define DB_LAST 18
#define DB_CURRENT 8
#define DB_NEXT 19
#define DB_NEXT_DUP 20
#define DB_PREV 27
......
......@@ -64,12 +64,14 @@ typedef enum {
#define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989
#define DB_SECONDARY_BAD -30976
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536
#define DB_FIRST 9
#define DB_GET_BOTH 10
#define DB_LAST 17
#define DB_CURRENT 7
#define DB_NEXT 18
#define DB_NEXT_DUP 19
#define DB_PREV 25
......
This diff is collapsed.
......@@ -64,12 +64,14 @@ typedef enum {
#define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989
#define DB_SECONDARY_BAD -30974
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536
#define DB_FIRST 7
#define DB_GET_BOTH 8
#define DB_LAST 15
#define DB_CURRENT 6
#define DB_NEXT 16
#define DB_NEXT_DUP 17
#define DB_PREV 23
......
......@@ -110,6 +110,9 @@ struct fieldinfo {
#elif USE_MAJOR==4 && USE_MINOR==4
#include "sample_offsets_32_4_4.h"
#include "sample_offsets_64_4_4.h"
#elif USE_MAJOR==4 && USE_MINOR==5
#include "sample_offsets_32_4_5.h"
#include "sample_offsets_64_4_5.h"
#elif USE_MAJOR==4 && USE_MINOR==6
#include "sample_offsets_32_4_6.h"
#include "sample_offsets_64_4_6.h"
......
......@@ -82,7 +82,7 @@ void sample_db_env_offsets (void) {
STRUCT_SETUP(DB_ENV, set_lg_dir, "int (*%s) (DB_ENV *, const char *)");
STRUCT_SETUP(DB_ENV, set_lg_max, "int (*%s) (DB_ENV *, u_int32_t)");
STRUCT_SETUP(DB_ENV, set_lk_detect, "int (*%s) (DB_ENV *, u_int32_t)");
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 6
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 4
STRUCT_SETUP(DB_ENV, set_lk_max, "int (*%s) (DB_ENV *, u_int32_t)");
#endif
//STRUCT_SETUP(DB_ENV, set_noticecall, "void (*%s) (DB_ENV *, void (*)(DB_ENV *, db_notices))");
......
/* BDB offsets on a 32-bit machine */
#define DB_VERSION_MAJOR_32 4
#define DB_VERSION_MINOR_32 5
#define DB_VERSION_STRING_32 "Berkeley DB Compatability Header 4.5"
struct fieldinfo db_btree_stat_fields32[] = {
{"u_int32_t bt_nkeys", 12, 4},
{"u_int32_t bt_ndata", 16, 4},
{0, 80, 80} /* size of whole struct */
};
struct fieldinfo db_env_fields32[] = {
{"void *app_private", 52, 4},
{"int (*close) (DB_ENV *, u_int32_t)", 372, 4},
{"void (*err) (const DB_ENV *, int, const char *, ...)", 384, 4},
{"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 548, 4},
{"int (*log_flush) (DB_ENV *, const DB_LSN *)", 560, 4},
{"int (*open) (DB_ENV *, const char *, u_int32_t, int)", 664, 4},
{"int (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 776, 4},
{"int (*set_data_dir) (DB_ENV *, const char *)", 780, 4},
{"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 788, 4},
{"void (*set_errpfx) (DB_ENV *, const char *)", 796, 4},
{"int (*set_flags) (DB_ENV *, u_int32_t, int)", 808, 4},
{"int (*set_lg_bsize) (DB_ENV *, u_int32_t)", 820, 4},
{"int (*set_lg_dir) (DB_ENV *, const char *)", 824, 4},
{"int (*set_lg_max) (DB_ENV *, u_int32_t)", 832, 4},
{"int (*set_lk_detect) (DB_ENV *, u_int32_t)", 844, 4},
{"int (*set_tmp_dir) (DB_ENV *, const char *)", 912, 4},
{"int (*set_verbose) (DB_ENV *, u_int32_t, int)", 924, 4},
{"int (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t)", 932, 4},
{"int (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t)", 936, 4},
{"int (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t)", 944, 4},
{0, 972, 972} /* size of whole struct */
};
struct fieldinfo db_key_range_fields32[] = {
{"double less", 0, 8},
{"double equal", 8, 8},
{"double greater", 16, 8},
{0, 972, 972} /* size of whole struct */
};
struct fieldinfo db_lsn_fields32[] = {
{0, 8, 8} /* size of whole struct */
};
struct fieldinfo db_fields32[] = {
{"void *app_private", 16, 4},
{"DB_ENV *dbenv", 20, 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},
{"int (*del) (DB *, DB_TXN *, DBT *, u_int32_t)", 304, 4},
{"int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 320, 4},
{"int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t)", 420, 4},
{"int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int)", 424, 4},
{"int (*pget) (DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t)", 428, 4},
{"int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 432, 4},
{"int (*remove) (DB *, const char *, const char *, u_int32_t)", 436, 4},
{"int (*rename) (DB *, const char *, const char *, const char *, u_int32_t)", 440, 4},
{"int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 452, 4},
{"int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 468, 4},
{"int (*set_flags) (DB *, u_int32_t)", 492, 4},
{"int (*set_pagesize) (DB *, u_int32_t)", 520, 4},
{"int (*stat) (DB *, void *, u_int32_t)", 548, 4},
{"int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t)", 568, 4},
{0, 608, 608} /* size of whole struct */
};
struct fieldinfo db_txn_active_fields32[] = {
{"u_int32_t txnid", 0, 4},
{"DB_LSN lsn", 16, 8},
{0, 224, 224} /* size of whole struct */
};
struct fieldinfo db_txn_fields32[] = {
{"int (*abort) (DB_TXN *)", 96, 4},
{"int (*commit) (DB_TXN*, u_int32_t)", 100, 4},
{"u_int32_t (*id) (DB_TXN *)", 112, 4},
{0, 136, 136} /* size of whole struct */
};
struct fieldinfo db_txn_stat_fields32[] = {
{"u_int32_t st_nactive", 32, 4},
{"DB_TXN_ACTIVE *st_txnarray", 52, 4},
{0, 68, 68} /* size of whole struct */
};
struct fieldinfo dbc_fields32[] = {
{"int (*c_close) (DBC *)", 204, 4},
{"int (*c_del) (DBC *, u_int32_t)", 212, 4},
{"int (*c_get) (DBC *, DBT *, DBT *, u_int32_t)", 220, 4},
{0, 264, 264} /* size of whole struct */
};
struct fieldinfo dbt_fields32[] = {
{"void*data", 0, 4},
{"u_int32_t size", 4, 4},
{"u_int32_t ulen", 8, 4},
{"u_int32_t flags", 24, 4},
{0, 28, 28} /* size of whole struct */
};
/* BDB offsets on a 64-bit machine */
#define DB_VERSION_MAJOR_64 4
#define DB_VERSION_MINOR_64 5
#define DB_VERSION_STRING_64 "Berkeley DB Compatability Header 4.5"
struct fieldinfo db_btree_stat_fields64[] = {
{"u_int32_t bt_nkeys", 12, 4},
{"u_int32_t bt_ndata", 16, 4},
{0, 80, 80} /* size of whole struct */
};
struct fieldinfo db_env_fields64[] = {
{"void *app_private", 104, 8},
{"int (*close) (DB_ENV *, u_int32_t)", 616, 8},
{"void (*err) (const DB_ENV *, int, const char *, ...)", 640, 8},
{"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 968, 8},
{"int (*log_flush) (DB_ENV *, const DB_LSN *)", 992, 8},
{"int (*open) (DB_ENV *, const char *, u_int32_t, int)", 1200, 8},
{"int (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 1424, 8},
{"int (*set_data_dir) (DB_ENV *, const char *)", 1432, 8},
{"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 1448, 8},
{"void (*set_errpfx) (DB_ENV *, const char *)", 1464, 8},
{"int (*set_flags) (DB_ENV *, u_int32_t, int)", 1488, 8},
{"int (*set_lg_bsize) (DB_ENV *, u_int32_t)", 1512, 8},
{"int (*set_lg_dir) (DB_ENV *, const char *)", 1520, 8},
{"int (*set_lg_max) (DB_ENV *, u_int32_t)", 1536, 8},
{"int (*set_lk_detect) (DB_ENV *, u_int32_t)", 1560, 8},
{"int (*set_tmp_dir) (DB_ENV *, const char *)", 1696, 8},
{"int (*set_verbose) (DB_ENV *, u_int32_t, int)", 1720, 8},
{"int (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t)", 1736, 8},
{"int (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t)", 1744, 8},
{"int (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t)", 1760, 8},
{0, 1800, 1800} /* size of whole struct */
};
struct fieldinfo db_key_range_fields64[] = {
{"double less", 0, 8},
{"double equal", 8, 8},
{"double greater", 16, 8},
{0, 1800, 1800} /* size of whole struct */
};
struct fieldinfo db_lsn_fields64[] = {
{0, 8, 8} /* size of whole struct */
};
struct fieldinfo db_fields64[] = {
{"void *app_private", 32, 8},
{"DB_ENV *dbenv", 40, 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},
{"int (*del) (DB *, DB_TXN *, DBT *, u_int32_t)", 512, 8},
{"int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 544, 8},
{"int (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t)", 744, 8},
{"int (*open) (DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int)", 752, 8},
{"int (*pget) (DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t)", 760, 8},
{"int (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t)", 768, 8},
{"int (*remove) (DB *, const char *, const char *, u_int32_t)", 776, 8},
{"int (*rename) (DB *, const char *, const char *, const char *, u_int32_t)", 784, 8},
{"int (*set_bt_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 808, 8},
{"int (*set_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *))", 840, 8},
{"int (*set_flags) (DB *, u_int32_t)", 888, 8},
{"int (*set_pagesize) (DB *, u_int32_t)", 944, 8},
{"int (*stat) (DB *, void *, u_int32_t)", 1000, 8},
{"int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t)", 1040, 8},
{0, 1104, 1104} /* size of whole struct */
};
struct fieldinfo db_txn_active_fields64[] = {
{"u_int32_t txnid", 0, 4},
{"DB_LSN lsn", 24, 8},
{0, 232, 232} /* size of whole struct */
};
struct fieldinfo db_txn_fields64[] = {
{"int (*abort) (DB_TXN *)", 184, 8},
{"int (*commit) (DB_TXN*, u_int32_t)", 192, 8},
{"u_int32_t (*id) (DB_TXN *)", 216, 8},
{0, 264, 264} /* size of whole struct */
};
struct fieldinfo db_txn_stat_fields64[] = {
{"u_int32_t st_nactive", 36, 4},
{"DB_TXN_ACTIVE *st_txnarray", 56, 8},
{0, 80, 80} /* size of whole struct */
};
struct fieldinfo dbc_fields64[] = {
{"int (*c_close) (DBC *)", 304, 8},
{"int (*c_del) (DBC *, u_int32_t)", 320, 8},
{"int (*c_get) (DBC *, DBT *, DBT *, u_int32_t)", 336, 8},
{0, 424, 424} /* size of whole struct */
};
struct fieldinfo dbt_fields64[] = {
{"void*data", 0, 8},
{"u_int32_t size", 8, 4},
{"u_int32_t ulen", 12, 4},
{"u_int32_t flags", 32, 4},
{0, 40, 40} /* size of whole struct */
};
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