diff options
Diffstat (limited to 'storage/tokudb/PerconaFT/ft/tests/cachetable-simple-read-pin.cc')
| -rw-r--r-- | storage/tokudb/PerconaFT/ft/tests/cachetable-simple-read-pin.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/storage/tokudb/PerconaFT/ft/tests/cachetable-simple-read-pin.cc b/storage/tokudb/PerconaFT/ft/tests/cachetable-simple-read-pin.cc index dd5d59df002..1a8f3813ffa 100644 --- a/storage/tokudb/PerconaFT/ft/tests/cachetable-simple-read-pin.cc +++ b/storage/tokudb/PerconaFT/ft/tests/cachetable-simple-read-pin.cc @@ -77,11 +77,10 @@ static int sleep_pf_callback(void* UU(ftnode_pv), void* UU(disk_data), void* UU( static void *run_expensive_pf(void *arg) { void* v1; - long s1; CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); pf_called = false; fetch_called = false; - int r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, sleep_fetch, sleep_pf_req_callback, sleep_pf_callback, false, NULL); + int r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, wc, sleep_fetch, sleep_pf_req_callback, sleep_pf_callback, false, NULL); assert_zero(r); assert(pf_called); return arg; @@ -89,11 +88,10 @@ static void *run_expensive_pf(void *arg) { static void *run_expensive_fetch(void *arg) { void* v1; - long s1; CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL); pf_called = false; fetch_called = false; - int r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, sleep_fetch, sleep_pf_req_callback, sleep_pf_callback, false, NULL); + int r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, wc, sleep_fetch, sleep_pf_req_callback, sleep_pf_callback, false, NULL); assert_zero(r); assert(fetch_called); return arg; @@ -112,7 +110,6 @@ run_test (void) { 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); toku_pthread_t fetch_tid; @@ -124,7 +121,6 @@ run_test (void) { make_blocknum(1), 1, &v1, - &s1, wc, sleep_fetch, def_pf_req_callback, @@ -141,9 +137,9 @@ run_test (void) { assert_zero(r); // call with may_modify_node = false twice, make sure we can get it - r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, sleep_fetch, def_pf_req_callback, def_pf_callback, false, NULL); + r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, wc, sleep_fetch, def_pf_req_callback, def_pf_callback, false, NULL); assert_zero(r); - r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, sleep_fetch, def_pf_req_callback, def_pf_callback, false, NULL); + r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, wc, sleep_fetch, def_pf_req_callback, def_pf_callback, false, NULL); assert_zero(r); r = toku_test_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, make_pair_attr(8)); assert(r==0); @@ -159,7 +155,6 @@ run_test (void) { make_blocknum(1), 1, &v1, - &s1, wc, sleep_fetch, def_pf_req_callback, |