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

src/range_tree/Makefile

+# On OSX do:
+#   make OSX=OSX
+
+LIBNAME=libdb
+
+OPTFLAGS = -O2
+# GCOV_FLAGS = -fprofile-arcs -ftest-coverage
+CFLAGS = -W -Wall -Werror -g -fPIC $(OPTFLAGS) $(GCOV_FLAGS)
+CPPFLAGS = -I../../include -I../../newbrt
+CPPFLAGS += -D_GNU_SOURCE -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+
+
+ifeq ($(OSX),OSX)
+LIBEXT=dylib
+SHARED=-dynamiclib
+CFLAGS+=-fno-common
+else
+LIBEXT=so
+SHARED=-shared
+endif
+
+.PHONY: install logformat
+install: logformat $(LIBNAME).$(LIBEXT) $(LIBNAME).a
+	cp $(LIBNAME).$(LIBEXT) ../lib/
+	cp $(LIBNAME).a ../lib
+
+logformat:
+	(cd ../newbrt;make)
+
+check: $(LIBNAME).$(LIBEXT)
+	python tokuglobals.py $(LIBNAME).$(LIBEXT)
+
+strip: $(LIBNAME).$(LIBEXT)
+	strip $(LIBNAME).$(LIBEXT)
+
+clean:
+	rm -rf $(LIBNAME).$(LIBEXT) $(LIBNAME).a *.o *.gcno *.gcda *.gcov
+	cd tests;make clean
+
+ydb.o: ../include/db.h ../newbrt/cachetable.h ../newbrt/brt.h ../newbrt/log.c
+DBBINS = ydb.o ../newbrt/brt.o ../newbrt/brt-serialize.o ../newbrt/brt-verify.o ../newbrt/cachetable.o ../newbrt/fifo.o ../newbrt/key.o ../newbrt/memory.o ../newbrt/mempool.o ../newbrt/pma.o ../newbrt/ybt.o ../newbrt/primes.o ../newbrt/log.o ../newbrt/fingerprint.o ../newbrt/log_code.o ../newbrt/roll.o
+
+$(LIBNAME).$(LIBEXT): $(DBBINS)
+	cc  $(CPPFLAGS) $(DBBINS) $(SHARED) -o $@ $(CFLAGS) -lz
+
+$(LIBNAME).a: $(DBBINS)
+	$(AR) rv $@ $(DBBINS)
+
+libdb.a(ydb.o): ydb.o

src/range_tree/rt.h

+/* -*- mode: C; c-basic-offset: 4 -*- */
+#ident "Copyright (c) 2007-8 Tokutek Inc.  All rights reserved."
+
+#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
+
+const char *toku_patent_string = "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it.";
+const char *toku_copyright_string = "Copyright (c) 2007 Tokutek Inc.  All rights reserved.";
+
+/*
+ * Range trees
+ *
+ * This is the header file for range trees. */
+
+#include <brttypes.h>
+
+
+/* Represents a range of data with an extra value. */
+typedef struct {
+	void*   left;
+  	void*   right;
+	void*   data; 
+} toku_range;
+
+typedef struct {int dummy;} toku_range_tree;
+
+
+int toku_rt_create(toku_range_tree**, 
+                   int (*)(void*,void*), int (*)(void*,void*), 
+		           BOOL allow_overlaps);
+
+int toku_rt_close(toku_range_tree*);
+
+int toku_rt_find(toku_range_tree*, toku_range*, int, toku_range**, int*, int*);
+
+int toku_rt_insert(toku_range_tree*, toku_range*);
+int toku_rt_delete(toku_range_tree*, toku_range*);
+
+int toku_rt_predecessor (toku_range_tree*, void*, toku_range*);
+int toku_rt_successor   (toku_range_tree*, void*, toku_range*);
+

src/range_tree/tests/Makefile

