Import wiredtiger: 332dddfe0e48eb1c263455d3db9219ec5f7cdc30 from branch mongodb-4.4r4.4.4-rc0

ref: a52cd5a47a..332dddfe0e
for: 4.4.4

WT-6430       Move WT_CONN_SERVER flags into their own field
WT-6504       Don't fallback to onpage value as base value if we see the onpage value in the history store
WT-6567       Write "rollback to stable" subpage for Architecture Guide
WT-6772       Add support for prepared updates in datastore for test_hs09
WT-6901       Write "cursor" subpage for Architecture Guide
WT-7069       Enable column store configuration to history store
WT-7089       Don't skip checkpointing objects that have obsolete pages
WT-7091       Restrict usage of LSM to only operate in conjunction with compatible incremental backup mechanism
WT-7117       RTS to skip modifies that are more than on-disk base update while restoring an update
WT-7121       Include log-structured allocation python tests in WT
WT-7126       Coverity analysis defect 116991: Explicit null dereferenced
WT-7127       Coverity analysis defect 116992: Unchecked return value
WT-7128       Coverity analysis defect 116993: Resource leak
WT-7131       Tiered cursors should return error if configured with zero tiers

1 files changed, 8 insertions, 1 deletions

diff --git a/src/third_party/wiredtiger/test/suite/test_hs05.py b/src/third_party/wiredtiger/test/suite/test_hs05.py
index f2d93a40547..745d22d5480 100644
--- a/src/third_party/wiredtiger/test/suite/test_hs05.py
+++ b/src/third_party/wiredtiger/test/suite/test_hs05.py
@@ -30,6 +30,7 @@ from helper import copy_wiredtiger_home
 import wiredtiger, wttest
 from wiredtiger import stat
 from wtdataset import SimpleDataSet
+from wtscenario import make_scenarios
 
 def timestamp_str(t):
     return '%x' % t
@@ -44,6 +45,12 @@ class test_hs05(wttest.WiredTigerTestCase):
     conn_config += 'eviction_updates_target=100,eviction_updates_trigger=100'
     session_config = 'isolation=snapshot'
     stable = 1
+    key_format_values = [
+        ('column', dict(key_format='r')),
+        ('integer', dict(key_format='i')),
+        ('string', dict(key_format='S'))
+    ]
+    scenarios = make_scenarios(key_format_values)
 
     def get_stat(self, stat):
         stat_cursor = self.session.open_cursor('statistics:')
@@ -71,7 +78,7 @@ class test_hs05(wttest.WiredTigerTestCase):
         # Create a small table.
         uri = "table:test_hs05"
         nrows = 100
-        ds = SimpleDataSet(self, uri, nrows, key_format="S", value_format='u')
+        ds = SimpleDataSet(self, uri, nrows, key_format=self.key_format, value_format='u')
         ds.populate()
         bigvalue = b"aaaaa" * 100