summaryrefslogtreecommitdiff
path: root/src/third_party
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2021-05-17 16:37:06 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-05-17 06:58:55 +0000
commit9d1c6d33505e3b9e09a196db36995380db909f4d (patch)
treee82f1e8e4ffc9e6f093ad1041048844bca4b86bd /src/third_party
parent3c3e009805d2662d46d6f3ae72ff416f8df2b578 (diff)
downloadmongo-9d1c6d33505e3b9e09a196db36995380db909f4d.tar.gz
Import wiredtiger: f66921dc67934d1d4d9f9329cf6c65bc8e722a7d from branch mongodb-5.0
ref: 3e3be1bd98..f66921dc67 for: 5.0.0 WT-7525 Add key order check right after history store insert
Diffstat (limited to 'src/third_party')
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/cursor/cur_hs.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 26cb97a0993..3a270a84004 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-5.0",
- "commit": "3e3be1bd985dcec489ebc5b5ea74df2bd5868737"
+ "commit": "f66921dc67934d1d4d9f9329cf6c65bc8e722a7d"
}
diff --git a/src/third_party/wiredtiger/src/cursor/cur_hs.c b/src/third_party/wiredtiger/src/cursor/cur_hs.c
index a090d0fe0e1..74dd2899fe0 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_hs.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_hs.c
@@ -867,6 +867,13 @@ retry:
goto retry;
WT_ERR(ret);
+#ifdef HAVE_DIAGNOSTIC
+ /* Do a search again and call next to check the key order. */
+ WT_WITH_PAGE_INDEX(session, ret = __wt_hs_row_search(cbt, &file_cursor->key, true));
+ WT_ASSERT(session, ret == 0);
+ WT_ERR_NOTFOUND_OK(__curhs_file_cursor_next(session, file_cursor), false);
+#endif
+
/* Insert doesn't maintain a position across calls, clear resources. */
if (0) {
err: