summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChenhao Qu <chenhao.qu@mongodb.com>2021-12-22 18:32:28 +1100
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-12-22 07:57:33 +0000
commitbea0c9bf186fea629d23b8d21c8ca0d024d0b813 (patch)
treedff1208aa1d20c41560f8db84ee1cccb6c280bc1
parent13106f65b27d7ed47fa39a7d4d679df5c3c4af3e (diff)
downloadmongo-bea0c9bf186fea629d23b8d21c8ca0d024d0b813.tar.gz
Import wiredtiger: 7feed3f6351bbb3164538a2510bf5ce39e36133f from branch mongodb-master
ref: f8f4afb7ff..7feed3f635 for: 5.3.0 WT-8465 Resolve all stale FIXME comments
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_handle.c2
-rw-r--r--src/third_party/wiredtiger/src/include/cell_inline.h1
-rw-r--r--src/third_party/wiredtiger/src/tiered/tiered_handle.c2
-rw-r--r--src/third_party/wiredtiger/test/format/config.sh2
-rw-r--r--src/third_party/wiredtiger/test/format/config_def.c2
-rwxr-xr-xsrc/third_party/wiredtiger/test/suite/test_prepare03.py3
7 files changed, 6 insertions, 8 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 1f0c0752638..ab67742b8c0 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": "f8f4afb7ff5e17966bfc2d9ea39cbfea9aa6cfbe"
+ "commit": "7feed3f6351bbb3164538a2510bf5ce39e36133f"
}
diff --git a/src/third_party/wiredtiger/src/btree/bt_handle.c b/src/third_party/wiredtiger/src/btree/bt_handle.c
index b76b0c19609..5273a02b65a 100644
--- a/src/third_party/wiredtiger/src/btree/bt_handle.c
+++ b/src/third_party/wiredtiger/src/btree/bt_handle.c
@@ -528,7 +528,7 @@ __btree_conf(WT_SESSION_IMPL *session, WT_CKPT *ckpt)
* for every subsequent open, we want to reuse it. This so that we're still able to read
* transaction ids from the previous time a btree was open in the same run.
*
- * FIXME-WT-6819: When we begin discarding dhandles more aggressively, we need to check that
+ * FIXME-WT-8590: When we begin discarding dhandles more aggressively, we need to check that
* updates aren't having their transaction ids wiped after reopening the dhandle. The runtime
* write generation is relevant here since it should remain static across the entire run.
*/
diff --git a/src/third_party/wiredtiger/src/include/cell_inline.h b/src/third_party/wiredtiger/src/include/cell_inline.h
index 4fe2992bd9f..5c13af6b56e 100644
--- a/src/third_party/wiredtiger/src/include/cell_inline.h
+++ b/src/third_party/wiredtiger/src/include/cell_inline.h
@@ -391,7 +391,6 @@ __wt_cell_pack_del(WT_SESSION_IMPL *session, WT_CELL *cell, WT_TIME_WINDOW *tw,
p = cell->__chunk;
*p = '\0';
- /* FIXME-WT-6124: we should set the time window prepare value. */
__cell_pack_value_validity(session, &p, tw);
if (rle < 2)
diff --git a/src/third_party/wiredtiger/src/tiered/tiered_handle.c b/src/third_party/wiredtiger/src/tiered/tiered_handle.c
index 0ec04eb3b34..cfe57a2c8cf 100644
--- a/src/third_party/wiredtiger/src/tiered/tiered_handle.c
+++ b/src/third_party/wiredtiger/src/tiered/tiered_handle.c
@@ -28,7 +28,7 @@ __tiered_dhandle_setup(WT_SESSION_IMPL *session, WT_TIERED *tiered, uint32_t i,
id = WT_TIERED_INDEX_LOCAL;
else if (type == WT_DHANDLE_TYPE_TIERED_TREE)
/*
- * FIXME-WT-7538: this type can be removed. For now, there is nothing to do for this
+ * FIXME-WT-7731: this type can be removed. For now, there is nothing to do for this
* type.
*/
goto err;
diff --git a/src/third_party/wiredtiger/test/format/config.sh b/src/third_party/wiredtiger/test/format/config.sh
index 57d2844653d..12084033118 100644
--- a/src/third_party/wiredtiger/test/format/config.sh
+++ b/src/third_party/wiredtiger/test/format/config.sh
@@ -159,7 +159,7 @@ CONFIG configuration_list[] = {
/*
* 0%
- * FIXME-WT-7510: Temporarily disable import until WT_ROLLBACK error and wt_copy_and_sync error is
+ * FIXME-WT-7418: Temporarily disable import until WT_ROLLBACK error and wt_copy_and_sync error is
* fixed. It should be (C_BOOL, 20, 0, 0).
*/
{"import", "import table from newly created database", C_BOOL, 0, 0, 0}
diff --git a/src/third_party/wiredtiger/test/format/config_def.c b/src/third_party/wiredtiger/test/format/config_def.c
index 078a49377df..c10f306903f 100644
--- a/src/third_party/wiredtiger/test/format/config_def.c
+++ b/src/third_party/wiredtiger/test/format/config_def.c
@@ -134,7 +134,7 @@ CONFIG configuration_list[] = {
/*
* 0%
- * FIXME-WT-7510: Temporarily disable import until WT_ROLLBACK error and wt_copy_and_sync error is
+ * FIXME-WT-7418: Temporarily disable import until WT_ROLLBACK error and wt_copy_and_sync error is
* fixed. It should be (C_BOOL, 20, 0, 0).
*/
{"import", "import table from newly created database",
diff --git a/src/third_party/wiredtiger/test/suite/test_prepare03.py b/src/third_party/wiredtiger/test/suite/test_prepare03.py
index 5e15bfa363a..44a2268dd57 100755
--- a/src/third_party/wiredtiger/test/suite/test_prepare03.py
+++ b/src/third_party/wiredtiger/test/suite/test_prepare03.py
@@ -192,8 +192,7 @@ class test_prepare03(wttest.WiredTigerTestCase):
self.session.timestamp_transaction("commit_timestamp=2b")
self.session.timestamp_transaction("durable_timestamp=2b")
self.session.commit_transaction()
- # There is a bug with search_near operation when no key is set.
- # This fix is being tracked in WT-3918.
+ # FIXME-WT-3682: There is a bug with search_near operation when no key is set.
if self.uri == 'lsm':
cursor.set_key(self.genkey(self.nentries))
cursor.search_near()