Import wiredtiger: f49c810f58d706c592a7aa54ae44c3dd0c3f3bb9 from branch mongodb-7.0 (#31609)

GitOrigin-RevId: b72b25fae961e57c17d873cbd183389f91fc18bb

Author: wt-vendoring-bot[bot]

src/third_party/wiredtiger/.github/CODEOWNERS

@@ -0,0 +1,8 @@
+# All backports must be approved by the backport-approvers Github team.
+* @wiredtiger/backport-approvers
+
+# Exclude some test and non-functional folders from the backport approvals.
+bench/
+dist/
+test/
+tools/

src/third_party/wiredtiger/import.data

@@ -1,6 +1,6 @@
 {
     "vendor": "wiredtiger",
-    "github": "wiredtiger/wiredtiger.git",
+    "github": "wiredtiger/wiredtiger",
     "branch": "mongodb-7.0",
-    "commit": "862374f32e5e9325922e85b6f07b9b5bed8d68fe"
+    "commit": "f49c810f58d706c592a7aa54ae44c3dd0c3f3bb9"
 }

src/third_party/wiredtiger/lang/python/wiredtiger.i

@@ -665,7 +665,7 @@ OVERRIDE_METHOD(__wt_cursor, WT_CURSOR, search_near, (self))
 		metadata = PyBytes_FromStringAndSize(*$1, *$2);
 		$result = metadata;
 		data = PyBytes_FromStringAndSize(*$3, *$4);
-		$result = SWIG_Python_AppendOutput($result, data);
+		$result = SWIG_AppendOutput($result, data);
 	} else {
 		SWIG_exception_fail(SWIG_AttributeError, "invalid pointer argument");
 	}
@@ -677,7 +677,7 @@ OVERRIDE_METHOD(__wt_cursor, WT_CURSOR, search_near, (self))
 		key_data = PyBytes_FromStringAndSize(*$1, *$2);
 		$result = key_data;
 		value_data = PyBytes_FromStringAndSize(*$3, *$4);
-		$result = SWIG_Python_AppendOutput($result, value_data);
+		$result = SWIG_AppendOutput($result, value_data);
 	} else {
 		SWIG_exception_fail(SWIG_AttributeError, "invalid pointer argument");
 	}

src/third_party/wiredtiger/src/conn/conn_sweep.c

@@ -44,6 +44,13 @@ __sweep_mark(WT_SESSION_IMPL *session, uint64_t now)
           dhandle->timeofdeath != 0)
             continue;
 
+        /*
+         * Never close out the history store handle via sweep. It can cause a deadlock if eviction
+         * needs to re-open a handle to the history store while a checkpoint is getting started.
+         */
+        if (WT_IS_HS(dhandle))
+            continue;
+
         dhandle->timeofdeath = now;
         WT_STAT_CONN_INCR(session, dh_sweep_tod);
     }

src/third_party/wiredtiger/src/session/session_compact.c

