summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Butler <135883+marcbutler@users.noreply.github.com>2023-04-04 02:57:02 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2023-04-04 03:57:13 +0000
commit11a5a961e255e9c07b1068bd702d57daa15ec33e (patch)
treead7d81225b38c4a1d10ad45ce78b73fa0920a537
parentb017745eb8b6348444433a329d40b7a974a70046 (diff)
downloadmongo-r7.0.0-alpha0.tar.gz
Import wiredtiger: ec5aa0d9af8622c600a2b21f4e2a31db82792c1d from branch mongodb-masterr7.0.0-alpha0
ref: f8548fe2f4..ec5aa0d9af for: 7.0.0-rc0 WT-10879 Fix compilation errors of unused variables in mac os 13.3
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_vrfy_dsk.c5
-rw-r--r--src/third_party/wiredtiger/src/btree/row_modify.c16
3 files changed, 4 insertions, 19 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 7593a4febf2..c15a881d2ed 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": "f8548fe2f4b7686395777bb6d6565eee31e4a508"
+ "commit": "ec5aa0d9af8622c600a2b21f4e2a31db82792c1d"
}
diff --git a/src/third_party/wiredtiger/src/btree/bt_vrfy_dsk.c b/src/third_party/wiredtiger/src/btree/bt_vrfy_dsk.c
index d7a01867efd..484724b357d 100644
--- a/src/third_party/wiredtiger/src/btree/bt_vrfy_dsk.c
+++ b/src/third_party/wiredtiger/src/btree/bt_vrfy_dsk.c
@@ -766,7 +766,7 @@ __verify_dsk_col_int(WT_VERIFY_INFO *vi)
WT_CELL *cell;
WT_CELL_UNPACK_ADDR *unpack, _unpack;
WT_DECL_RET;
- uint32_t cell_num, i;
+ uint32_t i;
uint8_t *end;
btree = S2BT(vi->session);
@@ -774,10 +774,7 @@ __verify_dsk_col_int(WT_VERIFY_INFO *vi)
unpack = &_unpack;
end = (uint8_t *)vi->dsk + vi->dsk->mem_size;
- cell_num = 0;
WT_CELL_FOREACH_VRFY (vi->session, vi->dsk, cell, unpack, i) {
- ++cell_num;
-
/* Carefully unpack the cell. */
ret = __wt_cell_unpack_safe(vi->session, vi->dsk, cell, unpack, NULL, end);
if (ret != 0)
diff --git a/src/third_party/wiredtiger/src/btree/row_modify.c b/src/third_party/wiredtiger/src/btree/row_modify.c
index 0b543ad7441..fd74b7649fa 100644
--- a/src/third_party/wiredtiger/src/btree/row_modify.c
+++ b/src/third_party/wiredtiger/src/btree/row_modify.c
@@ -344,8 +344,7 @@ __wt_update_obsolete_check(
WT_TXN_GLOBAL *txn_global;
WT_UPDATE *first, *next;
size_t size;
- uint64_t oldest, stable;
- u_int count, upd_seen, upd_unstable;
+ u_int count;
next = NULL;
page = cbt->ref->page;
@@ -355,9 +354,6 @@ __wt_update_obsolete_check(
if (WT_PAGE_TRYLOCK(session, page) != 0)
return;
- upd_seen = upd_unstable = 0;
- oldest = txn_global->has_oldest_timestamp ? txn_global->oldest_timestamp : WT_TS_NONE;
- stable = txn_global->has_stable_timestamp ? txn_global->stable_timestamp : WT_TS_NONE;
/*
* This function identifies obsolete updates, and truncates them from the rest of the chain;
* because this routine is called from inside a serialization function, the caller has
@@ -372,19 +368,11 @@ __wt_update_obsolete_check(
if (upd->txnid == WT_TXN_ABORTED)
continue;
- ++upd_seen;
if (__wt_txn_upd_visible_all(session, upd)) {
if (first == NULL && WT_UPDATE_DATA_VALUE(upd))
first = upd;
- } else {
+ } else
first = NULL;
- /*
- * While we're here, also check for the update being kept only for timestamp history to
- * gauge updates being kept due to history.
- */
- if (upd->start_ts != WT_TS_NONE && upd->start_ts >= oldest && upd->start_ts < stable)
- ++upd_unstable;
- }
/* Cannot truncate the updates if we need to remove the updates from the history store. */
if (F_ISSET(upd, WT_UPDATE_TO_DELETE_FROM_HS))