summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlison Felizzi <alison.felizzi@mongodb.com>2022-01-13 03:56:56 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-01-13 04:54:48 +0000
commita6b70909923ec689cdb6a77818c09481963f4abe (patch)
treef85e8fe0f56b48bf3dce21cb034e01af8bca7469
parent092a34f931d2acd57ec70130757fba758f175717 (diff)
downloadmongo-a6b70909923ec689cdb6a77818c09481963f4abe.tar.gz
Import wiredtiger: 8cdc5f9b66650f4f56ee9b444f2c1063e9d69c8c from branch mongodb-master
ref: 9e7795c75a..8cdc5f9b66 for: 5.3.0 WT-5316 Investigate the feasibility to remove __rec_update_stable check in __wt_rec_upd_select
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/include/reconcile.h3
-rw-r--r--src/third_party/wiredtiger/src/reconcile/rec_visibility.c17
-rw-r--r--src/third_party/wiredtiger/src/reconcile/rec_write.c1
4 files changed, 2 insertions, 21 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index b98c82bdaa9..fa9a035ec20 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": "9e7795c75ac0b8d98786c9956d670df6748f6be9"
+ "commit": "8cdc5f9b66650f4f56ee9b444f2c1063e9d69c8c"
}
diff --git a/src/third_party/wiredtiger/src/include/reconcile.h b/src/third_party/wiredtiger/src/include/reconcile.h
index 075d08beb49..e1a3a2b9d9e 100644
--- a/src/third_party/wiredtiger/src/include/reconcile.h
+++ b/src/third_party/wiredtiger/src/include/reconcile.h
@@ -97,9 +97,6 @@ struct __wt_reconcile {
wt_timestamp_t max_ts;
wt_timestamp_t min_skipped_ts;
- u_int updates_seen; /* Count of updates seen. */
- u_int updates_unstable; /* Count of updates not visible_all. */
-
/*
* When we do not find any update to be written for the whole page, we would like to mark
* eviction failed in the case of update-restore. There is no progress made by eviction in such
diff --git a/src/third_party/wiredtiger/src/reconcile/rec_visibility.c b/src/third_party/wiredtiger/src/reconcile/rec_visibility.c
index 1e6bdeec704..ddd6f4479dd 100644
--- a/src/third_party/wiredtiger/src/reconcile/rec_visibility.c
+++ b/src/third_party/wiredtiger/src/reconcile/rec_visibility.c
@@ -9,18 +9,6 @@
#include "wt_internal.h"
/*
- * __rec_update_stable --
- * Return whether an update is stable or not.
- */
-static inline bool
-__rec_update_stable(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_UPDATE *upd)
-{
- return (F_ISSET(r, WT_REC_VISIBLE_ALL) ? __wt_txn_upd_visible_all(session, upd) :
- __wt_txn_upd_visible(session, upd) &&
- __wt_txn_visible(session, upd->txnid, upd->durable_ts));
-}
-
-/*
* __rec_update_save --
* Save a WT_UPDATE list for later restoration.
*/
@@ -442,7 +430,6 @@ __wt_rec_upd_select(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_INSERT *ins, W
if ((txnid = upd->txnid) == WT_TXN_ABORTED)
continue;
- ++r->updates_seen;
upd_memsize += WT_UPDATE_MEMSIZE(upd);
/*
@@ -535,9 +522,7 @@ __wt_rec_upd_select(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_INSERT *ins, W
if (upd_select->upd == NULL)
upd_select->upd = upd;
- if (F_ISSET(r, WT_REC_EVICT) && !__rec_update_stable(session, r, upd))
- ++r->updates_unstable;
- else if (!F_ISSET(r, WT_REC_EVICT))
+ if (!F_ISSET(r, WT_REC_EVICT))
break;
}
diff --git a/src/third_party/wiredtiger/src/reconcile/rec_write.c b/src/third_party/wiredtiger/src/reconcile/rec_write.c
index d7269167a50..2cfe67fbae6 100644
--- a/src/third_party/wiredtiger/src/reconcile/rec_write.c
+++ b/src/third_party/wiredtiger/src/reconcile/rec_write.c
@@ -599,7 +599,6 @@ __rec_init(WT_SESSION_IMPL *session, WT_REF *ref, uint32_t flags, WT_SALVAGE_COO
r->min_skipped_ts = WT_TS_MAX;
/* Track if updates were used and/or uncommitted. */
- r->updates_seen = r->updates_unstable = 0;
r->update_used = false;
/* Track if the page can be marked clean. */