Import wiredtiger: 0349a673d5f61d16cf81eb697b7774457596cda7 from branch mongodb-master

ref: cbaffc1dda..0349a673d5
for: 5.2.0

WT-8070       Remove discrepancy between prefix_key and prefix_search

7 files changed, 15 insertions, 15 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 2bebe03d76c..66a3fd75f0b 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": "cbaffc1dda333b1f1908b9a4cfab69bf178a41b9"
+    "commit": "0349a673d5f61d16cf81eb697b7774457596cda7"
 }
diff --git a/src/third_party/wiredtiger/src/cursor/cur_std.c b/src/third_party/wiredtiger/src/cursor/cur_std.c
index ce683c17698..de5115845c7 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_std.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_std.c
@@ -856,7 +856,7 @@ __wt_cursor_cache_get(WT_SESSION_IMPL *session, const char *uri, uint64_t hash_v
              * than flag values, so fix them up according to the given configuration.
              */
             F_CLR(cursor,
-              WT_CURSTD_APPEND | WT_CURSTD_PREFIX_SEARCH | WT_CURSTD_RAW | WT_CURSTD_OVERWRITE);
+              WT_CURSTD_APPEND | WT_CURSTD_OVERWRITE | WT_CURSTD_PREFIX_SEARCH | WT_CURSTD_RAW);
             F_SET(cursor, overwrite_flag);
             /*
              * If this is a btree cursor, clear its read_once flag.
@@ -1084,7 +1084,7 @@ __wt_cursor_reconfigure(WT_CURSOR *cursor, const char *config)
         WT_ERR_NOTFOUND_OK(ret, false);
 
     /* Set the prefix search near flag. */
