add setup and check rules. get rid of the private tokudb.h refs[t:2202]

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

release/examples/Makefile

 TARGETS = db-insert db-insert-bdb db-scan db-scan-bdb
-default: $(TARGETS)
 CFLAGS = -g
 CPPFLAGS = -I./include
 LDFLAGS = -L.. -lfractaltreeindex -Wl,-rpath,..
+
+default: $(TARGETS)
+
 db-insert-bdb: db-insert.c
 	cc -ldb db-insert.c  -o db-insert-bdb -DBDB $(CFLAGS)
+
 db-scan-bdb: db-scan.c
 	cc -ldb db-scan.c    -o db-scan-bdb   -DBDB $(CFLAGS)
+
 default: db-insert
 
+setup:
+	cp ../../include/db.h include/tokudb.h
+	cp ../../include/tdb-internal.h include/tdb-internal.h
+	cp ../../toku_include/toku_list.h include/toku_list.h
+
+check: $(TARGETS)
+	./db-insert && ./db-scan --lwc --prelock --prelockflag
+
 clean:
 	rm -rf $(TARGETS) bench

release/examples/include/tokudb.h

-#ifndef _DB_H
-#define _DB_H
-/* This code generated by make_db_h.   Copyright (c) 2007-2009 Tokutek */
-#ident "Copyright (c) 2007-2009 Tokutek Inc.  All rights reserved."
-#include <sys/types.h>
-/*stdio is needed for the FILE* in db->verify*/
-#include <stdio.h>
-#if defined(__cplusplus)
-extern "C" {
-#endif
-#define TOKUDB 1
-#define TOKUDB_NATIVE_H 1
-#define DB_VERSION_MAJOR 4
-#define DB_VERSION_MINOR 6
-#define DB_VERSION_PATCH 19
-#ifndef _TOKUDB_WRAP_H
-#define DB_VERSION_STRING "Tokutek: TokuDB 4.6.19"
-#else
-#define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
-#endif
-#ifndef TOKU_OFF_T_DEFINED
-#define TOKU_OFF_T_DEFINED
-typedef int64_t toku_off_t;
-#endif
-typedef struct __toku_db_env DB_ENV;
-typedef struct __toku_db_key_range DB_KEY_RANGE;
-typedef struct __toku_db_lsn DB_LSN;
-typedef struct __toku_db DB;
-typedef struct __toku_db_txn DB_TXN;
-typedef struct __toku_db_txn_active DB_TXN_ACTIVE;
-typedef struct __toku_db_txn_stat DB_TXN_STAT;
-typedef struct __toku_dbc DBC;
-typedef struct __toku_dbt DBT;
-typedef u_int32_t db_recno_t;
-typedef int(*YDB_CALLBACK_FUNCTION)(DBT const*, DBT const*, void*);
-typedef int(*YDB_HEAVISIDE_CALLBACK_FUNCTION)(DBT const *key, DBT const *value, void *extra_f, int r_h);
-typedef int(*YDB_HEAVISIDE_FUNCTION)(const DBT *key, const DBT *value, void *extra_h);
-
-// Included by db.h, defines some internal structures.  These structures are inlined in some versions of db.h
-// the types DB_TXN and so forth have been defined.
-
-struct simple_dbt {
-    u_int32_t len;
-    void     *data;
-};
-
-struct __toku_db_txn_internal {
-    //TXNID txnid64; /* A sixty-four bit txn id. */
-    struct tokutxn *tokutxn;
-    struct __toku_lth *lth;  //Hash table holding list of dictionaries this txn has touched
-    u_int32_t flags;
-    DB_TXN *child;
-};
-
-struct __toku_dbc_internal {
-    struct brt_cursor *c;
-    DB_TXN *txn;
-    struct simple_dbt skey_s,sval_s;
-    struct simple_dbt *skey,*sval;
-};
-
-typedef struct __toku_db_btree_stat64 {
-  u_int64_t bt_nkeys; /* how many unique keys (guaranteed only to be an estimate, even when flattened)          */
-  u_int64_t bt_ndata; /* how many key-value pairs (an estimate, but exact when flattened)                       */
-  u_int64_t bt_dsize; /* how big are the keys+values (not counting the lengths) (an estimate, unless flattened) */
-  u_int64_t bt_fsize; /* how big is the underlying file                                                         */
-} DB_BTREE_STAT64;
-typedef enum {
- DB_BTREE=1,
- DB_UNKNOWN=5
-} DBTYPE;
-#ifndef _TOKUDB_WRAP_H
-#define DB_VERB_DEADLOCK 1
-#define DB_VERB_RECOVERY 8
-#define DB_VERB_REPLICATION 32
-#define DB_VERB_WAITSFOR 64
-#define DB_DBT_MALLOC 8
-#define DB_DBT_REALLOC 64
-#define DB_DBT_USERMEM 256
-#define DB_DBT_DUPOK 2
-#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
-#define DB_RECOVER 64
-#define DB_THREAD 128
-#define DB_TXN_NOSYNC 512
-#define DB_LOCK_DEFAULT 1
-#define DB_LOCK_OLDEST 7
-#define DB_LOCK_RANDOM 8
-#define DB_DUP 32768
-#define DB_DUPSORT 65536
-#define DB_KEYFIRST 13
-#define DB_KEYLAST 14
-#define DB_NODUPDATA 19
-#define DB_NOOVERWRITE 20
-#define DB_YESOVERWRITE 254
-#define DB_OPFLAGS_MASK 255
-#define DB_AUTO_COMMIT 33554432
-#define DB_INIT_LOCK 131072
-#define DB_INIT_LOG 262144
-#define DB_INIT_MPOOL 524288
-#define DB_INIT_TXN 2097152
-#define DB_USE_ENVIRON 16384
-#define DB_USE_ENVIRON_ROOT 32768
-#define DB_READ_UNCOMMITTED 134217728
-#define DB_KEYEXIST -30996
-#define DB_LOCK_DEADLOCK -30995
-#define DB_LOCK_NOTGRANTED -30994
-#define DB_NOTFOUND -30989
-#define DB_SECONDARY_BAD -30974
-#define DB_DONOTINDEX -30998
-#define DB_BUFFER_SMALL -30999
-#define DB_BADFORMAT -30500
-#define DB_DELETE_ANY 65536
-#define DB_TRUNCATE_WITHCURSORS 131072
-#define DB_FIRST 7
-#define DB_GET_BOTH 8
-#define DB_GET_BOTH_RANGE 10
-#define DB_LAST 15
-#define DB_CURRENT 6
-#define DB_NEXT 16
-#define DB_NEXT_DUP 17
-#define DB_NEXT_NODUP 18
-#define DB_PREV 23
-#define DB_PREV_DUP 24
-#define DB_PREV_NODUP 25
-#define DB_SET 26
-#define DB_SET_RANGE 27
-#define DB_CURRENT_BINDING 253
-#define DB_RMW 1073741824
-#define DB_PRELOCKED 0x00800000
-#define DB_PRELOCKED_WRITE 0x00400000
-#define DB_DBT_APPMALLOC 1
-#define DB_DBT_MULTIPLE 16
-#define DB_LOG_AUTOREMOVE 524288
-#define DB_TXN_WRITE_NOSYNC 4096
-#define DB_TXN_NOWAIT 1024
-#define DB_TXN_SYNC 16384
-#endif
-/* TOKUDB specific error codes */
-#define TOKUDB_OUT_OF_LOCKS -100000
-#define TOKUDB_SUCCEEDED_EARLY -100001
-#define TOKUDB_DICTIONARY_TOO_OLD -100004
-#define TOKUDB_DICTIONARY_TOO_NEW -100005
-#define TOKUDB_DICTIONARY_NO_HEADER -100006
-#define TOKUDB_FOUND_BUT_REJECTED -100002
-#define TOKUDB_USER_CALLBACK_ERROR -100003
-/* 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
-#endif
-struct __toku_db_env {
-  struct __toku_db_env_internal *i;
-#define db_env_struct_i(x) ((x)->i)
-  int (*checkpointing_set_period)             (DB_ENV*, u_int32_t) /* Change the delay between automatic checkpoints.  0 means disabled. */;
-  int (*checkpointing_get_period)             (DB_ENV*, u_int32_t*) /* Retrieve the delay between automatic checkpoints.  0 means disabled. */;
-  int (*checkpointing_postpone)               (DB_ENV*) /* Use for 'rename table' or any other operation that must be disjoint from a checkpoint */;
-  int (*checkpointing_resume)                 (DB_ENV*) /* Alert tokudb 'postpone' is no longer necessary */;
-  int (*checkpointing_begin_atomic_operation) (DB_ENV*) /* Begin a set of operations (that must be atomic as far as checkpoints are concerned). i.e. inserting into every index in one table */;
-  int (*checkpointing_end_atomic_operation)   (DB_ENV*) /* End   a set of operations (that must be atomic as far as checkpoints are concerned). */;
-  int (*set_default_bt_compare)  (DB_ENV*,int (*bt_compare) (DB *, const DBT *, const DBT *)) /* Set default (key) comparison function for all DBs in this environment.  Required for RECOVERY since you cannot open the DBs manually. */;
-  int (*set_default_dup_compare) (DB_ENV*,int (*bt_compare) (DB *, const DBT *, const DBT *)) /* Set default (val) comparison function for all DBs in this environment.  Required for RECOVERY since you cannot open the DBs manually. */;
-  void *app_private;
-  void *api1_internal;
-  int  (*close) (DB_ENV *, u_int32_t);
-  void (*err) (const DB_ENV *, int, const char *, ...);
-  int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *);
-  int (*get_flags) (DB_ENV *, u_int32_t *);
-  int  (*get_lg_max) (DB_ENV *, u_int32_t*);
-  int  (*get_lk_max_locks) (DB_ENV *, u_int32_t *);
-  int  (*log_archive) (DB_ENV *, char **[], u_int32_t);
-  int  (*log_flush) (DB_ENV *, const DB_LSN *);
-  int  (*open) (DB_ENV *, const char *, u_int32_t, int);
-  int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int);
-  int  (*set_data_dir) (DB_ENV *, const char *);
-  void (*set_errcall) (DB_ENV *, void (*)(const DB_ENV *, const char *, const char *));
-  void (*set_errfile) (DB_ENV *, FILE*);
-  void (*set_errpfx) (DB_ENV *, const char *);
-  int  (*set_flags) (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_lk_detect) (DB_ENV *, u_int32_t);
-  int  (*set_lk_max_locks) (DB_ENV *, u_int32_t);
-  int  (*set_tmp_dir) (DB_ENV *, const char *);
-  int  (*set_verbose) (DB_ENV *, u_int32_t, int);
-  int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t);
-  int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t);
-  int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t);
-};
-struct __toku_db_key_range {
-  double less;
-  double equal;
-  double greater;
-};
-struct __toku_db_lsn {
-};
-struct __toku_dbt {
-  void*data;
-  u_int32_t size;
-  u_int32_t ulen;
-  u_int32_t flags;
-};
-typedef int (*toku_dbt_upgradef)(DB*,
-                                 u_int32_t old_version, const DBT *old_descriptor, const DBT *old_key, const DBT *old_val,
-                                 u_int32_t new_version, const DBT *new_descriptor, const DBT *new_key, const DBT *new_val);
-struct __toku_db {
-  struct __toku_db_internal *i;
-#define db_struct_i(x) ((x)->i)
-  int (*key_range64)(DB*, DB_TXN *, DBT *, u_int64_t *less, u_int64_t *equal, u_int64_t *greater, int *is_exact);
-  int (*stat64)(DB *, DB_TXN *, DB_BTREE_STAT64 *);
-  void *app_private;
-  DB_ENV *dbenv;
-  int (*pre_acquire_read_lock)(DB*, DB_TXN*, const DBT*, const DBT*, const DBT*, const DBT*);
-  int (*pre_acquire_table_lock)(DB*, DB_TXN*);
-  const DBT* (*dbt_pos_infty)(void) /* Return the special DBT that refers to positive infinity in the lock table.*/;
-  const DBT* (*dbt_neg_infty)(void)/* Return the special DBT that refers to negative infinity in the lock table.*/;
-  int (*delboth) (DB*, DB_TXN*, DBT*, DBT*, u_int32_t) /* Delete the key/value pair. */;
-  int (*row_size_supported) (DB*, u_int32_t) /* Test whether a row size is supported. */;
-  const DBT *descriptor /* saved row/dictionary descriptor for aiding in comparisons */;
-  int (*set_descriptor) (DB*, u_int32_t version, const DBT* descriptor, toku_dbt_upgradef dbt_userformat_upgrade) /* set row/dictionary descriptor for a db.  Available only while db is open */;
-  void *api_internal;
-  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 (*fd) (DB *, int *);
-  int (*get) (DB *, DB_TXN *, DBT *, DBT *, u_int32_t);
-  int (*get_flags) (DB *, u_int32_t *);
-  int (*get_pagesize) (DB *, 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_dup_compare) (DB *, int (*)(DB *, const DBT *, const DBT *));
-  void (*set_errfile) (DB *, FILE*);
-  int (*set_flags) (DB *, u_int32_t);
-  int (*set_pagesize) (DB *, u_int32_t);
-  int (*stat) (DB *, void *, u_int32_t);
-  int (*truncate) (DB *, DB_TXN *, u_int32_t *, u_int32_t);
-  int (*verify) (DB *, const char *, const char *, FILE *, u_int32_t);
-};
-struct __toku_db_txn_active {
-  u_int32_t txnid;
-  DB_LSN lsn;
-};
-struct txn_stat {
-  u_int64_t rolltmp_raw_count;
-};
-struct __toku_db_txn {
-  DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/;
-  DB_TXN *parent;
-  struct __toku_db_txn_internal ii;
-#define db_txn_struct_i(x) (&(x)->ii)
-  int (*txn_stat)(DB_TXN *, struct txn_stat **);
-  void *api_internal;
-  int (*abort) (DB_TXN *);
-  int (*commit) (DB_TXN*, u_int32_t);
-  u_int32_t (*id) (DB_TXN *);
-};
-struct __toku_db_txn_stat {
-  u_int32_t st_nactive;
-  DB_TXN_ACTIVE *st_txnarray;
-};
-struct __toku_dbc {
-  DB *dbp;
-  struct __toku_dbc_internal ii;
-#define dbc_struct_i(x) (&(x)->ii)
-  int (*c_getf_first)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_last)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_next)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_next_dup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_next_nodup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_prev)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_prev_dup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_prev_nodup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_current)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_current_binding)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_heaviside)(DBC *, u_int32_t, YDB_HEAVISIDE_CALLBACK_FUNCTION f, void *extra_f, YDB_HEAVISIDE_FUNCTION h, void *extra_h, int direction);
-  int (*c_getf_set)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_set_range)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_get_both)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_get_both_range)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_close) (DBC *);
-  int (*c_count) (DBC *, db_recno_t *, u_int32_t);
-  int (*c_del) (DBC *, u_int32_t);
-  int (*c_get) (DBC *, DBT *, DBT *, u_int32_t);
-};
-#ifdef _TOKUDB_WRAP_H
-#define txn_begin txn_begin_tokudb
-#endif
-int db_env_create(DB_ENV **, u_int32_t) __attribute__((__visibility__("default")));
-int db_create(DB **, DB_ENV *, u_int32_t) __attribute__((__visibility__("default")));
-char *db_strerror(int) __attribute__((__visibility__("default")));
-const char *db_version(int*,int *,int *) __attribute__((__visibility__("default")));
-int log_compare (const DB_LSN*, const DB_LSN *) __attribute__((__visibility__("default")));
-int db_env_set_func_fsync (int (*)(int)) __attribute__((__visibility__("default")));
-int toku_set_trace_file (char *fname) __attribute__((__visibility__("default")));
-int toku_close_trace_file (void) __attribute__((__visibility__("default")));
-int db_env_set_func_free (void (*)(void*)) __attribute__((__visibility__("default")));
-int db_env_set_func_malloc (void *(*)(size_t)) __attribute__((__visibility__("default")));
-int db_env_set_func_pwrite (ssize_t (*)(int, const void *, size_t, toku_off_t)) __attribute__((__visibility__("default")));
-int db_env_set_func_write (ssize_t (*)(int, const void *, size_t)) __attribute__((__visibility__("default")));
-int db_env_set_func_realloc (void *(*)(void*, size_t)) __attribute__((__visibility__("default")));
-void db_env_set_checkpoint_callback (void (*)(void*), void*) __attribute__((__visibility__("default")));
-#if defined(__cplusplus)
-}
-#endif
-#endif