the splitting works again. Addresses #1195.

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

newbrt/Makefile

@@ -188,11 +188,14 @@ check-fanout:
 		let BRT_FANOUT=BRT_FANOUT+1; \
 	done
 
-BRT_INTERNAL_H_INCLUDES = brt-internal.h cachetable.h fifo.h omt.h brt.h brt-search.h brttypes.h ybt.h log.h ../include/db.h kv-pair.h memory.h mempool.h leafentry.h
+BRT_INTERNAL_H_INCLUDES = brt-internal.h cachetable.h fifo.h omt.h brt.h brt-search.h brttypes.h ybt.h log.h ../include/db.h kv-pair.h memory.h mempool.h leafentry.h log_header.h
 brt-test-helpers.o: $(BRT_INTERNAL_H_INCLUDES) toku_assert.h
 logformat: logformat.c
 brt-serialize-test.o: $(BRT_INTERNAL_H_INCLUDES)
 
+$(OFILES): $(BRT_INTERNAL_H_INCLUDES)
+
+
 test_toku_malloc_plain_free: newbrt.o
 
 

newbrt/brt-serialize.c

@@ -447,7 +447,7 @@ int toku_deserialize_brtnode_from (int fd, BLOCKNUM blocknum, u_int32_t fullhash
 	MALLOC_N(result->u.n.n_children+1,   result->u.n.childinfos);
 	MALLOC_N(result->u.n.n_children, result->u.n.childkeys);
 	//printf("n_children=%d\n", result->n_children);
-	assert(result->u.n.n_children>=0 && result->u.n.n_children<=TREE_FANOUT);
+	assert(result->u.n.n_children>=0);
 	for (i=0; i<result->u.n.n_children; i++) {
 	    u_int32_t childfp = rbuf_int(&rc);
 	    BNC_SUBTREE_FINGERPRINT(result, i)= childfp;

newbrt/brt-verify.c

@@ -114,7 +114,7 @@ int toku_verify_brtnode (BRT brt, BLOCKNUM blocknum, bytevec lorange, ITEMLEN lo
     int r;
     u_int32_t fullhash = toku_cachetable_hash(brt->cf, blocknum);
     if ((r = toku_cachetable_get_and_pin(brt->cf, blocknum, fullhash, &node_v, NULL,
-					 toku_brtnode_flush_callback, toku_brtnode_fetch_callback, (void*)(long)brt->h->nodesize)))
+					 toku_brtnode_flush_callback, toku_brtnode_fetch_callback, brt->h)))
 	return r;
     //printf("%s:%d pin %p\n", __FILE__, __LINE__, node_v);
     node=node_v;
@@ -177,5 +177,8 @@ int toku_verify_brt (BRT brt) {
     assert(brt->h);
     u_int32_t root_hash;
     rootp = toku_calculate_root_offset_pointer(brt, &root_hash);
-    return toku_verify_brtnode(brt, *rootp, 0, 0, 0, 0, 1);
+    int n_pinned = toku_cachefile_count_pinned(brt->cf, 0);
+    int r = toku_verify_brtnode(brt, *rootp, 0, 0, 0, 0, 1);
+    assert(n_pinned ==  toku_cachefile_count_pinned(brt->cf, 0));
+    return r;
 }

newbrt/tests/keyrange-unflat.c

@@ -25,7 +25,6 @@ static void test_flat (void) {
     for (i=1; i<limit; i++) {
 	permute[i]=i;
 	int ra = random()%(i+1);
-	if (i==1) printf("ra=%d\n", ra);
 	permute[i]=permute[ra];
 	permute[ra]=i;
     }