Commit 515d526a authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul

Make test_log5.recover work again. Fixes #527.

git-svn-id: file:///svn/tokudb@2796 c7de825b-a66e-492c-adef-691d508d4ae1
parent 383d8952
...@@ -180,9 +180,8 @@ void toku_recover_newbrtnode (LSN lsn, FILENUM filenum,DISKOFF diskoff,u_int32_t ...@@ -180,9 +180,8 @@ void toku_recover_newbrtnode (LSN lsn, FILENUM filenum,DISKOFF diskoff,u_int32_t
n->u.n.n_children = 0; n->u.n.n_children = 0;
n->u.n.totalchildkeylens = 0; n->u.n.totalchildkeylens = 0;
n->u.n.n_bytes_in_buffers = 0; n->u.n.n_bytes_in_buffers = 0;
int i; MALLOC_N(3,n->u.n.childinfos);
for (i=0; i<TREE_FANOUT+1; i++) MALLOC_N(2,n->u.n.childkeys);
BNC_NBYTESINBUF(n, i) = 0;
} }
// Now put it in the cachetable // Now put it in the cachetable
toku_cachetable_put(pair->cf, diskoff, n, toku_serialize_brtnode_size(n), toku_brtnode_flush_callback, toku_brtnode_fetch_callback, 0); toku_cachetable_put(pair->cf, diskoff, n, toku_serialize_brtnode_size(n), toku_brtnode_flush_callback, toku_brtnode_fetch_callback, 0);
......
...@@ -186,7 +186,7 @@ all.recover: test_log2.recover test_log3.recover test_log4.recover test_log5.rec ...@@ -186,7 +186,7 @@ all.recover: test_log2.recover test_log3.recover test_log4.recover test_log5.rec
$(MAYBEATSIGN) $(SETTOKUENV) $(VGRIND) ./$< $(MAYBEATSIGN) $(SETTOKUENV) $(VGRIND) ./$<
$(MAYBEATSIGN) $(SETTOKUENV) rm -rf dir.$(patsubst %.tdb,%.c.tdb,$<).recover $(MAYBEATSIGN) $(SETTOKUENV) rm -rf dir.$(patsubst %.tdb,%.c.tdb,$<).recover
$(MAYBEATSIGN) $(SETTOKUENV) mkdir dir.$(patsubst %.tdb,%.c.tdb,$<).recover $(MAYBEATSIGN) $(SETTOKUENV) mkdir dir.$(patsubst %.tdb,%.c.tdb,$<).recover
$(MAYBEATSIGN) $(SETTOKUENV) cd dir.$(patsubst %.tdb,%.c.tdb,$<).recover; $(VGRIND) ../../../newbrt/recover ../dir.$(patsubst %.tdb,%.c.tdb,$<) $(MAYBEATSIGN) $(SETTOKUENV) cd dir.$(patsubst %.tdb,%.c.tdb,$<).recover; $(VGRIND) ../../../newbrt/tdb-recover ../dir.$(patsubst %.tdb,%.c.tdb,$<)
$(MAYBEATSIGN) $(SETTOKUENV) diff dir.$(patsubst %.tdb,%.c.tdb,$<) dir.$(patsubst %.tdb,%.c.tdb,$<).recover/foo.db $(MAYBEATSIGN) $(SETTOKUENV) diff dir.$(patsubst %.tdb,%.c.tdb,$<) dir.$(patsubst %.tdb,%.c.tdb,$<).recover/foo.db
%.recoverwc: %.tdb %.recoverwc: %.tdb
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment