use the new db.h

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

buildheader/db.h

@@ -51,6 +51,20 @@ typedef enum { /* This appears to be a mysql-specific addition to the api. */
 #define DB_INIT_LOG 8192
 #define DB_INIT_MPOOL 16384
 #define DB_INIT_TXN 32768
+#define DB_KEYEMPTY -30998
+#define DB_KEYEXIST -30997
+#define DB_LOCK_DEADLOCK -30996
+#define DB_NOTFOUND -30991
+#define DB_BADFORMAT -30500
+#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
 /* 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
 #undef txn_begin

buildheader/make_db_h.c

@@ -54,6 +54,23 @@ void print_defines (void) {
     dodefine(DB_INIT_LOG);
     dodefine(DB_INIT_MPOOL);
     dodefine(DB_INIT_TXN);
+
+    dodefine(DB_KEYEMPTY);
+    dodefine(DB_KEYEXIST);
+    dodefine(DB_LOCK_DEADLOCK);
+    dodefine(DB_NOTFOUND);
+
+    printf("#define DB_BADFORMAT -30500\n"); // private tokudb
+
+    dodefine(DB_FIRST);
+    dodefine(DB_GET_BOTH);
+    dodefine(DB_LAST);
+    dodefine(DB_NEXT);
+    dodefine(DB_NEXT_DUP);
+    dodefine(DB_PREV);
+    dodefine(DB_SET);
+    dodefine(DB_SET_RANGE);
+    dodefine(DB_RMW);
 }
 
 //#define DECL_LIMIT 100

include/old-db.h

+#ifndef _YOBI_DB_H
+#define _YOBI_DB_H
+
+#include "ydb-constants.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+}
+#endif
+#endif
+
+#include <sys/types.h>
+#include <stdio.h>
+
+typedef enum {
+	DB_BTREE=1,
+	//	DB_HASH=2,
+	//	DB_RECNO=3,
+	//	DB_QUEUE=4,
+	//	DB_UNKNOWN=5			/* Figure it out on open. */
+} DBTYPE;
+
+typedef enum {
+	DB_NOTICE_LOGFILE_CHANGED
+} db_notices;
+
+enum {
+  DB_VERB_CHKPOINT = 0x0001,
+  DB_VERB_DEADLOCK = 0x0002,
+  DB_VERB_RECOVERY = 0x0004
+  
+};
+
+typedef struct yobi_db DB;
+typedef struct yobi_db_btree_stat DB_BTREE_STAT;
+typedef struct yobi_db_env DB_ENV;
+typedef struct yobi_db_key_range DB_KEY_RANGE;
+typedef struct yobi_db_lsn DB_LSN;
+typedef struct yobi_db_txn DB_TXN;
+typedef struct yobi_db_txn_active DB_TXN_ACTIVE;
+typedef struct yobi_db_txn_stat DB_TXN_STAT;
+typedef struct yobi_dbc DBC;
+typedef struct yobi_dbt DBT;
+
+struct yobi_db {
+  void *app_private;
+  int  (*close) (DB *, u_int32_t);
+  int  (*cursor) (DB *, DB_TXN *, DBC **, u_int32_t);
+  int  (*del) (DB *, DB_TXN *, DBT *, u_int32_t);
+  int  (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t);
+  int  (*key_range) (DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t);
+  int  (*open) (DB *, DB_TXN *,
+		const char *, const char *, DBTYPE, u_int32_t, int);
+  int  (*put) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t);
+  int  (*remove) (DB *, const char *, const char *, u_int32_t);
+  int  (*rename) (DB *, const char *, const char *, const char *, u_int32_t);
+  int  (*set_bt_compare) (DB *,
+			  int (*)(DB *, const DBT *, const DBT *));
+  int  (*set_flags)    (DB *, u_int32_t);
+  int  (*stat) (DB *, void *, u_int32_t);
+
+  struct ydb_db_internal *i;
+};
+enum {
+  DB_DBT_MALLOC = 0x002,
+  DB_DBT_REALLOC = 0x010,
+  DB_DBT_USERMEM = 0x020,
+  DB_DBT_DUPOK  = 0x040
+};
+struct yobi_dbt {
+  void	   *app_private;
+  void     *data;
+  u_int32_t flags;
+  u_int32_t size;
+  u_int32_t ulen;
+};
+struct yobi_db_txn {
+  int (*commit) (DB_TXN*, u_int32_t);
+  u_int32_t (*id) (DB_TXN *);
+  // internal stuff
+  struct yobi_db_txn_internal *i;
+};
+struct yobi_dbc {
+  int (*c_get) (DBC *, DBT *, DBT *, u_int32_t);
+  int (*c_close) (DBC *);
+  int (*c_del) (DBC *, u_int32_t);
+  struct yobi_dbc_internal *i;
+};
+struct yobi_db_env {
+  // Methods used by MYSQL
+  void (*err) (const DB_ENV *, int, const char *, ...);
+  int  (*open) (DB_ENV *, const char *, u_int32_t, int);
+  int  (*close) (DB_ENV *, u_int32_t);
+  int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t);
+  int  (*log_flush) (DB_ENV *, const DB_LSN *);
+  void (*set_errcall) (DB_ENV *, void (*)(const char *, char *));
+  void (*set_errpfx) (DB_ENV *, const char *);
+  void (*set_noticecall) (DB_ENV *, void (*)(DB_ENV *, db_notices));
+  int  (*set_flags) (DB_ENV *, u_int32_t, int);
+  int  (*set_data_dir) (DB_ENV *, const char *);
+  int  (*set_tmp_dir) (DB_ENV *, const char *);
+  int  (*set_verbose) (DB_ENV *, u_int32_t, int);
+  int  (*set_lg_bsize) (DB_ENV *, u_int32_t);
+  int  (*set_lg_dir) (DB_ENV *, const char *);
+  int  (*set_lg_max) (DB_ENV *, u_int32_t);
+  int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int);
+  int  (*set_lk_detect) (DB_ENV *, u_int32_t);
+  int  (*set_lk_max) (DB_ENV *, u_int32_t);
+  int  (*log_archive) (DB_ENV *, char **[], u_int32_t);
+  int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t);
+#ifdef _YDB_WRAP_H
+#undef txn_begin
+#endif
+  int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t);
+#ifdef _YDB_WRAP_H
+#define txn_begin txn_begin_ydb
+#endif
+  // Internal state
+  struct db_env_ydb_internal *i;
+};
+struct yobi_db_key_range {
+  double less,equal,greater;
+};
+struct yobi_db_btree_stat {
+  u_int32_t bt_ndata;
+  u_int32_t bt_nkeys;
+};
+struct yobi_db_txn_stat {
+  u_int32_t st_nactive;
+  DB_TXN_ACTIVE *st_txnarray;
+};
+struct yobi_db_lsn {
+  int hello;
+};
+struct yobi_db_txn_active {
+  DB_LSN	lsn;
+  u_int32_t	txnid;
+};
+
+#ifndef _YDB_WRAP_H
+#define DB_VERSION_STRING "Yobiduck: Fractal DB (November 19, 2006)"
+#else
+#define DB_VERSION_STRING_ydb "Yobiduck: Fractal DB (November 19, 2006) (wrapped bdb)"
+#endif
+
+enum {
+  DB_ARCH_ABS = 0x001,
+  DB_ARCH_LOG = 0x004
+};
+
+enum {
+  DB_CREATE     = 0x0000001,
+  DB_RDONLY     = 0x0000010,
+  DB_RECOVER    = 0x0000020,
+  DB_THREAD     = 0x0000040, 
+  DB_TXN_NOSYNC = 0x0000100,
+  
+  DB_PRIVATE    = 0x0100000
+};
+
+enum {
+  DB_LOCK_DEFAULT = 1,
+  DB_LOCK_OLDEST  = 7,
+  DB_LOCK_RANDOM  = 8 
+};
+
+enum {
+  DB_DUP = 0x000002
+};
+
+enum {
+  DB_NOOVERWRITE = 23
+};
+
+enum {
+  DB_INIT_LOCK  = 0x001000,
+  DB_INIT_LOG   = 0x002000,
+  DB_INIT_MPOOL = 0x004000,
+  DB_INIT_TXN   = 0x008000
+};
+
+int db_create (DB **, DB_ENV *, u_int32_t);
+int db_env_create (DB_ENV **, u_int32_t);
+
+int txn_begin (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t);
+int txn_commit (DB_TXN *, u_int32_t);
+int txn_abort (DB_TXN *);
+
+int log_compare (const DB_LSN *, const DB_LSN *);
+
+#if defined(__cplusplus)
+}
+#endif
+#endif

