From 05bb25c46ccea947f42c603c9bc0756ba745db55 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Tue, 15 Feb 2022 08:33:30 +1100 Subject: Import wiredtiger: bb94262bdac5537fb63bf019e922893def810706 from branch mongodb-master ref: 2aec3a4574..bb94262bda for: 5.3.0 WT-8816 Coverity analysis defect 121526: Redundant test --- src/third_party/wiredtiger/import.data | 2 +- src/third_party/wiredtiger/src/btree/bt_sync.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index f65fce377ad..90d65502668 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "2aec3a457468b4ef3e2945c7d6c6291c7fe0cd5d" + "commit": "bb94262bdac5537fb63bf019e922893def810706" } diff --git a/src/third_party/wiredtiger/src/btree/bt_sync.c b/src/third_party/wiredtiger/src/btree/bt_sync.c index 71be50c0280..b5af4541f3b 100644 --- a/src/third_party/wiredtiger/src/btree/bt_sync.c +++ b/src/third_party/wiredtiger/src/btree/bt_sync.c @@ -132,7 +132,7 @@ __sync_ref_obsolete_check(WT_SESSION_IMPL *session, WT_REF *ref) uint8_t previous_state; char tp_string[WT_TP_STRING_SIZE]; const char *tag; - bool busy, hazard, obsolete, ovfl_items; + bool busy, obsolete, ovfl_items; /* Ignore root pages as they can never be deleted. */ if (__wt_ref_is_root(ref)) { @@ -222,7 +222,6 @@ __sync_ref_obsolete_check(WT_SESSION_IMPL *session, WT_REF *ref) WT_RET(__wt_hazard_set(session, ref, &busy)); if (busy) return (0); - hazard = true; mod = ref->page == NULL ? NULL : ref->page->modify; if (mod != NULL && mod->rec_result == WT_PM_REC_EMPTY) { @@ -293,8 +292,7 @@ __sync_ref_obsolete_check(WT_SESSION_IMPL *session, WT_REF *ref) newest_stop_ts, newest_stop_durable_ts, newest_stop_txn, tp_string)); err: - if (hazard) - WT_TRET(__wt_hazard_clear(session, ref)); + WT_TRET(__wt_hazard_clear(session, ref)); return (ret); } -- cgit v1.2.1