Commit 0c86c018 authored by Christian Rober's avatar Christian Rober Committed by Yoni Fogel

refs #5372 Replaced CACHETABLE pointer argument with checkpointer pointer. ...

refs #5372 Replaced CACHETABLE pointer argument with checkpointer pointer.  The relevant logging function only needed the checkpointer.

git-svn-id: file:///svn/toku/tokudb@47537 c7de825b-a66e-492c-adef-691d508d4ae1
parent 13852c48
...@@ -2740,10 +2740,9 @@ int set_filenum_in_array(const FT &ft, const uint32_t index, FILENUM *const arra ...@@ -2740,10 +2740,9 @@ int set_filenum_in_array(const FT &ft, const uint32_t index, FILENUM *const arra
return 0; return 0;
} }
int log_open_txn (const TOKUTXN &txn, const uint32_t UU(index), CACHETABLE *const ctp); int log_open_txn (const TOKUTXN &txn, const uint32_t UU(index), checkpointer * const cp);
int log_open_txn (const TOKUTXN &txn, const uint32_t UU(index), CACHETABLE *const ctp) { int log_open_txn (const TOKUTXN &txn, const uint32_t UU(index), checkpointer * const cp) {
int r; int r;
CACHETABLE ct = *ctp;
TOKULOGGER logger = txn->logger; TOKULOGGER logger = txn->logger;
FILENUMS open_filenums; FILENUMS open_filenums;
uint32_t num_filenums = txn->open_fts.size(); uint32_t num_filenums = txn->open_fts.size();
...@@ -2752,7 +2751,7 @@ int log_open_txn (const TOKUTXN &txn, const uint32_t UU(index), CACHETABLE *cons ...@@ -2752,7 +2751,7 @@ int log_open_txn (const TOKUTXN &txn, const uint32_t UU(index), CACHETABLE *cons
goto cleanup; goto cleanup;
} }
else { else {
ct->cp.increment_num_txns(); cp->increment_num_txns();
} }
open_filenums.num = num_filenums; open_filenums.num = num_filenums;
...@@ -4322,9 +4321,9 @@ void checkpointer::log_begin_checkpoint() { ...@@ -4322,9 +4321,9 @@ void checkpointer::log_begin_checkpoint() {
} }
// Write open transactions to the log. // Write open transactions to the log.
r = toku_txn_manager_iter_over_live_txns<CACHETABLE, log_open_txn> ( r = toku_txn_manager_iter_over_live_txns<checkpointer, log_open_txn> (
m_logger->txn_manager, m_logger->txn_manager,
&m_ct); this);
assert(r == 0); assert(r == 0);
// Writes list of dictionaries that have had // Writes list of dictionaries that have had
......
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