diff options
Diffstat (limited to 'storage/tokudb/ft-index/ft/rollback-ct-callbacks.cc')
| -rw-r--r-- | storage/tokudb/ft-index/ft/rollback-ct-callbacks.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/storage/tokudb/ft-index/ft/rollback-ct-callbacks.cc b/storage/tokudb/ft-index/ft/rollback-ct-callbacks.cc index c1ca79be7a4..bea70a5155e 100644 --- a/storage/tokudb/ft-index/ft/rollback-ct-callbacks.cc +++ b/storage/tokudb/ft-index/ft/rollback-ct-callbacks.cc @@ -219,13 +219,13 @@ void toku_rollback_flush_callback ( } } -int toku_rollback_fetch_callback (CACHEFILE cachefile, PAIR p, int fd, BLOCKNUM logname, uint32_t fullhash, +int toku_rollback_fetch_callback (CACHEFILE cachefile, PAIR p, int fd, BLOCKNUM logname, uint32_t fullhash UU(), void **rollback_pv, void** UU(disk_data), PAIR_ATTR *sizep, int * UU(dirtyp), void *extraargs) { int r; FT CAST_FROM_VOIDP(h, extraargs); assert(h->cf == cachefile); ROLLBACK_LOG_NODE *result = (ROLLBACK_LOG_NODE*)rollback_pv; - r = toku_deserialize_rollback_log_from(fd, logname, fullhash, result, h); + r = toku_deserialize_rollback_log_from(fd, logname, result, h); if (r==0) { (*result)->ct_pair = p; *sizep = rollback_memory_size(*result); @@ -249,13 +249,14 @@ void toku_rollback_pe_est_callback( // callback for partially evicting a cachetable entry int toku_rollback_pe_callback ( void *rollback_v, - PAIR_ATTR UU(old_attr), - PAIR_ATTR* new_attr, - void* UU(extraargs) + PAIR_ATTR old_attr, + void* UU(extraargs), + void (*finalize)(PAIR_ATTR new_attr, void * extra), + void *finalize_extra ) { assert(rollback_v != NULL); - *new_attr = old_attr; + finalize(old_attr, finalize_extra); return 0; } |