include/ydb-constants.h

-#ifndef _YDB_CONSTANTS_H
-#define _YDB_CONSTANTS_H
-
-enum {
-  DB_KEYEMPTY      = -30998,
-  DB_KEYEXIST      = -30997,
-  DB_LOCK_DEADLOCK = -30996,
-  DB_NOTFOUND      = -30991,
-
-  // Private
-  DB_BADFORMAT     = -31000
-};
-
-enum {
-  //DB_AFTER   =  1,
-  DB_FIRST     = 10,
-  DB_GET_BOTH  = 11,
-  DB_LAST      = 18,
-  DB_NEXT      = 19,
-  DB_NEXT_DUP  = 20,
-  DB_PREV      = 27,
-  DB_SET       = 30,
-  DB_SET_RANGE = 32,
-  DB_RMW = 0x40000000
-};
-
-#endif

newbrt/Makefile

@@ -57,25 +57,27 @@ check-fanout:
 
 # pma: PROF_FLAGS=-fprofile-arcs -ftest-coverage
 key.o: brttypes.h key.h
-pma-test.o: pma-internal.h pma.h yerror.h memory.h  ../include/ydb-constants.h
+pma-test.o: pma-internal.h pma.h yerror.h memory.h  ../include/db.h
 pma-test: pma.o memory.o key.o ybt.o