+# On OSX do:
+#   make OSX=OSX
+
+# For verbose output do
+#   make VERBOSE=1
+# For very verbose output do 
+#   make VERBOSE=2
+
+ifeq ($(OSX),OSX)
+#Note: OSX 10.4 needs DYLD_LIBRARY_PATH.  OSX 10.5 claims to support -rpath.
+ LIBEXT=dylib
+ VGRIND=
+ TDB_LOADLIBES = -L../ -ldb
+ SETTOKUENV=export DYLD_LIBRARY_PATH=.. ;
+ UNSETTOKUENV=unset DYLD_LIBRARY_PATH ;
+else
+ SETTOKUENV=
+ UNSETTOKUENV=
+ LIBEXT=so
+ TDB_LOADLIBES = -L../ -ldb -Wl,-rpath,.. -lpthread
+ VGRIND=valgrind --quiet --error-exitcode=1 --leak-check=yes
+endif
+
+LIBNAME=librt.$(LIBEXT)
+# GCOV_FLAGS = -fprofile-arcs -ftest-coverage
+CFLAGS = -Wall -Werror $(OPTFLAGS) -g $(GCOV_FLAGS)
+TDB_CPPFLAGS = -I../ -I../../newbrt
+
+
+SRCS = $(wildcard *.c)
+
+TDB_TESTS = $(patsubst %.c,%.tdb,$(SRCS))
+BDB_TESTS = $(patsubst %.c,%.bdb,$(SRCS))
+LINEAR_TESTS = $(patsubst %.c,%.bdb,$(SRCS))
+
+ALL_TESTS = $(TDB_TESTS) $(BDB_TESTS)
+
+RUN_TDB_TESTS = $(patsubst %.tdb,%.tdbrun,$(TDB_TESTS))
+RUN_BDB_TESTS = $(patsubst %.bdb,%.bdbrun,$(BDB_TESTS))
+RUN_ALL_TESTS = $(RUN_TDB_TESTS) $(RUN_BDB_TESTS)
+
+
+all: make_libs $(ALL_TESTS)
+
+foo:
+	echo RUN_TDB_TESTS: $(RUN_TDB_TESTS)
+	echo ALL_TESTS: $(ALL_TESTS)
+
+.PHONY: check check.bdb check.tdb
+check: check.bdb check.tdb all.recover test_db_assoc3.tdbrun_wasbad
+	@ echo ok
+tests.bdb: $(BDB_TESTS)
+check.bdb: $(RUN_BDB_TESTS)
+tests.tdb: $(TDB_TESTS)
+check.tdb: $(RUN_TDB_TESTS)
+
+# Need these rule so that Make knows about all the file names
+.PHONY: %.bdbrun %.tdbrun %.run
+$(RUN_ALL_TESTS):
+$(ALL_TESTS):
+
+%.run: %.bdbrun %.tdbrun
+	@ echo ok
+
+ifeq ($(VERBOSE),2)
+VERBVERBOSE=-v
+MAYBEATSIGN= 
+VERBQUIET=
+else
+ ifeq ($(VERBOSE),1)
+  VERBVERBOSE=
+  MAYBEATSIGN=
+  VERBQUIET=
+ else
+  VERBVERBOSE=
+  MAYBEATSIGN=@
+  VERBQUIET=--quiet
+ endif
+endif
+
+# The @ sign makes the make quiet.  If there is an error there is enough info to tell what test failed.
+%.bdbrun: %.bdb
+	$(MAYBEATSIGN) $(UNSETTOKUENV) $(VGRIND) $(BDB_SUPPRESSIONS) ./$< $(VERBVERBOSE)
+%.tdbrun: %.tdb
+	$(MAYBEATSIGN) $(SETTOKUENV) $(VGRIND) ./$< $(VERBVERBOSE)
+
+# For a few of the tests bdb is making valgrind unhappy.
+FOO_NO_VGRIND = \
+  db_already_exists \
+  db_curs2 \
+  db_dbt_appmalloc \
+  db_dbt_mem_behavior \
+  db_dup \
+  db_env_open_nocreate \
+  db_env_open_open_close \
+  db_open_notexist_reopen \
+  db_remove_subdb \
+  db_subdb \
+  dup_delete \
+  dup_flags \
+  dup_insert \
+  dup_search \
+  kv_limits \
+  log4 \
+  rand_insert \
+  reverse_compare_fun \
+  # Comment to terminate list so the previous line can end with a slash
+ 
+NO_VGRIND = \
+  db_dbt_appmalloc \
+  db_dbt_mem_behavior \
+  db_assoc3 \
+  db_curs2 \
+  db_delete \
+  db_env_open_nocreate \
+  db_env_open_open_close \
+  db_open_notexist_reopen \
+  db_remove_subdb \
+  log4 \
+  log5 \
+  # Comment to terminate list so the previous line can end with a slash
+
+$(patsubst %,test_%.bdbrun,$(NO_VGRIND)): VGRIND=
+$(patsubst %,test_%.bdbrun,$(NO_VGRIND)): BDB_SUPPRESSIONS=
+
+libs:
+	cd ..;make
+
+%.bdb: %.c
+	$(UNSETTOKUENV) cc  -DDIR=\"dir.$<.bdb\" $(BDB_CPPFLAGS) -DUSE_BDB -DIS_TDB=0 $(CFLAGS) $< $(BDB_LDFLAGS) -ldb -o $@
+%.tdb: %.c
+	$(SETTOKUENV) cc  -DDIR=\"dir.$<.tdb\" -DUSE_TDB -DIS_TDB=1 $(CFLAGS) $(TDB_CPPFLAGS) $(TDB_LOADLIBES) $< -o $@
+
+.PHONY: %.recover
+all.recover: test_log2.recover test_log3.recover test_log4.recover test_log5.recover
+%.recover: %.tdb
+	$(MAYBEATSIGN) cd ../../newbrt;make $(VERBQUIET) recover;make $(VERBQUIET)
+	$(MAYBEATSIGN) cd ..;make $(VERBQUIET)
+	$(MAYBEATSIGN) $(VGRIND) ./$<
+	$(MAYBEATSIGN) rm -rf dir.$(patsubst %.tdb,%.c.tdb,$<).recover
+	$(MAYBEATSIGN) mkdir dir.$(patsubst %.tdb,%.c.tdb,$<).recover
+	$(MAYBEATSIGN) cd dir.$(patsubst %.tdb,%.c.tdb,$<).recover;$(VGRIND) ../../../newbrt/recover ../dir.$(patsubst %.tdb,%.c.tdb,$<)
+	$(MAYBEATSIGN) diff dir.$(patsubst %.tdb,%.c.tdb,$<) dir.$(patsubst %.tdb,%.c.tdb,$<).recover/foo.db
+
+make_libs:
+	cd ..;make
+
+clean:
+	rm -f $(ALL_TESTS) *.o *.gcno *.gcda *.gcov
+	rm -rf dir.*.tdb dir.*.bdb
+
+test_db_curs4.tdb: trace.h
+test_db_curs4.bdb: trace.h
+test_db_assoc3.tdb test_db_assoc3.bdb: test.h
+
+
+# This one failed in both BDB and TokuDB, in the same way.  It was a program error.  Now it works
+test_db_assoc3.tdbrun_wasbad: test_db_assoc3.tdb
+	$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200
+	$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more
+	$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more
+	$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more
+	$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more
+	$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more
+	$(MAYBEATSIGN) ./test_db_assoc3.tdb --seed=1 --count=200 --more
+
+test_db_assoc3.tdbrun: test_db_assoc3.tdb
+	$(MAYBEATSIGN) $(VGRIND) ./test_db_assoc3.tdb --seed=2 --count=100000 $(VERBVERBOSE)
+	$(MAYBEATSIGN) $(VGRIND) ./test_db_assoc3.tdb --seed=2 --count=100000 --more $(VERBVERBOSE)
+
+test_db_assoc3.bdbrun: test_db_assoc3.bdb
+	$(MAYBEATSIGN) $(VGRIND) ./test_db_assoc3.bdb --seed=2 --count=100000 $(VERBVERBOSE)
+	$(MAYBEATSIGN) $(VGRIND) ./test_db_assoc3.bdb --seed=2 --count=100000 --more $(VERBVERBOSE)

