up

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

src/Makefile

 # On OSX do:
 #   make OSX=OSX
 
-CFLAGS = -W -Wall -Wno-unused -g -fPIC -O2
+LIBNAME=libdb
+
+OPTFLAGS = -O2
+CFLAGS = -W -Wall -Wno-unused -g -fPIC $(OPTFLAGS)
 CPPFLAGS = -I../include -I../newbrt
 CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 
@@ -15,15 +18,20 @@ LIBEXT=so
 SHARED=-shared
 endif
 
-LIBNAME=libdb.$(LIBEXT)
-
-install: $(LIBNAME)
-	cp $(LIBNAME) ../lib/
+install: $(LIBNAME).$(LIBEXT) $(LIBNAME).a
+	cp $(LIBNAME).$(LIBEXT) ../lib/
+	cp $(LIBNAME).a ../lib
 
 clean:
-	rm -rf *.$(LIBEXT) *.o
+	rm -rf $(LIBNAME).$(LIBEXT) $(LIBNAME).a *.o
+
 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/cachetable.o ../newbrt/hashtable.o ../newbrt/header-io.o ../newbrt/key.o ../newbrt/memory.o ../newbrt/pma.o ../newbrt/ybt.o ../newbrt/primes.o ../newbrt/log.o ../newbrt/mempool.o
-$(LIBNAME): $(DBBINS)
-	cc  $(CPPFLAGS) $(DBBINS) $(SHARED) -o $@ $(CFLAGS)
+DBBINS = ydb.o ../newbrt/brt.o ../newbrt/brt-serialize.o ../newbrt/brt-verify.o ../newbrt/cachetable.o ../newbrt/hashtable.o ../newbrt/header-io.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 
+
+$(LIBNAME).$(LIBEXT): $(DBBINS)
+	cc  $(CPPFLAGS) $(DBBINS) $(SHARED) -o $@ $(CFLAGS) -lz
+
+$(LIBNAME).a: $(DBBINS)
+	$(AR) rv $@ $(DBBINS)
+
 libdb.a(ydb.o): ydb.o

src/ydb-internal.h

@@ -13,17 +13,14 @@ struct db_header {
 
 struct __toku_db_internal {
     int freed;
-    int (*bt_compare)(DB *, const DBT *, const DBT *);
     struct db_header *header;
     int database_number; // -1 if it is the single unnamed database.  Nonnengative number otherwise.
-    DB_ENV *env;
     char *full_fname;
     char *database_name;
     //int fd;
     u_int32_t open_flags;
     int open_mode;
     BRT brt;
-    int is_db_dup;
-    unsigned long long fileid;
+    FILENUM fileid;
 };
 #endif