-    if ((ret = __wt_config_getones(session, config, "prefix_key", &cval)) == 0) {
+    if ((ret = __wt_config_getones(session, config, "prefix_search", &cval)) == 0) {
         if (cval.val) {
             /* Prefix search near configuration can only be used for row-store. */
             if (WT_CURSOR_RECNO(cursor))
diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cxx
index 76f4131b249..abacf3dc196 100644
--- a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cxx
@@ -206,7 +206,7 @@ class search_near_01 : public test_harness::test {
             collection &coll = tc->db.get_random_collection();
             if (cursors.find(coll.id) == cursors.end()) {
                 scoped_cursor cursor = tc->session.open_scoped_cursor(coll.name.c_str());
-                cursor->reconfigure(cursor.get(), "prefix_key=true");
+                cursor->reconfigure(cursor.get(), "prefix_search=true");
                 cursors.emplace(coll.id, std::move(cursor));
             }
 
diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_02.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_02.cxx
index b15a4d75efd..1df75a83bc0 100644
--- a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_02.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_02.cxx
@@ -160,7 +160,7 @@ class search_near_02 : public test_harness::test {
                 auto &cursor_prefix = cursors[coll.id];
                 /* The cached cursors have the prefix configuration enabled. */
                 testutil_check(
-                  cursor_prefix.get()->reconfigure(cursor_prefix.get(), "prefix_key=true"));
+                  cursor_prefix.get()->reconfigure(cursor_prefix.get(), "prefix_search=true"));
             }
 
             auto &cursor_prefix = cursors[coll.id];
diff --git a/src/third_party/wiredtiger/test/suite/test_search_near01.py b/src/third_party/wiredtiger/test/suite/test_search_near01.py
index 412cbd894f0..6df71b438ff 100755
--- a/src/third_party/wiredtiger/test/suite/test_search_near01.py
+++ b/src/third_party/wiredtiger/test/suite/test_search_near01.py
@@ -98,7 +98,7 @@ class test_search_near01(wttest.WiredTigerTestCase):
         # range forward, and then the whole range backwards.
         self.assertGreater(skip_count, key_count * 2)
 
-        cursor2.reconfigure("prefix_key=true")
+        cursor2.reconfigure("prefix_search=true")
         cursor2.set_key('aa')
         cursor2.search_near()
 
@@ -196,7 +196,7 @@ class test_search_near01(wttest.WiredTigerTestCase):
         # range forward, and then the whole range backwards.
         self.assertGreater(skip_count, key_count * 2)
 
-        cursor2.reconfigure("prefix_key=true")
+        cursor2.reconfigure("prefix_search=true")
         cursor2.set_key('cc')
         cursor2.search_near()
         self.assertEqual(self.get_stat(stat.conn.cursor_search_near_prefix_fast_paths), 2)
@@ -304,7 +304,7 @@ class test_search_near01(wttest.WiredTigerTestCase):
         # range forward, and then the whole range backwards.
         self.assertGreater(skip_count, key_count)
 
-        cursor2.reconfigure("prefix_key=true")
+        cursor2.reconfigure("prefix_search=true")
         cursor2.set_key('c')
         cursor2.search_near()
 
@@ -317,14 +317,14 @@ class test_search_near01(wttest.WiredTigerTestCase):
         session2.rollback_transaction()
         session2.begin_transaction('ignore_prepare=true')
         cursor4 = session2.open_cursor(uri)
-        cursor4.reconfigure("prefix_key=true")
+        cursor4.reconfigure("prefix_search=true")
         cursor4.set_key('c')
         cursor4.search_near()
         prefix_skip_count = self.get_stat(stat.conn.cursor_next_skip_lt_100, session2)
         self.assertEqual(prefix_skip_count - skip_count, 2)
         skip_count = prefix_skip_count
 
-        cursor4.reconfigure("prefix_key=false")
+        cursor4.reconfigure("prefix_search=false")
         cursor4.set_key('c')
         cursor4.search_near()
         self.assertEqual(self.get_stat(stat.conn.cursor_next_skip_lt_100, session2) - skip_count, 2)
diff --git a/src/third_party/wiredtiger/test/suite/test_search_near02.py b/src/third_party/wiredtiger/test/suite/test_search_near02.py
index 75cff116a2b..0f981f84af4 100644
--- a/src/third_party/wiredtiger/test/suite/test_search_near02.py
+++ b/src/third_party/wiredtiger/test/suite/test_search_near02.py
@@ -118,7 +118,7 @@ class test_search_near02(wttest.WiredTigerTestCase):
         self.assertEqual(cursor3.get_key(), self.check_key("aaz"))
 
         # Enable prefix search.
-        cursor3.reconfigure("prefix_key=true")
+        cursor3.reconfigure("prefix_search=true")
 
         # The only visible key is aaz. As long we are looking for a key that starts with either "a",
         # "aa" or "aaz", search near should return back aaz. Otherwise, search near should return
@@ -153,7 +153,7 @@ class test_search_near02(wttest.WiredTigerTestCase):
         self.assertEqual(cursor3.search_near(), wiredtiger.WT_NOTFOUND)
 
         # Enable prefix search.
-        cursor3.reconfigure("prefix_key=true")
+        cursor3.reconfigure("prefix_search=true")
 
         cursor3.set_key("aaz")
         self.assertEqual(cursor3.search_near(), wiredtiger.WT_NOTFOUND)
@@ -181,7 +181,7 @@ class test_search_near02(wttest.WiredTigerTestCase):
         self.assertEqual(cursor3.get_key(), self.check_key("aazab"))
 
         # Enable prefix search.
-        cursor3.reconfigure("prefix_key=true")
+        cursor3.reconfigure("prefix_search=true")
 
         # Search near for a, should return the closest visible key with a matching prefix: aaa.
         cursor3.set_key("a")
diff --git a/src/third_party/wiredtiger/test/suite/test_search_near03.py b/src/third_party/wiredtiger/test/suite/test_search_near03.py
index 073e5c44a13..748ef746cba 100644
--- a/src/third_party/wiredtiger/test/suite/test_search_near03.py
+++ b/src/third_party/wiredtiger/test/suite/test_search_near03.py
@@ -64,9 +64,9 @@ class test_search_near03(wttest.WiredTigerTestCase):
         cursor = self.session.open_cursor(uri)
         # Check if the format is valid for prefix configuration.
         if self.valid_key_format():
-            self.assertEqual(cursor.reconfigure("prefix_key=true"), 0)
+            self.assertEqual(cursor.reconfigure("prefix_search=true"), 0)
         else:
             msg = '/Invalid argument/'
             self.assertRaisesWithMessage(wiredtiger.WiredTigerError,
-                lambda: cursor.reconfigure("prefix_key=true"), msg)
+                lambda: cursor.reconfigure("prefix_search=true"), msg)
         cursor.close()