src/range_tree/tests/test.h

+#include <string.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <db.h>
+
+int verbose=0;
+
+#define CKERR(r) ({ if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, strerror(r)); assert(r==0); })
+#define CKERR2(r,r2) ({ if (r!=r2) fprintf(stderr, "%s:%d error %d %s, expected %d\n", __FILE__, __LINE__, r, strerror(r), r2); assert(r==r2); })
+
+void parse_args (int argc, const char *argv[]) {
+    const char *argv0=argv[0];
+    while (argc>1) {
+	int resultcode=0;
+	if (strcmp(argv[1], "-v")==0) {
+	    verbose++;
+	} else if (strcmp(argv[1], "-h")==0) {
+	do_usage:
+	    fprintf(stderr, "Usage:\n%s [-v|-h]\n", argv0);
+	    exit(resultcode);
+	} else {
+	    resultcode=1;
+	    goto do_usage;
+	}
+	argc--;
+	argv++;
+    }
+}
+
+// Simle LCG random number generator.  Not high quality, but good enough.
+static uint32_t rstate=1;
+static inline void mysrandom (int s) {
+    rstate=s;
+}
+static inline uint32_t myrandom (void) {
+    rstate = (279470275ull*(uint64_t)rstate)%4294967291ull;
+    return rstate;
+}
+