diff options
| author | Yoni Fogel <yoni@tokutek.com> | 2012-08-02 21:11:31 +0000 |
|---|---|---|
| committer | Yoni Fogel <yoni@tokutek.com> | 2013-04-17 00:01:02 -0400 |
| commit | 3c00a0e77bc3e4854d85761c02cfcd45f3cbb850 (patch) | |
| tree | 1dea0e337cc5561073302fc31bcb1ceeb64bab1b /ft/rollback-apply.cc | |
| parent | ce7934a0a4e5ef53c41d44f9ef35398a8b626ed8 (diff) | |
| download | mariadb-git-3c00a0e77bc3e4854d85761c02cfcd45f3cbb850.tar.gz | |
refs #5155 refs #5308 closes #5309 merge new omt api functions to main (still unused), use templated omt for TOKUTXN->open_fts, OMT becomes a wrapper for omt<OMTVALUE>, other misc fixes
git-svn-id: file:///svn/toku/tokudb@46448 c7de825b-a66e-492c-adef-691d508d4ae1
Diffstat (limited to 'ft/rollback-apply.cc')
| -rw-r--r-- | ft/rollback-apply.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ft/rollback-apply.cc b/ft/rollback-apply.cc index fa03c21d888..bd11e067818 100644 --- a/ft/rollback-apply.cc +++ b/ft/rollback-apply.cc @@ -41,10 +41,8 @@ int toku_abort_rollback_item (TOKUTXN txn, struct roll_entry *item, LSN lsn) { } static int -note_ft_used_in_txns_parent(OMTVALUE ftv, uint32_t UU(index), void *txnv) { - TOKUTXN CAST_FROM_VOIDP(child, txnv); +note_ft_used_in_txns_parent(const FT &ft, uint32_t UU(index), TOKUTXN const child) { TOKUTXN parent = child->parent; - FT CAST_FROM_VOIDP(ft, ftv); toku_txn_maybe_note_ft(parent, ft); if (ft->txnid_that_created_or_locked_when_empty == toku_txn_get_txnid(child)) { //Pass magic "no rollback needed" flag to parent. @@ -194,7 +192,7 @@ int toku_rollback_commit(TOKUTXN txn, LSN lsn) { } // Note the open brts, the omts must be merged - r = toku_omt_iterate(txn->open_fts, note_ft_used_in_txns_parent, txn); + r = txn->open_fts.iterate<struct tokutxn, note_ft_used_in_txns_parent>(txn); assert(r==0); // Merge the list of headers that must be checkpointed before commit |