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 | |
| 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')
151 files changed, 791 insertions, 1094 deletions
diff --git a/ft/tests/benchmark-test.cc b/ft/tests/benchmark-test.cc index b5f15be1c92..674bef82671 100644 --- a/ft/tests/benchmark-test.cc +++ b/ft/tests/benchmark-test.cc @@ -35,14 +35,14 @@ static FT_HANDLE t; static void setup (void) { int r; unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &t, nodesize, basementnodesize, compression_method, ct, NULL_TXN, toku_builtin_compare_fun); assert(r==0); } static void toku_shutdown (void) { int r; r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } static void long_long_to_array (unsigned char *a, unsigned long long l) { int i; @@ -57,8 +57,7 @@ static void insert (long long v) { long_long_to_array(kc, v); memset(vc, 0, sizeof vc); long_long_to_array(vc, v); - int r = toku_ft_insert(t, toku_fill_dbt(&kt, kc, keysize), toku_fill_dbt(&vt, vc, valsize), 0); - CKERR(r); + toku_ft_insert(t, toku_fill_dbt(&kt, kc, keysize), toku_fill_dbt(&vt, vc, valsize), 0); if (do_verify) toku_cachetable_verify(ct); } diff --git a/ft/tests/bnc-insert-benchmark.cc b/ft/tests/bnc-insert-benchmark.cc index b12c98e6d7b..b6c76e03847 100644 --- a/ft/tests/bnc-insert-benchmark.cc +++ b/ft/tests/bnc-insert-benchmark.cc @@ -54,11 +54,11 @@ run_test(unsigned long eltsize, unsigned long nodesize, unsigned long repeat) for (unsigned int i = 0; i < repeat; ++i) { bnc = toku_create_empty_nl(); for (; toku_bnc_nbytesinbuf(bnc) <= nodesize; ++cur) { - r = toku_bnc_insert_msg(bnc, - &keys[cur % 1024], sizeof keys[cur % 1024], - vals[cur % 1024], eltsize - (sizeof keys[cur % 1024]), - FT_NONE, next_dummymsn(), xids_123, true, - NULL, long_key_cmp); assert_zero(r); + toku_bnc_insert_msg(bnc, + &keys[cur % 1024], sizeof keys[cur % 1024], + vals[cur % 1024], eltsize - (sizeof keys[cur % 1024]), + FT_NONE, next_dummymsn(), xids_123, true, + NULL, long_key_cmp); assert_zero(r); } nbytesinserted += toku_bnc_nbytesinbuf(bnc); destroy_nonleaf_childinfo(bnc); diff --git a/ft/tests/cachetable-3969.cc b/ft/tests/cachetable-3969.cc index cd63708b876..161698df4c9 100644 --- a/ft/tests/cachetable-3969.cc +++ b/ft/tests/cachetable-3969.cc @@ -23,7 +23,7 @@ run_test (void) { const int test_limit = 20; int r; ct = NULL; - 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); f1 = NULL; @@ -53,7 +53,7 @@ run_test (void) { // pin 1 and 2 r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v2, &s2, def_write_callback(NULL), def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_begin_checkpoint(cp, NULL); // mark nodes as pending a checkpoint, so that get_and_pin_nonblocking on block 1 will return TOKUDB_TRY_AGAIN r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_DIRTY, make_pair_attr(8)); assert(r==0); @@ -80,19 +80,16 @@ run_test (void) { ); assert(r==TOKUDB_TRY_AGAIN); - 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 diff --git a/ft/tests/cachetable-4357.cc b/ft/tests/cachetable-4357.cc index f7c51088f5a..fc28bbd46b0 100644 --- a/ft/tests/cachetable-4357.cc +++ b/ft/tests/cachetable-4357.cc @@ -31,7 +31,7 @@ cachetable_test (void) { 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); r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); @@ -61,10 +61,8 @@ cachetable_test (void) { 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 diff --git a/ft/tests/cachetable-4365.cc b/ft/tests/cachetable-4365.cc index fbcb4d6ec3d..3d3f811f62b 100644 --- a/ft/tests/cachetable-4365.cc +++ b/ft/tests/cachetable-4365.cc @@ -26,7 +26,7 @@ static void *pin_nonblocking(void *arg) { } static void *put_same_key(void *arg) { - int r = toku_cachetable_put( + toku_cachetable_put( f1, make_blocknum(1), toku_cachetable_hash(f1,make_blocknum(1)), @@ -35,7 +35,6 @@ static void *put_same_key(void *arg) { def_write_callback(NULL), put_callback_nop ); - assert(r==0); return arg; } @@ -53,7 +52,7 @@ cachetable_test (void) { 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); r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); @@ -87,10 +86,8 @@ cachetable_test (void) { r = toku_test_cachetable_unpin(f1, make_blocknum(1), toku_cachetable_hash(f1, make_blocknum(1)), CACHETABLE_CLEAN, make_pair_attr(2)); 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 diff --git a/ft/tests/cachetable-5097.cc b/ft/tests/cachetable-5097.cc index 06c4c8dda54..e08a6e27880 100644 --- a/ft/tests/cachetable-5097.cc +++ b/ft/tests/cachetable-5097.cc @@ -84,7 +84,7 @@ cachetable_test (void) { check_flush = false; dirty_flush_called = false; - r = toku_create_cachetable(&ct, test_limit, ZERO_LSN, NULL_LOGGER); assert(r == 0); + toku_cachetable_create(&ct, test_limit, ZERO_LSN, NULL_LOGGER); evictor_test_helpers::disable_ev_thread(&ct->ev); // disable eviction thread char fname1[] = __SRCFILE__ "test1.dat"; @@ -118,7 +118,7 @@ cachetable_test (void) { usleep(2*1024*1024); check_flush = true; - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); assert(dirty_flush_called); check_flush = false; @@ -129,8 +129,8 @@ cachetable_test (void) { toku_cachetable_verify(ct); - r = toku_cachefile_close(&f2, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); lazy_assert_zero(r); + r = toku_cachefile_close(&f2, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-all-write.cc b/ft/tests/cachetable-all-write.cc index b17a166c133..4e155b09f26 100644 --- a/ft/tests/cachetable-all-write.cc +++ b/ft/tests/cachetable-all-write.cc @@ -32,7 +32,7 @@ cachetable_test (void) { 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; @@ -52,8 +52,8 @@ cachetable_test (void) { //r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, 8); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-checkpoint-pending.cc b/ft/tests/cachetable-checkpoint-pending.cc index ac81329ae3a..daa24133208 100644 --- a/ft/tests/cachetable-checkpoint-pending.cc +++ b/ft/tests/cachetable-checkpoint-pending.cc @@ -105,7 +105,7 @@ static void checkpoint_pending(void) { if (verbose) { printf("%s:%d n=%d\n", __FUNCTION__, __LINE__, N); fflush(stdout); } const int test_limit = N; int r; - r = toku_create_cachetable(&ct, test_limit*sizeof(int), ZERO_LSN, NULL_LOGGER); assert(r == 0); + toku_cachetable_create(&ct, test_limit*sizeof(int), ZERO_LSN, NULL_LOGGER); char fname1[] = __SRCFILE__ "test1.dat"; r = unlink(fname1); if (r!=0) CKERR2(get_error_errno(), ENOENT); r = toku_cachetable_openf(&cf, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); @@ -119,7 +119,7 @@ static void checkpoint_pending(void) { values[i] = 42; CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); wc.flush_callback = flush; - r = toku_cachetable_put(cf, key, hi, &values[i], make_pair_attr(sizeof(int)), wc, put_callback_nop); + toku_cachetable_put(cf, key, hi, &values[i], make_pair_attr(sizeof(int)), wc, put_callback_nop); assert(r == 0); r = toku_test_cachetable_unpin(cf, key, hi, CACHETABLE_DIRTY, make_pair_attr(item_size)); @@ -153,8 +153,8 @@ static void checkpoint_pending(void) { assert(r == 0); assert(n_flush == 0 && n_write_me == 0 && n_keep_me == 0); - r = toku_cachefile_close(&cf, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&cf, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-checkpoint-pinned-nodes.cc b/ft/tests/cachetable-checkpoint-pinned-nodes.cc index 7836a9c72cd..c0aa645a2e9 100644 --- a/ft/tests/cachetable-checkpoint-pinned-nodes.cc +++ b/ft/tests/cachetable-checkpoint-pinned-nodes.cc @@ -68,7 +68,7 @@ cachetable_test (void) { const int test_limit = 20; 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; @@ -91,7 +91,7 @@ cachetable_test (void) { // flush will be called only for v1, because v1 is dirty // CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert(r == 0); + toku_cachetable_begin_checkpoint(cp, NULL); r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_DIRTY, make_pair_attr(8)); @@ -99,7 +99,7 @@ cachetable_test (void) { check_me = true; flush_called = false; - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, @@ -110,8 +110,8 @@ cachetable_test (void) { check_me = false; 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); } diff --git a/ft/tests/cachetable-checkpoint-prefetched-nodes.cc b/ft/tests/cachetable-checkpoint-prefetched-nodes.cc index d0d9828f3e3..68356ad5106 100644 --- a/ft/tests/cachetable-checkpoint-prefetched-nodes.cc +++ b/ft/tests/cachetable-checkpoint-prefetched-nodes.cc @@ -70,7 +70,7 @@ cachetable_test (void) { const int test_limit = 20; 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; @@ -93,12 +93,12 @@ cachetable_test (void) { // flush will be called only for v1, because v1 is dirty // CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert(r == 0); + toku_cachetable_begin_checkpoint(cp, NULL); check_me = true; flush_called = false; - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, @@ -111,8 +111,8 @@ cachetable_test (void) { 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); } diff --git a/ft/tests/cachetable-checkpoint-test.cc b/ft/tests/cachetable-checkpoint-test.cc index c0197ebf0fe..08227b527b7 100644 --- a/ft/tests/cachetable-checkpoint-test.cc +++ b/ft/tests/cachetable-checkpoint-test.cc @@ -60,7 +60,7 @@ static void cachetable_checkpoint_test(int n, enum cachetable_dirty dirty) { const int test_limit = n; 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; @@ -74,8 +74,7 @@ static void cachetable_checkpoint_test(int n, enum cachetable_dirty dirty) { uint32_t hi = toku_cachetable_hash(f1, key); CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); wc.flush_callback = flush; - r = toku_cachetable_put(f1, key, hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f1, key, hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); r = toku_test_cachetable_unpin(f1, key, hi, dirty, make_pair_attr(item_size)); assert(r == 0); @@ -132,8 +131,8 @@ static void cachetable_checkpoint_test(int n, enum cachetable_dirty dirty) { assert(r == 0); assert(n_flush == 0 && n_write_me == 0 && n_keep_me == 0); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0 ); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0 ); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-checkpointer-class.cc b/ft/tests/cachetable-checkpointer-class.cc index a7135790117..f7129d3edfa 100644 --- a/ft/tests/cachetable-checkpointer-class.cc +++ b/ft/tests/cachetable-checkpointer-class.cc @@ -34,8 +34,6 @@ struct checkpointer_test { // Description: // void checkpointer_test::test_begin_checkpoint() { - int r = 0; - cachefile_list cfl; cfl.init(); @@ -46,8 +44,7 @@ void checkpointer_test::test_begin_checkpoint() { m_cp.init(&ctbl.list, NULL, &ctbl.ev, &cfl); // 1. Call checkpoint with NO cachefiles. - r = m_cp.begin_checkpoint(); - if (r) { assert(!"CHECKPOINTER: Checkpoint with no cachefiles failed!\n"); } + m_cp.begin_checkpoint(); // 2. Call checkpoint with ONE cachefile. //cachefile cf; @@ -57,8 +54,7 @@ void checkpointer_test::test_begin_checkpoint() { m_cp.m_cf_list->m_head = &cf; create_dummy_functions(&cf); - r = m_cp.begin_checkpoint(); - if (r) { assert(!"CHECKPOINTER: Checkpoint with one cachefile failed!\n"); } + m_cp.begin_checkpoint(); assert(m_cp.m_checkpoint_num_files == 1); assert(cf.for_checkpoint == true); @@ -76,8 +72,7 @@ void checkpointer_test::test_begin_checkpoint() { } } - r = m_cp.begin_checkpoint(); - if (r) { assert(!"CHECKPOINTER: Multiple checkpoint failed!\n"); } + m_cp.begin_checkpoint(); assert(m_cp.m_checkpoint_num_files == count); for (uint32_t i = 0; i < count; ++i) { assert(cfs[i].for_checkpoint == true); @@ -171,8 +166,7 @@ void checkpointer_test::test_pending_bits() { m_cp.m_list->evict(pp); } - int r = ctbl.list.destroy(); - assert_zero(r); + ctbl.list.destroy(); m_cp.destroy(); } @@ -307,8 +301,7 @@ void checkpointer_test::test_end_checkpoint() { m_cp.m_list->evict(pp); } m_cp.destroy(); - int r = ctbl.list.destroy(); - assert_zero(r); + ctbl.list.destroy(); } diff --git a/ft/tests/cachetable-cleaner-checkpoint.cc b/ft/tests/cachetable-cleaner-checkpoint.cc index e2b569583e3..41672e14345 100644 --- a/ft/tests/cachetable-cleaner-checkpoint.cc +++ b/ft/tests/cachetable-cleaner-checkpoint.cc @@ -63,7 +63,7 @@ cachetable_test (void) { 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); r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); @@ -83,11 +83,11 @@ cachetable_test (void) { cleaner_called = false; CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_begin_checkpoint(cp, NULL); assert_zero(r); toku_cleaner_thread_for_test(ct); assert(cleaner_called); - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, @@ -96,8 +96,8 @@ cachetable_test (void) { 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); } diff --git a/ft/tests/cachetable-cleaner-checkpoint2.cc b/ft/tests/cachetable-cleaner-checkpoint2.cc index 2ae524e6985..c117c566583 100644 --- a/ft/tests/cachetable-cleaner-checkpoint2.cc +++ b/ft/tests/cachetable-cleaner-checkpoint2.cc @@ -63,7 +63,7 @@ cachetable_test (void) { 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); r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); @@ -83,11 +83,11 @@ cachetable_test (void) { cleaner_called = false; CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_begin_checkpoint(cp, NULL); assert_zero(r); toku_cleaner_thread_for_test(ct); assert(!cleaner_called); - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, @@ -96,8 +96,8 @@ cachetable_test (void) { 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); } diff --git a/ft/tests/cachetable-cleaner-thread-attrs-accumulate.cc b/ft/tests/cachetable-cleaner-thread-attrs-accumulate.cc index c7a9e334175..cef6667ec29 100644 --- a/ft/tests/cachetable-cleaner-thread-attrs-accumulate.cc +++ b/ft/tests/cachetable-cleaner-thread-attrs-accumulate.cc @@ -59,7 +59,7 @@ run_test (void) { int r; CACHETABLE ct; toku_mutex_init(&attr_mutex, NULL); - 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); @@ -126,8 +126,8 @@ run_test (void) { assert(STATUS_VALUE(CT_SIZE_CACHEPRESSURE) == (uint64_t) expect.cache_pressure_size); 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 diff --git a/ft/tests/cachetable-cleaner-thread-empty-cachetable.cc b/ft/tests/cachetable-cleaner-thread-empty-cachetable.cc index 08795c9274a..f7c4dbd0ff5 100644 --- a/ft/tests/cachetable-cleaner-thread-empty-cachetable.cc +++ b/ft/tests/cachetable-cleaner-thread-empty-cachetable.cc @@ -15,8 +15,8 @@ cachetable_test (void) { const int test_limit = 1000; int r; CACHETABLE ct; - r = toku_create_cachetable(&ct, test_limit, ZERO_LSN, NULL_LOGGER); assert(r == 0); - r = toku_set_cleaner_period(ct, 1); assert(r == 0); + toku_cachetable_create(&ct, test_limit, ZERO_LSN, NULL_LOGGER); + toku_set_cleaner_period(ct, 1); char fname1[] = __SRCFILE__ "test1.dat"; unlink(fname1); @@ -26,8 +26,8 @@ cachetable_test (void) { usleep(4000000); CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert(r == 0); - r = toku_cachetable_end_checkpoint( + toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_end_checkpoint( cp, NULL, NULL, @@ -36,8 +36,8 @@ cachetable_test (void) { 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 diff --git a/ft/tests/cachetable-cleaner-thread-everything-pinned.cc b/ft/tests/cachetable-cleaner-thread-everything-pinned.cc index 9f1953b5ce1..446d466c59f 100644 --- a/ft/tests/cachetable-cleaner-thread-everything-pinned.cc +++ b/ft/tests/cachetable-cleaner-thread-everything-pinned.cc @@ -27,14 +27,14 @@ run_test (void) { const int test_limit = 1000; int r; CACHETABLE ct; - r = toku_create_cachetable(&ct, test_limit, ZERO_LSN, NULL_LOGGER); assert(r == 0); - r = toku_set_cleaner_period(ct, 1); assert(r == 0); + toku_cachetable_create(&ct, test_limit, ZERO_LSN, NULL_LOGGER); + toku_set_cleaner_period(ct, 1); char fname1[] = __SRCFILE__ "test1.dat"; unlink(fname1); CACHEFILE f1; r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); - r = toku_set_cleaner_period(ct, 1); + toku_set_cleaner_period(ct, 1); assert(r==0); void* vs[8]; @@ -62,8 +62,8 @@ run_test (void) { } 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 diff --git a/ft/tests/cachetable-cleaner-thread-nothing-needs-flushing.cc b/ft/tests/cachetable-cleaner-thread-nothing-needs-flushing.cc index 5b271a09c20..856fac9d9d9 100644 --- a/ft/tests/cachetable-cleaner-thread-nothing-needs-flushing.cc +++ b/ft/tests/cachetable-cleaner-thread-nothing-needs-flushing.cc @@ -27,8 +27,8 @@ run_test (void) { const int test_limit = 1000; int r; CACHETABLE ct; - r = toku_create_cachetable(&ct, test_limit, ZERO_LSN, NULL_LOGGER); assert(r == 0); - r = toku_set_cleaner_period(ct, 1); assert(r == 0); + toku_cachetable_create(&ct, test_limit, ZERO_LSN, NULL_LOGGER); + toku_set_cleaner_period(ct, 1); char fname1[] = __SRCFILE__ "test1.dat"; unlink(fname1); @@ -60,8 +60,8 @@ run_test (void) { usleep(4000000); 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 diff --git a/ft/tests/cachetable-cleaner-thread-simple.cc b/ft/tests/cachetable-cleaner-thread-simple.cc index 046d05d8654..60e4c42b867 100644 --- a/ft/tests/cachetable-cleaner-thread-simple.cc +++ b/ft/tests/cachetable-cleaner-thread-simple.cc @@ -35,8 +35,8 @@ run_test (void) { const int test_limit = 1000; int r; CACHETABLE ct; - r = toku_create_cachetable(&ct, test_limit, ZERO_LSN, NULL_LOGGER); assert(r == 0); - r = toku_set_cleaner_period(ct, 1); assert(r == 0); + toku_cachetable_create(&ct, test_limit, ZERO_LSN, NULL_LOGGER); + toku_set_cleaner_period(ct, 1); my_cleaner_callback_called = false; char fname1[] = __SRCFILE__ "test1.dat"; @@ -80,8 +80,8 @@ run_test (void) { assert(my_cleaner_callback_called); 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 diff --git a/ft/tests/cachetable-clock-all-pinned.cc b/ft/tests/cachetable-clock-all-pinned.cc index ed048b216fa..171505f6e9a 100644 --- a/ft/tests/cachetable-clock-all-pinned.cc +++ b/ft/tests/cachetable-clock-all-pinned.cc @@ -12,7 +12,7 @@ cachetable_test (void) { int test_limit = 6; 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; @@ -20,14 +20,13 @@ cachetable_test (void) { // test that putting something too big in the cachetable works fine CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); - r = toku_cachetable_put(f1, make_blocknum(num_entries+1), num_entries+1, NULL, make_pair_attr(test_limit*2), wc, put_callback_nop); - assert(r==0); + toku_cachetable_put(f1, make_blocknum(num_entries+1), num_entries+1, NULL, make_pair_attr(test_limit*2), wc, put_callback_nop); r = toku_test_cachetable_unpin(f1, make_blocknum(num_entries+1), num_entries+1, CACHETABLE_DIRTY, make_pair_attr(test_limit*2)); assert(r==0); for (int64_t i = 0; i < num_entries; i++) { - r = toku_cachetable_put(f1, make_blocknum(i), i, NULL, make_pair_attr(1), wc, put_callback_nop); + toku_cachetable_put(f1, make_blocknum(i), i, NULL, make_pair_attr(1), wc, put_callback_nop); assert(toku_cachefile_count_pinned(f1, 0) == (i+1)); } for (int64_t i = 0; i < num_entries; i++) { @@ -35,8 +34,8 @@ cachetable_test (void) { } - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0 ); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0 ); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-clock-eviction.cc b/ft/tests/cachetable-clock-eviction.cc index 49ee874c243..730980eac46 100644 --- a/ft/tests/cachetable-clock-eviction.cc +++ b/ft/tests/cachetable-clock-eviction.cc @@ -58,7 +58,7 @@ cachetable_test (void) { num_entries = 0; 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; @@ -89,7 +89,7 @@ cachetable_test (void) { } flush_may_occur = true; expected_flushed_key = 4; - r = toku_cachetable_put(f1, make_blocknum(5), 5, NULL, make_pair_attr(4), wc, put_callback_nop); + toku_cachetable_put(f1, make_blocknum(5), 5, NULL, make_pair_attr(4), wc, put_callback_nop); ct->ev.signal_eviction_thread(); usleep(1*1024*1024); @@ -100,8 +100,8 @@ cachetable_test (void) { usleep(1*1024*1024); check_flush = false; - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0 ); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0 ); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-clock-eviction2.cc b/ft/tests/cachetable-clock-eviction2.cc index 902fac2848b..084b76d63ba 100644 --- a/ft/tests/cachetable-clock-eviction2.cc +++ b/ft/tests/cachetable-clock-eviction2.cc @@ -99,7 +99,7 @@ cachetable_test (void) { const int test_limit = 16; 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; @@ -142,7 +142,7 @@ cachetable_test (void) { CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); wc.flush_callback = other_flush; wc.pe_callback = other_pe_callback; - r = toku_cachetable_put(f1, make_blocknum(5), 5, NULL, make_pair_attr(4), wc, put_callback_nop); + toku_cachetable_put(f1, make_blocknum(5), 5, NULL, make_pair_attr(4), wc, put_callback_nop); ct->ev.signal_eviction_thread(); usleep(1*1024*1024); flush_may_occur = true; @@ -152,8 +152,8 @@ cachetable_test (void) { assert(expected_bytes_to_free == 0); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-clock-eviction3.cc b/ft/tests/cachetable-clock-eviction3.cc index 6b795ebc0b4..acf8b05f5b1 100644 --- a/ft/tests/cachetable-clock-eviction3.cc +++ b/ft/tests/cachetable-clock-eviction3.cc @@ -115,7 +115,7 @@ cachetable_test (void) { const int test_limit = 20; 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); evictor_test_helpers::set_hysteresis_limits(&ct->ev, test_limit, 100*test_limit); evictor_test_helpers::disable_ev_thread(&ct->ev); char fname1[] = __SRCFILE__ "test1.dat"; @@ -165,7 +165,7 @@ cachetable_test (void) { wc.flush_callback = other_flush; wc.pe_est_callback = pe_est_callback; wc.pe_callback = other_pe_callback; - r = toku_cachetable_put(f1, make_blocknum(5), 5, NULL, make_pair_attr(4), wc, put_callback_nop); + toku_cachetable_put(f1, make_blocknum(5), 5, NULL, make_pair_attr(4), wc, put_callback_nop); flush_may_occur = true; r = toku_test_cachetable_unpin(f1, make_blocknum(5), 5, CACHETABLE_CLEAN, make_pair_attr(8)); ct->ev.signal_eviction_thread(); @@ -180,8 +180,8 @@ cachetable_test (void) { assert(expected_bytes_to_free == 3); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-clock-eviction4.cc b/ft/tests/cachetable-clock-eviction4.cc index 61d52d5f358..4255e7a5d54 100644 --- a/ft/tests/cachetable-clock-eviction4.cc +++ b/ft/tests/cachetable-clock-eviction4.cc @@ -95,7 +95,7 @@ cachetable_test (void) { num_entries = 0; 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; @@ -128,14 +128,14 @@ cachetable_test (void) { } flush_may_occur = true; expected_flushed_key = 4; - r = toku_cachetable_put(f1, make_blocknum(5), 5, NULL, make_pair_attr(4), wc, put_callback_nop); + toku_cachetable_put(f1, make_blocknum(5), 5, NULL, make_pair_attr(4), wc, put_callback_nop); flush_may_occur = true; expected_flushed_key = 5; r = toku_test_cachetable_unpin(f1, make_blocknum(5), 5, CACHETABLE_CLEAN, make_pair_attr(4)); check_flush = false; - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0 ); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0 ); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-clone-checkpoint.cc b/ft/tests/cachetable-clone-checkpoint.cc index 8551340b01c..9828d9d1be8 100644 --- a/ft/tests/cachetable-clone-checkpoint.cc +++ b/ft/tests/cachetable-clone-checkpoint.cc @@ -42,13 +42,12 @@ flush ( static void *run_end_checkpoint(void *arg) { CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - int r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, NULL ); - assert_zero(r); return arg; } @@ -60,7 +59,7 @@ cachetable_test (void) { const int test_limit = 200; int r; ct = NULL; - 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; @@ -77,7 +76,7 @@ cachetable_test (void) { r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_DIRTY, make_pair_attr(8)); assert_zero(r); CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_begin_checkpoint(cp, NULL); clone_flush_started = false; @@ -100,8 +99,8 @@ cachetable_test (void) { assert(clone_flush_started && clone_flush_completed); 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 diff --git a/ft/tests/cachetable-clone-partial-fetch-pinned-node.cc b/ft/tests/cachetable-clone-partial-fetch-pinned-node.cc index 776648e165f..50819c5f213 100644 --- a/ft/tests/cachetable-clone-partial-fetch-pinned-node.cc +++ b/ft/tests/cachetable-clone-partial-fetch-pinned-node.cc @@ -53,7 +53,7 @@ cachetable_test (void) { 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; @@ -73,7 +73,7 @@ cachetable_test (void) { flush_completed = false; CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert_zero(r); + toku_cachetable_begin_checkpoint(cp, NULL); assert_zero(r); r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); assert_zero(r); @@ -91,7 +91,7 @@ cachetable_test (void) { assert_zero(r); assert(pf_called); - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, @@ -101,8 +101,8 @@ cachetable_test (void) { 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); } diff --git a/ft/tests/cachetable-clone-partial-fetch.cc b/ft/tests/cachetable-clone-partial-fetch.cc index 1792c95767a..9899f8f55f4 100644 --- a/ft/tests/cachetable-clone-partial-fetch.cc +++ b/ft/tests/cachetable-clone-partial-fetch.cc @@ -58,7 +58,7 @@ cachetable_test (void) { 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; @@ -78,7 +78,7 @@ cachetable_test (void) { flush_completed = false; CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert_zero(r); + toku_cachetable_begin_checkpoint(cp, NULL); assert_zero(r); r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); assert_zero(r); @@ -92,7 +92,7 @@ cachetable_test (void) { assert_zero(r); assert(pf_called); - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, @@ -102,8 +102,8 @@ cachetable_test (void) { 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); } 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 diff --git a/ft/tests/cachetable-clone-unpin-remove.cc b/ft/tests/cachetable-clone-unpin-remove.cc index 68d5f5b82fe..7f0e1487cbc 100644 --- a/ft/tests/cachetable-clone-unpin-remove.cc +++ b/ft/tests/cachetable-clone-unpin-remove.cc @@ -51,7 +51,7 @@ cachetable_test (void) { 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; @@ -72,7 +72,7 @@ cachetable_test (void) { flush_completed = false; evict_called = false; CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert_zero(r); + toku_cachetable_begin_checkpoint(cp, NULL); assert_zero(r); r = toku_cachetable_get_and_pin(f1, make_blocknum(1), toku_cachetable_hash(f1, make_blocknum(1)), &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); assert_zero(r); @@ -80,7 +80,7 @@ cachetable_test (void) { assert_zero(r); - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, @@ -90,8 +90,8 @@ cachetable_test (void) { 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); } diff --git a/ft/tests/cachetable-count-pinned-test.cc b/ft/tests/cachetable-count-pinned-test.cc index 47edc92c6f3..291b30d378c 100644 --- a/ft/tests/cachetable-count-pinned-test.cc +++ b/ft/tests/cachetable-count-pinned-test.cc @@ -12,7 +12,7 @@ cachetable_count_pinned_test (int n) { const int test_limit = 2*n; 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; @@ -23,8 +23,7 @@ cachetable_count_pinned_test (int n) { uint32_t hi; hi = toku_cachetable_hash(f1, make_blocknum(i)); CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); - r = toku_cachetable_put(f1, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f1, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); assert(toku_cachefile_count_pinned(f1, 0) == i); void *v; @@ -48,8 +47,8 @@ cachetable_count_pinned_test (int n) { assert(toku_cachefile_count_pinned(f1, 1) == 0); toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-debug-test.cc b/ft/tests/cachetable-debug-test.cc index a7132a99543..b8548c47a2e 100644 --- a/ft/tests/cachetable-debug-test.cc +++ b/ft/tests/cachetable-debug-test.cc @@ -11,7 +11,7 @@ cachetable_debug_test (int n) { const int test_limit = n; 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; @@ -30,8 +30,7 @@ cachetable_debug_test (int n) { uint32_t hi; hi = toku_cachetable_hash(f1, make_blocknum(i)); CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); - r = toku_cachetable_put(f1, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(item_size), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f1, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(item_size), wc, put_callback_nop); void *v; int dirty; long long pinned; long pair_size; r = toku_cachetable_get_key_state(ct, make_blocknum(i), f1, &v, &dirty, &pinned, &pair_size); @@ -53,8 +52,8 @@ cachetable_debug_test (int n) { } toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-eviction-close-test.cc b/ft/tests/cachetable-eviction-close-test.cc index 985bc552ae6..c3e1b349d92 100644 --- a/ft/tests/cachetable-eviction-close-test.cc +++ b/ft/tests/cachetable-eviction-close-test.cc @@ -70,7 +70,7 @@ static void cachetable_eviction_full_test (void) { 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; @@ -132,8 +132,8 @@ static void cachetable_eviction_full_test (void) { // close with the eviction in progress. the close should block until // all of the reads and writes are complete. - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-eviction-close-test2.cc b/ft/tests/cachetable-eviction-close-test2.cc index 72a841267b9..42bb6bb75cd 100644 --- a/ft/tests/cachetable-eviction-close-test2.cc +++ b/ft/tests/cachetable-eviction-close-test2.cc @@ -82,7 +82,7 @@ static void cachetable_eviction_full_test (void) { 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; @@ -146,8 +146,8 @@ static void cachetable_eviction_full_test (void) { // close with the eviction in progress. the close should block until // all of the reads and writes are complete. - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-eviction-getandpin-test.cc b/ft/tests/cachetable-eviction-getandpin-test.cc index 9a26b17bb80..f2d77cd7d3f 100644 --- a/ft/tests/cachetable-eviction-getandpin-test.cc +++ b/ft/tests/cachetable-eviction-getandpin-test.cc @@ -38,7 +38,7 @@ static void cachetable_predef_fetch_maybegetandpin_test (void) { 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); evictor_test_helpers::disable_ev_thread(&ct->ev); char fname1[] = __SRCFILE__ "test1.dat"; unlink(fname1); @@ -119,8 +119,8 @@ static void cachetable_predef_fetch_maybegetandpin_test (void) { assert(r == 0); toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-eviction-getandpin-test2.cc b/ft/tests/cachetable-eviction-getandpin-test2.cc index a411c522c03..4e5f5247c7d 100644 --- a/ft/tests/cachetable-eviction-getandpin-test2.cc +++ b/ft/tests/cachetable-eviction-getandpin-test2.cc @@ -44,7 +44,7 @@ static void cachetable_prefetch_maybegetandpin_test (void) { 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); evictor_test_helpers::disable_ev_thread(&ct->ev); char fname1[] = __SRCFILE__ "test1.dat"; unlink(fname1); @@ -148,8 +148,8 @@ static void cachetable_prefetch_maybegetandpin_test (void) { assert(r == 0); toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-fd-test.cc b/ft/tests/cachetable-fd-test.cc index e4a6bbcac37..ae972938271 100644 --- a/ft/tests/cachetable-fd-test.cc +++ b/ft/tests/cachetable-fd-test.cc @@ -12,7 +12,7 @@ cachetable_fd_test (void) { const int test_limit = 1; 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 cf; @@ -44,8 +44,8 @@ cachetable_fd_test (void) { r = toku_cachefile_of_filenum(ct, fn, &newcf); assert(r == ENOENT); - r = toku_cachefile_close(&cf, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&cf, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-fetch-inducing-evictor.cc b/ft/tests/cachetable-fetch-inducing-evictor.cc index 174b2d51be0..95fe02f7b10 100644 --- a/ft/tests/cachetable-fetch-inducing-evictor.cc +++ b/ft/tests/cachetable-fetch-inducing-evictor.cc @@ -28,7 +28,7 @@ cachetable_test (enum pin_evictor_test_type test_type, bool nonblocking) { const int test_limit = 7; 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); evictor_test_helpers::set_hysteresis_limits(&ct->ev, test_limit, test_limit); evictor_test_helpers::disable_ev_thread(&ct->ev); char fname1[] = __SRCFILE__ "test1.dat"; @@ -100,8 +100,8 @@ cachetable_test (enum pin_evictor_test_type test_type, bool nonblocking) { } 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 diff --git a/ft/tests/cachetable-flush-during-cleaner.cc b/ft/tests/cachetable-flush-during-cleaner.cc index 7bcbac2596f..134bf3d0e6f 100644 --- a/ft/tests/cachetable-flush-during-cleaner.cc +++ b/ft/tests/cachetable-flush-during-cleaner.cc @@ -25,8 +25,8 @@ cachetable_test (void) { const int test_limit = 400; int r; CACHETABLE ct; - r = toku_create_cachetable(&ct, test_limit, ZERO_LSN, NULL_LOGGER); assert(r == 0); - r = toku_set_cleaner_period(ct, 1); assert(r == 0); + toku_cachetable_create(&ct, test_limit, ZERO_LSN, NULL_LOGGER); + toku_set_cleaner_period(ct, 1); char fname1[] = __SRCFILE__ "test1.dat"; unlink(fname1); @@ -43,12 +43,11 @@ cachetable_test (void) { r = toku_cachetable_get_and_pin(f1, make_blocknum(i), i, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); r = toku_test_cachetable_unpin(f1, make_blocknum(i), i, CACHETABLE_DIRTY, make_pair_attr(8)); } - r = toku_cachefile_flush(f1); - assert(r == 0); + toku_cachefile_flush(f1); } 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); } diff --git a/ft/tests/cachetable-flush-test.cc b/ft/tests/cachetable-flush-test.cc index 20d396cf1b6..f39cd357212 100644 --- a/ft/tests/cachetable-flush-test.cc +++ b/ft/tests/cachetable-flush-test.cc @@ -12,7 +12,7 @@ test_cachetable_def_flush (int n) { const int test_limit = 2*n; 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; @@ -28,13 +28,11 @@ test_cachetable_def_flush (int n) { for (i=0; i<n; i++) { uint32_t hi; hi = toku_cachetable_hash(f1, make_blocknum(i)); - r = toku_cachetable_put(f1, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f1, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); r = toku_test_cachetable_unpin(f1, make_blocknum(i), hi, CACHETABLE_CLEAN, make_pair_attr(1)); assert(r == 0); hi = toku_cachetable_hash(f2, make_blocknum(i)); - r = toku_cachetable_put(f2, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f2, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); r = toku_test_cachetable_unpin(f2, make_blocknum(i), hi, CACHETABLE_CLEAN, make_pair_attr(1)); assert(r == 0); } @@ -57,7 +55,7 @@ test_cachetable_def_flush (int n) { } // def_flush - r = toku_cachefile_flush(f1); assert(r == 0); + toku_cachefile_flush(f1); toku_cachefile_verify(f1); // verify keys do not exist in f1 but do exist in f2 @@ -74,9 +72,9 @@ test_cachetable_def_flush (int n) { assert(r == 0); } - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachefile_close(&f2, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + r = toku_cachefile_close(&f2, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-getandpin-test.cc b/ft/tests/cachetable-getandpin-test.cc index 7f6edc4f068..305712267eb 100644 --- a/ft/tests/cachetable-getandpin-test.cc +++ b/ft/tests/cachetable-getandpin-test.cc @@ -49,7 +49,7 @@ cachetable_getandpin_test (int n) { const int test_limit = 1024*1024; 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__ "test_getandpin.dat"; unlink(fname1); CACHEFILE f1; @@ -73,8 +73,8 @@ cachetable_getandpin_test (int n) { } toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-kibbutz_and_flush_cachefile.cc b/ft/tests/cachetable-kibbutz_and_flush_cachefile.cc index e280034ae12..91b50603df6 100644 --- a/ft/tests/cachetable-kibbutz_and_flush_cachefile.cc +++ b/ft/tests/cachetable-kibbutz_and_flush_cachefile.cc @@ -29,7 +29,7 @@ run_test (void) { 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; @@ -43,16 +43,16 @@ run_test (void) { r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); foo = false; cachefile_kibbutz_enq(f1, kibbutz_work, f1); - r = toku_cachefile_flush(f1); assert(r == 0); + toku_cachefile_flush(f1); assert(foo); assert(f1); r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); foo = false; cachefile_kibbutz_enq(f1, kibbutz_work, f1); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); assert(foo); - r = toku_cachetable_close(&ct); lazy_assert_zero(r); + toku_cachetable_close(&ct); } diff --git a/ft/tests/cachetable-partial-fetch.cc b/ft/tests/cachetable-partial-fetch.cc index fa237c9e40a..c2ccb08a64d 100644 --- a/ft/tests/cachetable-partial-fetch.cc +++ b/ft/tests/cachetable-partial-fetch.cc @@ -81,7 +81,7 @@ cachetable_test (void) { int r; CACHETABLE ct; bool doing_prefetch = false; - 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; @@ -128,7 +128,7 @@ cachetable_test (void) { r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, make_pair_attr(8)); // close and reopen cachefile so we can do some simple prefetch tests - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); // // verify that a prefetch of the node will succeed @@ -176,8 +176,8 @@ cachetable_test (void) { 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); } diff --git a/ft/tests/cachetable-pin-checkpoint.cc b/ft/tests/cachetable-pin-checkpoint.cc index e12c96929f3..717b83edd50 100644 --- a/ft/tests/cachetable-pin-checkpoint.cc +++ b/ft/tests/cachetable-pin-checkpoint.cc @@ -269,16 +269,14 @@ static void *checkpoints(void *arg) { // // now run a checkpoint // - int r; CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert(r == 0); - r = toku_cachetable_end_checkpoint( + toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_end_checkpoint( cp, NULL, NULL, NULL ); - assert(r==0); assert (sum==0); for (int i = 0; i < NUM_ELEMENTS; i++) { sum += checkpointed_data[i]; @@ -290,18 +288,12 @@ static void *checkpoints(void *arg) { return arg; } -static int +static void test_begin_checkpoint ( LSN UU(checkpoint_lsn), void* UU(header_v)) { memcpy(checkpointed_data, data, sizeof(int64_t)*NUM_ELEMENTS); - return 0; -} - -static int -dummy_int_checkpoint_userdata(CACHEFILE UU(cf), int UU(n), void* UU(extra)) { - return 0; } static void sum_vals(void) { @@ -336,7 +328,7 @@ cachetable_test (void) { int r; - 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); r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); @@ -344,13 +336,13 @@ cachetable_test (void) { toku_cachefile_set_userdata( f1, NULL, - &dummy_log_fassociate, - &dummy_log_rollback, - &dummy_close_usr, - dummy_int_checkpoint_userdata, - test_begin_checkpoint, // called in begin_checkpoint - dummy_int_checkpoint_userdata, - &dummy_note_pin, + &dummy_log_fassociate, + &dummy_log_rollback, + &dummy_close_usr, + &dummy_chckpnt_usr, + &test_begin_checkpoint, + &dummy_end, + &dummy_note_pin, &dummy_note_unpin ); @@ -389,8 +381,8 @@ cachetable_test (void) { } 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); sum_vals(); if (verbose) printf("num_checkpoints %d\n", num_checkpoints); diff --git a/ft/tests/cachetable-pin-nonblocking-checkpoint-clean.cc b/ft/tests/cachetable-pin-nonblocking-checkpoint-clean.cc index 76a15247ac9..205ea5e54db 100644 --- a/ft/tests/cachetable-pin-nonblocking-checkpoint-clean.cc +++ b/ft/tests/cachetable-pin-nonblocking-checkpoint-clean.cc @@ -15,7 +15,7 @@ run_test (void) { const int test_limit = 20; int r; ct = NULL; - 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); f1 = NULL; @@ -37,7 +37,7 @@ run_test (void) { r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v2, &s2, def_write_callback(NULL), def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_begin_checkpoint(cp, NULL); // mark nodes as pending a checkpoint, so that get_and_pin_nonblocking on block 1 will return TOKUDB_TRY_AGAIN r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, make_pair_attr(8)); assert(r==0); @@ -58,7 +58,7 @@ run_test (void) { assert(r==0); r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, make_pair_attr(8)); assert(r==0); - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, @@ -67,8 +67,8 @@ run_test (void) { 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); } diff --git a/ft/tests/cachetable-prefetch-checkpoint-test.cc b/ft/tests/cachetable-prefetch-checkpoint-test.cc index ceea32d3d52..6d5268d1654 100644 --- a/ft/tests/cachetable-prefetch-checkpoint-test.cc +++ b/ft/tests/cachetable-prefetch-checkpoint-test.cc @@ -68,7 +68,7 @@ static void cachetable_prefetch_checkpoint_test(int n, enum cachetable_dirty dir CACHETABLE ct; CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); wc.flush_callback = flush; - 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; @@ -88,8 +88,7 @@ static void cachetable_prefetch_checkpoint_test(int n, enum cachetable_dirty dir for (i=0; i<n; i++) { CACHEKEY key = make_blocknum(i); uint32_t hi = toku_cachetable_hash(f1, key); - r = toku_cachetable_put(f1, key, hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f1, key, hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); r = toku_test_cachetable_unpin(f1, key, hi, dirty, make_pair_attr(item_size)); assert(r == 0); @@ -143,8 +142,8 @@ static void cachetable_prefetch_checkpoint_test(int n, enum cachetable_dirty dir assert(r == 0); assert(n_flush == 0 && n_write_me == 0 && n_keep_me == 0); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-prefetch-close-leak-test.cc b/ft/tests/cachetable-prefetch-close-leak-test.cc index 35fabf9d66b..991d098803f 100644 --- a/ft/tests/cachetable-prefetch-close-leak-test.cc +++ b/ft/tests/cachetable-prefetch-close-leak-test.cc @@ -54,7 +54,7 @@ static void cachetable_prefetch_close_leak_test (void) { const int test_limit = 1; 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; @@ -70,8 +70,8 @@ static void cachetable_prefetch_close_leak_test (void) { // close with the prefetch in progress. the close should block until // all of the reads and writes are complete. - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-prefetch-close-test.cc b/ft/tests/cachetable-prefetch-close-test.cc index 16d1c5e8308..5dd8f33890d 100644 --- a/ft/tests/cachetable-prefetch-close-test.cc +++ b/ft/tests/cachetable-prefetch-close-test.cc @@ -56,7 +56,7 @@ static void cachetable_prefetch_full_test (bool partial_fetch) { expect_pf = false; 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; @@ -97,8 +97,8 @@ static void cachetable_prefetch_full_test (bool partial_fetch) { // close with the prefetch in progress. the close should block until // all of the reads and writes are complete. - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-prefetch-flowcontrol-test.cc b/ft/tests/cachetable-prefetch-flowcontrol-test.cc index 346fd1325ed..4d83eb1551e 100644 --- a/ft/tests/cachetable-prefetch-flowcontrol-test.cc +++ b/ft/tests/cachetable-prefetch-flowcontrol-test.cc @@ -67,7 +67,7 @@ fetch (CACHEFILE f __attribute__((__unused__)), static void cachetable_prefetch_flowcontrol_test (int cachetable_size_limit) { int r; CACHETABLE ct; - r = toku_create_cachetable(&ct, cachetable_size_limit, ZERO_LSN, NULL_LOGGER); assert(r == 0); + toku_cachetable_create(&ct, cachetable_size_limit, ZERO_LSN, NULL_LOGGER); evictor_test_helpers::set_hysteresis_limits(&ct->ev, cachetable_size_limit, cachetable_size_limit); evictor_test_helpers::disable_ev_thread(&ct->ev); char fname1[] = __SRCFILE__ "test1.dat"; @@ -103,11 +103,10 @@ static void cachetable_prefetch_flowcontrol_test (int cachetable_size_limit) { } - char *error_string; - r = toku_cachefile_close(&f1, &error_string, false, ZERO_LSN); assert(r == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); if (verbose) printf("%s:%d 0x%x 0x%x\n", __FUNCTION__, __LINE__, evicted_keys, (1 << (2*cachetable_size_limit))-1); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-prefetch-getandpin-test.cc b/ft/tests/cachetable-prefetch-getandpin-test.cc index 58d45094511..f48a85375c2 100644 --- a/ft/tests/cachetable-prefetch-getandpin-test.cc +++ b/ft/tests/cachetable-prefetch-getandpin-test.cc @@ -77,7 +77,7 @@ static void cachetable_prefetch_maybegetandpin_test (bool do_partial_fetch) { const int test_limit = 2; 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; @@ -137,8 +137,8 @@ static void cachetable_prefetch_maybegetandpin_test (bool do_partial_fetch) { assert(r == 0); toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-prefetch-maybegetandpin-test.cc b/ft/tests/cachetable-prefetch-maybegetandpin-test.cc index 539da656c7d..a311aabca77 100644 --- a/ft/tests/cachetable-prefetch-maybegetandpin-test.cc +++ b/ft/tests/cachetable-prefetch-maybegetandpin-test.cc @@ -34,7 +34,7 @@ static void cachetable_prefetch_maybegetandpin_test (void) { const int test_limit = 1; 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; @@ -63,8 +63,8 @@ static void cachetable_prefetch_maybegetandpin_test (void) { assert(r == 0); toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-prefetch2-test.cc b/ft/tests/cachetable-prefetch2-test.cc index c7a894abe31..7d4e21f3ec0 100644 --- a/ft/tests/cachetable-prefetch2-test.cc +++ b/ft/tests/cachetable-prefetch2-test.cc @@ -37,7 +37,7 @@ static void cachetable_prefetch_maybegetandpin_test (void) { const int test_limit = 1; 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; @@ -73,8 +73,8 @@ static void cachetable_prefetch_maybegetandpin_test (void) { assert(r == 0); toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-put-checkpoint.cc b/ft/tests/cachetable-put-checkpoint.cc index 9a59e631402..6071a8bf31a 100644 --- a/ft/tests/cachetable-put-checkpoint.cc +++ b/ft/tests/cachetable-put-checkpoint.cc @@ -315,7 +315,7 @@ static void merge_and_split_child( CACHEKEY new_key; uint32_t new_fullhash; int64_t* XMALLOC(data_val); - r = toku_cachetable_put_with_dep_pairs( + toku_cachetable_put_with_dep_pairs( f1, get_data, data_val, @@ -398,16 +398,14 @@ static void *checkpoints(void *arg) { // // now run a checkpoint // - int r; CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert(r == 0); - r = toku_cachetable_end_checkpoint( + toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_end_checkpoint( cp, NULL, NULL, NULL ); - assert(r==0); assert (sum==0); for (int i = 0; i < NUM_ELEMENTS; i++) { if (checkpointed_data[i] != INT64_MAX) { @@ -420,13 +418,12 @@ static void *checkpoints(void *arg) { return arg; } -static int +static void test_begin_checkpoint ( LSN UU(checkpoint_lsn), void* UU(header_v)) { memcpy(checkpointed_data, data, sizeof(int64_t)*NUM_ELEMENTS); - return 0; } static int @@ -470,7 +467,7 @@ cachetable_test (void) { int r; - 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__ "test-put-checkpoint.dat"; unlink(fname1); r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); @@ -481,9 +478,9 @@ cachetable_test (void) { &dummy_log_fassociate, &dummy_log_rollback, &dummy_close_usr, - dummy_int_checkpoint_userdata, - test_begin_checkpoint, // called in begin_checkpoint dummy_int_checkpoint_userdata, + test_begin_checkpoint, // called in begin_checkpoint + &dummy_end, &dummy_note_pin, &dummy_note_unpin ); @@ -523,8 +520,8 @@ cachetable_test (void) { } 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); sum_vals(); if (verbose) printf("num_checkpoints %d\n", num_checkpoints); diff --git a/ft/tests/cachetable-put-test.cc b/ft/tests/cachetable-put-test.cc index ae5dd8e7be7..0acd16f2042 100644 --- a/ft/tests/cachetable-put-test.cc +++ b/ft/tests/cachetable-put-test.cc @@ -11,7 +11,7 @@ cachetable_put_test (int n) { const int test_limit = 2*n; 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; @@ -22,8 +22,7 @@ cachetable_put_test (int n) { uint32_t hi; hi = toku_cachetable_hash(f1, make_blocknum(i)); CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); - r = toku_cachetable_put(f1, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f1, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); assert(toku_cachefile_count_pinned(f1, 0) == i); void *v; @@ -45,8 +44,8 @@ cachetable_put_test (int n) { assert(toku_cachefile_count_pinned(f1, 1) == 0); toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-scan.cc b/ft/tests/cachetable-scan.cc index bcda0cc0660..64b9e868932 100644 --- a/ft/tests/cachetable-scan.cc +++ b/ft/tests/cachetable-scan.cc @@ -59,7 +59,7 @@ CACHEFILE f; static void open_file (void ) { int r; - r = toku_create_cachetable(&t, KEYLIMIT, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&t, KEYLIMIT, ZERO_LSN, NULL_LOGGER); r = toku_cachetable_openf(&f, t, fname, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r==0); } @@ -75,7 +75,7 @@ static void writeit (void) { for (j=0; j<BLOCKSIZE; j++) ((char*)buf)[j]=(char)((i+j)%256); CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); wc.flush_callback = f_flush; - r = toku_cachetable_put(f, key, fullhash, buf, make_pair_attr(BLOCKSIZE), wc, put_callback_nop); assert(r==0); + toku_cachetable_put(f, key, fullhash, buf, make_pair_attr(BLOCKSIZE), wc, put_callback_nop); r = toku_test_cachetable_unpin(f, key, fullhash, CACHETABLE_CLEAN, make_pair_attr(BLOCKSIZE)); assert(r==0); } gettimeofday(&end, 0); @@ -101,8 +101,8 @@ static void readit (void) { r=toku_cachetable_get_and_pin(f, key, fullhash, &block, ¤t_size, wc, f_fetch, def_pf_req_callback, def_pf_callback, true, 0); assert(r==0); r=toku_test_cachetable_unpin(f, key, fullhash, CACHETABLE_CLEAN, make_pair_attr(BLOCKSIZE)); assert(r==0); } - r = toku_cachefile_close(&f, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&t); assert(r == 0); + r = toku_cachefile_close(&f, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&t); gettimeofday(&end, 0); toku_os_get_process_times(&end_usertime, &end_systime); double diff = toku_tdiff(&end, &start); diff --git a/ft/tests/cachetable-simple-clone.cc b/ft/tests/cachetable-simple-clone.cc index c3aac059117..969ddbf236b 100644 --- a/ft/tests/cachetable-simple-clone.cc +++ b/ft/tests/cachetable-simple-clone.cc @@ -64,7 +64,7 @@ test_clean (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; @@ -86,7 +86,7 @@ test_clean (enum cachetable_dirty dirty, bool cloneable) { // begin checkpoint, since pair is clean, we should not // have the clone called CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_begin_checkpoint(cp, NULL); assert_zero(r); struct timeval tstart; struct timeval tend; @@ -130,19 +130,18 @@ test_clean (enum cachetable_dirty dirty, bool cloneable) { assert(tdelta_usec(&tend, &tstart) >= 2000000); } - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, NULL ); - assert_zero(r); check_flush = false; 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 diff --git a/ft/tests/cachetable-simple-clone2.cc b/ft/tests/cachetable-simple-clone2.cc index 433a53e28de..7c5da0d3d59 100644 --- a/ft/tests/cachetable-simple-clone2.cc +++ b/ft/tests/cachetable-simple-clone2.cc @@ -51,7 +51,7 @@ test_clean (enum cachetable_dirty dirty, bool cloneable) { const int test_limit = 200; 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; @@ -70,28 +70,27 @@ test_clean (enum cachetable_dirty dirty, bool cloneable) { // begin checkpoint, since pair is clean, we should not // have the clone called CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_begin_checkpoint(cp, NULL); assert_zero(r); r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); // at this point, there should be no more dirty writes r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, dirty, make_pair_attr(8)); usleep(2*1024*1024); - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, NULL ); - assert_zero(r); check_flush = true; flush_expected = (dirty == CACHETABLE_DIRTY) ? true : false; flush_called = false; 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); if (flush_expected) assert(flush_called); } diff --git a/ft/tests/cachetable-simple-maybe-get-pin.cc b/ft/tests/cachetable-simple-maybe-get-pin.cc index cd7a56ba9d9..d2b67b36868 100644 --- a/ft/tests/cachetable-simple-maybe-get-pin.cc +++ b/ft/tests/cachetable-simple-maybe-get-pin.cc @@ -15,7 +15,7 @@ cachetable_test (void) { 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; @@ -52,26 +52,22 @@ cachetable_test (void) { assert(r==0); r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_DIRTY, make_pair_attr(8)); CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert(r == 0); + toku_cachetable_begin_checkpoint(cp, NULL); // now these should fail, because the node should be pending a checkpoint r = toku_cachetable_maybe_get_and_pin(f1, make_blocknum(1), 1, &v1); assert(r==-1); r = toku_cachetable_maybe_get_and_pin(f1, make_blocknum(1), 1, &v1); assert(r==-1); - 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 diff --git a/ft/tests/cachetable-simple-pin-cheap.cc b/ft/tests/cachetable-simple-pin-cheap.cc index 1ec2c6fcebf..e23e7f3f232 100644 --- a/ft/tests/cachetable-simple-pin-cheap.cc +++ b/ft/tests/cachetable-simple-pin-cheap.cc @@ -40,7 +40,7 @@ run_test (pair_lock_type lock_type) { struct unlockers unlockers = {true, unlock_dummy, NULL, NULL}; 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; @@ -81,9 +81,9 @@ run_test (pair_lock_type lock_type) { } toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); lazy_assert_zero(r); + toku_cachetable_close(&ct); } int 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 diff --git a/ft/tests/cachetable-simple-pin-nonblocking-cheap.cc b/ft/tests/cachetable-simple-pin-nonblocking-cheap.cc index c6e2adf0055..84b8dcac5c3 100644 --- a/ft/tests/cachetable-simple-pin-nonblocking-cheap.cc +++ b/ft/tests/cachetable-simple-pin-nonblocking-cheap.cc @@ -79,7 +79,7 @@ run_test (void) { 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; @@ -109,9 +109,9 @@ run_test (void) { run_case_that_should_fail(f1, PL_WRITE_EXPENSIVE, PL_WRITE_EXPENSIVE); toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); lazy_assert_zero(r); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-simple-pin-nonblocking.cc b/ft/tests/cachetable-simple-pin-nonblocking.cc index 373fa6e2028..4ae5f0530fe 100644 --- a/ft/tests/cachetable-simple-pin-nonblocking.cc +++ b/ft/tests/cachetable-simple-pin-nonblocking.cc @@ -62,7 +62,7 @@ run_test (void) { 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; @@ -109,25 +109,20 @@ run_test (void) { r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_DIRTY, make_pair_attr(8)); assert(r==0); // this should mark the PAIR as pending CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert(r == 0); + 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_WRITE_EXPENSIVE, NULL, NULL); assert(r==TOKUDB_TRY_AGAIN); - 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); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); lazy_assert_zero(r); - - + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-simple-pin.cc b/ft/tests/cachetable-simple-pin.cc index e1283749756..cc886c3457e 100644 --- a/ft/tests/cachetable-simple-pin.cc +++ b/ft/tests/cachetable-simple-pin.cc @@ -54,7 +54,7 @@ run_test (void) { 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; @@ -81,7 +81,7 @@ run_test (void) { // now this should mark the pair for checkpoint CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_begin_checkpoint(cp, NULL); // // now we pin the pair again, and verify in flush callback that the pair is being checkpointed @@ -94,20 +94,16 @@ run_test (void) { check_me = false; - 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 diff --git a/ft/tests/cachetable-simple-put-dep-nodes.cc b/ft/tests/cachetable-simple-put-dep-nodes.cc index 4e33fc5f108..759bd746246 100644 --- a/ft/tests/cachetable-simple-put-dep-nodes.cc +++ b/ft/tests/cachetable-simple-put-dep-nodes.cc @@ -76,7 +76,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; @@ -112,7 +112,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 @@ -123,7 +123,7 @@ cachetable_test (bool write_first, bool write_second, bool start_checkpoint) { CACHEKEY put_key; uint32_t put_fullhash; - r = toku_cachetable_put_with_dep_pairs( + toku_cachetable_put_with_dep_pairs( f1, get_key_and_fullhash, &val3, @@ -139,7 +139,6 @@ cachetable_test (bool write_first, bool write_second, bool start_checkpoint) { &put_fullhash, put_callback_nop ); - assert(r == 0); assert(put_key.b == 3); assert(put_fullhash == 3); @@ -154,18 +153,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); } diff --git a/ft/tests/cachetable-simple-read-pin-nonblocking.cc b/ft/tests/cachetable-simple-read-pin-nonblocking.cc index 10c61f6ea0e..a23fb237a09 100644 --- a/ft/tests/cachetable-simple-read-pin-nonblocking.cc +++ b/ft/tests/cachetable-simple-read-pin-nonblocking.cc @@ -67,7 +67,7 @@ run_test (void) { int r; void *ret; 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); r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); @@ -112,8 +112,8 @@ run_test (void) { 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 diff --git a/ft/tests/cachetable-simple-read-pin.cc b/ft/tests/cachetable-simple-read-pin.cc index b110e77c653..9b4c603025b 100644 --- a/ft/tests/cachetable-simple-read-pin.cc +++ b/ft/tests/cachetable-simple-read-pin.cc @@ -73,7 +73,7 @@ run_test (void) { int r; void *ret; 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); r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); @@ -122,8 +122,8 @@ run_test (void) { 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 diff --git a/ft/tests/cachetable-simple-unpin-remove-checkpoint.cc b/ft/tests/cachetable-simple-unpin-remove-checkpoint.cc index 82d39eb1116..50c01482f89 100644 --- a/ft/tests/cachetable-simple-unpin-remove-checkpoint.cc +++ b/ft/tests/cachetable-simple-unpin-remove-checkpoint.cc @@ -29,7 +29,7 @@ cachetable_test (void) { const int test_limit = 120; 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; @@ -43,23 +43,21 @@ cachetable_test (void) { CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); assert(r == 0); + toku_cachetable_begin_checkpoint(cp, NULL); r = toku_test_cachetable_unpin_and_remove(f1, make_blocknum(1), remove_key_expect_checkpoint, NULL); - r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, NULL ); - assert(r==0); r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); r = toku_test_cachetable_unpin_and_remove(f1, make_blocknum(1), remove_key_expect_no_checkpoint, NULL); - 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); } diff --git a/ft/tests/cachetable-simple-verify.cc b/ft/tests/cachetable-simple-verify.cc index 2a3aad6ab61..bed3e6392f1 100644 --- a/ft/tests/cachetable-simple-verify.cc +++ b/ft/tests/cachetable-simple-verify.cc @@ -10,7 +10,7 @@ cachetable_test (void) { 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; @@ -24,8 +24,8 @@ cachetable_test (void) { r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_DIRTY, make_pair_attr(8)); 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); } diff --git a/ft/tests/cachetable-test.cc b/ft/tests/cachetable-test.cc index b2ae4c6f434..860eb2e66fa 100644 --- a/ft/tests/cachetable-test.cc +++ b/ft/tests/cachetable-test.cc @@ -28,32 +28,12 @@ static inline void test_mutex_unlock(void) { toku_mutex_unlock(&test_mutex); } -static void *my_malloc_always_fails(size_t n UU()) { - errno = ENOMEM; - return NULL; -} - // verify that cachetable creation and close works static void test_cachetable_create(void) { CACHETABLE ct = NULL; - int r; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r == 0); - r = toku_cachetable_close(&ct); - assert(r == 0 && ct == 0); -} - -// verify that cachetable create with no memory returns ENOMEM -static void -test_cachetable_create_no_memory (void) { - toku_set_func_malloc(my_malloc_always_fails); - CACHETABLE ct = NULL; - int r; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r == ENOMEM); - toku_set_func_malloc(NULL); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); } static const int test_object_size = 1; @@ -106,8 +86,7 @@ static void test_nested_pin (void) { void *vv,*vv2; char fname[] = __SRCFILE__ "test_ct.dat"; if (verbose) printf("creating cachetable\n"); - r = toku_create_cachetable(&t, 1, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&t, 1, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_cachetable_openf(&f, t, fname, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r==0); @@ -117,8 +96,7 @@ static void test_nested_pin (void) { uint32_t f1hash = toku_cachetable_hash(f, make_blocknum(1)); CACHETABLE_WRITE_CALLBACK wc = def_write_callback(f2); wc.flush_callback = flush_n; - r = toku_cachetable_put(f, make_blocknum(1), f1hash, &i0, make_pair_attr(1), wc, put_callback_nop); - assert(r==0); + toku_cachetable_put(f, make_blocknum(1), f1hash, &i0, make_pair_attr(1), wc, put_callback_nop); r = toku_test_cachetable_unpin(f, make_blocknum(1), f1hash, CACHETABLE_CLEAN, make_pair_attr(test_object_size)); r = toku_cachetable_get_and_pin(f, make_blocknum(1), f1hash, &vv, NULL, wc, fetch_n, def_pf_req_callback, def_pf_callback, true, f2); assert(r==0); @@ -132,13 +110,11 @@ static void test_nested_pin (void) { r = toku_test_cachetable_unpin(f, make_blocknum(1), f1hash, CACHETABLE_CLEAN, make_pair_attr(test_object_size)); assert(r==0); uint32_t f2hash = toku_cachetable_hash(f, make_blocknum(2)); - r = toku_cachetable_put(f, make_blocknum(2), f2hash, &i1, make_pair_attr(test_object_size), wc, put_callback_nop); - assert(r==0); // The other one is pinned, but now the cachetable fails gracefully: It allows the pin to happen + toku_cachetable_put(f, make_blocknum(2), f2hash, &i1, make_pair_attr(test_object_size), wc, put_callback_nop); r = toku_test_cachetable_unpin(f, make_blocknum(2), f2hash, CACHETABLE_CLEAN, make_pair_attr(test_object_size)); assert(r==0); - // toku_os_usleep(1*1000000); - r = toku_cachefile_close(&f, 0, false, ZERO_LSN); assert(r==0); - r = toku_cachetable_close(&t); assert(r==0); + r = toku_cachefile_close(&f, false, ZERO_LSN); assert(r==0); + toku_cachetable_close(&t); } @@ -192,7 +168,7 @@ static void test_multi_filehandles (void) { unlink(fname1); unlink(fname2); - r = toku_create_cachetable(&t, 4, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&t, 4, ZERO_LSN, NULL_LOGGER); r = toku_cachetable_openf(&f1, t, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r==0); r = link(fname1, fname2); assert(r==0); r = toku_cachetable_openf(&f2, t, fname2, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r==0); @@ -203,7 +179,7 @@ static void test_multi_filehandles (void) { CACHETABLE_WRITE_CALLBACK wc = def_write_callback((void*)123); wc.flush_callback = null_flush; - r = toku_cachetable_put(f1, make_blocknum(1), toku_cachetable_hash(f1, make_blocknum(1)), (void*)124, make_pair_attr(test_object_size), wc, put_callback_nop); assert(r==0); + toku_cachetable_put(f1, make_blocknum(1), toku_cachetable_hash(f1, make_blocknum(1)), (void*)124, make_pair_attr(test_object_size), wc, put_callback_nop); r = toku_test_cachetable_unpin(f1, make_blocknum(1), toku_cachetable_hash(f1, make_blocknum(1)), CACHETABLE_DIRTY, make_pair_attr(0)); assert(r==0); r = toku_cachetable_get_and_pin(f2, make_blocknum(1), toku_cachetable_hash(f2, make_blocknum(1)), &v, NULL, wc, add123_fetch, def_pf_req_callback, def_pf_callback, true, (void*)123); assert(r==0); assert((unsigned long)v==124); @@ -216,12 +192,12 @@ static void test_multi_filehandles (void) { // we support only one close for a file handle r = toku_test_cachetable_unpin(f1, make_blocknum(1), toku_cachetable_hash(f1, make_blocknum(1)), CACHETABLE_CLEAN, make_pair_attr(0)); assert(r==0); r = toku_test_cachetable_unpin(f2, make_blocknum(2), toku_cachetable_hash(f2, make_blocknum(2)), CACHETABLE_CLEAN, make_pair_attr(0)); assert(r==0); - r = toku_cachefile_close(&f2, 0, false, ZERO_LSN); assert(r==0); + r = toku_cachefile_close(&f2, false, ZERO_LSN); assert(r==0); r = toku_test_cachetable_unpin(f3, make_blocknum(2), toku_cachetable_hash(f3, make_blocknum(2)), CACHETABLE_CLEAN, make_pair_attr(0)); assert(r==0); - r = toku_cachefile_close(&f3, 0, false, ZERO_LSN); assert(r==0); + r = toku_cachefile_close(&f3, false, ZERO_LSN); assert(r==0); - r = toku_cachetable_close(&t); assert(r==0); + toku_cachetable_close(&t); } #endif @@ -262,8 +238,7 @@ static void test_dirty(void) { int dirty; long long pinned; long entry_size; int r; - r = toku_create_cachetable(&t, 4, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&t, 4, ZERO_LSN, NULL_LOGGER); const char *fname = __SRCFILE__ "test.dat"; unlink(fname); @@ -274,8 +249,7 @@ static void test_dirty(void) { uint32_t hkey = toku_cachetable_hash(f, key); CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); wc.flush_callback = test_dirty_flush; - r = toku_cachetable_put(f, key, hkey, value, make_pair_attr(test_object_size), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f, key, hkey, value, make_pair_attr(test_object_size), wc, put_callback_nop); // cachetable_print_state(t); r = toku_cachetable_get_key_state(t, key, f, &value, &dirty, &pinned, &entry_size); @@ -351,10 +325,7 @@ static void test_dirty(void) { assert(dirty == 1); assert(pinned == 0); - r = toku_cachefile_close(&f, 0, false, ZERO_LSN); - assert(r == 0); - r = toku_cachetable_close(&t); - assert(r == 0); + toku_cachefile_close(&f, false, ZERO_LSN); } static int test_size_debug; @@ -395,8 +366,7 @@ static void test_size_resize(void) { int n = 3; long size = 1; - r = toku_create_cachetable(&t, n*size, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&t, n*size, ZERO_LSN, NULL_LOGGER); const char *fname = __SRCFILE__ "test.dat"; unlink(fname); @@ -410,8 +380,7 @@ static void test_size_resize(void) { CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); wc.flush_callback = test_size_flush_callback; - r = toku_cachetable_put(f, key, hkey, value, make_pair_attr(size), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f, key, hkey, value, make_pair_attr(size), wc, put_callback_nop); void *entry_value; int dirty; long long pinned; long entry_size; r = toku_cachetable_get_key_state(t, key, f, &entry_value, &dirty, &pinned, &entry_size); @@ -435,10 +404,7 @@ static void test_size_resize(void) { r = toku_test_cachetable_unpin(f, key, hkey, CACHETABLE_CLEAN, make_pair_attr(new_size)); assert(r == 0); - r = toku_cachefile_close(&f, 0, false, ZERO_LSN); - assert(r == 0); - r = toku_cachetable_close(&t); - assert(r == 0); + toku_cachefile_close(&f, false, ZERO_LSN); } static int min2(int a, int b) { return a < b ? a : b; } @@ -453,8 +419,7 @@ static void test_size_flush(void) { const int n = 8; long long size = 1*1024*1024; - r = toku_create_cachetable(&t, n*size, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&t, n*size, ZERO_LSN, NULL_LOGGER); const char *fname = __SRCFILE__ "test.dat"; unlink(fname); @@ -475,8 +440,7 @@ static void test_size_flush(void) { uint32_t hkey = toku_cachetable_hash(f, key); CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); wc.flush_callback = test_size_flush_callback; - r = toku_cachetable_put(f, key, hkey, value, make_pair_attr(size), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f, key, hkey, value, make_pair_attr(size), wc, put_callback_nop); int n_entries, hash_size; long size_current, size_limit; toku_cachetable_get_state(t, &n_entries, &hash_size, &size_current, &size_limit); @@ -506,17 +470,13 @@ static void test_size_flush(void) { assert(r == 0); } - r = toku_cachefile_close(&f, 0, false, ZERO_LSN); - assert(r == 0); - r = toku_cachetable_close(&t); + r = toku_cachefile_close(&f, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&t); } int test_main (int argc, const char *argv[]) { - // defaults - int do_malloc_fail = 0; - // parse args int i; for (i=1; i<argc; i++) { @@ -529,10 +489,6 @@ test_main (int argc, const char *argv[]) { if (verbose > 0) verbose--; continue; } - if (strcmp(arg, "-malloc-fail") == 0) { - do_malloc_fail = 1; - continue; - } } test_mutex_init(); @@ -542,8 +498,6 @@ test_main (int argc, const char *argv[]) { test_multi_filehandles(); #endif test_cachetable_create(); - if (do_malloc_fail) - test_cachetable_create_no_memory(); // fails with valgrind for (i=0; i<1; i++) { test_nested_pin(); #if !TOKU_WINDOWS diff --git a/ft/tests/cachetable-test.h b/ft/tests/cachetable-test.h index 1b3b585fb7f..cafeb01832a 100644 --- a/ft/tests/cachetable-test.h +++ b/ft/tests/cachetable-test.h @@ -9,22 +9,22 @@ // // Dummy callbacks for checkpointing // -static int dummy_log_fassociate(CACHEFILE UU(cf), void* UU(p)) -{ return 0; } -static int dummy_log_rollback(CACHEFILE UU(cf), void* UU(p)) -{ return 0; } -static int dummy_close_usr(CACHEFILE UU(cf), int UU(i), void* UU(p), char** UU(c), bool UU(b), LSN UU(lsn)) +static void dummy_log_fassociate(CACHEFILE UU(cf), void* UU(p)) +{ return; } +static void dummy_log_rollback(CACHEFILE UU(cf), void* UU(p)) +{ return; } +static int dummy_close_usr(CACHEFILE UU(cf), int UU(i), void* UU(p), bool UU(b), LSN UU(lsn)) { return 0; } static int dummy_chckpnt_usr(CACHEFILE UU(cf), int UU(i), void* UU(p)) { return 0; } -static int dummy_begin(LSN UU(lsn), void* UU(p)) -{ return 0; } -static int dummy_end(CACHEFILE UU(cf), int UU(i), void* UU(p)) -{ return 0; } -static int dummy_note_pin(CACHEFILE UU(cf), void* UU(p)) -{ return 0; } -static int dummy_note_unpin(CACHEFILE UU(cf), void* UU(p)) -{ return 0; } +static void dummy_begin(LSN UU(lsn), void* UU(p)) +{ return; } +static void dummy_end(CACHEFILE UU(cf), int UU(i), void* UU(p)) +{ return; } +static void dummy_note_pin(CACHEFILE UU(cf), void* UU(p)) +{ return; } +static void dummy_note_unpin(CACHEFILE UU(cf), void* UU(p)) +{ return; } // // Helper function to set dummy functions in given cachefile. @@ -43,4 +43,4 @@ create_dummy_functions(CACHEFILE cf) &dummy_end, &dummy_note_pin, &dummy_note_unpin); -};
\ No newline at end of file +}; diff --git a/ft/tests/cachetable-unpin-and-remove-test.cc b/ft/tests/cachetable-unpin-and-remove-test.cc index 1cba7f2b960..349591072ce 100644 --- a/ft/tests/cachetable-unpin-and-remove-test.cc +++ b/ft/tests/cachetable-unpin-and-remove-test.cc @@ -31,7 +31,7 @@ cachetable_unpin_and_remove_test (int n) { int i; CACHETABLE ct; - r = toku_create_cachetable(&ct, table_limit, ZERO_LSN, NULL_LOGGER); assert(r == 0); + toku_cachetable_create(&ct, table_limit, ZERO_LSN, NULL_LOGGER); char fname1[] = __SRCFILE__ "test1.dat"; unlink(fname1); CACHEFILE f1; @@ -47,8 +47,7 @@ cachetable_unpin_and_remove_test (int n) { // put the keys into the cachetable for (i=0; i<n; i++) { uint32_t hi = toku_cachetable_hash(f1, make_blocknum(keys[i].b)); - r = toku_cachetable_put(f1, make_blocknum(keys[i].b), hi, (void *)(long) keys[i].b, make_pair_attr(1),wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f1, make_blocknum(keys[i].b), hi, (void *)(long) keys[i].b, make_pair_attr(1),wc, put_callback_nop); } // unpin and remove @@ -75,9 +74,8 @@ cachetable_unpin_and_remove_test (int n) { toku_cachetable_get_state(ct, &nentries, NULL, NULL, NULL); assert(nentries == 0); - char *error_string; - r = toku_cachefile_close(&f1, &error_string, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } // test remove when the pair in being written @@ -89,7 +87,7 @@ cachetable_put_evict_remove_test (int n) { int i; CACHETABLE ct; - r = toku_create_cachetable(&ct, table_limit, ZERO_LSN, NULL_LOGGER); assert(r == 0); + toku_cachetable_create(&ct, table_limit, ZERO_LSN, NULL_LOGGER); char fname1[] = __SRCFILE__ "test1.dat"; unlink(fname1); CACHEFILE f1; @@ -102,8 +100,7 @@ cachetable_put_evict_remove_test (int n) { // put 0, 1, 2, ... should evict 0 for (i=0; i<n; i++) { - r = toku_cachetable_put(f1, make_blocknum(i), hi[i], (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f1, make_blocknum(i), hi[i], (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); r = toku_test_cachetable_unpin(f1, make_blocknum(i), hi[i], CACHETABLE_CLEAN, make_pair_attr(1)); assert(r == 0); } @@ -117,9 +114,8 @@ cachetable_put_evict_remove_test (int n) { r = toku_test_cachetable_unpin_and_remove(f1, make_blocknum(0), NULL, NULL); assert(r == 0); - char *error_string; - r = toku_cachefile_close(&f1, &error_string, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-unpin-remove-and-checkpoint.cc b/ft/tests/cachetable-unpin-remove-and-checkpoint.cc index 6ba24aae430..dc6a93d86a2 100644 --- a/ft/tests/cachetable-unpin-remove-and-checkpoint.cc +++ b/ft/tests/cachetable-unpin-remove-and-checkpoint.cc @@ -15,13 +15,12 @@ CACHETABLE ct; static void *run_end_chkpt(void *arg) { assert(arg == NULL); CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - int r = toku_cachetable_end_checkpoint( + toku_cachetable_end_checkpoint( cp, NULL, NULL, NULL ); - assert(r==0); return arg; } @@ -30,7 +29,7 @@ run_test (void) { const int test_limit = 12; int r; ct = NULL; - 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; @@ -53,7 +52,7 @@ run_test (void) { // now this should mark the pair for checkpoint CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); - r = toku_cachetable_begin_checkpoint(cp, NULL); + toku_cachetable_begin_checkpoint(cp, NULL); r = toku_cachetable_get_and_pin(f1, make_blocknum(1), toku_cachetable_hash(f1, make_blocknum(1)), &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); toku_pthread_t mytid; @@ -70,8 +69,8 @@ run_test (void) { 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); } diff --git a/ft/tests/cachetable-unpin-test.cc b/ft/tests/cachetable-unpin-test.cc index d842ebddbf9..32e8c4e0aa1 100644 --- a/ft/tests/cachetable-unpin-test.cc +++ b/ft/tests/cachetable-unpin-test.cc @@ -12,7 +12,7 @@ cachetable_unpin_test (int n) { const int test_limit = 2*n; 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; @@ -23,8 +23,7 @@ cachetable_unpin_test (int n) { uint32_t hi; CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); hi = toku_cachetable_hash(f1, make_blocknum(i)); - r = toku_cachetable_put(f1, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); - assert(r == 0); + toku_cachetable_put(f1, make_blocknum(i), hi, (void *)(long)i, make_pair_attr(1), wc, put_callback_nop); assert(toku_cachefile_count_pinned(f1, 0) == i); void *v; @@ -46,8 +45,8 @@ cachetable_unpin_test (int n) { assert(toku_cachefile_count_pinned(f1, 1) == 0); toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } enum unpin_evictor_test_type { @@ -61,7 +60,7 @@ unpin_and_evictor_test(enum unpin_evictor_test_type test_type) { int r; CACHETABLE ct; int test_limit = 4; - 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; @@ -113,8 +112,8 @@ unpin_and_evictor_test(enum unpin_evictor_test_type test_type) { } toku_cachetable_verify(ct); - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/cachetable-writer-thread-limit.cc b/ft/tests/cachetable-writer-thread-limit.cc index 3cbf25e3840..278d9c5c295 100644 --- a/ft/tests/cachetable-writer-thread-limit.cc +++ b/ft/tests/cachetable-writer-thread-limit.cc @@ -39,7 +39,7 @@ cachetable_test (void) { test_limit = 6; 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; @@ -48,14 +48,14 @@ cachetable_test (void) { for (int64_t i = 0; i < num_entries; i++) { CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); wc.flush_callback = flush; - r = toku_cachetable_put(f1, make_blocknum(i), i, NULL, make_pair_attr(1), wc, put_callback_nop); + toku_cachetable_put(f1, make_blocknum(i), i, NULL, make_pair_attr(1), wc, put_callback_nop); int curr_size = __sync_fetch_and_add(&total_size, 1); assert(curr_size <= test_limit + test_limit/2+1); r = toku_test_cachetable_unpin(f1, make_blocknum(i), i, CACHETABLE_DIRTY, make_pair_attr(4)); } - r = toku_cachefile_close(&f1, 0, false, ZERO_LSN); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); + r = toku_cachefile_close(&f1, false, ZERO_LSN); assert(r == 0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/ft-bfe-query.cc b/ft/tests/ft-bfe-query.cc index 77f7d59ad38..2f42622ddf1 100644 --- a/ft/tests/ft-bfe-query.cc +++ b/ft/tests/ft-bfe-query.cc @@ -336,7 +336,6 @@ test_prefetching(void) { 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } //Want to use block #20 diff --git a/ft/tests/ft-clock-test.cc b/ft/tests/ft-clock-test.cc index 05c0ccfb412..9652725a2e9 100644 --- a/ft/tests/ft-clock-test.cc +++ b/ft/tests/ft-clock-test.cc @@ -263,9 +263,9 @@ test_serialize_nonleaf(void) { r = xids_create_child(xids_123, &xids_234, (TXNID)234); CKERR(r); - r = toku_bnc_insert_msg(BNC(&sn, 0), "a", 2, "aval", 5, FT_NONE, next_dummymsn(), xids_0, true, NULL, string_key_cmp); assert_zero(r); - r = toku_bnc_insert_msg(BNC(&sn, 0), "b", 2, "bval", 5, FT_NONE, next_dummymsn(), xids_123, false, NULL, string_key_cmp); assert_zero(r); - r = toku_bnc_insert_msg(BNC(&sn, 1), "x", 2, "xval", 5, FT_NONE, next_dummymsn(), xids_234, true, NULL, string_key_cmp); assert_zero(r); + toku_bnc_insert_msg(BNC(&sn, 0), "a", 2, "aval", 5, FT_NONE, next_dummymsn(), xids_0, true, NULL, string_key_cmp); + toku_bnc_insert_msg(BNC(&sn, 0), "b", 2, "bval", 5, FT_NONE, next_dummymsn(), xids_123, false, NULL, string_key_cmp); + toku_bnc_insert_msg(BNC(&sn, 1), "x", 2, "xval", 5, FT_NONE, next_dummymsn(), xids_234, true, NULL, string_key_cmp); //Cleanup: xids_destroy(&xids_0); xids_destroy(&xids_123); @@ -281,7 +281,7 @@ test_serialize_nonleaf(void) { 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; + toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } //Want to use block #20 @@ -369,7 +369,7 @@ test_serialize_leaf(void) { 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; + toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } //Want to use block #20 diff --git a/ft/tests/ft-serialize-benchmark.cc b/ft/tests/ft-serialize-benchmark.cc index f0890b04e92..3b4797eaa04 100644 --- a/ft/tests/ft-serialize-benchmark.cc +++ b/ft/tests/ft-serialize-benchmark.cc @@ -114,7 +114,7 @@ test_serialize_leaf(int valsize, int nelts, double entropy) { 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; + brt_h->compare_fun = long_key_cmp; toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } @@ -222,7 +222,7 @@ test_serialize_nonleaf(int valsize, int nelts, double entropy) { } memset(&buf[c], 0, valsize - c); - r = toku_bnc_insert_msg(bnc, &k, sizeof k, buf, valsize, FT_NONE, next_dummymsn(), xids_123, true, NULL, long_key_cmp); assert_zero(r); + toku_bnc_insert_msg(bnc, &k, sizeof k, buf, valsize, FT_NONE, next_dummymsn(), xids_123, true, NULL, long_key_cmp); } if (ck < 7) { toku_fill_dbt(&sn.childkeys[ck], toku_xmemdup(&k, sizeof k), sizeof k); @@ -244,7 +244,7 @@ test_serialize_nonleaf(int valsize, int nelts, double entropy) { 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; + brt_h->compare_fun = long_key_cmp; toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } diff --git a/ft/tests/ft-serialize-sub-block-test.cc b/ft/tests/ft-serialize-sub-block-test.cc index c840ce9a72a..18fd862392b 100644 --- a/ft/tests/ft-serialize-sub-block-test.cc +++ b/ft/tests/ft-serialize-sub-block-test.cc @@ -27,8 +27,7 @@ static void test_sub_block(int n) { unlink(fname); - error = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(error == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); error = toku_open_ft_handle(fname, true, &brt, nodesize, basementnodesize, compression_method, ct, null_txn, toku_builtin_compare_fun); assert(error == 0); @@ -40,7 +39,7 @@ static void test_sub_block(int n) { DBT key, val; toku_fill_dbt(&key, &k, sizeof k); toku_fill_dbt(&val, &v, sizeof v); - error = toku_ft_insert(brt, &key, &val, 0); + toku_ft_insert(brt, &key, &val, 0); assert(error == 0); } @@ -69,14 +68,12 @@ static void test_sub_block(int n) { } assert(i == n); - error = toku_ft_cursor_close(cursor); - assert(error == 0); + toku_ft_cursor_close(cursor); error = toku_close_ft_handle_nolsn(brt, 0); assert(error == 0); - error = toku_cachetable_close(&ct); - assert(error == 0); + toku_cachetable_close(&ct); } int test_main (int argc , const char *argv[]) { diff --git a/ft/tests/ft-serialize-test.cc b/ft/tests/ft-serialize-test.cc index 34e55a1e2a7..64192a36302 100644 --- a/ft/tests/ft-serialize-test.cc +++ b/ft/tests/ft-serialize-test.cc @@ -259,7 +259,6 @@ test_serialize_leaf_check_msn(enum ftnode_verify_type bft, bool do_clone) { 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } @@ -405,7 +404,6 @@ test_serialize_leaf_with_large_pivots(enum ftnode_verify_type bft, bool do_clone 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } //Want to use block #20 @@ -547,7 +545,7 @@ test_serialize_leaf_with_many_rows(enum ftnode_verify_type bft, bool do_clone) { 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; + toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } //Want to use block #20 @@ -694,7 +692,7 @@ test_serialize_leaf_with_large_rows(enum ftnode_verify_type bft, bool do_clone) 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; + toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } //Want to use block #20 @@ -856,7 +854,7 @@ test_serialize_leaf_with_empty_basement_nodes(enum ftnode_verify_type bft, bool 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; + toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } //Want to use block #20 @@ -982,7 +980,7 @@ test_serialize_leaf_with_multiple_empty_basement_nodes(enum ftnode_verify_type b 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; + toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } //Want to use block #20 @@ -1113,7 +1111,7 @@ test_serialize_leaf(enum ftnode_verify_type bft, bool do_clone) { 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; + toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } //Want to use block #20 @@ -1239,9 +1237,9 @@ test_serialize_nonleaf(enum ftnode_verify_type bft, bool do_clone) { r = xids_create_child(xids_123, &xids_234, (TXNID)234); CKERR(r); - r = toku_bnc_insert_msg(BNC(&sn, 0), "a", 2, "aval", 5, FT_NONE, next_dummymsn(), xids_0, true, NULL, string_key_cmp); assert_zero(r); - r = toku_bnc_insert_msg(BNC(&sn, 0), "b", 2, "bval", 5, FT_NONE, next_dummymsn(), xids_123, false, NULL, string_key_cmp); assert_zero(r); - r = toku_bnc_insert_msg(BNC(&sn, 1), "x", 2, "xval", 5, FT_NONE, next_dummymsn(), xids_234, true, NULL, string_key_cmp); assert_zero(r); + toku_bnc_insert_msg(BNC(&sn, 0), "a", 2, "aval", 5, FT_NONE, next_dummymsn(), xids_0, true, NULL, string_key_cmp); + toku_bnc_insert_msg(BNC(&sn, 0), "b", 2, "bval", 5, FT_NONE, next_dummymsn(), xids_123, false, NULL, string_key_cmp); + toku_bnc_insert_msg(BNC(&sn, 1), "x", 2, "xval", 5, FT_NONE, next_dummymsn(), xids_234, true, NULL, string_key_cmp); //Cleanup: xids_destroy(&xids_0); xids_destroy(&xids_123); @@ -1257,7 +1255,7 @@ test_serialize_nonleaf(enum ftnode_verify_type bft, bool do_clone) { 128*1024, TOKU_DEFAULT_COMPRESSION_METHOD); brt->ft = brt_h; - brt_h->panic = 0; brt_h->panic_string = 0; + toku_blocktable_create_new(&brt_h->blocktable); { int r_truncate = ftruncate(fd, 0); CKERR(r_truncate); } //Want to use block #20 diff --git a/ft/tests/ft-test-cursor-2.cc b/ft/tests/ft-test-cursor-2.cc index 086b1630a61..2ad0bd0ec73 100644 --- a/ft/tests/ft-test-cursor-2.cc +++ b/ft/tests/ft-test-cursor-2.cc @@ -33,8 +33,7 @@ static void test_multiple_ft_cursor_dbts(int n) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -45,11 +44,10 @@ static void test_multiple_ft_cursor_dbts(int n) { char key[10],val[10]; snprintf(key, sizeof key, "k%04d", i); snprintf(val, sizeof val, "v%04d", i); - r = toku_ft_insert(brt, - toku_fill_dbt(&kbt, key, 1+strlen(key)), - toku_fill_dbt(&vbt, val, 1+strlen(val)), - 0); - assert(r == 0); + toku_ft_insert(brt, + toku_fill_dbt(&kbt, key, 1+strlen(key)), + toku_fill_dbt(&vbt, val, 1+strlen(val)), + 0); } for (i=0; i<n; i++) { @@ -78,7 +76,7 @@ static void test_multiple_ft_cursor_dbts(int n) { } for (i=0; i<n; i++) { - r = toku_ft_cursor_close(cursors[i]); + toku_ft_cursor_close(cursors[i]); assert(r == 0); toku_free(ptrs[i]); } @@ -86,8 +84,7 @@ static void test_multiple_ft_cursor_dbts(int n) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } static void test_ft_cursor(void) { diff --git a/ft/tests/ft-test-cursor.cc b/ft/tests/ft-test-cursor.cc index 5b0221883e8..658dd57e781 100644 --- a/ft/tests/ft-test-cursor.cc +++ b/ft/tests/ft-test-cursor.cc @@ -29,8 +29,7 @@ static void assert_cursor_notfound(FT_HANDLE brt, int position) { assert(r == DB_NOTFOUND); assert(pair.call_count==0); - r = toku_ft_cursor_close(cursor); - assert(r==0); + toku_ft_cursor_close(cursor); } static void assert_cursor_value(FT_HANDLE brt, int position, long long value) { @@ -46,8 +45,7 @@ static void assert_cursor_value(FT_HANDLE brt, int position, long long value) { assert(r == 0); assert(pair.call_count==1); - r = toku_ft_cursor_close(cursor); - assert(r==0); + toku_ft_cursor_close(cursor); } static void assert_cursor_first_last(FT_HANDLE brt, long long firstv, long long lastv) { @@ -74,8 +72,7 @@ static void assert_cursor_first_last(FT_HANDLE brt, long long firstv, long long } if (test_cursor_debug && verbose) printf("\n"); - r = toku_ft_cursor_close(cursor); - assert(r==0); + toku_ft_cursor_close(cursor); } static void test_ft_cursor_first(int n) { @@ -88,8 +85,7 @@ static void test_ft_cursor_first(int n) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -103,8 +99,7 @@ static void test_ft_cursor_first(int n) { toku_fill_dbt(&kbt, key, strlen(key)+1); v = i; toku_fill_dbt(&vbt, &v, sizeof v); - r = toku_ft_insert(brt, &kbt, &vbt, 0); - assert(r==0); + toku_ft_insert(brt, &kbt, &vbt, 0); } if (n == 0) @@ -115,8 +110,7 @@ static void test_ft_cursor_first(int n) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } static void test_ft_cursor_last(int n) { @@ -129,8 +123,7 @@ static void test_ft_cursor_last(int n) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -144,7 +137,7 @@ static void test_ft_cursor_last(int n) { toku_fill_dbt(&kbt, key, strlen(key)+1); v = i; toku_fill_dbt(&vbt, &v, sizeof v); - r = toku_ft_insert(brt, &kbt, &vbt, 0); + toku_ft_insert(brt, &kbt, &vbt, 0); assert(r==0); } @@ -156,8 +149,7 @@ static void test_ft_cursor_last(int n) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } static void test_ft_cursor_first_last(int n) { @@ -170,8 +162,7 @@ static void test_ft_cursor_first_last(int n) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -186,8 +177,7 @@ static void test_ft_cursor_first_last(int n) { v = i; toku_fill_dbt(&vbt, &v, sizeof v); - r = toku_ft_insert(brt, &kbt, &vbt, 0); - assert(r==0); + toku_ft_insert(brt, &kbt, &vbt, 0); } if (n == 0) { @@ -199,8 +189,7 @@ static void test_ft_cursor_first_last(int n) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } @@ -215,8 +204,7 @@ static void test_ft_cursor_rfirst(int n) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -231,8 +219,7 @@ static void test_ft_cursor_rfirst(int n) { toku_fill_dbt(&kbt, key, strlen(key)+1); v = i; toku_fill_dbt(&vbt, &v, sizeof v); - r = toku_ft_insert(brt, &kbt, &vbt, 0); - assert(r==0); + toku_ft_insert(brt, &kbt, &vbt, 0); } if (n == 0) @@ -243,8 +230,7 @@ static void test_ft_cursor_rfirst(int n) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } static void assert_cursor_walk(FT_HANDLE brt, int n) { @@ -269,8 +255,7 @@ static void assert_cursor_walk(FT_HANDLE brt, int n) { if (test_cursor_debug && verbose) printf("\n"); assert(i == n); - r = toku_ft_cursor_close(cursor); - assert(r==0); + toku_ft_cursor_close(cursor); } static void test_ft_cursor_walk(int n) { @@ -283,8 +268,7 @@ static void test_ft_cursor_walk(int n) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -298,8 +282,7 @@ static void test_ft_cursor_walk(int n) { toku_fill_dbt(&kbt, key, strlen(key)+1); v = i; toku_fill_dbt(&vbt, &v, sizeof v); - r = toku_ft_insert(brt, &kbt, &vbt, 0); - assert(r==0); + toku_ft_insert(brt, &kbt, &vbt, 0); } /* walk the tree */ @@ -308,8 +291,7 @@ static void test_ft_cursor_walk(int n) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } @@ -335,8 +317,7 @@ static void assert_cursor_rwalk(FT_HANDLE brt, int n) { if (test_cursor_debug && verbose) printf("\n"); assert(i == -1); - r = toku_ft_cursor_close(cursor); - assert(r==0); + toku_ft_cursor_close(cursor); } static void test_ft_cursor_rwalk(int n) { @@ -349,8 +330,7 @@ static void test_ft_cursor_rwalk(int n) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -364,8 +344,7 @@ static void test_ft_cursor_rwalk(int n) { toku_fill_dbt(&kbt, &k, sizeof k); v = i; toku_fill_dbt(&vbt, &v, sizeof v); - r = toku_ft_insert(brt, &kbt, &vbt, 0); - assert(r==0); + toku_ft_insert(brt, &kbt, &vbt, 0); } /* walk the tree */ @@ -374,8 +353,7 @@ static void test_ft_cursor_rwalk(int n) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } @@ -420,8 +398,7 @@ static void assert_cursor_walk_inorder(FT_HANDLE brt, int n) { if (test_cursor_debug && verbose) printf("\n"); assert(i == n); - r = toku_ft_cursor_close(cursor); - assert(r==0); + toku_ft_cursor_close(cursor); } static void test_ft_cursor_rand(int n) { @@ -434,8 +411,7 @@ static void test_ft_cursor_rand(int n) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -459,8 +435,7 @@ static void test_ft_cursor_rand(int n) { continue; } assert(pair.call_count==0); - r = toku_ft_insert(brt, &kbt, &vbt, 0); - assert(r==0); + toku_ft_insert(brt, &kbt, &vbt, 0); break; } } @@ -471,9 +446,7 @@ static void test_ft_cursor_rand(int n) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); - + toku_cachetable_close(&ct); } static void test_ft_cursor_split(int n) { @@ -488,8 +461,7 @@ static void test_ft_cursor_split(int n) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -503,8 +475,7 @@ static void test_ft_cursor_split(int n) { toku_fill_dbt(&kbt, key, strlen(key)+1); v = keyseqnum; toku_fill_dbt(&vbt, &v, sizeof v); - r = toku_ft_insert(brt, &kbt, &vbt, 0); - assert(r==0); + toku_ft_insert(brt, &kbt, &vbt, 0); } r = toku_ft_cursor(brt, &cursor, NULL, false, false); @@ -527,8 +498,7 @@ static void test_ft_cursor_split(int n) { toku_fill_dbt(&kbt, key, strlen(key)+1); v = keyseqnum; toku_fill_dbt(&vbt, &v, sizeof v); - r = toku_ft_insert(brt, &kbt, &vbt, 0); - assert(r==0); + toku_ft_insert(brt, &kbt, &vbt, 0); } if (test_cursor_debug && verbose) printf("key: "); @@ -544,14 +514,12 @@ static void test_ft_cursor_split(int n) { } if (test_cursor_debug && verbose) printf("\n"); - r = toku_ft_cursor_close(cursor); - assert(r==0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } static void test_multiple_ft_cursors(int n) { @@ -564,8 +532,7 @@ static void test_multiple_ft_cursors(int n) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -577,15 +544,13 @@ static void test_multiple_ft_cursors(int n) { } for (i=0; i<n; i++) { - r = toku_ft_cursor_close(cursors[i]); - assert(r == 0); + toku_ft_cursor_close(cursors[i]); } r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } static int log16(int n) { @@ -613,8 +578,7 @@ static void test_multiple_ft_cursor_walk(int n) { int nodesize = 1<<12; int h = log16(n); int cachesize = 2 * h * ncursors * nodesize; - r = toku_create_cachetable(&ct, cachesize, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, cachesize, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -637,8 +601,7 @@ static void test_multiple_ft_cursor_walk(int n) { toku_fill_dbt(&key, &k, sizeof k); toku_fill_dbt(&val, &v, sizeof v); - r = toku_ft_insert(brt, &key, &val, 0); - assert(r == 0); + toku_ft_insert(brt, &key, &val, 0); } /* point cursor i / cursor_gap to the current last key i */ @@ -669,15 +632,13 @@ static void test_multiple_ft_cursor_walk(int n) { } for (i=0; i<ncursors; i++) { - r = toku_ft_cursor_close(cursors[i]); - assert(r == 0); + toku_ft_cursor_close(cursors[i]); } r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } static void test_ft_cursor_set(int n, int cursor_op) { @@ -690,8 +651,7 @@ static void test_ft_cursor_set(int n, int cursor_op) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -705,8 +665,7 @@ static void test_ft_cursor_set(int n, int cursor_op) { DBT key,val; toku_fill_dbt(&key, &k, sizeof k); toku_fill_dbt(&val, &v, sizeof v); - r = toku_ft_insert(brt, &key, &val, 0); - assert(r == 0); + toku_ft_insert(brt, &key, &val, 0); } r = toku_ft_cursor(brt, &cursor, NULL, false, false); @@ -742,14 +701,12 @@ static void test_ft_cursor_set(int n, int cursor_op) { assert((unsigned int)k==toku_htonl(i)); } - r = toku_ft_cursor_close(cursor); - assert(r==0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } static void test_ft_cursor_set_range(int n) { @@ -762,8 +719,7 @@ static void test_ft_cursor_set_range(int n) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -778,8 +734,7 @@ static void test_ft_cursor_set_range(int n) { DBT key, val; toku_fill_dbt(&key, &k, sizeof k); toku_fill_dbt(&val, &v, sizeof v); - r = toku_ft_insert(brt, &key, &val, 0); - assert(r == 0); + toku_ft_insert(brt, &key, &val, 0); } r = toku_ft_cursor(brt, &cursor, NULL, false, false); @@ -806,14 +761,12 @@ static void test_ft_cursor_set_range(int n) { } } - r = toku_ft_cursor_close(cursor); - assert(r==0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } static void test_ft_cursor_delete(int n) { @@ -826,8 +779,7 @@ static void test_ft_cursor_delete(int n) { unlink(fname); - error = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(error == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); error = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(error == 0); @@ -845,8 +797,7 @@ static void test_ft_cursor_delete(int n) { v = i; toku_fill_dbt(&key, &k, sizeof k); toku_fill_dbt(&val, &v, sizeof v); - error = toku_ft_insert(brt, &key, &val, 0); - assert(error == 0); + toku_ft_insert(brt, &key, &val, 0); } /* walk the tree and delete under the cursor */ @@ -867,14 +818,12 @@ static void test_ft_cursor_delete(int n) { error = toku_ft_cursor_delete(cursor, 0, null_txn); assert(error != 0); - error = toku_ft_cursor_close(cursor); - assert(error == 0); + toku_ft_cursor_close(cursor); error = toku_close_ft_handle_nolsn(brt, 0); assert(error == 0); - error = toku_cachetable_close(&ct); - assert(error == 0); + toku_cachetable_close(&ct); } static int test_ft_cursor_inc = 1000; diff --git a/ft/tests/ft-test-header.cc b/ft/tests/ft-test-header.cc index eeced70c87b..174b3cfcaf8 100644 --- a/ft/tests/ft-test-header.cc +++ b/ft/tests/ft-test-header.cc @@ -19,8 +19,7 @@ static void test_header (void) { char fname[]= __SRCFILE__ ".ft_handle"; // First create dictionary - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, 1024, 256, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -35,12 +34,10 @@ static void test_header (void) { ft->in_memory_stats = (STAT64INFO_S) {10, 11}; ft->h->on_disk_stats = (STAT64INFO_S) {20, 21}; r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); // Now read dictionary back into memory and examine some header fields - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 0, &t, 1024, 256, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -53,8 +50,7 @@ static void test_header (void) { assert(ft->in_memory_stats.numrows == expected_stats.numrows); assert(ft->h->on_disk_stats.numbytes == expected_stats.numbytes); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/ft-test.cc b/ft/tests/ft-test.cc index 03e77914613..20698dd3ecb 100644 --- a/ft/tests/ft-test.cc +++ b/ft/tests/ft-test.cc @@ -16,14 +16,13 @@ static void test_dump_empty_db (void) { CACHETABLE ct; int r; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, 1024, 256, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); if (verbose) { r=toku_dump_ft(stdout, t); assert(r==0); } r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } @@ -38,7 +37,7 @@ static void test_multiple_files_of_size (int size) { unlink(n0); unlink(n1); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(n0, 1, &t0, size, size / 4, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); r = toku_open_ft_handle(n1, 1, &t1, size, size / 4, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); for (i=0; i<10000; i++) { @@ -46,9 +45,9 @@ static void test_multiple_files_of_size (int size) { DBT k,v; snprintf(key, 100, "key%d", i); snprintf(val, 100, "val%d", i); - r = toku_ft_insert(t0, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); assert(r==0); + toku_ft_insert(t0, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); snprintf(val, 100, "Val%d", i); - r = toku_ft_insert(t1, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); assert(r==0); + toku_ft_insert(t1, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); } //toku_verify_ft(t0); //dump_ft(t0); @@ -58,11 +57,11 @@ static void test_multiple_files_of_size (int size) { r = toku_close_ft_handle_nolsn(t0, 0); assert(r==0); r = toku_close_ft_handle_nolsn(t1, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); /* Now see if the data is all there. */ - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(n0, 0, &t0, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); if (verbose) printf("%s:%d r=%d\n", __SRCFILE__, __LINE__,r); assert(r==0); @@ -79,7 +78,7 @@ static void test_multiple_files_of_size (int size) { r = toku_close_ft_handle_nolsn(t0, 0); assert(r==0); r = toku_close_ft_handle_nolsn(t1, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } @@ -97,7 +96,7 @@ static void test_multiple_ft_handles_one_db_one_file (void) { if (verbose) printf("test_multiple_ft_handles_one_db_one_file:"); unlink(fname); - r = toku_create_cachetable(&ct, 32, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 32, ZERO_LSN, NULL_LOGGER); for (i=0; i<MANYN; i++) { r = toku_open_ft_handle(fname, (i==0), &trees[i], 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -107,8 +106,7 @@ static void test_multiple_ft_handles_one_db_one_file (void) { DBT kb, vb; snprintf(k, 20, "key%d", i); snprintf(v, 20, "val%d", i); - r = toku_ft_insert(trees[i], toku_fill_dbt(&kb, k, strlen(k)+1), toku_fill_dbt(&vb, v, strlen(v)+1), null_txn); - assert(r==0); + toku_ft_insert(trees[i], toku_fill_dbt(&kb, k, strlen(k)+1), toku_fill_dbt(&vb, v, strlen(v)+1), null_txn); } for (i=0; i<MANYN; i++) { char k[20],vexpect[20]; @@ -119,7 +117,7 @@ static void test_multiple_ft_handles_one_db_one_file (void) { for (i=0; i<MANYN; i++) { r=toku_close_ft_handle_nolsn(trees[i], 0); assert(r==0); } - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); if (verbose) printf(" ok\n"); } @@ -137,31 +135,30 @@ static void test_read_what_was_written (void) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); /* Now see if we can read an empty tree in. */ - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 0, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); /* See if we can put something in it. */ { DBT k,v; - r = toku_ft_insert(brt, toku_fill_dbt(&k, "hello", 6), toku_fill_dbt(&v, "there", 6), null_txn); - assert(r==0); + toku_ft_insert(brt, toku_fill_dbt(&k, "hello", 6), toku_fill_dbt(&v, "there", 6), null_txn); } r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); /* Now see if we can read it in and get the value. */ - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 0, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); ft_lookup_and_check_nodup(brt, "hello", "there"); @@ -180,8 +177,7 @@ static void test_read_what_was_written (void) { int verify_result=toku_verify_ft(brt);; assert(verify_result==0); } - r = toku_ft_insert(brt, toku_fill_dbt(&k, key, strlen(key)+1), toku_fill_dbt(&v, val, strlen(val)+1), null_txn); - assert(r==0); + toku_ft_insert(brt, toku_fill_dbt(&k, key, strlen(key)+1), toku_fill_dbt(&v, val, strlen(val)+1), null_txn); if (i<600) { int verify_result=toku_verify_ft(brt); if (verify_result) { @@ -220,11 +216,11 @@ static void test_read_what_was_written (void) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); if (verbose) printf("%s:%d About to close %p\n", __SRCFILE__, __LINE__, ct); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 0, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); ft_lookup_and_check_nodup(brt, "hello", "there"); @@ -239,7 +235,7 @@ static void test_read_what_was_written (void) { } r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); @@ -257,7 +253,7 @@ static void test_cursor_last_empty(void) { unlink(fname); //printf("%s:%d %d alloced\n", __SRCFILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); //printf("%s:%d %d alloced\n", __SRCFILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); //printf("%s:%d %d alloced\n", __SRCFILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); @@ -274,11 +270,10 @@ static void test_cursor_last_empty(void) { assert(pair.call_count==0); assert(r==DB_NOTFOUND); } - r = toku_ft_cursor_close(cursor); - assert_zero(r); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(brt, 0); //printf("%s:%d %d alloced\n", __SRCFILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); //printf("%s:%d %d alloced\n", __SRCFILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); } @@ -292,12 +287,12 @@ static void test_cursor_next (void) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); //printf("%s:%d %d alloced\n", __SRCFILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); //printf("%s:%d %d alloced\n", __SRCFILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); - r = toku_ft_insert(brt, toku_fill_dbt(&kbt, "hello", 6), toku_fill_dbt(&vbt, "there", 6), null_txn); - r = toku_ft_insert(brt, toku_fill_dbt(&kbt, "byebye", 7), toku_fill_dbt(&vbt, "byenow", 7), null_txn); + toku_ft_insert(brt, toku_fill_dbt(&kbt, "hello", 6), toku_fill_dbt(&vbt, "there", 6), null_txn); + toku_ft_insert(brt, toku_fill_dbt(&kbt, "byebye", 7), toku_fill_dbt(&vbt, "byenow", 7), null_txn); if (verbose) printf("%s:%d calling toku_ft_cursor(...)\n", __SRCFILE__, __LINE__); r = toku_ft_cursor(brt, &cursor, NULL, false, false); assert(r==0); toku_init_dbt(&kbt); @@ -327,11 +322,10 @@ static void test_cursor_next (void) { assert(pair.call_count==0); } - r = toku_ft_cursor_close(cursor); - assert_zero(r); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(brt, 0); //printf("%s:%d %d alloced\n", __SRCFILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); //printf("%s:%d %d alloced\n", __SRCFILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); @@ -369,7 +363,7 @@ static void test_wrongendian_compare (int wrong_p, unsigned int N) { assert(wrong_compare_fun(NULL, toku_fill_dbt(&at, b, 4), toku_fill_dbt(&bt, a, 4))<0); } - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); //printf("%s:%d WRONG=%d\n", __SRCFILE__, __LINE__, wrong_p); if (0) { // ???? Why is this commented out? @@ -388,8 +382,7 @@ static void test_wrongendian_compare (int wrong_p, unsigned int N) { printf("%s:%d insert: %02x%02x%02x%02x -> %02x%02x%02x%02x\n", __SRCFILE__, __LINE__, ((char*)kbt.data)[0], ((char*)kbt.data)[1], ((char*)kbt.data)[2], ((char*)kbt.data)[3], ((char*)vbt.data)[0], ((char*)vbt.data)[1], ((char*)vbt.data)[2], ((char*)vbt.data)[3]); - r = toku_ft_insert(brt, &kbt, &vbt, null_txn); - assert(r==0); + toku_ft_insert(brt, &kbt, &vbt, null_txn); } { FT_CURSOR cursor=0; @@ -430,8 +423,7 @@ static void test_wrongendian_compare (int wrong_p, unsigned int N) { if (0) printf("%s:%d insert: %02x%02x%02x%02x -> %02x%02x%02x%02x\n", __SRCFILE__, __LINE__, ((unsigned char*)kbt.data)[0], ((unsigned char*)kbt.data)[1], ((unsigned char*)kbt.data)[2], ((unsigned char*)kbt.data)[3], ((unsigned char*)vbt.data)[0], ((unsigned char*)vbt.data)[1], ((unsigned char*)vbt.data)[2], ((unsigned char*)vbt.data)[3]); - r = toku_ft_insert(brt, &kbt, &vbt, null_txn); - assert(r==0); + toku_ft_insert(brt, &kbt, &vbt, null_txn); toku_cachetable_verify(ct); } FT_CURSOR cursor=0; @@ -449,12 +441,11 @@ static void test_wrongendian_compare (int wrong_p, unsigned int N) { assert(pair.call_count==1); toku_cachetable_verify(ct); } - r = toku_ft_cursor_close(cursor); - assert_zero(r); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); } - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } @@ -469,8 +460,7 @@ static void test_large_kv(int bsize, int ksize, int vsize) { if (verbose) printf("test_large_kv: %d %d %d\n", bsize, ksize, vsize); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, bsize, bsize / 4, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -482,14 +472,13 @@ static void test_large_kv(int bsize, int ksize, int vsize) { toku_fill_dbt(&key, k, ksize); toku_fill_dbt(&val, v, vsize); - r = toku_ft_insert(t, &key, &val, 0); - assert(r == 0); + toku_ft_insert(t, &key, &val, 0); toku_free(k); toku_free(v); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } /* @@ -515,8 +504,7 @@ static void test_ft_delete_empty(void) { int r; CACHETABLE ct; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, 4096, 1024, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -524,11 +512,10 @@ static void test_ft_delete_empty(void) { DBT key; int k = toku_htonl(1); toku_fill_dbt(&key, &k, sizeof k); - r = toku_ft_delete(t, &key, null_txn); - assert(r == 0); + toku_ft_delete(t, &key, null_txn); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } /* @@ -543,8 +530,7 @@ static void test_ft_delete_present(int n) { CACHETABLE ct; int i; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, 4096, 1024, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -557,8 +543,7 @@ static void test_ft_delete_present(int n) { toku_fill_dbt(&key, &k, sizeof k); DBT val; toku_fill_dbt(&val, &v, sizeof v); - r = toku_ft_insert(t, &key, &val, 0); - assert(r == 0); + toku_ft_insert(t, &key, &val, 0); } /* delete 0 .. n-1 */ @@ -566,7 +551,7 @@ static void test_ft_delete_present(int n) { int k = toku_htonl(i); DBT key; toku_fill_dbt(&key, &k, sizeof k); - r = toku_ft_delete(t, &key, null_txn); + toku_ft_delete(t, &key, null_txn); assert(r == 0); } @@ -594,11 +579,10 @@ static void test_ft_delete_present(int n) { assert(pair.call_count==0); } - r = toku_ft_cursor_close(cursor); - assert(r == 0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } static void test_ft_delete_not_present(int n) { @@ -609,8 +593,7 @@ static void test_ft_delete_not_present(int n) { CACHETABLE ct; int i; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, 4096, 1024, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -623,28 +606,27 @@ static void test_ft_delete_not_present(int n) { k = toku_htonl(i); v = i; toku_fill_dbt(&key, &k, sizeof k); toku_fill_dbt(&val, &v, sizeof v); - r = toku_ft_insert(t, &key, &val, 0); - assert(r == 0); + toku_ft_insert(t, &key, &val, 0); } /* delete 0 .. n-1 */ for (i=0; i<n; i++) { k = toku_htonl(i); toku_fill_dbt(&key, &k, sizeof k); - r = toku_ft_delete(t, &key, null_txn); + toku_ft_delete(t, &key, null_txn); assert(r == 0); } /* try to delete key n+1 not in the tree */ k = toku_htonl(n+1); toku_fill_dbt(&key, &k, sizeof k); - r = toku_ft_delete(t, &key, null_txn); + toku_ft_delete(t, &key, null_txn); /* the delete may be buffered or may be executed on a leaf node, so the return value depends */ if (verbose) printf("toku_ft_delete k=%d %d\n", k, r); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } static void test_ft_delete_cursor_first(int n) { @@ -655,8 +637,7 @@ static void test_ft_delete_cursor_first(int n) { CACHETABLE ct; int i; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, 4096, 1024, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -669,8 +650,7 @@ static void test_ft_delete_cursor_first(int n) { toku_fill_dbt(&key, &k, sizeof k); DBT val; toku_fill_dbt(&val, &v, sizeof v); - r = toku_ft_insert(t, &key, &val, 0); - assert(r == 0); + toku_ft_insert(t, &key, &val, 0); } /* lookups 0 .. n-1 should succeed */ @@ -692,8 +672,7 @@ static void test_ft_delete_cursor_first(int n) { int k = toku_htonl(i); DBT key; toku_fill_dbt(&key, &k, sizeof k); - r = toku_ft_delete(t, &key, null_txn); - assert(r == 0); + toku_ft_delete(t, &key, null_txn); } { @@ -733,11 +712,10 @@ static void test_ft_delete_cursor_first(int n) { assert(pair.call_count==1); } - r = toku_ft_cursor_close(cursor); - assert(r == 0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } /* test for bug: insert cmd in a nonleaf node, delete removes the @@ -754,8 +732,7 @@ static void test_insert_delete_lookup(int n) { CACHETABLE ct; int i; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, 4096, 1024, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -768,8 +745,7 @@ static void test_insert_delete_lookup(int n) { toku_fill_dbt(&key, &k, sizeof k); DBT val; toku_fill_dbt(&val, &v, sizeof v); - r = toku_ft_insert(t, &key, &val, 0); - assert(r == 0); + toku_ft_insert(t, &key, &val, 0); } if (n > 0) { @@ -777,8 +753,7 @@ static void test_insert_delete_lookup(int n) { int k = toku_htonl(n-1); DBT key; toku_fill_dbt(&key, &k, sizeof k); - r = toku_ft_delete(t, &key, null_txn); - assert(r == 0); + toku_ft_delete(t, &key, null_txn); } { int k = toku_htonl(n-1); @@ -792,7 +767,7 @@ static void test_insert_delete_lookup(int n) { } r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } /* insert <0,0>, <0,1>, .. <0,n> @@ -822,7 +797,7 @@ static void test_new_ft_cursor_create_close (void) { int n = 8; FT_CURSOR cursors[n]; - r = toku_ft_handle_create(&brt); assert(r == 0); + toku_ft_handle_create(&brt); int i; for (i=0; i<n; i++) { @@ -830,7 +805,7 @@ static void test_new_ft_cursor_create_close (void) { } for (i=0; i<n; i++) { - r = toku_ft_cursor_close(cursors[i]); assert(r == 0); + toku_ft_cursor_close(cursors[i]); } r = toku_close_ft_handle_nolsn(brt, 0); assert(r == 0); @@ -844,9 +819,9 @@ static void test_new_ft_cursor_first(int n) { CACHETABLE ct; int i; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); - r = toku_ft_handle_create(&t); assert(r == 0); + toku_ft_handle_create(&t); toku_ft_handle_set_nodesize(t, 4096); r = toku_ft_handle_open(t, fname, 1, 1, ct, null_txn); assert(r==0); @@ -855,7 +830,7 @@ static void test_new_ft_cursor_first(int n) { for (i=0; i<n; i++) { k = toku_htonl(i); v = toku_htonl(i); - r = toku_ft_insert(t, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); + toku_ft_insert(t, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); } FT_CURSOR cursor=0; @@ -883,9 +858,9 @@ static void test_new_ft_cursor_first(int n) { if (key.data) toku_free(key.data); if (val.data) toku_free(val.data); - r = toku_ft_cursor_close(cursor); assert(r == 0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct);assert(r==0); + toku_cachetable_close(&ct); } static void test_new_ft_cursor_last(int n) { @@ -896,9 +871,9 @@ static void test_new_ft_cursor_last(int n) { CACHETABLE ct; int i; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); - r = toku_ft_handle_create(&t); assert(r == 0); + toku_ft_handle_create(&t); toku_ft_handle_set_nodesize(t, 4096); r = toku_ft_handle_open(t, fname, 1, 1, ct, null_txn); assert(r==0); @@ -907,7 +882,7 @@ static void test_new_ft_cursor_last(int n) { for (i=0; i<n; i++) { k = toku_htonl(i); v = toku_htonl(i); - r = toku_ft_insert(t, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); + toku_ft_insert(t, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); } FT_CURSOR cursor=0; @@ -936,9 +911,9 @@ static void test_new_ft_cursor_last(int n) { if (key.data) toku_free(key.data); if (val.data) toku_free(val.data); - r = toku_ft_cursor_close(cursor); assert(r == 0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct);assert(r==0); + toku_cachetable_close(&ct); } static void test_new_ft_cursor_next(int n) { @@ -949,9 +924,9 @@ static void test_new_ft_cursor_next(int n) { CACHETABLE ct; int i; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); - r = toku_ft_handle_create(&t); assert(r == 0); + toku_ft_handle_create(&t); toku_ft_handle_set_nodesize(t, 4096); r = toku_ft_handle_open(t, fname, 1, 1, ct, null_txn); assert(r==0); @@ -959,7 +934,7 @@ static void test_new_ft_cursor_next(int n) { DBT key, val; int k = toku_htonl(i); int v = toku_htonl(i); - r = toku_ft_insert(t, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); + toku_ft_insert(t, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); } FT_CURSOR cursor=0; @@ -979,9 +954,9 @@ static void test_new_ft_cursor_next(int n) { } assert(i == n); - r = toku_ft_cursor_close(cursor); assert(r == 0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct);assert(r==0); + toku_cachetable_close(&ct); } static void test_new_ft_cursor_prev(int n) { @@ -992,9 +967,9 @@ static void test_new_ft_cursor_prev(int n) { CACHETABLE ct; int i; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); - r = toku_ft_handle_create(&t); assert(r == 0); + toku_ft_handle_create(&t); toku_ft_handle_set_nodesize(t, 4096); r = toku_ft_handle_open(t, fname, 1, 1, ct, null_txn); assert(r==0); @@ -1002,7 +977,7 @@ static void test_new_ft_cursor_prev(int n) { DBT key, val; int k = toku_htonl(i); int v = toku_htonl(i); - r = toku_ft_insert(t, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); + toku_ft_insert(t, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); } FT_CURSOR cursor=0; @@ -1022,9 +997,9 @@ static void test_new_ft_cursor_prev(int n) { } assert(i == -1); - r = toku_ft_cursor_close(cursor); assert(r == 0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct);assert(r==0); + toku_cachetable_close(&ct); } static void test_new_ft_cursor_current(int n) { @@ -1035,9 +1010,9 @@ static void test_new_ft_cursor_current(int n) { CACHETABLE ct; int i; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); - r = toku_ft_handle_create(&t); assert(r == 0); + toku_ft_handle_create(&t); toku_ft_handle_set_nodesize(t, 4096); r = toku_ft_handle_open(t, fname, 1, 1, ct, null_txn); assert(r==0); @@ -1045,7 +1020,7 @@ static void test_new_ft_cursor_current(int n) { int k = toku_htonl(i); int v = toku_htonl(i); DBT key, val; - r = toku_ft_insert(t, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); + toku_ft_insert(t, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); } FT_CURSOR cursor=0; @@ -1104,9 +1079,9 @@ static void test_new_ft_cursor_current(int n) { } assert(i == n); - r = toku_ft_cursor_close(cursor); assert(r == 0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct);assert(r==0); + toku_cachetable_close(&ct); } static void test_new_ft_cursor_set_range(int n) { @@ -1117,9 +1092,9 @@ static void test_new_ft_cursor_set_range(int n) { FT_HANDLE brt=0; FT_CURSOR cursor=0; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); - r = toku_ft_handle_create(&brt); assert(r == 0); + toku_ft_handle_create(&brt); toku_ft_handle_set_nodesize(brt, 4096); r = toku_ft_handle_open(brt, fname, 1, 1, ct, null_txn); assert(r==0); @@ -1131,7 +1106,7 @@ static void test_new_ft_cursor_set_range(int n) { DBT key, val; int k = toku_htonl(10*i); int v = 10*i; - r = toku_ft_insert(brt, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); + toku_ft_insert(brt, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); } r = toku_ft_cursor(brt, &cursor, NULL, false, false); assert(r==0); @@ -1161,11 +1136,11 @@ static void test_new_ft_cursor_set_range(int n) { } } - r = toku_ft_cursor_close(cursor); assert(r==0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } static void test_new_ft_cursor_set(int n, int cursor_op, DB *db) { @@ -1178,7 +1153,7 @@ static void test_new_ft_cursor_set(int n, int cursor_op, DB *db) { unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); @@ -1189,7 +1164,7 @@ static void test_new_ft_cursor_set(int n, int cursor_op, DB *db) { DBT key, val; int k = toku_htonl(10*i); int v = 10*i; - r = toku_ft_insert(brt, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); + toku_ft_insert(brt, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); } r = toku_ft_cursor(brt, &cursor, NULL, false, false); assert(r==0); @@ -1222,11 +1197,11 @@ static void test_new_ft_cursor_set(int n, int cursor_op, DB *db) { assert(key.data == &k); } - r = toku_ft_cursor_close(cursor); assert(r==0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } static void test_new_ft_cursors(void) { diff --git a/ft/tests/ft-test0.cc b/ft/tests/ft-test0.cc index 8205cca4c90..58db9680116 100644 --- a/ft/tests/ft-test0.cc +++ b/ft/tests/ft-test0.cc @@ -16,8 +16,7 @@ static void test0 (void) { char fname[]= __SRCFILE__ ".ft_handle"; if (verbose) printf("%s:%d test0\n", __SRCFILE__, __LINE__); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); if (verbose) printf("%s:%d test0\n", __SRCFILE__, __LINE__); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, 1024, 256, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); @@ -26,9 +25,7 @@ static void test0 (void) { //printf("%s:%d n_items_malloced=%lld\n", __SRCFILE__, __LINE__, n_items_malloced); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); //printf("%s:%d n_items_malloced=%lld\n", __SRCFILE__, __LINE__, n_items_malloced); - r = toku_cachetable_close(&ct); - assert(r==0); - + toku_cachetable_close(&ct); } int diff --git a/ft/tests/ft-test1.cc b/ft/tests/ft-test1.cc index d9e199be9f2..aef1d3c637f 100644 --- a/ft/tests/ft-test1.cc +++ b/ft/tests/ft-test1.cc @@ -16,12 +16,11 @@ static void test1 (void) { char fname[]= __SRCFILE__ ".ft_handle"; DBT k,v; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, 1024, 256, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); - r = toku_ft_insert(t, toku_fill_dbt(&k, "hello", 6), toku_fill_dbt(&v, "there", 6), null_txn); + toku_ft_insert(t, toku_fill_dbt(&k, "hello", 6), toku_fill_dbt(&v, "there", 6), null_txn); assert(r==0); { struct check_pair pair = {6, "hello", 6, "there", 0}; @@ -30,7 +29,7 @@ static void test1 (void) { assert(pair.call_count==1); } r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); if (verbose) printf("test1 ok\n"); } diff --git a/ft/tests/ft-test2.cc b/ft/tests/ft-test2.cc index 2131c9fd205..5e5c4376bc9 100644 --- a/ft/tests/ft-test2.cc +++ b/ft/tests/ft-test2.cc @@ -17,7 +17,7 @@ static void test2 (int limit) { char fname[]= __SRCFILE__ ".ft_handle"; if (verbose) printf("%s:%d checking\n", __SRCFILE__, __LINE__); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, 1024, 256, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); if (verbose) printf("%s:%d did setup\n", __SRCFILE__, __LINE__); @@ -27,7 +27,7 @@ static void test2 (int limit) { char key[100],val[100]; snprintf(key,100,"hello%d",i); snprintf(val,100,"there%d",i); - r = toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); + toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); assert(r==0); r = toku_verify_ft(t); assert(r==0); //printf("%s:%d did insert %d\n", __SRCFILE__, __LINE__, i); @@ -35,7 +35,7 @@ static void test2 (int limit) { if (verbose) printf("%s:%d inserted\n", __SRCFILE__, __LINE__); r = toku_verify_ft(t); assert(r==0); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); if (verbose) printf("test2 ok\n"); } diff --git a/ft/tests/ft-test3.cc b/ft/tests/ft-test3.cc index 97e72a160cb..97efc7476e1 100644 --- a/ft/tests/ft-test3.cc +++ b/ft/tests/ft-test3.cc @@ -21,7 +21,7 @@ static void test3 (int nodesize, int basementnodesize, int count) { int i; CACHETABLE ct; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); gettimeofday(&t0, 0); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, nodesize, basementnodesize, compression_method, ct, null_txn, toku_builtin_compare_fun); @@ -31,12 +31,11 @@ static void test3 (int nodesize, int basementnodesize, int count) { DBT k,v; snprintf(key,100,"hello%d",i); snprintf(val,100,"there%d",i); - r = toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); - assert(r==0); + toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); } r = toku_verify_ft(t); assert(r==0); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); gettimeofday(&t1, 0); { diff --git a/ft/tests/ft-test4.cc b/ft/tests/ft-test4.cc index 4d78f49347f..3ee7da9e0b0 100644 --- a/ft/tests/ft-test4.cc +++ b/ft/tests/ft-test4.cc @@ -21,7 +21,7 @@ static void test4 (int nodesize, int count) { gettimeofday(&t0, 0); unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &t, nodesize, nodesize / 8, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); for (i=0; i<count; i++) { char key[100],val[100]; @@ -29,12 +29,11 @@ static void test4 (int nodesize, int count) { DBT k,v; snprintf(key,100,"hello%d",rv); snprintf(val,100,"there%d",i); - r = toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); - assert(r==0); + toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); } r = toku_verify_ft(t); assert(r==0); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); gettimeofday(&t1, 0); { diff --git a/ft/tests/ft-test5.cc b/ft/tests/ft-test5.cc index 958e8e03703..63a9ebd13aa 100644 --- a/ft/tests/ft-test5.cc +++ b/ft/tests/ft-test5.cc @@ -21,7 +21,7 @@ static void test5 (void) { MALLOC_N(limit,values); for (i=0; i<limit; i++) values[i]=-1; unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &t, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); for (i=0; i<limit/2; i++) { char key[100],val[100]; @@ -32,8 +32,7 @@ static void test5 (void) { snprintf(key, 100, "key%d", rk); snprintf(val, 100, "val%d", rv); DBT k,v; - r = toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); - assert(r==0); + toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); } if (verbose) printf("\n"); for (i=0; i<limit/2; i++) { @@ -54,7 +53,7 @@ static void test5 (void) { toku_free(values); r = toku_verify_ft(t); assert(r==0); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } diff --git a/ft/tests/ftloader-test-merge-files-dbufio.cc b/ft/tests/ftloader-test-merge-files-dbufio.cc index 2acf692bec2..ac4d12b6b64 100644 --- a/ft/tests/ftloader-test-merge-files-dbufio.cc +++ b/ft/tests/ftloader-test-merge-files-dbufio.cc @@ -313,8 +313,7 @@ static void test (const char *directory, bool is_error) { CACHETABLE ct; enum {CACHETABLE_SIZE = 64*1024}; { - int r = toku_create_cachetable(&ct, CACHETABLE_SIZE, (LSN){1}, NULL); - assert(r==0); + toku_cachetable_create(&ct, CACHETABLE_SIZE, (LSN){1}, NULL); } LSN *XMALLOC(lsnp); { @@ -426,8 +425,7 @@ static void test (const char *directory, bool is_error) { } toku_ft_loader_internal_destroy(bl, false); { - int r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } for (int i=0; i<N_DEST_DBS; i++) { toku_free((void*)new_fnames_in_env[i]); diff --git a/ft/tests/ftloader-test-vm.cc b/ft/tests/ftloader-test-vm.cc index ba3d2ac92ab..5fedfe32b7d 100644 --- a/ft/tests/ftloader-test-vm.cc +++ b/ft/tests/ftloader-test-vm.cc @@ -12,8 +12,7 @@ static void test_cachetable_reservation (long size) { CACHETABLE ct; { - int r = toku_create_cachetable(&ct, size, ZERO_LSN, NULL); - assert(r==0); + toku_cachetable_create(&ct, size, ZERO_LSN, NULL); } { uint64_t r0 = toku_cachetable_reserve_memory(ct, 0.5); @@ -38,8 +37,7 @@ static void test_cachetable_reservation (long size) { toku_cachetable_release_reserved_memory(ct, r2); } { - int r = toku_cachetable_close(&ct); - assert(r==0); + toku_cachetable_close(&ct); } } diff --git a/ft/tests/ftloader-test-writer.cc b/ft/tests/ftloader-test-writer.cc index bd4b024a46f..e29106e8aea 100644 --- a/ft/tests/ftloader-test-writer.cc +++ b/ft/tests/ftloader-test-writer.cc @@ -43,13 +43,12 @@ static void verify_dbfile(int n, const char *name) { int r; CACHETABLE ct; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); TOKUTXN const null_txn = NULL; FT_HANDLE t = NULL; - r = toku_ft_handle_create(&t); assert(r == 0); - r = toku_ft_set_bt_compare(t, compare_ints); - assert(r==0); + toku_ft_handle_create(&t); + toku_ft_set_bt_compare(t, compare_ints); r = toku_ft_handle_open(t, name, 0, 0, ct, null_txn); assert(r==0); if (verbose) traceit("Verifying brt internals"); @@ -76,14 +75,14 @@ static void verify_dbfile(int n, const char *name) { assert(i == n); - r = toku_ft_cursor_close(cursor); assert(r == 0); + toku_ft_cursor_close(cursor); struct ftstat64_s s; - r = toku_ft_handle_stat64(t, NULL, &s); assert(r == 0); + toku_ft_handle_stat64(t, NULL, &s); assert(s.nkeys == (uint64_t)n && s.ndata == (uint64_t)n && s.dsize == userdata); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct);assert(r==0); + toku_cachetable_close(&ct); if (verbose) traceit("verify done"); } diff --git a/ft/tests/ftloader-test.cc b/ft/tests/ftloader-test.cc index 8b959c3f9ea..48a77b566bf 100644 --- a/ft/tests/ftloader-test.cc +++ b/ft/tests/ftloader-test.cc @@ -249,12 +249,12 @@ static void verify_dbfile(int n, int sorted_keys[], const char *sorted_vals[], c int r; CACHETABLE ct; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); TOKUTXN const null_txn = NULL; FT_HANDLE t = NULL; - r = toku_ft_handle_create(&t); assert(r == 0); - r = toku_ft_set_bt_compare(t, compare_ints); assert(r==0); + toku_ft_handle_create(&t); + toku_ft_set_bt_compare(t, compare_ints); r = toku_ft_handle_open(t, name, 0, 0, ct, null_txn); assert(r==0); FT_CURSOR cursor = NULL; @@ -277,14 +277,14 @@ static void verify_dbfile(int n, int sorted_keys[], const char *sorted_vals[], c r = toku_ft_cursor_get(cursor, NULL, lookup_checkf, &pair, DB_NEXT); assert(r != 0); - r = toku_ft_cursor_close(cursor); assert(r == 0); + toku_ft_cursor_close(cursor); struct ftstat64_s s; - r = toku_ft_handle_stat64(t, NULL, &s); assert(r == 0); + toku_ft_handle_stat64(t, NULL, &s); assert(s.nkeys == (uint64_t) n && s.ndata == (uint64_t) n && s.dsize == userdata); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct);assert(r==0); + toku_cachetable_close(&ct); } static void test_merge_files (const char *tf_template, const char *output_name) { diff --git a/ft/tests/is_empty.cc b/ft/tests/is_empty.cc index 0936d149904..d41ac7c5fc9 100644 --- a/ft/tests/is_empty.cc +++ b/ft/tests/is_empty.cc @@ -26,7 +26,7 @@ static void test_it (int N) { CACHETABLE ct; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, logger); CKERR(r); + toku_cachetable_create(&ct, 0, ZERO_LSN, logger); toku_cachetable_set_env_dir(ct, TESTDIR); toku_logger_set_cachetable(logger, ct); @@ -58,7 +58,7 @@ static void test_it (int N) { snprintf(key, sizeof(key), "key%x.%x", rands[i], i); memset(val, 'v', sizeof(val)); val[sizeof(val)-1]=0; - r = toku_ft_insert(brt, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), txn); + toku_ft_insert(brt, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), txn); r = toku_txn_commit_txn(txn, false, NULL, NULL); CKERR(r); toku_txn_close_txn(txn); @@ -78,7 +78,7 @@ static void test_it (int N) { char key[100]; DBT k; snprintf(key, sizeof(key), "key%x.%x", rands[i], i); - r = toku_ft_delete(brt, toku_fill_dbt(&k, key, 1+strlen(key)), txn); + toku_ft_delete(brt, toku_fill_dbt(&k, key, 1+strlen(key)), txn); if (0) { bool is_empty; @@ -109,9 +109,9 @@ static void test_it (int N) { r = toku_close_ft_handle_nolsn(brt, NULL); CKERR(r); r = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT); CKERR(r); - r = toku_logger_close_rollback(logger, false); CKERR(r); + toku_logger_close_rollback(logger); CKERR(r); r = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT); CKERR(r); - r = toku_cachetable_close(&ct); CKERR(r); + toku_cachetable_close(&ct); r = toku_logger_close(&logger); assert(r==0); } diff --git a/ft/tests/keyrange.cc b/ft/tests/keyrange.cc index 46b0a406f7b..7e277946f9d 100644 --- a/ft/tests/keyrange.cc +++ b/ft/tests/keyrange.cc @@ -20,13 +20,13 @@ static FT_HANDLE t; static void close_ft_and_ct (void) { int r; r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } static void open_ft_and_ct (bool unlink_old) { int r; if (unlink_old) unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &t, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); } @@ -75,13 +75,12 @@ static void test_keyrange (enum memory_state ms, uint64_t limit) { snprintf(key, 100, "%08llu", (unsigned long long)2*i+1); snprintf(val, 100, "%08llu", (unsigned long long)2*i+1); DBT k,v; - int r = toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v,val, 1+strlen(val)), null_txn); - assert(r == 0); + toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v,val, 1+strlen(val)), null_txn); } { struct ftstat64_s s; - int r = toku_ft_handle_stat64(t, null_txn, &s); assert(r == 0); + toku_ft_handle_stat64(t, null_txn, &s); assert(0 < s.nkeys && s.nkeys < limit); assert(0 < s.dsize && s.dsize < limit * (9 + 9)); // keylen = 9, vallen = 9 @@ -100,8 +99,7 @@ static void test_keyrange (enum memory_state ms, uint64_t limit) { snprintf(key, 100, "%08llu", (unsigned long long)2*i+1); DBT k; uint64_t less,equal,greater; - int r = toku_ft_keyrange(t, toku_fill_dbt(&k, key, 1+strlen(key)), &less, &equal, &greater); - assert(r == 0); + toku_ft_keyrange(t, toku_fill_dbt(&k, key, 1+strlen(key)), &less, &equal, &greater); if (verbose > 1) printf("Pkey %llu/%llu %llu %llu %llu\n", (unsigned long long)2*i+1, (unsigned long long)2*limit, (unsigned long long)less, (unsigned long long)equal, (unsigned long long)greater); @@ -163,8 +161,7 @@ static void test_keyrange (enum memory_state ms, uint64_t limit) { snprintf(key, 100, "%08llu", (unsigned long long)2*i); DBT k; uint64_t less,equal,greater; - int r = toku_ft_keyrange(t, toku_fill_dbt(&k, key, 1+strlen(key)), &less, &equal, &greater); - assert(r == 0); + toku_ft_keyrange(t, toku_fill_dbt(&k, key, 1+strlen(key)), &less, &equal, &greater); if (verbose > 1) printf("Akey %llu/%llu %llu %llu %llu\n", (unsigned long long)2*i, (unsigned long long)2*limit, (unsigned long long)less, (unsigned long long)equal, (unsigned long long)greater); diff --git a/ft/tests/le-cursor-provdel.cc b/ft/tests/le-cursor-provdel.cc index 1a8372419e0..06821759ee4 100644 --- a/ft/tests/le-cursor-provdel.cc +++ b/ft/tests/le-cursor-provdel.cc @@ -44,8 +44,7 @@ create_populate_tree(const char *logdir, const char *fname, int n) { error = toku_logger_open(logdir, logger); assert(error == 0); CACHETABLE ct = NULL; - error = toku_create_cachetable(&ct, 0, ZERO_LSN, logger); - assert(error == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, logger); toku_logger_set_cachetable(logger, ct); error = toku_logger_open_rollback(logger, ct, true); assert(error == 0); @@ -74,7 +73,7 @@ create_populate_tree(const char *logdir, const char *fname, int n) { toku_fill_dbt(&key, &k, sizeof k); DBT val; toku_fill_dbt(&val, &v, sizeof v); - error = toku_ft_insert(brt, &key, &val, txn); + toku_ft_insert(brt, &key, &val, txn); assert(error == 0); } @@ -89,20 +88,18 @@ create_populate_tree(const char *logdir, const char *fname, int n) { error = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT); assert(error == 0); - error = toku_logger_close_rollback(logger, false); + toku_logger_close_rollback(logger); assert(error == 0); error = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT); assert(error == 0); - error = toku_logger_shutdown(logger); - CKERR(error); + toku_logger_shutdown(logger); error = toku_logger_close(&logger); assert(error == 0); - error = toku_cachetable_close(&ct); - assert(error == 0); + toku_cachetable_close(&ct); } // provionally delete all of the even keys @@ -118,8 +115,7 @@ test_provdel(const char *logdir, const char *fname, int n) { error = toku_logger_open(logdir, logger); assert(error == 0); CACHETABLE ct = NULL; - error = toku_create_cachetable(&ct, 0, ZERO_LSN, logger); - assert(error == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, logger); toku_logger_set_cachetable(logger, ct); error = toku_logger_open_rollback(logger, ct, false); assert(error == 0); @@ -145,7 +141,7 @@ test_provdel(const char *logdir, const char *fname, int n) { int k = toku_htonl(i); DBT key; toku_fill_dbt(&key, &k, sizeof k); - error = toku_ft_delete(brt, &key, txn); + toku_ft_delete(brt, &key, txn); assert(error == 0); } @@ -180,8 +176,7 @@ test_provdel(const char *logdir, const char *fname, int n) { toku_destroy_dbt(&key); toku_destroy_dbt(&val); - error = toku_le_cursor_close(cursor); - assert(error == 0); + toku_le_cursor_close(cursor); error = toku_txn_commit_txn(cursortxn, true, NULL, NULL); assert(error == 0); @@ -197,13 +192,12 @@ test_provdel(const char *logdir, const char *fname, int n) { error = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT); assert(error == 0); - error = toku_logger_close_rollback(logger, false); + toku_logger_close_rollback(logger); assert(error == 0); error = toku_logger_close(&logger); assert(error == 0); - error = toku_cachetable_close(&ct); - assert(error == 0); + toku_cachetable_close(&ct); } static void diff --git a/ft/tests/le-cursor-right.cc b/ft/tests/le-cursor-right.cc index 9c4473604f2..072617cc2d6 100644 --- a/ft/tests/le-cursor-right.cc +++ b/ft/tests/le-cursor-right.cc @@ -48,8 +48,7 @@ create_populate_tree(const char *logdir, const char *fname, int n) { error = toku_logger_open(logdir, logger); assert(error == 0); CACHETABLE ct = NULL; - error = toku_create_cachetable(&ct, 0, ZERO_LSN, logger); - assert(error == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, logger); toku_logger_set_cachetable(logger, ct); error = toku_logger_open_rollback(logger, ct, true); assert(error == 0); @@ -78,8 +77,7 @@ create_populate_tree(const char *logdir, const char *fname, int n) { toku_fill_dbt(&key, &k, sizeof k); DBT val; toku_fill_dbt(&val, &v, sizeof v); - error = toku_ft_insert(brt, &key, &val, txn); - assert(error == 0); + toku_ft_insert(brt, &key, &val, txn); } error = toku_txn_commit_txn(txn, true, NULL, NULL); @@ -92,20 +90,18 @@ create_populate_tree(const char *logdir, const char *fname, int n) { CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); error = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT); assert(error == 0); - error = toku_logger_close_rollback(logger, false); + toku_logger_close_rollback(logger); assert(error == 0); error = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT); assert(error == 0); - error = toku_logger_shutdown(logger); - CKERR(error); + toku_logger_shutdown(logger); error = toku_logger_close(&logger); assert(error == 0); - error = toku_cachetable_close(&ct); - assert(error == 0); + toku_cachetable_close(&ct); } // test toku_le_cursor_is_key_greater when the LE_CURSOR is positioned at -infinity @@ -115,8 +111,7 @@ test_neg_infinity(const char *fname, int n) { int error; CACHETABLE ct = NULL; - error = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(error == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); FT_HANDLE brt = NULL; error = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_keycompare); @@ -135,14 +130,12 @@ test_neg_infinity(const char *fname, int n) { assert(right == true); } - error = toku_le_cursor_close(cursor); - assert(error == 0); + toku_le_cursor_close(cursor); error = toku_close_ft_handle_nolsn(brt, 0); assert(error == 0); - error = toku_cachetable_close(&ct); - assert(error == 0); + toku_cachetable_close(&ct); } // test toku_le_cursor_is_key_greater when the LE_CURSOR is positioned at +infinity @@ -152,8 +145,7 @@ test_pos_infinity(const char *fname, int n) { int error; CACHETABLE ct = NULL; - error = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(error == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); FT_HANDLE brt = NULL; error = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_keycompare); @@ -196,14 +188,12 @@ test_pos_infinity(const char *fname, int n) { assert(right == false); } - error = toku_le_cursor_close(cursor); - assert(error == 0); + toku_le_cursor_close(cursor); error = toku_close_ft_handle_nolsn(brt, 0); assert(error == 0); - error = toku_cachetable_close(&ct); - assert(error == 0); + toku_cachetable_close(&ct); } // test toku_le_cursor_is_key_greater when the LE_CURSOR is positioned in between -infinity and +infinity @@ -213,8 +203,7 @@ test_between(const char *fname, int n) { int error; CACHETABLE ct = NULL; - error = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(error == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); FT_HANDLE brt = NULL; error = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_keycompare); @@ -268,14 +257,12 @@ test_between(const char *fname, int n) { toku_destroy_dbt(&key); toku_destroy_dbt(&val); - error = toku_le_cursor_close(cursor); - assert(error == 0); + toku_le_cursor_close(cursor); error = toku_close_ft_handle_nolsn(brt, 0); assert(error == 0); - error = toku_cachetable_close(&ct); - assert(error == 0); + toku_cachetable_close(&ct); } static void diff --git a/ft/tests/le-cursor-walk.cc b/ft/tests/le-cursor-walk.cc index 64e2b3a588a..f7bd94b4ef5 100644 --- a/ft/tests/le-cursor-walk.cc +++ b/ft/tests/le-cursor-walk.cc @@ -44,8 +44,7 @@ create_populate_tree(const char *logdir, const char *fname, int n) { error = toku_logger_open(logdir, logger); assert(error == 0); CACHETABLE ct = NULL; - error = toku_create_cachetable(&ct, 0, ZERO_LSN, logger); - assert(error == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, logger); toku_logger_set_cachetable(logger, ct); error = toku_logger_open_rollback(logger, ct, true); assert(error == 0); @@ -74,8 +73,7 @@ create_populate_tree(const char *logdir, const char *fname, int n) { toku_fill_dbt(&key, &k, sizeof k); DBT val; toku_fill_dbt(&val, &v, sizeof v); - error = toku_ft_insert(brt, &key, &val, txn); - assert(error == 0); + toku_ft_insert(brt, &key, &val, txn); } error = toku_txn_commit_txn(txn, true, NULL, NULL); @@ -88,18 +86,16 @@ create_populate_tree(const char *logdir, const char *fname, int n) { CHECKPOINTER cp = toku_cachetable_get_checkpointer(ct); error = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT); assert(error == 0); - error = toku_logger_close_rollback(logger, false); + toku_logger_close_rollback(logger); assert(error == 0); error = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT); assert(error == 0); - error = toku_logger_shutdown(logger); - CKERR(error); + toku_logger_shutdown(logger); error = toku_logger_close(&logger); assert(error == 0); - error = toku_cachetable_close(&ct); - assert(error == 0); + toku_cachetable_close(&ct); } // retrieve all of the leaf entries in the the tree and verify the key associated with each one. @@ -110,8 +106,7 @@ walk_tree(const char *fname, int n) { int error; CACHETABLE ct = NULL; - error = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(error == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); FT_HANDLE brt = NULL; error = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); @@ -147,14 +142,12 @@ walk_tree(const char *fname, int n) { toku_destroy_dbt(&key); toku_destroy_dbt(&val); - error = toku_le_cursor_close(cursor); - assert(error == 0); + toku_le_cursor_close(cursor); error = toku_close_ft_handle_nolsn(brt, 0); assert(error == 0); - error = toku_cachetable_close(&ct); - assert(error == 0); + toku_cachetable_close(&ct); } static void diff --git a/ft/tests/log-test-maybe-trim.cc b/ft/tests/log-test-maybe-trim.cc index eaa9e1868b8..1ad58d47cfe 100644 --- a/ft/tests/log-test-maybe-trim.cc +++ b/ft/tests/log-test-maybe-trim.cc @@ -27,11 +27,11 @@ test_main (int argc __attribute__((__unused__)), r = toku_logger_open(dname, logger); assert(r == 0); BYTESTRING hello = (BYTESTRING) { 5, (char *) "hello"}; LSN comment_lsn; - r = toku_log_comment(logger, &comment_lsn, true, 0, hello); + toku_log_comment(logger, &comment_lsn, true, 0, hello); LSN begin_lsn; - r = toku_log_begin_checkpoint(logger, &begin_lsn, true, 0, 0); assert(r == 0); + toku_log_begin_checkpoint(logger, &begin_lsn, true, 0, 0); LSN end_lsn; - r = toku_log_end_checkpoint(logger, &end_lsn, true, begin_lsn, 0, 0, 0); assert(r == 0); + toku_log_end_checkpoint(logger, &end_lsn, true, begin_lsn, 0, 0, 0); r = toku_logger_maybe_trim_log(logger, begin_lsn); assert(r == 0); r = toku_logger_close(&logger); assert(r == 0); diff --git a/ft/tests/log-test4.cc b/ft/tests/log-test4.cc index 3da7c585660..ebc1585642a 100644 --- a/ft/tests/log-test4.cc +++ b/ft/tests/log-test4.cc @@ -34,7 +34,7 @@ test_main (int argc __attribute__((__unused__)), { ml_lock(&logger->input_lock); - r = toku_logger_make_space_in_inbuf(logger, 5); assert(r == 0); + toku_logger_make_space_in_inbuf(logger, 5); snprintf(logger->inbuf.buf+logger->inbuf.n_in_buf, 5, "a1234"); logger->inbuf.n_in_buf+=5; logger->lsn.lsn++; diff --git a/ft/tests/log-test5.cc b/ft/tests/log-test5.cc index 26fa609d246..0821bbf95be 100644 --- a/ft/tests/log-test5.cc +++ b/ft/tests/log-test5.cc @@ -39,7 +39,7 @@ test_main (int argc __attribute__((__unused__)), ml_lock(&logger->input_lock); int ilen=3+random()%5; - r = toku_logger_make_space_in_inbuf(logger, ilen+1); assert(r==0); + toku_logger_make_space_in_inbuf(logger, ilen+1); snprintf(logger->inbuf.buf+logger->inbuf.n_in_buf, ilen+1, "a%0*d ", (int)ilen, i); logger->inbuf.n_in_buf+=(ilen+1); logger->lsn.lsn++; diff --git a/ft/tests/log-test6.cc b/ft/tests/log-test6.cc index 6ee0d99f0f5..b1358f6032c 100644 --- a/ft/tests/log-test6.cc +++ b/ft/tests/log-test6.cc @@ -44,7 +44,7 @@ test_main (int argc __attribute__((__unused__)), { ml_lock(&logger->input_lock); int lsize=LSIZE-12-2; - r = toku_logger_make_space_in_inbuf(logger, lsize); assert(r==0); + toku_logger_make_space_in_inbuf(logger, lsize); snprintf(logger->inbuf.buf+logger->inbuf.n_in_buf, lsize, "a%*d", lsize-1, 0); logger->inbuf.n_in_buf += lsize; logger->lsn.lsn++; @@ -54,7 +54,7 @@ test_main (int argc __attribute__((__unused__)), { ml_lock(&logger->input_lock); - r = toku_logger_make_space_in_inbuf(logger, 2); assert(r==0); + toku_logger_make_space_in_inbuf(logger, 2); memcpy(logger->inbuf.buf+logger->inbuf.n_in_buf, "b1", 2); logger->inbuf.n_in_buf += 2; logger->lsn.lsn++; diff --git a/ft/tests/log-test7.cc b/ft/tests/log-test7.cc index 8e717abe3bd..fc77766fc71 100644 --- a/ft/tests/log-test7.cc +++ b/ft/tests/log-test7.cc @@ -41,11 +41,10 @@ static void setup_logger(int which) { } static void play_with_logger(int which) { - int r; { ml_lock(&logger[which]->input_lock); int lsize=LSIZE-12-2; - r = toku_logger_make_space_in_inbuf(logger[which], lsize); assert(r==0); + toku_logger_make_space_in_inbuf(logger[which], lsize); snprintf(logger[which]->inbuf.buf+logger[which]->inbuf.n_in_buf, lsize, "a%*d", lsize-1, 0); logger[which]->inbuf.n_in_buf += lsize; logger[which]->lsn.lsn++; @@ -55,7 +54,7 @@ static void play_with_logger(int which) { { ml_lock(&logger[which]->input_lock); - r = toku_logger_make_space_in_inbuf(logger[which], 2); assert(r==0); + toku_logger_make_space_in_inbuf(logger[which], 2); memcpy(logger[which]->inbuf.buf+logger[which]->inbuf.n_in_buf, "b1", 2); logger[which]->inbuf.n_in_buf += 2; logger[which]->lsn.lsn++; diff --git a/ft/tests/logcursor-bad-checksum.cc b/ft/tests/logcursor-bad-checksum.cc index 12302dfcdc0..bcffefab0fd 100644 --- a/ft/tests/logcursor-bad-checksum.cc +++ b/ft/tests/logcursor-bad-checksum.cc @@ -51,8 +51,7 @@ test_main (int argc, const char *argv[]) { assert(r == 0); BYTESTRING bs0 = { .len = 5, .data = (char *) "hello" }; - r = toku_log_comment(logger, &lsn, 0, 0, bs0); - assert(r == 0); + toku_log_comment(logger, &lsn, 0, 0, bs0); r = toku_logger_close(&logger); assert(r == 0); diff --git a/ft/tests/logcursor-empty-logfile-2.cc b/ft/tests/logcursor-empty-logfile-2.cc index db14cc4f1e9..0a05f975a91 100644 --- a/ft/tests/logcursor-empty-logfile-2.cc +++ b/ft/tests/logcursor-empty-logfile-2.cc @@ -48,8 +48,7 @@ test_main (int argc, const char *argv[]) { char str[32]; sprintf(str, "hello%d", helloseq++); BYTESTRING bs0 = { .len = (uint32_t) strlen(str), .data = str }; - r = toku_log_comment(logger, &lsn, 0, 0, bs0); - assert(r == 0); + toku_log_comment(logger, &lsn, 0, 0, bs0); r = toku_logger_close(&logger); assert(r == 0); diff --git a/ft/tests/logcursor-empty-logfile-3.cc b/ft/tests/logcursor-empty-logfile-3.cc index c5a03c8680b..5c7d3bda1b4 100644 --- a/ft/tests/logcursor-empty-logfile-3.cc +++ b/ft/tests/logcursor-empty-logfile-3.cc @@ -36,8 +36,7 @@ test_main (int argc, const char *argv[]) { char str[32]; sprintf(str, "hello%d", helloseq++); BYTESTRING bs0 = { .len = (uint32_t) strlen(str), .data = str }; - r = toku_log_comment(logger, &lsn, 0, 0, bs0); - assert(r == 0); + toku_log_comment(logger, &lsn, 0, 0, bs0); r = toku_logger_close(&logger); assert(r == 0); @@ -78,8 +77,7 @@ test_main (int argc, const char *argv[]) { char str[32]; sprintf(str, "hello%d", helloseq++); BYTESTRING bs0 = { .len = (uint32_t) strlen(str), .data = str }; - r = toku_log_comment(logger, &lsn, 0, 0, bs0); - assert(r == 0); + toku_log_comment(logger, &lsn, 0, 0, bs0); r = toku_logger_close(&logger); assert(r == 0); diff --git a/ft/tests/logcursor-empty-logfile.cc b/ft/tests/logcursor-empty-logfile.cc index 283ef70e735..ac652f2a3ab 100644 --- a/ft/tests/logcursor-empty-logfile.cc +++ b/ft/tests/logcursor-empty-logfile.cc @@ -36,8 +36,7 @@ test_main (int argc, const char *argv[]) { char str[32]; sprintf(str, "hello%d", helloseq++); BYTESTRING bs0 = { .len = (uint32_t) strlen(str), .data = str }; - r = toku_log_comment(logger, &lsn, 0, 0, bs0); - assert(r == 0); + toku_log_comment(logger, &lsn, 0, 0, bs0); r = toku_logger_close(&logger); assert(r == 0); @@ -66,8 +65,7 @@ test_main (int argc, const char *argv[]) { char str[32]; sprintf(str, "hello%d", helloseq++); BYTESTRING bs0 = { .len = (uint32_t) strlen(str), .data = str }; - r = toku_log_comment(logger, &lsn, 0, 0, bs0); - assert(r == 0); + toku_log_comment(logger, &lsn, 0, 0, bs0); r = toku_logger_close(&logger); assert(r == 0); diff --git a/ft/tests/logcursor-timestamp.cc b/ft/tests/logcursor-timestamp.cc index 0b1e0f157e3..07eaae360d7 100644 --- a/ft/tests/logcursor-timestamp.cc +++ b/ft/tests/logcursor-timestamp.cc @@ -40,14 +40,12 @@ test_main (int argc, const char *argv[]) { assert(r == 0); BYTESTRING bs0 = { .len = 5, .data = (char *) "hello" }; - r = toku_log_comment(logger, &lsn, 0, now(), bs0); - assert(r == 0); + toku_log_comment(logger, &lsn, 0, now(), bs0); sleep(11); BYTESTRING bs1 = { .len = 5, .data = (char *) "world" }; - r = toku_log_comment(logger, &lsn, 0, now(), bs1); - assert(r == 0); + toku_log_comment(logger, &lsn, 0, now(), bs1); r = toku_logger_close(&logger); assert(r == 0); diff --git a/ft/tests/make-tree.cc b/ft/tests/make-tree.cc index cb1cb1d4f94..ea8fc8051d8 100644 --- a/ft/tests/make-tree.cc +++ b/ft/tests/make-tree.cc @@ -123,8 +123,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { // create a cachetable CACHETABLE ct = NULL; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); // create the brt TOKUTXN null_txn = NULL; @@ -154,8 +153,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { assert(r == 0); // shutdown the cachetable - r = toku_cachetable_close(&ct); - assert(r == 0); + toku_cachetable_close(&ct); } static int diff --git a/ft/tests/minicron-test.cc b/ft/tests/minicron-test.cc index 7876ad68cc3..511dde61f64 100644 --- a/ft/tests/minicron-test.cc +++ b/ft/tests/minicron-test.cc @@ -126,7 +126,7 @@ test5 (void *v) { int counter = 0; ZERO_STRUCT(m); int r = toku_minicron_setup(&m, 10, run_3sec, &counter); assert(r==0); - r = toku_minicron_change_period(&m, 2); assert(r==0); + toku_minicron_change_period(&m, 2); sleep(9); r = toku_minicron_shutdown(&m); assert(r==0); assert(counter==2); @@ -138,7 +138,7 @@ test6 (void *v) { struct minicron m; ZERO_STRUCT(m); int r = toku_minicron_setup(&m, 5, never_run, 0); assert(r==0); - r = toku_minicron_change_period(&m, 0); assert(r==0); + toku_minicron_change_period(&m, 0); sleep(7); r = toku_minicron_shutdown(&m); assert(r==0); return v; diff --git a/ft/tests/msnfilter.cc b/ft/tests/msnfilter.cc index 46c5f4ea7a0..43c9bf7ce6c 100644 --- a/ft/tests/msnfilter.cc +++ b/ft/tests/msnfilter.cc @@ -116,8 +116,7 @@ test_msnfilter(int do_verify) { // create a cachetable CACHETABLE ct = NULL; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); // create the brt TOKUTXN null_txn = NULL; @@ -150,8 +149,7 @@ test_msnfilter(int do_verify) { assert(r == 0); // shutdown the cachetable - r = toku_cachetable_close(&ct); - assert(r == 0); + toku_cachetable_close(&ct); } static int diff --git a/ft/tests/orthopush-flush.cc b/ft/tests/orthopush-flush.cc index 167c6911273..19a9a63aa4d 100644 --- a/ft/tests/orthopush-flush.cc +++ b/ft/tests/orthopush-flush.cc @@ -88,10 +88,9 @@ insert_random_message(NONLEAF_CHILDINFO bnc, FT_MSG_S **save, bool *is_fresh_out *save = result; *is_fresh_out = is_fresh; - int r = toku_bnc_insert_msg(bnc, key, keylen + (sizeof pfx), val, vallen, - FT_INSERT, msn, xids, is_fresh, - NULL, dummy_cmp); - assert_zero(r); + toku_bnc_insert_msg(bnc, key, keylen + (sizeof pfx), val, vallen, + FT_INSERT, msn, xids, is_fresh, + NULL, dummy_cmp); } // generate a random message with xids and a key starting with pfx, insert @@ -224,11 +223,10 @@ insert_random_update_message(NONLEAF_CHILDINFO bnc, FT_MSG_S **save, bool is_fre result->u.id.val = valdbt; *save = result; - int r = toku_bnc_insert_msg(bnc, key, keylen + (sizeof pfx), - update_extra, sizeof *update_extra, - FT_UPDATE, msn, xids, is_fresh, - NULL, dummy_cmp); - assert_zero(r); + toku_bnc_insert_msg(bnc, key, keylen + (sizeof pfx), + update_extra, sizeof *update_extra, + FT_UPDATE, msn, xids, is_fresh, + NULL, dummy_cmp); if (msn.msn > max_msn->msn) { *max_msn = msn; } @@ -1119,12 +1117,11 @@ test_main (int argc, const char *argv[]) { initialize_dummymsn(); int r; CACHETABLE ct; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); FT_HANDLE t; r = toku_open_ft_handle(fname, 1, &t, 128*1024, 4096, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); - r = toku_ft_set_update(t, orthopush_flush_update_fun); assert(r==0); + toku_ft_set_update(t, orthopush_flush_update_fun); // HACK t->ft->update_fun = orthopush_flush_update_fun; @@ -1148,7 +1145,7 @@ test_main (int argc, const char *argv[]) { } r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); return 0; } diff --git a/ft/tests/recovery-bad-last-entry.cc b/ft/tests/recovery-bad-last-entry.cc index 7b90c128276..b7560cb7913 100644 --- a/ft/tests/recovery-bad-last-entry.cc +++ b/ft/tests/recovery-bad-last-entry.cc @@ -37,15 +37,15 @@ run_test(void) { r = toku_logger_open(TESTDIR, logger); assert(r == 0); LSN beginlsn; // all logs must contain a valid checkpoint - r = toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); assert(r == 0); - r = toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); assert(r == 0); - r = toku_log_comment(logger, NULL, true, 0, hello); assert(r == 0); - r = toku_log_comment(logger, NULL, true, 0, world); assert(r == 0); - r = toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); assert(r == 0); - r = toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); assert(r == 0); - r = toku_log_comment(logger, NULL, true, 0, hello); assert(r == 0); - r = toku_log_comment(logger, NULL, true, 0, there); assert(r == 0); - r = toku_logger_close(&logger); assert(r == 0); + toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); + toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); + toku_log_comment(logger, NULL, true, 0, hello); + toku_log_comment(logger, NULL, true, 0, world); + toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); + toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); + toku_log_comment(logger, NULL, true, 0, hello); + toku_log_comment(logger, NULL, true, 0, there); + toku_logger_close(&logger); // redirect stderr int devnul = open(DEV_NULL_FILE, O_WRONLY); diff --git a/ft/tests/recovery-cbegin-cend-hello.cc b/ft/tests/recovery-cbegin-cend-hello.cc index 069335afe79..7f65485877e 100644 --- a/ft/tests/recovery-cbegin-cend-hello.cc +++ b/ft/tests/recovery-cbegin-cend-hello.cc @@ -26,8 +26,8 @@ run_test(void) { // add begin checkpoint, end checkpoint LSN beginlsn; - r = toku_log_begin_checkpoint(logger, &beginlsn, false, 0, 0); assert(r == 0); - r = toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); assert(r == 0); + toku_log_begin_checkpoint(logger, &beginlsn, false, 0, 0); + toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); r = toku_logger_close(&logger); assert(r == 0); // add hello @@ -35,7 +35,7 @@ run_test(void) { r = toku_logger_create(&logger); assert(r == 0); r = toku_logger_open(TESTDIR, logger); assert(r == 0); BYTESTRING hello = { (uint32_t) strlen("hello"), (char *) "hello" }; - r = toku_log_comment(logger, NULL, true, 0, hello); + toku_log_comment(logger, NULL, true, 0, hello); r = toku_logger_close(&logger); assert(r == 0); } diff --git a/ft/tests/recovery-cbegin-cend.cc b/ft/tests/recovery-cbegin-cend.cc index 0aaa47d115d..eb686a694e7 100644 --- a/ft/tests/recovery-cbegin-cend.cc +++ b/ft/tests/recovery-cbegin-cend.cc @@ -22,12 +22,12 @@ run_test(void) { r = toku_logger_create(&logger); assert(r == 0); r = toku_logger_open(TESTDIR, logger); assert(r == 0); LSN beginlsn; - r = toku_log_begin_checkpoint(logger, &beginlsn, false, 0, 0); assert(r == 0); + toku_log_begin_checkpoint(logger, &beginlsn, false, 0, 0); r = toku_logger_close(&logger); assert(r == 0); r = toku_logger_create(&logger); assert(r == 0); r = toku_logger_open(TESTDIR, logger); assert(r == 0); - r = toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); assert(r == 0); + toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); r = toku_logger_close(&logger); assert(r == 0); // run recovery diff --git a/ft/tests/recovery-cbegin.cc b/ft/tests/recovery-cbegin.cc index dc6a9c0a488..39e5bad1a4c 100644 --- a/ft/tests/recovery-cbegin.cc +++ b/ft/tests/recovery-cbegin.cc @@ -22,9 +22,9 @@ run_test(void) { r = toku_logger_create(&logger); assert(r == 0); r = toku_logger_open(TESTDIR, logger); assert(r == 0); LSN beginlsn; - r = toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); assert(r == 0); - r = toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); assert(r == 0); - r = toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); assert(r == 0); + toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); + toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); + toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); r = toku_logger_close(&logger); assert(r == 0); // run recovery diff --git a/ft/tests/recovery-cend-cbegin.cc b/ft/tests/recovery-cend-cbegin.cc index a80ef7b9586..f78e14ded8e 100644 --- a/ft/tests/recovery-cend-cbegin.cc +++ b/ft/tests/recovery-cend-cbegin.cc @@ -24,10 +24,10 @@ run_test(void) { r = toku_logger_create(&logger); assert(r == 0); r = toku_logger_open(TESTDIR, logger); assert(r == 0); LSN firstbegin = ZERO_LSN; - r = toku_log_begin_checkpoint(logger, &firstbegin, true, 0, 0); assert(r == 0); + toku_log_begin_checkpoint(logger, &firstbegin, true, 0, 0); assert(firstbegin.lsn != ZERO_LSN.lsn); - r = toku_log_end_checkpoint(logger, NULL, false, firstbegin, 0, 0, 0); assert(r == 0); - r = toku_log_begin_checkpoint(logger, NULL, true, 0, 0); assert(r == 0); + toku_log_end_checkpoint(logger, NULL, false, firstbegin, 0, 0, 0); + toku_log_begin_checkpoint(logger, NULL, true, 0, 0); r = toku_logger_close(&logger); assert(r == 0); if (!verbose) { diff --git a/ft/tests/recovery-datadir-is-file.cc b/ft/tests/recovery-datadir-is-file.cc index 1d47b21258a..f60d59fc328 100644 --- a/ft/tests/recovery-datadir-is-file.cc +++ b/ft/tests/recovery-datadir-is-file.cc @@ -25,7 +25,7 @@ run_test(void) { r = toku_logger_create(&logger); assert(r == 0); r = toku_logger_open(TESTDIR, logger); assert(r == 0); BYTESTRING hello = { (uint32_t) strlen("hello"), (char *) "hello" }; - r = toku_log_comment(logger, NULL, true, 0, hello); + toku_log_comment(logger, NULL, true, 0, hello); r = toku_logger_close(&logger); assert(r == 0); // redirect stderr diff --git a/ft/tests/recovery-fopen-missing-file.cc b/ft/tests/recovery-fopen-missing-file.cc index 077a9a07957..ec5141a04e0 100644 --- a/ft/tests/recovery-fopen-missing-file.cc +++ b/ft/tests/recovery-fopen-missing-file.cc @@ -24,13 +24,13 @@ run_test(void) { r = toku_logger_create(&logger); assert(r == 0); r = toku_logger_open(TESTDIR, logger); assert(r == 0); LSN beginlsn; - r = toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); assert(r == 0); - r = toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); assert(r == 0); + toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); + toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); BYTESTRING iname = { (uint32_t) strlen("missing_tokudb_file"), (char *) "missing_tokudb_file" }; FILENUM filenum = {42}; uint32_t treeflags = 0; - r = toku_log_fopen(logger, NULL, true, iname, filenum, treeflags); + toku_log_fopen(logger, NULL, true, iname, filenum, treeflags); r = toku_logger_close(&logger); assert(r == 0); // redirect stderr diff --git a/ft/tests/recovery-hello.cc b/ft/tests/recovery-hello.cc index 749a586d7d7..58c09c47d4b 100644 --- a/ft/tests/recovery-hello.cc +++ b/ft/tests/recovery-hello.cc @@ -24,13 +24,13 @@ run_test(void) { r = toku_logger_create(&logger); assert(r == 0); r = toku_logger_open(TESTDIR, logger); assert(r == 0); BYTESTRING hello = { (uint32_t) strlen("hello"), (char *) "hello" }; - r = toku_log_comment(logger, NULL, true, 0, hello); assert(r == 0); + toku_log_comment(logger, NULL, true, 0, hello); LSN beginlsn; - r = toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); assert(r == 0); - r = toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); assert(r == 0); - r = toku_log_comment(logger, NULL, true, 0, hello); assert(r == 0); + toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); + toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); + toku_log_comment(logger, NULL, true, 0, hello); BYTESTRING there = { (uint32_t) strlen("there"), (char *) "there" }; - r = toku_log_comment(logger, NULL, true, 0, there); assert(r == 0); + toku_log_comment(logger, NULL, true, 0, there); r = toku_logger_close(&logger); assert(r == 0); // redirect stderr diff --git a/ft/tests/recovery-lsn-error-during-forward-scan.cc b/ft/tests/recovery-lsn-error-during-forward-scan.cc index a73b086e967..045d7f509f6 100644 --- a/ft/tests/recovery-lsn-error-during-forward-scan.cc +++ b/ft/tests/recovery-lsn-error-during-forward-scan.cc @@ -43,8 +43,8 @@ run_test(void) { r = toku_logger_open(TESTDIR, logger); assert(r == 0); LSN beginlsn; - r = toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); assert(r == 0); - r = toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); assert(r == 0); + toku_log_begin_checkpoint(logger, &beginlsn, true, 0, 0); + toku_log_end_checkpoint(logger, NULL, true, beginlsn, 0, 0, 0); r = toku_logger_close(&logger); assert(r == 0); @@ -53,7 +53,7 @@ run_test(void) { r = toku_logger_open(TESTDIR, logger); assert(r == 0); BYTESTRING hello = { (uint32_t) strlen("hello"), (char *) "hello" }; - r = toku_log_comment(logger, NULL, true, 0, hello); assert(r == 0); + toku_log_comment(logger, NULL, true, 0, hello); r = toku_logger_close(&logger); assert(r == 0); @@ -62,7 +62,7 @@ run_test(void) { r = toku_logger_open(TESTDIR, logger); assert(r == 0); BYTESTRING there = { (uint32_t) strlen("there"), (char *) "there" }; - r = toku_log_comment(logger, NULL, true, 0, there); assert(r == 0); + toku_log_comment(logger, NULL, true, 0, there); r = toku_logger_close(&logger); assert(r == 0); diff --git a/ft/tests/recovery-no-datadir.cc b/ft/tests/recovery-no-datadir.cc index 0e57a787337..3e413a19f8c 100644 --- a/ft/tests/recovery-no-datadir.cc +++ b/ft/tests/recovery-no-datadir.cc @@ -24,7 +24,7 @@ run_test(void) { r = toku_logger_create(&logger); assert(r == 0); r = toku_logger_open(TESTDIR, logger); assert(r == 0); BYTESTRING hello = { (uint32_t) strlen("hello"), (char *) "hello" }; - r = toku_log_comment(logger, NULL, true, 0, hello); + toku_log_comment(logger, NULL, true, 0, hello); r = toku_logger_close(&logger); assert(r == 0); // redirect stderr diff --git a/ft/tests/recovery-test5123.cc b/ft/tests/recovery-test5123.cc index 8b65f875968..c8028c4b7c4 100644 --- a/ft/tests/recovery-test5123.cc +++ b/ft/tests/recovery-test5123.cc @@ -21,21 +21,15 @@ static void test_5123(void) { int r; - r = toku_log_xbegin(logger, NULL, false, (TXNID) 1, TXNID_NONE); - CKERR(r); - r = toku_log_xbegin(logger, NULL, false, (TXNID) 3, TXNID_NONE); - CKERR(r); - r = toku_log_xbegin(logger, NULL, false, (TXNID) 2, TXNID_NONE); - CKERR(r); + toku_log_xbegin(logger, NULL, false, (TXNID) 1, TXNID_NONE); + toku_log_xbegin(logger, NULL, false, (TXNID) 3, TXNID_NONE); + toku_log_xbegin(logger, NULL, false, (TXNID) 2, TXNID_NONE); - r = toku_log_xcommit(logger, NULL, false, NULL, (TXNID) 2); - CKERR(r); + toku_log_xcommit(logger, NULL, false, NULL, (TXNID) 2); - r = toku_logger_close_rollback(logger, false); - CKERR(r); + toku_logger_close_rollback(logger); - r = toku_cachetable_close(&ct); - CKERR(r); + toku_cachetable_close(&ct); // "Crash" r = toku_logger_close(&logger); CKERR(r); diff --git a/ft/tests/shortcut.cc b/ft/tests/shortcut.cc index 6f39aecb3c9..687d5aca6fa 100644 --- a/ft/tests/shortcut.cc +++ b/ft/tests/shortcut.cc @@ -23,7 +23,7 @@ test_main (int argc __attribute__((__unused__)), const char *argv[] __attribute unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, test_ft_cursor_keycompare); assert(r==0); r = toku_ft_cursor(brt, &cursor, NULL, false, false); assert(r==0); @@ -32,7 +32,7 @@ test_main (int argc __attribute__((__unused__)), const char *argv[] __attribute char string[100]; snprintf(string, sizeof(string), "%04d", i); DBT key,val; - r = toku_ft_insert(brt, toku_fill_dbt(&key, string, 5), toku_fill_dbt(&val, string, 5), 0); assert(r==0); + toku_ft_insert(brt, toku_fill_dbt(&key, string, 5), toku_fill_dbt(&val, string, 5), 0); } { @@ -47,7 +47,7 @@ test_main (int argc __attribute__((__unused__)), const char *argv[] __attribute // This will invalidate due to the root counter bumping, but the OMT itself will still be valid. { DBT key, val; - r = toku_ft_insert(brt, toku_fill_dbt(&key, "d", 2), toku_fill_dbt(&val, "w", 2), 0); assert(r==0); + toku_ft_insert(brt, toku_fill_dbt(&key, "d", 2), toku_fill_dbt(&val, "w", 2), 0); } { @@ -55,8 +55,8 @@ test_main (int argc __attribute__((__unused__)), const char *argv[] __attribute r = toku_ft_cursor_get(cursor, NULL, lookup_checkf, &pair, DB_NEXT); assert(r==0); assert(pair.call_count==1); } - r = toku_ft_cursor_close(cursor); assert(r==0); + toku_ft_cursor_close(cursor); r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); return 0; } diff --git a/ft/tests/test-checkpoint-during-flush.cc b/ft/tests/test-checkpoint-during-flush.cc index 14d1b1e2033..24f9a01d3eb 100644 --- a/ft/tests/test-checkpoint-during-flush.cc +++ b/ft/tests/test-checkpoint-during-flush.cc @@ -99,7 +99,7 @@ doit (bool after_child_pin) { toku_flusher_thread_set_callback(flusher_callback, &after_child_pin); - r = toku_create_cachetable(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); unlink("foo1.ft_handle"); r = toku_open_ft_handle("foo1.ft_handle", 1, &t, NODESIZE, NODESIZE/2, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -251,7 +251,7 @@ doit (bool after_child_pin) { r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); r = toku_close_ft_handle_nolsn(c_ft, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/test-checkpoint-during-merge.cc b/ft/tests/test-checkpoint-during-merge.cc index 5e9ad242ec0..e195bad7f03 100644 --- a/ft/tests/test-checkpoint-during-merge.cc +++ b/ft/tests/test-checkpoint-during-merge.cc @@ -90,7 +90,7 @@ doit (int state) { toku_flusher_thread_set_callback(flusher_callback, &state); - r = toku_create_cachetable(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); unlink("foo2.ft_handle"); unlink("bar2.ft_handle"); // note the basement node size is 5 times the node size @@ -315,7 +315,7 @@ doit (int state) { r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); r = toku_close_ft_handle_nolsn(c_ft, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); toku_free(pivots[0]); } diff --git a/ft/tests/test-checkpoint-during-rebalance.cc b/ft/tests/test-checkpoint-during-rebalance.cc index 24c5afb7364..e11f148c681 100644 --- a/ft/tests/test-checkpoint-during-rebalance.cc +++ b/ft/tests/test-checkpoint-during-rebalance.cc @@ -90,7 +90,7 @@ doit (int state) { toku_flusher_thread_set_callback(flusher_callback, &state); - r = toku_create_cachetable(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); unlink("foo3.ft_handle"); unlink("bar3.ft_handle"); // note the basement node size is 5 times the node size @@ -311,7 +311,7 @@ doit (int state) { r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); r = toku_close_ft_handle_nolsn(c_ft, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); toku_free(pivots[0]); } diff --git a/ft/tests/test-checkpoint-during-split.cc b/ft/tests/test-checkpoint-during-split.cc index d1411dc052f..1c74d121f49 100644 --- a/ft/tests/test-checkpoint-during-split.cc +++ b/ft/tests/test-checkpoint-during-split.cc @@ -99,7 +99,7 @@ doit (bool after_split) { toku_flusher_thread_set_callback(flusher_callback, &after_split); - r = toku_create_cachetable(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); unlink("foo4.ft_handle"); unlink("bar4.ft_handle"); // note the basement node size is 5 times the node size @@ -306,7 +306,7 @@ doit (bool after_split) { r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); r = toku_close_ft_handle_nolsn(c_ft, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/test-del-inorder.cc b/ft/tests/test-del-inorder.cc index d6e25a66ead..81b3e1f1b9c 100644 --- a/ft/tests/test-del-inorder.cc +++ b/ft/tests/test-del-inorder.cc @@ -29,7 +29,7 @@ doit (void) { XMALLOC_N(fnamelen, fname); snprintf(fname, fnamelen, "%s.ft_handle", __SRCFILE__); - r = toku_create_cachetable(&ct, 16*1024, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 16*1024, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, NODESIZE, NODESIZE, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -50,11 +50,10 @@ doit (void) { assert(r==0); DBT k,v; - r = toku_ft_insert(t, - toku_fill_dbt(&k, "hello", 6), - toku_fill_dbt(&v, "there", 6), - null_txn); - assert(r==0); + toku_ft_insert(t, + toku_fill_dbt(&k, "hello", 6), + toku_fill_dbt(&v, "there", 6), + null_txn); memset(&v, 0, sizeof(v)); struct check_pair pair = {6, "hello", 6, "there", 0}; @@ -63,7 +62,7 @@ doit (void) { assert(pair.call_count == 1); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/test-dirty-flushes-on-cleaner.cc b/ft/tests/test-dirty-flushes-on-cleaner.cc index 5f88e7cfd4e..72b830750b2 100644 --- a/ft/tests/test-dirty-flushes-on-cleaner.cc +++ b/ft/tests/test-dirty-flushes-on-cleaner.cc @@ -52,7 +52,7 @@ doit (void) { XMALLOC_N(fnamelen, fname); snprintf(fname, fnamelen, "%s.ft_handle", __SRCFILE__); - r = toku_create_cachetable(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &brt, NODESIZE, NODESIZE/2, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -266,7 +266,7 @@ doit (void) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); toku_free(pivots[0]); } diff --git a/ft/tests/test-dump-ft.cc b/ft/tests/test-dump-ft.cc index 4b63e3350a7..05542b141a3 100644 --- a/ft/tests/test-dump-ft.cc +++ b/ft/tests/test-dump-ft.cc @@ -21,7 +21,7 @@ test_main(int argc, const char *argv[]) { FILE *f = fopen("test-dump-ft.out", "w"); unlink(n); assert(f); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(n, 1, &t, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); int i; for (i=0; i<10000; i++) { @@ -29,12 +29,11 @@ test_main(int argc, const char *argv[]) { DBT k,v; snprintf(key, 100, "key%d", i); snprintf(val, 100, "val%d", i); - r = toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); - assert(r==0); + toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); } r = toku_dump_ft(f, t); assert(r==0); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); fclose(f); return 0; } diff --git a/ft/tests/test-flushes-on-cleaner.cc b/ft/tests/test-flushes-on-cleaner.cc index 650b80e9ab0..60966b5906d 100644 --- a/ft/tests/test-flushes-on-cleaner.cc +++ b/ft/tests/test-flushes-on-cleaner.cc @@ -52,7 +52,7 @@ doit (bool keep_other_bn_in_memory) { XMALLOC_N(fnamelen, fname); snprintf(fname, fnamelen, "%s.ft_handle", __SRCFILE__); - r = toku_create_cachetable(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &brt, NODESIZE, NODESIZE/2, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -295,7 +295,7 @@ doit (bool keep_other_bn_in_memory) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); toku_free(pivots[0]); } diff --git a/ft/tests/test-ft-overflow.cc b/ft/tests/test-ft-overflow.cc index a92f978660a..414fa3b3caa 100644 --- a/ft/tests/test-ft-overflow.cc +++ b/ft/tests/test-ft-overflow.cc @@ -21,7 +21,7 @@ test_overflow (void) { uint32_t nodesize = 1<<20; int r; unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &t, nodesize, nodesize / 8, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); DBT k,v; @@ -31,11 +31,10 @@ test_overflow (void) { int i; for (i=0; i<8; i++) { char key[]={(char)('a'+i), 0}; - r = toku_ft_insert(t, toku_fill_dbt(&k, key, 2), toku_fill_dbt(&v,buf,sizeof(buf)), null_txn); - assert(r==0); + toku_ft_insert(t, toku_fill_dbt(&k, key, 2), toku_fill_dbt(&v,buf,sizeof(buf)), null_txn); } r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/test-ft-txns.h b/ft/tests/test-ft-txns.h index 6f4adcb48d3..a64339ada47 100644 --- a/ft/tests/test-ft-txns.h +++ b/ft/tests/test-ft-txns.h @@ -28,8 +28,7 @@ test_setup(TOKULOGGER *loggerp, CACHETABLE *ctp) { r = toku_logger_open(TESTDIR, logger); CKERR(r); - r = toku_create_cachetable(ctp, 0, ZERO_LSN, logger); - CKERR(r); + toku_cachetable_create(ctp, 0, ZERO_LSN, logger); CACHETABLE ct = *ctp; toku_cachetable_set_env_dir(ct, TESTDIR); @@ -68,8 +67,7 @@ static inline void test_setup_and_recover(TOKULOGGER *loggerp, CACHETABLE *ctp) invariant(ct==NULL); r = toku_logger_open(TESTDIR, logger); CKERR(r); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, logger); - CKERR(r); + toku_cachetable_create(&ct, 0, ZERO_LSN, logger); toku_logger_set_cachetable(logger, ct); } *ctp = ct; @@ -82,17 +80,15 @@ static inline void clean_shutdown(TOKULOGGER *loggerp, CACHETABLE *ctp) { r = toku_checkpoint(cp, *loggerp, NULL, NULL, NULL, NULL, SHUTDOWN_CHECKPOINT); CKERR(r); - r = toku_logger_close_rollback(*loggerp, false); + r = toku_logger_close_rollback(*loggerp); CKERR(r); r = toku_checkpoint(cp, *loggerp, NULL, NULL, NULL, NULL, SHUTDOWN_CHECKPOINT); CKERR(r); - r = toku_logger_shutdown(*loggerp); - CKERR(r); + toku_logger_shutdown(*loggerp); - r = toku_cachetable_close(ctp); - CKERR(r); + toku_cachetable_close(ctp); r = toku_logger_close(loggerp); CKERR(r); @@ -100,10 +96,9 @@ static inline void clean_shutdown(TOKULOGGER *loggerp, CACHETABLE *ctp) { static inline void shutdown_after_recovery(TOKULOGGER *loggerp, CACHETABLE *ctp) { int r; - r = toku_logger_close_rollback(*loggerp, false); - CKERR(r); - r = toku_cachetable_close(ctp); + r = toku_logger_close_rollback(*loggerp); CKERR(r); + toku_cachetable_close(ctp); r = toku_logger_close(loggerp); CKERR(r); } diff --git a/ft/tests/test-inc-split.cc b/ft/tests/test-inc-split.cc index 4ab12403946..bf5c9ae8e4d 100644 --- a/ft/tests/test-inc-split.cc +++ b/ft/tests/test-inc-split.cc @@ -57,7 +57,7 @@ doit (int ksize __attribute__((__unused__))) { XMALLOC_N(fnamelen, fname); snprintf(fname, fnamelen, "%s.ft_handle", __SRCFILE__); - r = toku_create_cachetable(&ct, 16*1024, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 16*1024, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, NODESIZE, NODESIZE, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -123,17 +123,17 @@ doit (int ksize __attribute__((__unused__))) { int keylen=1+snprintf(key, sizeof(key), "%08d", 4); int vallen=magic_size; snprintf(data, magic_size, "%*s", magic_size-1, " "); - r=toku_ft_insert(t, - toku_fill_dbt(&k, key, keylen), - toku_fill_dbt(&v, data, vallen), - null_txn); + toku_ft_insert(t, + toku_fill_dbt(&k, key, keylen), + toku_fill_dbt(&v, data, vallen), + null_txn); } r = toku_testsetup_root(t, anode); assert(r==0); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); //printf("ksize=%d, unused\n", ksize); diff --git a/ft/tests/test-merges-on-cleaner.cc b/ft/tests/test-merges-on-cleaner.cc index e5fd74e8a32..580bc1cc060 100644 --- a/ft/tests/test-merges-on-cleaner.cc +++ b/ft/tests/test-merges-on-cleaner.cc @@ -51,7 +51,7 @@ doit (void) { XMALLOC_N(fnamelen, fname); snprintf(fname, fnamelen, "%s.ft_handle", __SRCFILE__); - r = toku_create_cachetable(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &brt, NODESIZE, NODESIZE/2, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -210,7 +210,7 @@ doit (void) { r = toku_close_ft_handle_nolsn(brt, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); toku_free(pivots[0]); } diff --git a/ft/tests/test-pick-child-to-flush.cc b/ft/tests/test-pick-child-to-flush.cc index fe2cb627dc2..9c4b06bc26b 100644 --- a/ft/tests/test-pick-child-to-flush.cc +++ b/ft/tests/test-pick-child-to-flush.cc @@ -85,7 +85,7 @@ doit (void) { XMALLOC_N(fnamelen, fname); snprintf(fname, fnamelen, "%s.ft_handle", __SRCFILE__); - r = toku_create_cachetable(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, NODESIZE, NODESIZE/2, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -300,7 +300,7 @@ doit (void) { assert(num_flushes_called == 2); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); toku_free(pivots[0]); } diff --git a/ft/tests/test3681.cc b/ft/tests/test3681.cc index deac90e1c8e..999d3b3f23e 100644 --- a/ft/tests/test3681.cc +++ b/ft/tests/test3681.cc @@ -22,7 +22,7 @@ static TOKUTXN const null_txn = 0; volatile bool done = false; static void setup (void) { - { int r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); } + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); char fname[] = __SRCFILE__ "test1.dat"; unlink(fname); { int r = toku_open_ft_handle(fname, 1, &t, 1024, 256, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); } @@ -31,7 +31,7 @@ static void setup (void) { static void finish (void) { { int r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); }; - { int r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0); } + toku_cachetable_close(&ct); } static void *starta (void *n) { @@ -41,8 +41,7 @@ static void *starta (void *n) { char ks[20], vs[20]; snprintf(ks, sizeof(ks), "hello%03d", i); snprintf(vs, sizeof(vs), "there%03d", i); - int r = toku_ft_insert(t, toku_fill_dbt(&k, ks, strlen(ks)), toku_fill_dbt(&v, vs, strlen(vs)), null_txn); - assert(r==0); + toku_ft_insert(t, toku_fill_dbt(&k, ks, strlen(ks)), toku_fill_dbt(&v, vs, strlen(vs)), null_txn); usleep(1); } done = true; diff --git a/ft/tests/test3856.cc b/ft/tests/test3856.cc index e81ada7ea29..31263713a25 100644 --- a/ft/tests/test3856.cc +++ b/ft/tests/test3856.cc @@ -38,22 +38,21 @@ test_main (int argc __attribute__((__unused__)), const char *argv[] __attribute_ CACHETABLE ct; FT_HANDLE t; - int r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); unlink(fname); - r = toku_open_ft_handle(fname, 1, &t, nodesize, basementnodesize, compression_method, ct, null_txn, string_cmp); assert(r==0); + int r = toku_open_ft_handle(fname, 1, &t, nodesize, basementnodesize, compression_method, ct, null_txn, string_cmp); assert(r==0); for (int i = 0; i < count; ++i) { char key[100],val[100]; DBT k,v; snprintf(key, 100, "hello%d", i); snprintf(val, 100, "there%d", i); - r = toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); - assert(r==0); + toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), null_txn); } r = toku_close_ft_handle_nolsn(t, 0); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0); + toku_cachetable_close(&ct); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &t, nodesize, basementnodesize, compression_method, ct, null_txn, string_cmp); assert(r == 0); for (int n = 0; n < count/100; ++n) { @@ -71,11 +70,11 @@ test_main (int argc __attribute__((__unused__)), const char *argv[] __attribute_ for (int j = 0; j < 100; ++j) { r = toku_ft_cursor_next(c, found, NULL); assert(r == 0); } - r = toku_ft_cursor_close(c); assert(r == 0); + toku_ft_cursor_close(c); } r = toku_close_ft_handle_nolsn(t, 0); assert(r == 0); - r = toku_cachetable_close(&ct), assert(r == 0); + toku_cachetable_close(&ct); return 0; } diff --git a/ft/tests/test3884.cc b/ft/tests/test3884.cc index 863ae80d68f..920d3993916 100644 --- a/ft/tests/test3884.cc +++ b/ft/tests/test3884.cc @@ -165,7 +165,7 @@ test_split_on_boundary(void) unlink(fname); CACHETABLE ct; FT_HANDLE brt; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, nodesize, bnsize, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); FTNODE nodea, nodeb; @@ -178,7 +178,7 @@ test_split_on_boundary(void) toku_unpin_ftnode(brt->ft, nodeb); r = toku_close_ft_handle_nolsn(brt, NULL); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0); + toku_cachetable_close(&ct); if (splitk.data) { toku_free(splitk.data); @@ -238,7 +238,7 @@ test_split_with_everything_on_the_left(void) unlink(fname); CACHETABLE ct; FT_HANDLE brt; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, nodesize, bnsize, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); FTNODE nodea, nodeb; @@ -248,7 +248,7 @@ test_split_with_everything_on_the_left(void) toku_unpin_ftnode(brt->ft, nodeb); r = toku_close_ft_handle_nolsn(brt, NULL); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0); + toku_cachetable_close(&ct); if (splitk.data) { toku_free(splitk.data); @@ -313,7 +313,7 @@ test_split_on_boundary_of_last_node(void) unlink(fname); CACHETABLE ct; FT_HANDLE brt; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, nodesize, bnsize, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); FTNODE nodea, nodeb; @@ -323,7 +323,7 @@ test_split_on_boundary_of_last_node(void) toku_unpin_ftnode(brt->ft, nodeb); r = toku_close_ft_handle_nolsn(brt, NULL); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0); + toku_cachetable_close(&ct); if (splitk.data) { toku_free(splitk.data); @@ -381,7 +381,7 @@ test_split_at_begin(void) unlink(fname); CACHETABLE ct; FT_HANDLE brt; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, nodesize, bnsize, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); FTNODE nodea, nodeb; @@ -391,7 +391,7 @@ test_split_at_begin(void) toku_unpin_ftnode(brt->ft, nodeb); r = toku_close_ft_handle_nolsn(brt, NULL); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0); + toku_cachetable_close(&ct); if (splitk.data) { toku_free(splitk.data); @@ -445,7 +445,7 @@ test_split_at_end(void) unlink(fname); CACHETABLE ct; FT_HANDLE brt; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, nodesize, bnsize, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); FTNODE nodea, nodeb; @@ -455,7 +455,7 @@ test_split_at_end(void) toku_unpin_ftnode(brt->ft, nodeb); r = toku_close_ft_handle_nolsn(brt, NULL); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0); + toku_cachetable_close(&ct); if (splitk.data) { toku_free(splitk.data); @@ -499,7 +499,7 @@ test_split_odd_nodes(void) unlink(fname); CACHETABLE ct; FT_HANDLE brt; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &brt, nodesize, bnsize, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); FTNODE nodea, nodeb; @@ -512,7 +512,7 @@ test_split_odd_nodes(void) toku_unpin_ftnode(brt->ft, nodeb); r = toku_close_ft_handle_nolsn(brt, NULL); assert(r == 0); - r = toku_cachetable_close(&ct); assert(r == 0); + toku_cachetable_close(&ct); if (splitk.data) { toku_free(splitk.data); diff --git a/ft/tests/test4115.cc b/ft/tests/test4115.cc index 0f694a2df99..ffa60f16d1d 100644 --- a/ft/tests/test4115.cc +++ b/ft/tests/test4115.cc @@ -26,15 +26,15 @@ static int dont_allow_prefix (DB *db __attribute__((__unused__)), const DBT *a, static void close_ft_and_ct (void) { int r; r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } static void open_ft_and_ct (bool unlink_old) { int r; if (unlink_old) unlink(fname); - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 1, &t, 1<<12, 1<<9, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); - r = toku_ft_set_bt_compare(t, dont_allow_prefix); + toku_ft_set_bt_compare(t, dont_allow_prefix); } static void test_4115 (void) { @@ -45,12 +45,10 @@ static void test_4115 (void) { snprintf(key, 100, "%08llu", (unsigned long long)2*i+1); snprintf(val, 100, "%08llu", (unsigned long long)2*i+1); DBT k,v; - int r = toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v,val, 1+strlen(val)), null_txn); - assert(r == 0); + toku_ft_insert(t, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v,val, 1+strlen(val)), null_txn); } struct ftstat64_s s; - int r = toku_ft_handle_stat64(t, NULL, &s); - assert(r==0); + toku_ft_handle_stat64(t, NULL, &s); assert(s.nkeys>0); assert(s.dsize>0); close_ft_and_ct(); diff --git a/ft/tests/test4244.cc b/ft/tests/test4244.cc index f4386fff46c..1d13f1cc780 100644 --- a/ft/tests/test4244.cc +++ b/ft/tests/test4244.cc @@ -30,7 +30,7 @@ doit (void) { XMALLOC_N(fnamelen, fname); snprintf(fname, fnamelen, "%s.ft_handle", __SRCFILE__); - r = toku_create_cachetable(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); assert(r==0); + toku_cachetable_create(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER); unlink(fname); r = toku_open_ft_handle(fname, 1, &t, NODESIZE, NODESIZE/2, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun); assert(r==0); @@ -57,11 +57,10 @@ doit (void) { memset(&k, 0, sizeof(k)); memset(&v, 0, sizeof(v)); for (int i = 0; i < 100; i++) { - r = toku_ft_insert(t, - toku_fill_dbt(&k, "hello", 6), - toku_fill_dbt(&v, big_val, big_val_size), - null_txn); - assert(r==0); + toku_ft_insert(t, + toku_fill_dbt(&k, "hello", 6), + toku_fill_dbt(&v, big_val, big_val_size), + null_txn); } toku_free(big_val); @@ -89,7 +88,7 @@ doit (void) { toku_unpin_ftnode_off_client_thread(t->ft, node); r = toku_close_ft_handle_nolsn(t, 0); assert(r==0); - r = toku_cachetable_close(&ct); assert(r==0); + toku_cachetable_close(&ct); } int diff --git a/ft/tests/test_logcursor.cc b/ft/tests/test_logcursor.cc index 218b8e7ee73..f3441f9b604 100644 --- a/ft/tests/test_logcursor.cc +++ b/ft/tests/test_logcursor.cc @@ -184,44 +184,43 @@ int create_logfiles() { // use old x1.tdb test log as basis //xbegin 'b': lsn=1 parenttxnid=0 crc=00005f1f len=29 - r = toku_log_xbegin(logger, &lsn, 1, NO_FSYNC, 0); assert(r==0); txnid = lsn.lsn; + toku_log_xbegin(logger, &lsn, 1, NO_FSYNC, 0); txnid = lsn.lsn; //fcreate 'F': lsn=2 txnid=1 filenum=0 fname={len=4 data="a.db"} mode=0777 treeflags=0 crc=18a3d525 len=49 - r = toku_log_fcreate(logger, &lsn, NO_FSYNC, NULL, txnid, fn_aname, bs_aname, 0x0777, 0, 0, TOKU_DEFAULT_COMPRESSION_METHOD, 0); assert(r==0); + toku_log_fcreate(logger, &lsn, NO_FSYNC, NULL, txnid, fn_aname, bs_aname, 0x0777, 0, 0, TOKU_DEFAULT_COMPRESSION_METHOD, 0); //commit 'C': lsn=3 txnid=1 crc=00001f1e len=29 - r = toku_log_xcommit(logger, &lsn, FSYNC, NULL, txnid); assert(r==0); + toku_log_xcommit(logger, &lsn, FSYNC, NULL, txnid); //xbegin 'b': lsn=4 parenttxnid=0 crc=00000a1f len=29 - r = toku_log_xbegin(logger, &lsn, 2, NO_FSYNC, 0); assert(r==0); txnid = lsn.lsn; + toku_log_xbegin(logger, &lsn, 2, NO_FSYNC, 0); txnid = lsn.lsn; //fcreate 'F': lsn=5 txnid=4 filenum=1 fname={len=4 data="b.db"} mode=0777 treeflags=0 crc=14a47925 len=49 - r = toku_log_fcreate(logger, &lsn, NO_FSYNC, NULL, txnid, fn_bname, bs_bname, 0x0777, 0, 0, TOKU_DEFAULT_COMPRESSION_METHOD, 0); assert(r==0); + toku_log_fcreate(logger, &lsn, NO_FSYNC, NULL, txnid, fn_bname, bs_bname, 0x0777, 0, 0, TOKU_DEFAULT_COMPRESSION_METHOD, 0); //commit 'C': lsn=6 txnid=4 crc=0000c11e len=29 - r = toku_log_xcommit(logger, &lsn, FSYNC, NULL, txnid); assert(r==0); + toku_log_xcommit(logger, &lsn, FSYNC, NULL, txnid); //xbegin 'b': lsn=7 parenttxnid=0 crc=0000f91f len=29 - r = toku_log_xbegin(logger, &lsn, 3, NO_FSYNC, 0); assert(r==0); txnid = lsn.lsn; + toku_log_xbegin(logger, &lsn, 3, NO_FSYNC, 0); txnid = lsn.lsn; //enq_insert 'I': lsn=8 filenum=0 xid=7 key={len=2 data="a\000"} value={len=2 data="b\000"} crc=40b863e4 len=45 - r = toku_log_enq_insert(logger, &lsn, NO_FSYNC, NULL, fn_aname, txnid, bs_a, bs_b); assert(r==0); + toku_log_enq_insert(logger, &lsn, NO_FSYNC, NULL, fn_aname, txnid, bs_a, bs_b); //begin_checkpoint 'x': lsn=9 timestamp=1251309957584197 crc=cd067878 len=29 - r = toku_log_begin_checkpoint(logger, &lsn, NO_FSYNC, 1251309957584197, 0); assert(r==0); cp_txnid = lsn.lsn; + toku_log_begin_checkpoint(logger, &lsn, NO_FSYNC, 1251309957584197, 0); cp_txnid = lsn.lsn; //fassociate 'f': lsn=11 filenum=1 fname={len=4 data="b.db"} crc=a7126035 len=33 - r = toku_log_fassociate(logger, &lsn, NO_FSYNC, fn_bname, 0, bs_bname, 0); assert(r==0); + toku_log_fassociate(logger, &lsn, NO_FSYNC, fn_bname, 0, bs_bname, 0); num_fassociate++; //fassociate 'f': lsn=12 filenum=0 fname={len=4 data="a.db"} crc=a70c5f35 len=33 - r = toku_log_fassociate(logger, &lsn, NO_FSYNC, fn_aname, 0, bs_aname, 0); assert(r==0); + toku_log_fassociate(logger, &lsn, NO_FSYNC, fn_aname, 0, bs_aname, 0); num_fassociate++; //xstillopen 's': lsn=10 txnid=7 parent=0 crc=00061816 len=37 <- obsolete { FILENUMS filenums = {0, NULL}; - r = toku_log_xstillopen(logger, &lsn, NO_FSYNC, NULL, txnid, 0, + toku_log_xstillopen(logger, &lsn, NO_FSYNC, NULL, txnid, 0, 0, filenums, 0, 0, 0, ROLLBACK_NONE, ROLLBACK_NONE, ROLLBACK_NONE); - assert(r==0); } num_xstillopen++; //end_checkpoint 'X': lsn=13 txnid=9 timestamp=1251309957586872 crc=cd285c30 len=37 - r = toku_log_end_checkpoint(logger, &lsn, FSYNC, (LSN){cp_txnid}, 1251309957586872, num_fassociate, num_xstillopen); assert(r==0); + toku_log_end_checkpoint(logger, &lsn, FSYNC, (LSN){cp_txnid}, 1251309957586872, num_fassociate, num_xstillopen); //enq_insert 'I': lsn=14 filenum=1 xid=7 key={len=2 data="b\000"} value={len=2 data="a\000"} crc=40388be4 len=45 - r = toku_log_enq_insert(logger, &lsn, NO_FSYNC, NULL, fn_bname, txnid, bs_b, bs_a); assert(r==0); + toku_log_enq_insert(logger, &lsn, NO_FSYNC, NULL, fn_bname, txnid, bs_b, bs_a); //commit 'C': lsn=15 txnid=7 crc=00016d1e len=29 - r = toku_log_xcommit(logger, &lsn, FSYNC, NULL, txnid); assert(r==0); + toku_log_xcommit(logger, &lsn, FSYNC, NULL, txnid); // close logger r = toku_logger_close(&logger); assert(r==0); diff --git a/ft/tests/upgrade_test_simple.cc b/ft/tests/upgrade_test_simple.cc index 347fb1c6f1e..3ff69ca34cd 100644 --- a/ft/tests/upgrade_test_simple.cc +++ b/ft/tests/upgrade_test_simple.cc @@ -37,7 +37,7 @@ get_one_value(FT_HANDLE t, CACHETABLE UU(ct), void *UU(extra)) r = toku_ft_cursor_first(cursor, noop_getf, &called); CKERR(r); assert(called == 1); - r = toku_ft_cursor_close(cursor); + toku_ft_cursor_close(cursor); CKERR(r); return 0; @@ -71,14 +71,12 @@ static int insert_something(FT_HANDLE t, CACHETABLE UU(ct), void *UU(extra)) { assert(t); - int r = 0; unsigned int dummy_value = 1U << 31; DBT key; DBT val; toku_fill_dbt(&key, &dummy_value, sizeof(unsigned int)); toku_fill_dbt(&val, &dummy_value, sizeof(unsigned int)); - r = toku_ft_insert (t, &key, &val, 0); - CKERR(r); + toku_ft_insert (t, &key, &val, 0); return 0; } @@ -91,8 +89,7 @@ with_open_tree(const char *fname, tree_cb cb, void *cb_extra) FT_HANDLE t; CACHETABLE ct; - r = toku_create_cachetable(&ct, 16*(1<<20), ZERO_LSN, NULL_LOGGER); - CKERR(r); + toku_cachetable_create(&ct, 16*(1<<20), ZERO_LSN, NULL_LOGGER); r = toku_open_ft_handle(fname, 0, &t, @@ -113,8 +110,7 @@ with_open_tree(const char *fname, tree_cb cb, void *cb_extra) CKERR(r); r = toku_close_ft_handle_nolsn(t, 0); CKERR(r); - r = toku_cachetable_close(&ct); - CKERR(r); + toku_cachetable_close(&ct); return r2; } diff --git a/ft/tests/verify-bad-msn.cc b/ft/tests/verify-bad-msn.cc index f7e84e0bb45..1fb154d729e 100644 --- a/ft/tests/verify-bad-msn.cc +++ b/ft/tests/verify-bad-msn.cc @@ -126,8 +126,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { // create a cachetable CACHETABLE ct = NULL; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); // create the brt TOKUTXN null_txn = NULL; @@ -158,8 +157,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { assert(r == 0); // shutdown the cachetable - r = toku_cachetable_close(&ct); - assert(r == 0); + toku_cachetable_close(&ct); } static int diff --git a/ft/tests/verify-bad-pivots.cc b/ft/tests/verify-bad-pivots.cc index a2f9cee1d2d..141d8a31aba 100644 --- a/ft/tests/verify-bad-pivots.cc +++ b/ft/tests/verify-bad-pivots.cc @@ -96,8 +96,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { // create a cachetable CACHETABLE ct = NULL; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); // create the brt TOKUTXN null_txn = NULL; @@ -125,8 +124,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { assert(r == 0); // shutdown the cachetable - r = toku_cachetable_close(&ct); - assert(r == 0); + toku_cachetable_close(&ct); } static int diff --git a/ft/tests/verify-dup-in-leaf.cc b/ft/tests/verify-dup-in-leaf.cc index b79598bee39..6f87777a88c 100644 --- a/ft/tests/verify-dup-in-leaf.cc +++ b/ft/tests/verify-dup-in-leaf.cc @@ -54,8 +54,7 @@ test_dup_in_leaf(int do_verify) { // create a cachetable CACHETABLE ct = NULL; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); // create the brt TOKUTXN null_txn = NULL; @@ -85,8 +84,7 @@ test_dup_in_leaf(int do_verify) { assert(r == 0); // shutdown the cachetable - r = toku_cachetable_close(&ct); - assert(r == 0); + toku_cachetable_close(&ct); } static int diff --git a/ft/tests/verify-dup-pivots.cc b/ft/tests/verify-dup-pivots.cc index e08b97cf7ed..4a7d2b50d7f 100644 --- a/ft/tests/verify-dup-pivots.cc +++ b/ft/tests/verify-dup-pivots.cc @@ -99,8 +99,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { // create a cachetable CACHETABLE ct = NULL; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); // create the brt TOKUTXN null_txn = NULL; @@ -129,8 +128,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { assert(r == 0); // shutdown the cachetable - r = toku_cachetable_close(&ct); - assert(r == 0); + toku_cachetable_close(&ct); } static int diff --git a/ft/tests/verify-misrouted-msgs.cc b/ft/tests/verify-misrouted-msgs.cc index 5a5523d0a37..6c58c3c4e8a 100644 --- a/ft/tests/verify-misrouted-msgs.cc +++ b/ft/tests/verify-misrouted-msgs.cc @@ -111,8 +111,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { // create a cachetable CACHETABLE ct = NULL; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); // create the brt TOKUTXN null_txn = NULL; @@ -141,8 +140,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { assert(r == 0); // shutdown the cachetable - r = toku_cachetable_close(&ct); - assert(r == 0); + toku_cachetable_close(&ct); } static int diff --git a/ft/tests/verify-unsorted-leaf.cc b/ft/tests/verify-unsorted-leaf.cc index 428aa1eb6fd..8ad91eed5c3 100644 --- a/ft/tests/verify-unsorted-leaf.cc +++ b/ft/tests/verify-unsorted-leaf.cc @@ -56,8 +56,7 @@ test_dup_in_leaf(int do_verify) { // create a cachetable CACHETABLE ct = NULL; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); // create the brt TOKUTXN null_txn = NULL; @@ -86,8 +85,7 @@ test_dup_in_leaf(int do_verify) { assert(r == 0); // shutdown the cachetable - r = toku_cachetable_close(&ct); - assert(r == 0); + toku_cachetable_close(&ct); } static int diff --git a/ft/tests/verify-unsorted-pivots.cc b/ft/tests/verify-unsorted-pivots.cc index 2eb925be279..0b848792ecd 100644 --- a/ft/tests/verify-unsorted-pivots.cc +++ b/ft/tests/verify-unsorted-pivots.cc @@ -96,8 +96,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { // create a cachetable CACHETABLE ct = NULL; - r = toku_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); - assert(r == 0); + toku_cachetable_create(&ct, 0, ZERO_LSN, NULL_LOGGER); // create the brt TOKUTXN null_txn = NULL; @@ -125,8 +124,7 @@ test_make_tree(int height, int fanout, int nperleaf, int do_verify) { assert(r == 0); // shutdown the cachetable - r = toku_cachetable_close(&ct); - assert(r == 0); + toku_cachetable_close(&ct); } static int diff --git a/ft/tests/xid_lsn_independent.cc b/ft/tests/xid_lsn_independent.cc index c72108ac0f2..dc09b11bd87 100644 --- a/ft/tests/xid_lsn_independent.cc +++ b/ft/tests/xid_lsn_independent.cc @@ -61,8 +61,7 @@ static void test_xid_lsn_independent(int N) { snprintf(key, sizeof(key), "key%x.%x", rands[i], i); memset(val, 'v', sizeof(val)); val[sizeof(val)-1]=0; - r = toku_ft_insert(brt, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), txn); - CKERR(r); + toku_ft_insert(brt, toku_fill_dbt(&k, key, 1+strlen(key)), toku_fill_dbt(&v, val, 1+strlen(val)), txn); } { TOKUTXN txn2; @@ -117,11 +116,9 @@ static void test_xid_lsn_independent_crash_recovery(int N) { TXNID last_xid_before = logger_get_last_xid(logger); - r = toku_logger_close_rollback(logger, false); - CKERR(r); + toku_logger_close_rollback(logger); - r = toku_cachetable_close(&ct); - CKERR(r); + toku_cachetable_close(&ct); // "Crash" r = toku_logger_close(&logger); CKERR(r); |