-pma.o: pma.h yerror.h pma-internal.h memory.h key.h ybt.h brttypes.h  ../include/ydb-constants.h
-ybt.o: ybt.h brttypes.h
+pma.o: pma.h yerror.h pma-internal.h memory.h key.h ybt.h brttypes.h  ../include/db.h
+ybt.o: ybt.h brttypes.h ../include/db.h
 ybt-test: ybt-test.o ybt.o memory.o
+ybt-test.o: ybt.h ../include/db.h
 cachetable.o: cachetable.h hashfun.h
 brt-test: ybt.o brt.o hashtable.o pma.o memory.o brt-serialize.o cachetable.o header-io.o ybt.o key.o primes.o
-brt-test.o brt.o: brt.h hashtable.h pma.h brttypes.h cachetable.h
-brt-serialize-test.o: pma.h yerror.h brt.h memory.h hashtable.h brttypes.h brt-internal.h
-brt.o: brt.h mdict.h pma.h brttypes.h memory.h brt-internal.h cachetable.h hashtable.h
+brt-test.o brt.o: brt.h ../include/db.h hashtable.h pma.h brttypes.h cachetable.h
+brt-serialize-test.o: pma.h yerror.h brt.h ../include/db.h memory.h hashtable.h brttypes.h brt-internal.h
+brt.o: brt.h ../include/db.h mdict.h pma.h brttypes.h memory.h brt-internal.h cachetable.h hashtable.h
 mdict.o: pma.h
-hashtable.o: hashtable.h brttypes.h memory.h key.h yerror.h ../include/ydb-constants.h hashfun.h
+hashtable.o: hashtable.h brttypes.h memory.h key.h yerror.h ../include/db.h hashfun.h
 memory.o: memory.h
 primes.o: primes.h
 hashtest: hashtable.o memory.o primes.o
-brt-serialize.o: brt.h cachetable.h memory.h mdict.h pma.h brttypes.h brt-internal.h hashtable.h wbuf.h rbuf.h
-header-io.o: brttypes.h brt-internal.h memory.h
+brt-serialize.o: brt.h ../include/db.h cachetable.h memory.h mdict.h pma.h brttypes.h brt-internal.h hashtable.h wbuf.h rbuf.h
+header-io.o: brttypes.h brt-internal.h brt.h ../include/db.h memory.h
 mdict-test: hashtable.o pma.o memory.o
 brt-bigtest: memory.o ybt.o brt.o pma.o cachetable.o key.o hashtable.o brt-serialize.o
+brt-bigtest.o: brt.h ../include/db.h
 log-test: log.o memory.o
 
 brt-serialize-test: brt-serialize-test.o brt-serialize.o memory.o hashtable.o pma.o key.o ybt.o brt.o cachetable.o primes.o
@@ -84,6 +86,7 @@ cachetable-test.o: cachetable.h memory.h
 cachetable-test: cachetable.o memory.o cachetable-test.o
 
 benchmark-test: benchmark-test.o ybt.o memory.o brt.o pma.o cachetable.o key.o hashtable.o brt-serialize.o primes.o
+benchmark-test.o: brt.h ../include/db.h
 
 clean:
 	rm -rf *.o hashtest brt-test cachetable-test randbrt randdb4 benchmark-test *.bb *.bbg *.da

newbrt/benchmark-test.c

@@ -2,11 +2,12 @@
 #include "brt.h"
 #include "key.h"
 #include "memory.h"
-#include <unistd.h>
-#include <stdlib.h>
 #include <assert.h>
-#include <sys/time.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <unistd.h>
 
 const char fname[]="sinsert.brt";
 

newbrt/brt.h

@@ -6,7 +6,7 @@
 #include "brttypes.h"
 
 #include "ybt.h"
-#include "../include/ydb-constants.h"
+#include "../include/db.h"
 #include "cachetable.h"
 typedef struct brt *BRT;
 int open_brt (const char *fname, const char *dbname, int is_create, BRT *, int nodesize, CACHETABLE, int(*)(DB*,const DBT*,const DBT*));

newbrt/hashtable.c

@@ -2,7 +2,7 @@
 #include "hashtable.h"
 #include "memory.h"
 #include "primes.h"
-#include "../include/ydb-constants.h"
+#include "../include/db.h"
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>

newbrt/pma-test.c

-#include "../include/ydb-constants.h"
+#include "../include/db.h"
 #include "memory.h"
 #include "key.h"
 #include <assert.h>

newbrt/pma.c

@@ -6,7 +6,7 @@
 #include "key.h"
 #include "memory.h"
 #include "myassert.h"
-#include "../include/ydb-constants.h"
+#include "../include/db.h"
 #include <stdio.h>
 #include <errno.h>
 /* Only needed for testing. */