Import wiredtiger: 5b6109fa425d492c42fbb9f259c429a0290865ea from branch mongodb-5.0

ref: c173271607..5b6109fa42
for: 5.0.0

WT-6538       Fix onpage prepare visibility check if the start and stop are from the same prepared transaction

4 files changed, 138 insertions, 6 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 11b8f5ec284..5d2dba54132 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": "c17327160788b8da7766b7ff8e47ae4610b1660b"
+    "commit": "5b6109fa425d492c42fbb9f259c429a0290865ea"
 }
diff --git a/src/third_party/wiredtiger/src/include/txn_inline.h b/src/third_party/wiredtiger/src/include/txn_inline.h
index 6c89b2024bf..0deaf77a532 100644
--- a/src/third_party/wiredtiger/src/include/txn_inline.h
+++ b/src/third_party/wiredtiger/src/include/txn_inline.h
@@ -631,7 +631,14 @@ __wt_txn_tw_stop_visible(WT_SESSION_IMPL *session, WT_TIME_WINDOW *tw)
 static inline bool
 __wt_txn_tw_start_visible(WT_SESSION_IMPL *session, WT_TIME_WINDOW *tw)
 {
-    return ((WT_TIME_WINDOW_HAS_STOP(tw) || !tw->prepare) &&
+    /*
+     * Check the prepared flag if there is no stop time point or the start and stop time points are
+     * from the same transaction.
+     */
+    return (((WT_TIME_WINDOW_HAS_STOP(tw) &&
+               (tw->start_txn != tw->stop_txn || tw->start_ts != tw->stop_ts ||
+                 tw->durable_start_ts != tw->durable_stop_ts)) ||
+              !tw->prepare) &&
       __wt_txn_visible(session, tw->start_txn, tw->start_ts));
 }
 
@@ -642,7 +649,14 @@ __wt_txn_tw_start_visible(WT_SESSION_IMPL *session, WT_TIME_WINDOW *tw)
 static inline bool
 __wt_txn_tw_start_visible_all(WT_SESSION_IMPL *session, WT_TIME_WINDOW *tw)
 {
-    return ((WT_TIME_WINDOW_HAS_STOP(tw) || !tw->prepare) &&
+    /*
+     * Check the prepared flag if there is no stop time point or the start and stop time points are
+     * from the same transaction.
+     */
+    return (((WT_TIME_WINDOW_HAS_STOP(tw) &&
+               (tw->start_txn != tw->stop_txn || tw->start_ts != tw->stop_ts ||
+                 tw->durable_start_ts != tw->durable_stop_ts)) ||
+              !tw->prepare) &&
       __wt_txn_visible_all(session, tw->start_txn, tw->durable_start_ts));
 }
 
diff --git a/src/third_party/wiredtiger/test/suite/test_prepare14.py b/src/third_party/wiredtiger/test/suite/test_prepare14.py
new file mode 100644
index 00000000000..fb32aefc713
--- /dev/null
+++ b/src/third_party/wiredtiger/test/suite/test_prepare14.py
@@ -0,0 +1,104 @@
+#!/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 wttest
+from wiredtiger import WT_NOTFOUND
+from wtscenario import make_scenarios
+
+def timestamp_str(t):
+    return '%x' % t
+
+# test_prepare14.py
+# Test that the transaction visibility of an on-disk update
+# that has both the start and the stop time points from the
+# same uncommitted prepared transaction.
+class test_prepare14(wttest.WiredTigerTestCase):
+    session_config = 'isolation=snapshot'
+
+    in_memory_values = [
+        ('no_inmem', dict(in_memory=False)),
+        ('inmem', dict(in_memory=True))
+    ]
+
+    key_format_values = [
+        ('column', dict(key_format='r')),
+        ('integer_row', dict(key_format='i')),
+    ]
+
+    scenarios = make_scenarios(in_memory_values, key_format_values)
+
+    def conn_config(self):
+        config = 'cache_size=50MB'
+        if self.in_memory:
+            config += ',in_memory=true'
+        else:
+            config += ',in_memory=false'
+        return config
+
+    def test_prepare14(self):
+        # Prepare transactions for column store table is not yet supported.
+        if self.key_format == 'r':
+            self.skipTest('Prepare transactions for column store table is not yet supported')
+
+        # Create a table without logging.
+        uri = "table:prepare14"
+        create_config = 'allocation_size=512,key_format=S,value_format=S'
+        self.session.create(uri, create_config)
+
+        # Pin oldest and stable timestamps to 10.
+        self.conn.set_timestamp('oldest_timestamp=' + timestamp_str(10) +
+            ',stable_timestamp=' + timestamp_str(10))
+
+        value = 'a'
+
+        # Perform several updates and removes.
+        s = self.conn.open_session()
+        cursor = s.open_cursor(uri)
+        s.begin_transaction()
+        cursor[str(0)] = value
+        cursor.set_key(str(0))
+        cursor.remove()
+        cursor.close()
+        s.prepare_transaction('prepare_timestamp=' + timestamp_str(20))
+
+        # Configure debug behavior on a cursor to evict the page positioned on when the reset API is used.
+        evict_cursor = self.session.open_cursor(uri, None, "debug=(release_evict)")
+
+        # Search for the key so we position our cursor on the page that we want to evict.
+        self.session.begin_transaction("ignore_prepare = true")
+        evict_cursor.set_key(str(0))
+        self.assertEquals(evict_cursor.search(), WT_NOTFOUND)
+        evict_cursor.reset()
+        evict_cursor.close()
+        self.session.commit_transaction()
+
+        self.session.begin_transaction("ignore_prepare = true")
+        cursor2 = self.session.open_cursor(uri)
+        cursor2.set_key(str(0))
+        self.assertEquals(cursor2.search(), WT_NOTFOUND)
+        self.session.commit_transaction()
diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable19.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable19.py
index 3a24113fa32..284499dae64 100644
--- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable19.py
+++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable19.py
@@ -29,7 +29,7 @@
 import fnmatch, os, shutil, time
 from helper import simulate_crash_restart
 from test_rollback_to_stable01 import test_rollback_to_stable_base
-from wiredtiger import stat
+from wiredtiger import stat, WT_NOTFOUND
 from wtdataset import SimpleDataSet
 from wtscenario import make_scenarios
 
@@ -102,11 +102,18 @@ class test_rollback_to_stable19(test_rollback_to_stable_base):
         # Search for the key so we position our cursor on the page that we want to evict.
         self.session.begin_transaction("ignore_prepare = true")
         evict_cursor.set_key(1)
-        evict_cursor.search()
+        self.assertEquals(evict_cursor.search(), WT_NOTFOUND)
         evict_cursor.reset()
         evict_cursor.close()
         self.session.commit_transaction()
 
+        # Search to make sure the data is not visible
+        self.session.begin_transaction("ignore_prepare = true")
+        cursor2 = self.session.open_cursor(uri)
+        cursor2.set_key(1)
+        self.assertEquals(cursor2.search(), WT_NOTFOUND)
+        self.session.commit_transaction()
+
         # Pin stable timestamp to 20.
         self.conn.set_timestamp('stable_timestamp=' + timestamp_str(20))
         if not self.in_memory:
@@ -175,11 +182,18 @@ class test_rollback_to_stable19(test_rollback_to_stable_base):
         # Search for the key so we position our cursor on the page that we want to evict.
         self.session.begin_transaction("ignore_prepare = true")
         evict_cursor.set_key(1)
-        evict_cursor.search()
+        self.assertEquals(evict_cursor.search(), WT_NOTFOUND)
         evict_cursor.reset()
         evict_cursor.close()
         self.session.commit_transaction()
 
+        # Search to make sure the data is not visible
+        self.session.begin_transaction("ignore_prepare = true")
+        cursor2 = self.session.open_cursor(uri)
+        cursor2.set_key(1)
+        self.assertEquals(cursor2.search(), WT_NOTFOUND)
+        self.session.commit_transaction()
+
         # Pin stable timestamp to 40.
         self.conn.set_timestamp('stable_timestamp=' + timestamp_str(40))
         if not self.in_memory: