Commit 19f913f8 authored by Christian Rober's avatar Christian Rober Committed by Yoni Fogel

[t:4759] Added extra non-flat 4.2 tree with nested transactions to get better...

[t:4759] Added extra non-flat 4.2 tree with nested transactions to get better coverage in brt-serialize.c and ule.c.

git-svn-id: file:///svn/toku/tokudb@42768 c7de825b-a66e-492c-adef-691d508d4ae1
parent a92b6238
...@@ -69,19 +69,19 @@ static int ...@@ -69,19 +69,19 @@ static int
insert_something(BRT t, CACHETABLE UU(ct), void *UU(extra)) insert_something(BRT t, CACHETABLE UU(ct), void *UU(extra))
{ {
assert(t); assert(t);
int r = 0;
return 0; unsigned int dummy_value = 1 << 31;
} DBT key;
DBT val;
static int toku_fill_dbt(&key, &dummy_value, sizeof(unsigned int));
scan_tree(BRT t, CACHETABLE UU(ct), void *UU(extra)) toku_fill_dbt(&val, &dummy_value, sizeof(unsigned int));
{ r = toku_brt_insert (t, &key, &val, 0);
assert(t); CKERR(r);
return 0; return 0;
} }
typedef int (*tree_cb)(BRT t, CACHETABLE ct, void *extra); typedef int (*tree_cb)(BRT t, CACHETABLE ct, void *extra);
static int static int
with_open_tree(const char *fname, tree_cb cb, void *cb_extra) with_open_tree(const char *fname, tree_cb cb, void *cb_extra)
{ {
...@@ -118,6 +118,7 @@ with_open_tree(const char *fname, tree_cb cb, void *cb_extra) ...@@ -118,6 +118,7 @@ with_open_tree(const char *fname, tree_cb cb, void *cb_extra)
#define TMPBRTFMT "%s-tmpdata.brt" #define TMPBRTFMT "%s-tmpdata.brt"
static const char *origbrt_5_0 = "upgrade_test_data.brt.5.0"; static const char *origbrt_5_0 = "upgrade_test_data.brt.5.0";
static const char *origbrt_4_2 = "upgrade_test_data.brt.4.2"; static const char *origbrt_4_2 = "upgrade_test_data.brt.4.2";
static const char *not_flat_4_2 = "upgrade_test_data.brt.4.2.not.flat";
static int static int
run_test(const char *prog, const char *origbrt) { run_test(const char *prog, const char *origbrt) {
...@@ -144,9 +145,6 @@ run_test(const char *prog, const char *origbrt) { ...@@ -144,9 +145,6 @@ run_test(const char *prog, const char *origbrt) {
fraction = 1.0; fraction = 1.0;
r = with_open_tree(tempbrt, do_hot_optimize, &fraction); r = with_open_tree(tempbrt, do_hot_optimize, &fraction);
CKERR(r); CKERR(r);
r = with_open_tree(tempbrt, scan_tree, NULL);
CKERR(r);
r = unlink(tempbrt); r = unlink(tempbrt);
CKERR(r); CKERR(r);
...@@ -163,5 +161,8 @@ test_main(int argc __attribute__((__unused__)), const char *argv[]) ...@@ -163,5 +161,8 @@ test_main(int argc __attribute__((__unused__)), const char *argv[])
r = run_test(argv[0], origbrt_4_2); r = run_test(argv[0], origbrt_4_2);
CKERR(r); CKERR(r);
r = run_test(argv[0], not_flat_4_2);
CKERR(r);
return r; return r;
} }
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