Try to recover with deletes. Addresses #27.

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

newbrt/Makefile

@@ -60,6 +60,7 @@ REGRESSION_TESTS = \
 
 BINS =  $(REGRESSION_TESTS) \
         benchmark-test \
+        brtdump \
         randbrt \
         randdb4 \
         tdb_logprint \

newbrt/brtdump.c

@@ -78,8 +78,8 @@ void dump_node (int f, DISKOFF off, struct brt_header *h) {
 	printf(" children:\n");
 	for (i=0; i<n->u.n.n_children; i++) {
 	    printf("   child %d: %lld\n", i, BNC_DISKOFF(n, i));
-	    printf("   buffer contains %d bytes (%d items)\n", n->u.n.n_bytes_in_buffer[i], toku_fifo_n_entries(n->u.n.buffers[i]));
-	    FIFO_ITERATE(n->u.n.buffers[i], key, keylen, data, datalen, typ,
+	    printf("   buffer contains %d bytes (%d items)\n", BNC_NBYTESINBUF(n, i), toku_fifo_n_entries(BNC_BUFFER(n,i)));
+	    FIFO_ITERATE(BNC_BUFFER(n,i), key, keylen, data, datalen, typ, xid,
 			 ({
 			     printf("    TYPE=");
 			     switch ((enum brt_cmd_type)typ) {
@@ -90,7 +90,7 @@ void dump_node (int f, DISKOFF off, struct brt_header *h) {
 			     }
 			     printf("HUH?");
 			 ok:
-			     printf(" ");
+			     printf(" xid=%lld ", xid);
 			     print_item(key, keylen);
 			     if (datalen>0) {
 				 printf(" ");

src/tests/test_log6.c

@@ -0,0 +1,113 @@
+/* -*- mode: C; c-basic-offset: 4 -*- */
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+
+/* Test to see if we can do logging and recovery. */
+/* This is very specific to TokuDB.  It won't work with Berkeley DB. */
+
+#include <assert.h>
+#include <db.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <string.h>
+
+#ifndef DB_DELETE_ANY
+#define DB_DELETE_ANY 0
+#endif
+
+// DIR is defined in the Makefile
+
+#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0);
+
+struct in_db;
+struct in_db {
+    long int r;
+    int i;
+    struct in_db *next;
+} *items=0, *deleted_items=0;
+
+static void put_n (DB *db, DB_TXN *tid, int i) {
+    char hello[30], there[30];
+    DBT key,data;
+    struct in_db *newitem = malloc(sizeof(*newitem));
+    newitem->r = random();
+    newitem->i = i;
+    newitem->next = items;
+    items = newitem;
+    snprintf(hello, sizeof(hello), "hello%ld.%d", newitem->r, newitem->i);
+    snprintf(there, sizeof(hello), "there%d", i);
+    memset(&key, 0, sizeof(key));
+    memset(&data, 0, sizeof(data));
+    key.data  = hello; key.size=strlen(hello)+1;
+    data.data = there; data.size=strlen(there)+1;
+    int r=db->put(db, tid, &key, &data, 0);  assert(r==0);
+}
+
+static void del_n (DB *db, DB_TXN *tid, int i) {
+    // Move it to deleted items if it is present.
+    struct in_db *present;
+    struct in_db **prevp;
+    for ((prevp=&items),         (present=items);
+	 present;
+	 (prevp=&present->next), (present=present->next)) {
+	if (present->i==i) {
+	    // Remove it
+	    struct in_db *next = present->next;
+	    present->next = deleted_items;
+	    deleted_items = present;
+	    *prevp = next;
+
+	    char hello[30];
+	    DBT key;
+	    snprintf(hello, sizeof(hello), "hello%ld.%d", present->r, i);
+	    key.data = hello; key.size = strlen(hello)+1;
+	    int r = db->del(db, tid, &key, DB_DELETE_ANY); assert(r==0);
+
+	    return;
+	}
+    }
+}
+
+static void make_db (void) {
+    DB_ENV *env;
+    DB *db;
+    DB_TXN *tid;
+    int r;
+    int i;
+
+    system("rm -rf " DIR);
+    r=mkdir(DIR, 0777);       assert(r==0);
+    r=db_env_create(&env, 0); assert(r==0);
+    r=env->open(env, DIR, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, 0777); CKERR(r);
+    r=db_create(&db, env, 0); CKERR(r);
+    r=env->txn_begin(env, 0, &tid, 0); assert(r==0);
+    r=db->open(db, tid, "foo.db", 0, DB_BTREE, DB_CREATE, 0777); CKERR(r);
+    r=tid->commit(tid, 0);    assert(r==0);
+    r=env->txn_begin(env, 0, &tid, 0); assert(r==0);
+    
+    for (i=0; i<1; i++) {
+	put_n(db, tid, i);
+	if (random()%3==0) {
+	    del_n(db, tid, random()%(i+1));
+	}
+    }
+    r=tid->commit(tid, 0);    assert(r==0);
+    r=db->close(db, 0);       assert(r==0);
+    r=env->close(env, 0);     assert(r==0);
+    while (items) {
+	struct in_db *next=items->next;
+	free(items);
+	items=next;
+    }
+
+    while (deleted_items) {
+	struct in_db *next=deleted_items->next;
+	free(deleted_items);
+	deleted_items=next;
+    }
+}
+
+int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__unused__))) {
+    make_db();
+    return 0;
+}