0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00

Import wiredtiger: 58b355e35289d90bfcf0e34119447caedc2a372f from branch mongodb-master

ref: b194a5a04c..58b355e352
for: 5.1.0

WT-7767       Code cleanup for curhs_remove and __txn_fixup_prepared_update
This commit is contained in:
Luke Chen 2021-07-02 16:36:05 +10:00 committed by Evergreen Agent
parent 9139cbf21e
commit 413dd4dc50
3 changed files with 3 additions and 4 deletions

View File

@ -2,5 +2,5 @@
"vendor": "wiredtiger",
"github": "wiredtiger/wiredtiger.git",
"branch": "mongodb-master",
"commit": "b194a5a04c2f37282542f19d46c1ee499fbcefac"
"commit": "58b355e35289d90bfcf0e34119447caedc2a372f"
}

View File

@ -968,7 +968,7 @@ __curhs_remove(WT_CURSOR *cursor)
cbt = (WT_CURSOR_BTREE *)file_cursor;
hs_tombstone = NULL;
CURSOR_API_CALL_PREPARE_ALLOWED(cursor, session, insert, CUR2BT(file_cursor));
CURSOR_API_CALL_PREPARE_ALLOWED(cursor, session, remove, CUR2BT(file_cursor));
/* Remove must be called with cursor positioned. */
WT_ASSERT(session, F_ISSET(cursor, WT_CURSTD_KEY_INT));

View File

@ -965,9 +965,8 @@ __txn_fixup_prepared_update(
hs_cursor->set_value(hs_cursor, &tw, tw.durable_stop_ts, tw.durable_start_ts,
(uint64_t)WT_UPDATE_STANDARD, &hs_value);
WT_ERR(hs_cursor->update(hs_cursor));
} else {
} else
WT_ERR(hs_cursor->remove(hs_cursor));
}
err:
F_SET(txn, txn_flags);