Import wiredtiger: 3e1694ee43fea423441143df135b76c855f87d5a from branch mongodb-master

ref: 0cbc1d8df6..3e1694ee43
for: 5.1.0

WT-6910       Write "history store" subpage for Architecture Guide
WT-7838       Ability for ordered timestamp assertion to do more than a log message
WT-7908       Make variable-length column store work again with the static tests

Reverted ticket(s):
WT-7757       Skip internal and leaf pages with content obsolete to the reader

1 files changed, 1 insertions, 21 deletions

diff --git a/src/third_party/wiredtiger/test/suite/test_hs18.py b/src/third_party/wiredtiger/test/suite/test_hs18.py
index a07338d62bb..f7462e5bb5e 100644
--- a/src/third_party/wiredtiger/test/suite/test_hs18.py
+++ b/src/third_party/wiredtiger/test/suite/test_hs18.py
@@ -36,7 +36,7 @@ class test_hs18(wttest.WiredTigerTestCase):
     session_config = 'isolation=snapshot'
     key_format_values = [
         ('column', dict(key_format='r')),
-        ('string', dict(key_format='S'))
+        ('string-row', dict(key_format='S'))
     ]
     scenarios = make_scenarios(key_format_values)
 
@@ -119,11 +119,6 @@ class test_hs18(wttest.WiredTigerTestCase):
 
     # Test that we don't get the wrong value if we read with a timestamp originally.
     def test_read_timestamp_weirdness(self):
-        # FIXME-WT-7136: Mixed mode transactions not supported for column store scenario.
-        # Re-enable once complete.
-        if self.key_format == 'r':
-            return
-
         uri = 'table:test_hs18'
         self.session.create(uri, 'key_format={},value_format=S'.format(self.key_format))
         cursor = self.session.open_cursor(uri)
@@ -248,11 +243,6 @@ class test_hs18(wttest.WiredTigerTestCase):
 
     # Test older readers for each of the updates moved to the history store.
     def test_multiple_older_readers(self):
-        # FIXME-WT-7136: Mixed mode transactions not supported for column store scenario.
-        # Re-enable once complete.
-        if self.key_format == 'r':
-            return
-
         uri = 'table:test_multiple_older_readers'
         self.session.create(uri, 'key_format={},value_format=S'.format(self.key_format))
         cursor = self.session.open_cursor(uri)
@@ -325,11 +315,6 @@ class test_hs18(wttest.WiredTigerTestCase):
             cursors[i].reset()
 
     def test_multiple_older_readers_with_multiple_mixed_mode(self):
-        # FIXME-WT-7136: Mixed mode transactions not supported for column store scenario.
-        # Re-enable once complete.
-        if self.key_format == 'r':
-            return
-
         uri = 'table:test_multiple_older_readers'
         self.session.create(uri, 'key_format={},value_format=S'.format(self.key_format))
         cursor = self.session.open_cursor(uri)
@@ -447,11 +432,6 @@ class test_hs18(wttest.WiredTigerTestCase):
             cursors[i].reset()
 
     def test_modifies(self):
-        # FIXME-WT-7136: Modify not supported for column store scenario.
-        # Re-enable once complete.
-        if self.key_format == 'r':
-            return
-
         uri = 'table:test_modifies'
         self.session.create(uri, 'key_format={},value_format=S'.format(self.key_format))
         cursor = self.session.open_cursor(uri)