diff options
Diffstat (limited to 'storage/tokudb/PerconaFT/ft/tests/cachetable-fetch-inducing-evictor.cc')
| -rw-r--r-- | storage/tokudb/PerconaFT/ft/tests/cachetable-fetch-inducing-evictor.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/storage/tokudb/PerconaFT/ft/tests/cachetable-fetch-inducing-evictor.cc b/storage/tokudb/PerconaFT/ft/tests/cachetable-fetch-inducing-evictor.cc index f330a6f20af..ff72e660bb5 100644 --- a/storage/tokudb/PerconaFT/ft/tests/cachetable-fetch-inducing-evictor.cc +++ b/storage/tokudb/PerconaFT/ft/tests/cachetable-fetch-inducing-evictor.cc @@ -70,9 +70,8 @@ cachetable_test (enum pin_evictor_test_type test_type, bool nonblocking) { r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0); void* v1; - long s1; 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); + r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, make_pair_attr(8)); // at this point, we should have 8 bytes of data in a cachetable that supports 7 @@ -82,11 +81,11 @@ cachetable_test (enum pin_evictor_test_type test_type, bool nonblocking) { if (test_type == pin_in_memory) { old_num_ev_runs = evictor_test_helpers::get_num_eviction_runs(&ct->ev); if (nonblocking) { - 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); + r = toku_cachetable_get_and_pin_nonblocking(f1, make_blocknum(1), 1, &v1, wc, def_fetch, def_pf_req_callback, def_pf_callback, PL_WRITE_EXPENSIVE, NULL, NULL); assert_zero(r); } else { - 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_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); assert_zero(r); } new_num_ev_runs = evictor_test_helpers::get_num_eviction_runs(&ct->ev); @@ -97,13 +96,13 @@ cachetable_test (enum pin_evictor_test_type test_type, bool nonblocking) { else if (test_type == pin_fetch) { old_num_ev_runs = evictor_test_helpers::get_num_eviction_runs(&ct->ev); if (nonblocking) { - r = toku_cachetable_get_and_pin_nonblocking(f1, make_blocknum(2), 2, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, PL_WRITE_EXPENSIVE, NULL, NULL); + r = toku_cachetable_get_and_pin_nonblocking(f1, make_blocknum(2), 2, &v1, wc, def_fetch, def_pf_req_callback, def_pf_callback, PL_WRITE_EXPENSIVE, NULL, NULL); assert(r == TOKUDB_TRY_AGAIN); new_num_ev_runs = evictor_test_helpers::get_num_eviction_runs(&ct->ev); assert(new_num_ev_runs > old_num_ev_runs); } else { - r = toku_cachetable_get_and_pin(f1, make_blocknum(2), 2, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); + r = toku_cachetable_get_and_pin(f1, make_blocknum(2), 2, &v1, wc, def_fetch, def_pf_req_callback, def_pf_callback, true, NULL); assert_zero(r); new_num_ev_runs = evictor_test_helpers::get_num_eviction_runs(&ct->ev); assert(new_num_ev_runs > old_num_ev_runs); @@ -114,13 +113,13 @@ cachetable_test (enum pin_evictor_test_type test_type, bool nonblocking) { else if (test_type == pin_partial_fetch) { old_num_ev_runs = evictor_test_helpers::get_num_eviction_runs(&ct->ev); if (nonblocking) { - r = toku_cachetable_get_and_pin_nonblocking(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, pf_req_callback, pf_callback, PL_WRITE_EXPENSIVE, NULL, NULL); + r = toku_cachetable_get_and_pin_nonblocking(f1, make_blocknum(1), 1, &v1, wc, def_fetch, pf_req_callback, pf_callback, PL_WRITE_EXPENSIVE, NULL, NULL); assert(r == TOKUDB_TRY_AGAIN); new_num_ev_runs = evictor_test_helpers::get_num_eviction_runs(&ct->ev); assert(new_num_ev_runs > old_num_ev_runs); } else { - r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, pf_req_callback, pf_callback, true, NULL); + r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, wc, def_fetch, pf_req_callback, pf_callback, true, NULL); assert_zero(r); new_num_ev_runs = evictor_test_helpers::get_num_eviction_runs(&ct->ev); assert(new_num_ev_runs > old_num_ev_runs); |