Commit 6c10bb3b authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

refs #5724, remove call to toku_cachefile_of_filenum in do_insertion

git-svn-id: file:///svn/toku/tokudb@50505 c7de825b-a66e-492c-adef-691d508d4ae1
parent eeaf0912
...@@ -145,23 +145,18 @@ int find_ft_from_filenum (const FT &h, const FILENUM &filenum) { ...@@ -145,23 +145,18 @@ int find_ft_from_filenum (const FT &h, const FILENUM &filenum) {
// the operation (insert, delete, update, etc). // the operation (insert, delete, update, etc).
static int do_insertion (enum ft_msg_type type, FILENUM filenum, BYTESTRING key, BYTESTRING *data, TOKUTXN txn, LSN oplsn, static int do_insertion (enum ft_msg_type type, FILENUM filenum, BYTESTRING key, BYTESTRING *data, TOKUTXN txn, LSN oplsn,
bool reset_root_xid_that_created) { bool reset_root_xid_that_created) {
CACHEFILE cf;
// 2954 - ignore messages for aborted hot-index
int r = 0; int r = 0;
//printf("%s:%d committing insert %s %s\n", __FILE__, __LINE__, key.data, data.data); //printf("%s:%d committing insert %s %s\n", __FILE__, __LINE__, key.data, data.data);
r = toku_cachefile_of_filenum(txn->logger->ct, filenum, &cf); FT h;
if (r==ENOENT) { //Missing file on recovered transaction is not an error h = NULL;
r = txn->open_fts.find_zero<FILENUM, find_ft_from_filenum>(filenum, &h, NULL);
if (r == DB_NOTFOUND) {
assert(txn->recovered_from_checkpoint); assert(txn->recovered_from_checkpoint);
r = 0; r = 0;
goto done; goto done;
} }
assert(r==0); assert(r==0);
FT h;
h = NULL;
r = txn->open_fts.find_zero<FILENUM, find_ft_from_filenum>(filenum, &h, NULL);
assert(r==0);
if (oplsn.lsn != 0) { // if we are executing the recovery algorithm if (oplsn.lsn != 0) { // if we are executing the recovery algorithm
LSN treelsn = toku_ft_checkpoint_lsn(h); LSN treelsn = toku_ft_checkpoint_lsn(h);
if (oplsn.lsn <= treelsn.lsn) { // if operation was already applied to tree ... if (oplsn.lsn <= treelsn.lsn) { // if operation was already applied to tree ...
......
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