summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/btree/bt_slvg.c
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@mongodb.com>2015-11-30 15:04:37 +1100
committerMichael Cahill <michael.cahill@mongodb.com>2015-11-30 15:04:58 +1100
commite7181b542b25981db42f74cdaee4e7fc323d3e9d (patch)
tree9e5dde5aa4a51b64d79e8782a9e2b69e4be98f3d /src/third_party/wiredtiger/src/btree/bt_slvg.c
parent1936560e01ecfab2a2b9bc12262602f9d5dd0b8c (diff)
downloadmongo-e7181b542b25981db42f74cdaee4e7fc323d3e9d.tar.gz
Import wiredtiger-wiredtiger-mongodb-3.2-rc4-41-g8326df6.tar.gz from wiredtiger branch mongodb-3.2
ref: b65381f..8326df6 4c49948 WT-2244 Trigger in-memory splits sooner. 9f2e4f3 WT-2248 WT_SESSION.close is updating WT_CONNECTION_IMPL.default_session. a6da10e SERVER-21553 Enable fast-path truncate after splits. 39dfd21 WT-2243 Don't keep transaction IDs pinned for reading from checkpoints. 4e1844c WT-2230 multi-split error path. cace179 WT-2228 avoid unnecessary raw-compression calls. 890ee34 SERVER-21619 Don't do internal page splits after a tree is marked DEAD. 6c7338f WT-2241 Use a lock to protect transaction ID allocation. 978c237 WT-2234 Coverity analysis warnings.
Diffstat (limited to 'src/third_party/wiredtiger/src/btree/bt_slvg.c')
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_slvg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/src/btree/bt_slvg.c b/src/third_party/wiredtiger/src/btree/bt_slvg.c
index 4f7fdc97f5f..80e467b5707 100644
--- a/src/third_party/wiredtiger/src/btree/bt_slvg.c
+++ b/src/third_party/wiredtiger/src/btree/bt_slvg.c
@@ -326,7 +326,7 @@ __wt_bt_salvage(WT_SESSION_IMPL *session, WT_CKPT *ckptbase, const char *cfg[])
*/
if (ss->root_ref.page != NULL) {
btree->ckpt = ckptbase;
- ret = __wt_evict(session, &ss->root_ref, 1);
+ ret = __wt_evict(session, &ss->root_ref, true);
ss->root_ref.page = NULL;
btree->ckpt = NULL;
}
@@ -1304,7 +1304,7 @@ __slvg_col_build_leaf(WT_SESSION_IMPL *session, WT_TRACK *trk, WT_REF *ref)
ret = __wt_page_release(session, ref, 0);
if (ret == 0)
- ret = __wt_evict(session, ref, 1);
+ ret = __wt_evict(session, ref, true);
if (0) {
err: WT_TRET(__wt_page_release(session, ref, 0));
@@ -2030,7 +2030,7 @@ __slvg_row_build_leaf(
*/
ret = __wt_page_release(session, ref, 0);
if (ret == 0)
- ret = __wt_evict(session, ref, 1);
+ ret = __wt_evict(session, ref, true);
if (0) {
err: WT_TRET(__wt_page_release(session, ref, 0));