From 6f9fddc762e0ad63a08dd5391a207bc527ca75f2 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Wed, 17 Apr 2013 00:00:30 -0400 Subject: [PATCH] #4884 remove local txn checkpoint log entry closes[t:4884] git-svn-id: file:///svn/toku/tokudb@43538 c7de825b-a66e-492c-adef-691d508d4ae1 --- newbrt/logformat.c | 2 ++ newbrt/recover.c | 24 ------------------------ 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/newbrt/logformat.c b/newbrt/logformat.c index 08631646972..ecb0153549b 100644 --- a/newbrt/logformat.c +++ b/newbrt/logformat.c @@ -90,7 +90,9 @@ const struct logtype rollbacks[] = { const struct logtype logtypes[] = { // Records produced by checkpoints +#if 0 // no longer used, but reserve the type {"local_txn_checkpoint", 'c', FA{{"TXNID", "xid", 0}, NULLFIELD}}, +#endif {"begin_checkpoint", 'x', FA{{"u_int64_t", "timestamp", 0}, NULLFIELD}}, {"end_checkpoint", 'X', FA{{"TXNID", "xid", 0}, // xid is LSN of begin_checkpoint {"u_int64_t", "timestamp", 0}, diff --git a/newbrt/recover.c b/newbrt/recover.c index f0c6eaa9c47..655c7e9ec48 100644 --- a/newbrt/recover.c +++ b/newbrt/recover.c @@ -323,30 +323,6 @@ static int internal_recover_fopen_or_fcreate (RECOVER_ENV renv, BOOL must_create return 0; } -static int toku_recover_local_txn_checkpoint (struct logtype_local_txn_checkpoint *l, RECOVER_ENV UU(renv)) { - int r; - switch (renv->ss.ss) { - case FORWARD_BETWEEN_CHECKPOINT_BEGIN_END: - case FORWARD_NEWER_CHECKPOINT_END: { - // assert that the transaction exists - TOKUTXN txn = NULL; - r = toku_txnid2txn(renv->logger, l->xid, &txn); - assert(r == 0 && txn != NULL); - r = 0; - break; - } - default: - assert(0); - return 0; - } - return r; -} - -static int toku_recover_backward_local_txn_checkpoint (struct logtype_local_txn_checkpoint *UU(l), RECOVER_ENV UU(renv)) { - // nothing - return 0; -} - static int toku_recover_begin_checkpoint (struct logtype_begin_checkpoint *l, RECOVER_ENV renv) { int r; switch (renv->ss.ss) {