diff options
Diffstat (limited to 'ft/tests/cachetable-clone-pin-nonblocking.cc')
| -rw-r--r-- | ft/tests/cachetable-clone-pin-nonblocking.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ft/tests/cachetable-clone-pin-nonblocking.cc b/ft/tests/cachetable-clone-pin-nonblocking.cc index 561c034593e..793516b5e5e 100644 --- a/ft/tests/cachetable-clone-pin-nonblocking.cc +++ b/ft/tests/cachetable-clone-pin-nonblocking.cc @@ -40,7 +40,7 @@ cachetable_test (enum cachetable_dirty dirty, bool cloneable) { const int test_limit = 12; int r; CACHETABLE ct; - r = toku_create_cachetable(&ct, test_limit, ZERO_LSN, NULL_LOGGER); assert(r == 0); + toku_cachetable_create(&ct, test_limit, ZERO_LSN, NULL_LOGGER); char fname1[] = __SRCFILE__ "test1.dat"; unlink(fname1); CACHEFILE f1; @@ -58,7 +58,7 @@ cachetable_test (enum cachetable_dirty dirty, bool cloneable) { // test that having a pin that passes false for may_modify_value does not stall behind checkpoint CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert_zero(r); + toku_cachetable_begin_checkpoint(cp, NULL); r = toku_cachetable_get_and_pin_nonblocking(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, PL_READ, NULL, NULL); assert(r == 0); r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, make_pair_attr(8)); @@ -73,20 +73,16 @@ cachetable_test (enum cachetable_dirty dirty, bool cloneable) { r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, make_pair_attr(8)); } - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, NULL ); - assert_zero(r); - toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); lazy_assert_zero(r); - - + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int |