Commit 2d1ef22e authored by Yoni Fogel's avatar Yoni Fogel

Closes #1973 closes[t:1973] Log entry for DELETE_ANY no longer wastes memory on 'value'

git-svn-id: file:///svn/toku/tokudb@14292 c7de825b-a66e-492c-adef-691d508d4ae1
parent 9231dda6
...@@ -2578,8 +2578,7 @@ int toku_brt_delete(BRT brt, DBT *key, TOKUTXN txn) { ...@@ -2578,8 +2578,7 @@ int toku_brt_delete(BRT brt, DBT *key, TOKUTXN txn) {
TOKULOGGER logger = toku_txn_logger(txn); TOKULOGGER logger = toku_txn_logger(txn);
if (logger) { if (logger) {
BYTESTRING keybs = {.len=key->size, .data=key->data}; BYTESTRING keybs = {.len=key->size, .data=key->data};
BYTESTRING valbs = {.len=0, .data=NULL}; r = toku_log_enq_delete_any(logger, (LSN*)0, 0, toku_cachefile_filenum(brt->cf), xid, keybs);
r = toku_log_enq_delete_any(logger, (LSN*)0, 0, toku_cachefile_filenum(brt->cf), xid, keybs, valbs);
if (r!=0) return r; if (r!=0) return r;
} }
DBT val; DBT val;
......
...@@ -129,7 +129,6 @@ const struct logtype logtypes[] = { ...@@ -129,7 +129,6 @@ const struct logtype logtypes[] = {
{"enq_delete_any", 'E', FA{{"FILENUM", "filenum", 0}, {"enq_delete_any", 'E', FA{{"FILENUM", "filenum", 0},
{"TXNID", "xid", 0}, {"TXNID", "xid", 0},
{"BYTESTRING", "key", 0}, {"BYTESTRING", "key", 0},
{"BYTESTRING", "value", 0},
NULLFIELD}}, NULLFIELD}},
{"shutdown", 'S', FA{{"u_int64_t", "timestamp", 0}, NULLFIELD}}, {"shutdown", 'S', FA{{"u_int64_t", "timestamp", 0}, NULLFIELD}},
{"timestamp", 'T', FA{{"u_int64_t", "timestamp", 0}, {"timestamp", 'T', FA{{"u_int64_t", "timestamp", 0},
......
...@@ -331,7 +331,7 @@ static int toku_recover_backward_enq_delete_both (struct logtype_enq_delete_both ...@@ -331,7 +331,7 @@ static int toku_recover_backward_enq_delete_both (struct logtype_enq_delete_both
return 0; return 0;
} }
static void toku_recover_enq_delete_any (LSN lsn __attribute__((__unused__)), FILENUM filenum, TXNID xid, BYTESTRING key, BYTESTRING UU(val), RECOVER_ENV env) { static void toku_recover_enq_delete_any (LSN lsn __attribute__((__unused__)), FILENUM filenum, TXNID xid, BYTESTRING key, RECOVER_ENV env) {
struct cf_pair *pair = NULL; struct cf_pair *pair = NULL;
int r = find_cachefile(&env->fmap, filenum, &pair); int r = find_cachefile(&env->fmap, filenum, &pair);
if (r!=0) { if (r!=0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment