diff options
author | John Esmet <esmet@tokutek.com> | 2012-09-20 21:45:08 +0000 |
---|---|---|
committer | Yoni Fogel <yoni@tokutek.com> | 2013-04-17 00:01:08 -0400 |
commit | ca73e89ea29c9fa0c73dfbbf7dfdd0bb5718add0 (patch) | |
tree | 814dc7f0c4fd0abc550476f945e3abd9fe5a9f41 /ft/tests/cachetable-simple-pin-dep-nodes.cc | |
parent | c41d7a5f223446d415822125221754a472f458cf (diff) | |
download | mariadb-git-ca73e89ea29c9fa0c73dfbbf7dfdd0bb5718add0.tar.gz |
fixes #5423 fixes #5424 fixes #5503 fixes #5225 fsync always succeeds and returns void, no more ft panic or logger panic, no more impossible error paths
git-svn-id: file:///svn/toku/tokudb@48076 c7de825b-a66e-492c-adef-691d508d4ae1
Diffstat (limited to 'ft/tests/cachetable-simple-pin-dep-nodes.cc')
-rw-r--r-- | ft/tests/cachetable-simple-pin-dep-nodes.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ft/tests/cachetable-simple-pin-dep-nodes.cc b/ft/tests/cachetable-simple-pin-dep-nodes.cc index 7fbb5180127..b2fa44c6e1e 100644 --- a/ft/tests/cachetable-simple-pin-dep-nodes.cc +++ b/ft/tests/cachetable-simple-pin-dep-nodes.cc @@ -69,7 +69,7 @@ cachetable_test (bool write_first, bool write_second, bool start_checkpoint) { 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; @@ -107,7 +107,7 @@ cachetable_test (bool write_first, bool write_second, bool start_checkpoint) { // // should mark the v1 and v2 as pending // - r = toku_cachetable_begin_checkpoint(cp, NULL); assert(r==0); + toku_cachetable_begin_checkpoint(cp, NULL); } // // This call should cause a flush for both @@ -145,20 +145,17 @@ cachetable_test (bool write_first, bool write_second, bool start_checkpoint) { r = toku_test_cachetable_unpin(f1, make_blocknum(3), 3, CACHETABLE_CLEAN, make_pair_attr(8)); if (start_checkpoint) { - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, NULL ); - assert(r==0); } 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 |