Commit 068ac9f8 authored by John Esmet's avatar John Esmet Committed by Yoni Fogel

refs #5559 fix more tests broken by 5559


git-svn-id: file:///svn/toku/tokudb@50891 c7de825b-a66e-492c-adef-691d508d4ae1
parent f62500a3
...@@ -74,6 +74,7 @@ test_serialize_leaf(int valsize, int nelts, double entropy) { ...@@ -74,6 +74,7 @@ test_serialize_leaf(int valsize, int nelts, double entropy) {
sn->height = 0; sn->height = 0;
sn->n_children = 8; sn->n_children = 8;
sn->dirty = 1; sn->dirty = 1;
sn->oldest_known_referenced_xid = TXNID_NONE;
MALLOC_N(sn->n_children, sn->bp); MALLOC_N(sn->n_children, sn->bp);
MALLOC_N(sn->n_children-1, sn->childkeys); MALLOC_N(sn->n_children-1, sn->childkeys);
sn->totalchildkeylens = 0; sn->totalchildkeylens = 0;
...@@ -196,6 +197,7 @@ test_serialize_nonleaf(int valsize, int nelts, double entropy) { ...@@ -196,6 +197,7 @@ test_serialize_nonleaf(int valsize, int nelts, double entropy) {
sn.height = 1; sn.height = 1;
sn.n_children = 8; sn.n_children = 8;
sn.dirty = 1; sn.dirty = 1;
sn.oldest_known_referenced_xid = TXNID_NONE;
MALLOC_N(sn.n_children, sn.bp); MALLOC_N(sn.n_children, sn.bp);
MALLOC_N(sn.n_children-1, sn.childkeys); MALLOC_N(sn.n_children-1, sn.childkeys);
sn.totalchildkeylens = 0; sn.totalchildkeylens = 0;
......
...@@ -223,6 +223,7 @@ test_serialize_leaf_check_msn(enum ftnode_verify_type bft, bool do_clone) { ...@@ -223,6 +223,7 @@ test_serialize_leaf_check_msn(enum ftnode_verify_type bft, bool do_clone) {
sn.height = 0; sn.height = 0;
sn.n_children = 2; sn.n_children = 2;
sn.dirty = 1; sn.dirty = 1;
sn.oldest_known_referenced_xid = TXNID_NONE;
MALLOC_N(sn.n_children, sn.bp); MALLOC_N(sn.n_children, sn.bp);
MALLOC_N(1, sn.childkeys); MALLOC_N(1, sn.childkeys);
toku_fill_dbt(&sn.childkeys[0], toku_xmemdup("b", 2), 2); toku_fill_dbt(&sn.childkeys[0], toku_xmemdup("b", 2), 2);
...@@ -368,6 +369,7 @@ test_serialize_leaf_with_large_pivots(enum ftnode_verify_type bft, bool do_clone ...@@ -368,6 +369,7 @@ test_serialize_leaf_with_large_pivots(enum ftnode_verify_type bft, bool do_clone
sn.height = 0; sn.height = 0;
sn.n_children = nrows; sn.n_children = nrows;
sn.dirty = 1; sn.dirty = 1;
sn.oldest_known_referenced_xid = TXNID_NONE;
MALLOC_N(sn.n_children, sn.bp); MALLOC_N(sn.n_children, sn.bp);
MALLOC_N(sn.n_children-1, sn.childkeys); MALLOC_N(sn.n_children-1, sn.childkeys);
...@@ -513,6 +515,7 @@ test_serialize_leaf_with_many_rows(enum ftnode_verify_type bft, bool do_clone) { ...@@ -513,6 +515,7 @@ test_serialize_leaf_with_many_rows(enum ftnode_verify_type bft, bool do_clone) {
sn.height = 0; sn.height = 0;
sn.n_children = 1; sn.n_children = 1;
sn.dirty = 1; sn.dirty = 1;
sn.oldest_known_referenced_xid = TXNID_NONE;
MALLOC_N(sn.n_children, sn.bp); MALLOC_N(sn.n_children, sn.bp);
MALLOC_N(sn.n_children-1, sn.childkeys); MALLOC_N(sn.n_children-1, sn.childkeys);
...@@ -656,6 +659,7 @@ test_serialize_leaf_with_large_rows(enum ftnode_verify_type bft, bool do_clone) ...@@ -656,6 +659,7 @@ test_serialize_leaf_with_large_rows(enum ftnode_verify_type bft, bool do_clone)
sn.height = 0; sn.height = 0;
sn.n_children = 1; sn.n_children = 1;
sn.dirty = 1; sn.dirty = 1;
sn.oldest_known_referenced_xid = TXNID_NONE;
MALLOC_N(sn.n_children, sn.bp); MALLOC_N(sn.n_children, sn.bp);
MALLOC_N(sn.n_children-1, sn.childkeys); MALLOC_N(sn.n_children-1, sn.childkeys);
...@@ -806,6 +810,7 @@ test_serialize_leaf_with_empty_basement_nodes(enum ftnode_verify_type bft, bool ...@@ -806,6 +810,7 @@ test_serialize_leaf_with_empty_basement_nodes(enum ftnode_verify_type bft, bool
sn.height = 0; sn.height = 0;
sn.n_children = 7; sn.n_children = 7;
sn.dirty = 1; sn.dirty = 1;
sn.oldest_known_referenced_xid = TXNID_NONE;
MALLOC_N(sn.n_children, sn.bp); MALLOC_N(sn.n_children, sn.bp);
MALLOC_N(sn.n_children-1, sn.childkeys); MALLOC_N(sn.n_children-1, sn.childkeys);
toku_fill_dbt(&sn.childkeys[0], toku_xmemdup("A", 2), 2); toku_fill_dbt(&sn.childkeys[0], toku_xmemdup("A", 2), 2);
...@@ -957,6 +962,7 @@ test_serialize_leaf_with_multiple_empty_basement_nodes(enum ftnode_verify_type b ...@@ -957,6 +962,7 @@ test_serialize_leaf_with_multiple_empty_basement_nodes(enum ftnode_verify_type b
sn.height = 0; sn.height = 0;
sn.n_children = 4; sn.n_children = 4;
sn.dirty = 1; sn.dirty = 1;
sn.oldest_known_referenced_xid = TXNID_NONE;
MALLOC_N(sn.n_children, sn.bp); MALLOC_N(sn.n_children, sn.bp);
MALLOC_N(sn.n_children-1, sn.childkeys); MALLOC_N(sn.n_children-1, sn.childkeys);
toku_fill_dbt(&sn.childkeys[0], toku_xmemdup("A", 2), 2); toku_fill_dbt(&sn.childkeys[0], toku_xmemdup("A", 2), 2);
...@@ -1077,6 +1083,7 @@ test_serialize_leaf(enum ftnode_verify_type bft, bool do_clone) { ...@@ -1077,6 +1083,7 @@ test_serialize_leaf(enum ftnode_verify_type bft, bool do_clone) {
sn.height = 0; sn.height = 0;
sn.n_children = 2; sn.n_children = 2;
sn.dirty = 1; sn.dirty = 1;
sn.oldest_known_referenced_xid = TXNID_NONE;
MALLOC_N(sn.n_children, sn.bp); MALLOC_N(sn.n_children, sn.bp);
MALLOC_N(1, sn.childkeys); MALLOC_N(1, sn.childkeys);
toku_fill_dbt(&sn.childkeys[0], toku_xmemdup("b", 2), 2); toku_fill_dbt(&sn.childkeys[0], toku_xmemdup("b", 2), 2);
...@@ -1219,6 +1226,7 @@ test_serialize_nonleaf(enum ftnode_verify_type bft, bool do_clone) { ...@@ -1219,6 +1226,7 @@ test_serialize_nonleaf(enum ftnode_verify_type bft, bool do_clone) {
sn.height = 1; sn.height = 1;
sn.n_children = 2; sn.n_children = 2;
sn.dirty = 1; sn.dirty = 1;
sn.oldest_known_referenced_xid = TXNID_NONE;
hello_string = toku_strdup("hello"); hello_string = toku_strdup("hello");
MALLOC_N(2, sn.bp); MALLOC_N(2, sn.bp);
MALLOC_N(1, sn.childkeys); MALLOC_N(1, sn.childkeys);
......
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