@@ -333,6 +333,9 @@ __wt_session_compact(WT_SESSION *wt_session, const char *uri, const char *config
     session = (WT_SESSION_IMPL *)wt_session;
     SESSION_API_CALL(session, compact, config, cfg);
 
+    if (uri == NULL)
+        WT_ERR_MSG(session, EINVAL, "Compaction requires a URI");
+
     WT_STAT_CONN_SET(session, session_table_compact_running, 1);
 
     /*

src/third_party/wiredtiger/test/suite/hook_tiered.py

@@ -191,7 +191,7 @@ def session_compact_replace(orig_session_compact, session_self, uri, config):
     # a tiered table, but we don't have the create config around to check.
     # We want readonly connections to do the real call, see comment in testcase_is_readonly.
     ret = 0
-    if not uri.startswith("table:") or testcase_is_readonly():
+    if not uri or not uri.startswith("table:") or testcase_is_readonly():
         ret = orig_session_compact(session_self, uri, config)
     return ret
 

src/third_party/wiredtiger/test/suite/test_autoclose.py

@@ -26,7 +26,7 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-import wttest
+import sys, wttest
 
 # test_autoclose
 class test_autoclose(wttest.WiredTigerTestCase):
@@ -36,6 +36,9 @@ class test_autoclose(wttest.WiredTigerTestCase):
     handles are also closed.
     """
     uri = 'table:test_autoclose'
+    # Note: SWIG generates a TypeError instead of a RuntimeError for several cases.
+    # The same error on all platforms would be better.
+    expected_exception = TypeError if sys.platform.startswith('darwin') else RuntimeError
 
     def create_table(self):
         self.session.create(self.uri,
@@ -57,7 +60,7 @@ def test_close_cursor1(self):
         inscursor = self.open_cursor()
         inscursor['key1'] = 'value1'
         inscursor.close()
-        self.assertRaisesHavingMessage(RuntimeError,
+        self.assertRaisesHavingMessage(self.expected_exception,
                                        lambda: inscursor.next(),
                                        '/wt_cursor.* is None/')
         self.drop_table()
@@ -72,7 +75,7 @@ def test_close_cursor2(self):
         inscursor = self.open_cursor()
         inscursor['key1'] = 'value1'
         self.session.close()
-        self.assertRaisesHavingMessage(RuntimeError,
+        self.assertRaisesHavingMessage(self.expected_exception,
                                        lambda: inscursor.next(),
                                        '/wt_cursor.* is None/')
         self.close_conn()
@@ -86,7 +89,7 @@ def test_close_cursor3(self):
         inscursor = self.open_cursor()
         inscursor['key1'] = 'value1'
         self.close_conn()
-        self.assertRaisesHavingMessage(RuntimeError,
+        self.assertRaisesHavingMessage(self.expected_exception,
                                        lambda: inscursor.next(),
                                        '/wt_cursor.* is None/')
 
@@ -117,14 +120,12 @@ def test_close_cursor5(self):
         inscursor2 = self.session.open_cursor(None, inscursor, None)
         inscursor.compare(inscursor2)
 
-        # Note: SWIG generates a TypeError in this case.
-        # A RuntimeError to match the other cases would be better.
         inscursor2.close()
         self.assertRaises(TypeError,
                           lambda: inscursor.compare(inscursor2))
 
         inscursor2 = None
-        self.assertRaisesHavingMessage(RuntimeError,
+        self.assertRaisesHavingMessage(self.expected_exception,
                                        lambda: inscursor.compare(inscursor2),
                                        '/wt_cursor.* is None/')
 
@@ -133,7 +134,7 @@ def test_close_session1(self):
         Use a session handle after it is explicitly closed.
         """
         self.session.close()
-        self.assertRaisesHavingMessage(RuntimeError,
+        self.assertRaisesHavingMessage(self.expected_exception,
                                        lambda: self.create_table(),
                                        '/wt_session.* is None/')
         self.close_conn()
@@ -143,7 +144,7 @@ def test_close_session2(self):
         Use a session handle after the connection is closed.
         """
         self.close_conn()
-        self.assertRaisesHavingMessage(RuntimeError,
+        self.assertRaisesHavingMessage(self.expected_exception,
                                        lambda: self.create_table(),
                                        '/wt_session.* is None/')
 
@@ -153,7 +154,7 @@ def test_close_connection1(self):
         """
         conn = self.conn
         self.close_conn()
-        self.assertRaisesHavingMessage(RuntimeError,
+        self.assertRaisesHavingMessage(self.expected_exception,
                                        lambda: conn.open_session(None),
                                        '/wt_connection.* is None/')
 

src/third_party/wiredtiger/test/suite/test_compact15.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+#
+# Public Domain 2014-present MongoDB, Inc.
+# Public Domain 2008-2014 WiredTiger, Inc.
+#
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+import wiredtiger
+import wttest
+from wtscenario import make_scenarios
+
+# test_compact15.py
+# This test checks that foreground compaction requires a URI.
+class test_compact15(wttest.WiredTigerTestCase):
+    uri = 'table:test_compact15'
+
+    uris = [
+        ('valid_uri', dict(valid_uri=True)),
+        ('invalid_uri', dict(valid_uri=False))
+    ]
+    scenarios = make_scenarios(uris)
+
+    def test_compact15(self):
+        self.session.create(self.uri)
+
+        if self.valid_uri:
+            self.session.compact(self.uri, None)
+        else:
+            self.assertRaisesWithMessage(wiredtiger.WiredTigerError, lambda:
+                self.session.compact(None, None),
+                '/Compaction requires a URI/')

src/third_party/wiredtiger/test/suite/test_cursor_compare.py

@@ -26,13 +26,16 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-import wiredtiger, wttest
+import sys, wiredtiger, wttest
 from wtdataset import SimpleDataSet, ComplexDataSet, ComplexLSMDataSet
 from wtscenario import make_scenarios
 
 # Test cursor comparisons.
 class test_cursor_comparison(wttest.WiredTigerTestCase):
     name = 'test_compare'
+    # Note: SWIG generates a TypeError instead of a RuntimeError for several cases.
+    # The same error on all platforms would be better.
+    expected_exception = TypeError if sys.platform.startswith('darwin') else RuntimeError
 
     types = [
         ('file', dict(type='file:', lsm=False, dataset=SimpleDataSet)),
@@ -114,7 +117,7 @@ def test_cursor_comparison(self):
             wiredtiger.WiredTigerError, lambda: cX.compare(c1), msg)
         msg = '/wt_cursor.* is None/'
         self.assertRaisesHavingMessage(
-            RuntimeError,  lambda: cX.compare(None), msg)
+            self.expected_exception,  lambda: cX.compare(None), msg)
         if ix0_0 != None:
             self.assertEqual(ix0_0.compare(ix0_1), 0)
             ix0_1.reset()
@@ -203,7 +206,7 @@ def test_cursor_equality(self):
             wiredtiger.WiredTigerError, lambda: cX.equals(c1), msg)
         msg = '/wt_cursor.* is None/'
         self.assertRaisesHavingMessage(
-            RuntimeError,  lambda: cX.equals(None), msg)
+            self.expected_exception,  lambda: cX.equals(None), msg)
         if ix0_0 != None:
             self.assertTrue(ix0_0.equals(ix0_1))
             ix0_1.reset()