diff options
Diffstat (limited to 'storage/tokudb/PerconaFT/ft/tests/cachetable-simple-pin-cheap.cc')
-rw-r--r-- | storage/tokudb/PerconaFT/ft/tests/cachetable-simple-pin-cheap.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/storage/tokudb/PerconaFT/ft/tests/cachetable-simple-pin-cheap.cc b/storage/tokudb/PerconaFT/ft/tests/cachetable-simple-pin-cheap.cc index fff5845ef8f..d79d1fb1eaf 100644 --- a/storage/tokudb/PerconaFT/ft/tests/cachetable-simple-pin-cheap.cc +++ b/storage/tokudb/PerconaFT/ft/tests/cachetable-simple-pin-cheap.cc @@ -80,12 +80,11 @@ run_test (pair_lock_type lock_type) { 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_with_dep_pairs(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, def_pf_req_callback, def_pf_callback, lock_type, NULL, 0, NULL, NULL); + r = toku_cachetable_get_and_pin_with_dep_pairs(f1, make_blocknum(1), 1, &v1, wc, def_fetch, def_pf_req_callback, def_pf_callback, lock_type, NULL, 0, NULL, NULL); cachefile_kibbutz_enq(f1, kibbutz_work, f1); reset_unlockers(&unlockers); - 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, &unlockers); + 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, &unlockers); // to fix #5393, we changed behavior on full fetch where if we // requested a PL_WRITE_CHEAP, and had to grab a PL_WRITE_EXPENSIVE for // a full fetch, we keep it as a PL_WRITE_EXPENSIVE because downgrading back @@ -100,11 +99,11 @@ run_test (pair_lock_type lock_type) { // now do the same test with a partial fetch required pf_called = false; - r = toku_cachetable_get_and_pin_with_dep_pairs(f1, make_blocknum(1), 1, &v1, &s1, wc, def_fetch, true_pf_req_callback, true_pf_callback, lock_type, NULL, 0, NULL, NULL); + r = toku_cachetable_get_and_pin_with_dep_pairs(f1, make_blocknum(1), 1, &v1, wc, def_fetch, true_pf_req_callback, true_pf_callback, lock_type, NULL, 0, NULL, NULL); assert(pf_called); cachefile_kibbutz_enq(f1, kibbutz_work, f1); reset_unlockers(&unlockers); - 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, &unlockers); + 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, &unlockers); if (lock_type == PL_WRITE_EXPENSIVE) { assert(r == TOKUDB_TRY_AGAIN); assert(!unlockers.locked); } |