diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-01-11 16:22:14 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-11 05:52:02 +0000 |
| commit | 35ba992f21b194fe577cf9069a1591d5d374d29f (patch) | |
| tree | ab110e6fabdcaee483dd865465114c5148be2e23 | |
| parent | e3b2297d340a083be330b178d2f7ce2c3b3566f2 (diff) | |
| download | mongo-35ba992f21b194fe577cf9069a1591d5d374d29f.tar.gz | |
Import wiredtiger: be77e039023f314b8c12ef131adaf628c296975f from branch mongodb-5.2
ref: 719945d56d..be77e03902
for: 5.2.0-rc5
WT-8648 Stop configuring snapshot isolation in the test suite
166 files changed, 117 insertions, 258 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 313b27c0380..0eeac142708 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.2", - "commit": "719945d56d3c7691106faaa8d31172df3f78b927" + "commit": "be77e039023f314b8c12ef131adaf628c296975f" } diff --git a/src/third_party/wiredtiger/test/suite/test_assert01.py b/src/third_party/wiredtiger/test/suite/test_assert01.py index 4793ef26e72..cb12d8bd030 100644 --- a/src/third_party/wiredtiger/test/suite/test_assert01.py +++ b/src/third_party/wiredtiger/test/suite/test_assert01.py @@ -45,7 +45,6 @@ class test_assert01(wttest.WiredTigerTestCase, suite_subprocess): cfg_def = '' cfg_never = 'verbose=(write_timestamp=true),write_timestamp_usage=never,assert=(write_timestamp=on)' cfg_none = 'assert=(write_timestamp=off)' - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r', usestrings=False)), diff --git a/src/third_party/wiredtiger/test/suite/test_assert02.py b/src/third_party/wiredtiger/test/suite/test_assert02.py index d3d5e885e87..d9bd372f7a9 100644 --- a/src/third_party/wiredtiger/test/suite/test_assert02.py +++ b/src/third_party/wiredtiger/test/suite/test_assert02.py @@ -35,7 +35,6 @@ import wiredtiger, wttest from wtscenario import make_scenarios class test_assert02(wttest.WiredTigerTestCase, suite_subprocess): - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r', usestrings=False)), diff --git a/src/third_party/wiredtiger/test/suite/test_assert04.py b/src/third_party/wiredtiger/test/suite/test_assert04.py index 6c5d4623d4d..46d8c0f08c9 100644 --- a/src/third_party/wiredtiger/test/suite/test_assert04.py +++ b/src/third_party/wiredtiger/test/suite/test_assert04.py @@ -35,7 +35,6 @@ import wiredtiger, wttest from wtscenario import make_scenarios class test_assert04(wttest.WiredTigerTestCase, suite_subprocess): - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r', usestrings=False)), diff --git a/src/third_party/wiredtiger/test/suite/test_assert05.py b/src/third_party/wiredtiger/test/suite/test_assert05.py index afa2acbcbfb..2dc0fc1788f 100644 --- a/src/third_party/wiredtiger/test/suite/test_assert05.py +++ b/src/third_party/wiredtiger/test/suite/test_assert05.py @@ -37,7 +37,6 @@ from wtscenario import make_scenarios class test_assert05(wttest.WiredTigerTestCase, suite_subprocess): base = 'assert05' base_uri = 'file:' + base - session_config = 'isolation=snapshot' uri_always = base_uri + '.always.wt' uri_def = base_uri + '.def.wt' uri_never = base_uri + '.never.wt' diff --git a/src/third_party/wiredtiger/test/suite/test_assert06.py b/src/third_party/wiredtiger/test/suite/test_assert06.py index ea8cb43ac1c..4223f53669b 100644 --- a/src/third_party/wiredtiger/test/suite/test_assert06.py +++ b/src/third_party/wiredtiger/test/suite/test_assert06.py @@ -35,7 +35,6 @@ import wiredtiger, wttest from wtscenario import make_scenarios class test_assert06(wttest.WiredTigerTestCase, suite_subprocess): - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r', usestrings=False)), diff --git a/src/third_party/wiredtiger/test/suite/test_assert07.py b/src/third_party/wiredtiger/test/suite/test_assert07.py index 687174b4796..a29fc165037 100644 --- a/src/third_party/wiredtiger/test/suite/test_assert07.py +++ b/src/third_party/wiredtiger/test/suite/test_assert07.py @@ -59,13 +59,13 @@ class test_assert07(wttest.WiredTigerTestCase, suite_subprocess): # No reserved, single update. self.session.create(uri, 'key_format={},value_format=S'.format(self.key_format)) c = self.session.open_cursor(uri) - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() c[key_ts1] = 'value1' self.apply_timestamps(1) self.session.commit_transaction() # Reserved at the start of the chain, with one update. - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() c.set_key(key_ts1) c.reserve() c[key_ts1] = 'value2' @@ -73,7 +73,7 @@ class test_assert07(wttest.WiredTigerTestCase, suite_subprocess): self.session.commit_transaction() # Reserved at the end of the chain, with one update. - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() c[key_ts1] = 'value3' c.set_key(key_ts1) c.reserve() @@ -81,7 +81,7 @@ class test_assert07(wttest.WiredTigerTestCase, suite_subprocess): self.session.commit_transaction() # Reserved at the start of the chain, with multiple. - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() c.set_key(key_ts1) c.reserve() c[key_ts1] = 'value4' @@ -90,7 +90,7 @@ class test_assert07(wttest.WiredTigerTestCase, suite_subprocess): self.session.commit_transaction() # Reserved at the end of the chain, with multiple updates. - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() c[key_ts1] = 'value6' c[key_ts1] = 'value7' c.set_key(key_ts1) @@ -99,7 +99,7 @@ class test_assert07(wttest.WiredTigerTestCase, suite_subprocess): self.session.commit_transaction() # Reserved between two updates. - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() c[key_ts1] = 'value8' c.set_key(key_ts1) c.reserve() @@ -108,7 +108,7 @@ class test_assert07(wttest.WiredTigerTestCase, suite_subprocess): self.session.commit_transaction() # Reserved update with multiple extra updates. - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() c[key_ts1] = 'value10' c.set_key(key_ts1) c.reserve() @@ -119,7 +119,7 @@ class test_assert07(wttest.WiredTigerTestCase, suite_subprocess): self.session.commit_transaction() # Reserved updates with multiple extra updates. - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() c[key_ts1] = 'value14' c.set_key(key_ts1) c.reserve() diff --git a/src/third_party/wiredtiger/test/suite/test_backup08.py b/src/third_party/wiredtiger/test/suite/test_backup08.py index 95e50971408..c6bcef5a626 100644 --- a/src/third_party/wiredtiger/test/suite/test_backup08.py +++ b/src/third_party/wiredtiger/test/suite/test_backup08.py @@ -36,7 +36,6 @@ from wtscenario import make_scenarios class test_backup08(wttest.WiredTigerTestCase): conn_config = 'config_base=false,create,log=(enabled)' - session_config = 'isolation=snapshot' dir = 'backup.dir' coll1_uri = 'table:collection10.1' coll2_uri = 'table:collection10.2' diff --git a/src/third_party/wiredtiger/test/suite/test_base01.py b/src/third_party/wiredtiger/test/suite/test_base01.py index 2b150c1f049..fd1cee87d95 100644 --- a/src/third_party/wiredtiger/test/suite/test_base01.py +++ b/src/third_party/wiredtiger/test/suite/test_base01.py @@ -40,7 +40,7 @@ class test_base01(wttest.WiredTigerTestCase): key_format_values = [ ('column', dict(key_format='r')), - ('string_row', dict(key_format='S')), + ('row_string', dict(key_format='S')), ] scenarios = make_scenarios(key_format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_bug004.py b/src/third_party/wiredtiger/test/suite/test_bug004.py index aedf35de731..7f47ba6688d 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug004.py +++ b/src/third_party/wiredtiger/test/suite/test_bug004.py @@ -51,7 +51,7 @@ class test_bug004(wttest.WiredTigerTestCase): key_format_values = [ ('column', dict(key_format='r')), - ('string_row', dict(key_format='S')), + ('row_string', dict(key_format='S')), ] scenarios = make_scenarios(key_format_values) @@ -81,7 +81,7 @@ class test_bug004(wttest.WiredTigerTestCase): # Create a new session and start a transaction to force the engine # to access old versions of the key/value pairs. tmp_session = self.conn.open_session(None) - tmp_session.begin_transaction("isolation=snapshot") + tmp_session.begin_transaction() # Load the object and use truncate to delete a set of records. (I'm # using truncate because it doesn't instantiate keys, all other ops diff --git a/src/third_party/wiredtiger/test/suite/test_bug013.py b/src/third_party/wiredtiger/test/suite/test_bug013.py index cb2bb82e3b4..594a3593e36 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug013.py +++ b/src/third_party/wiredtiger/test/suite/test_bug013.py @@ -50,7 +50,6 @@ class test_bug013(wttest.WiredTigerTestCase): self.assertEqual(i, len(keys)) def test_lsm_consistency(self): - self.session.reconfigure("isolation=snapshot") self.session.create(self.uri, 'key_format=iii,value_format=i,type=lsm') cursor = self.session.open_cursor(self.uri, None, None) cursor[(2, 6, 1)] = 0 diff --git a/src/third_party/wiredtiger/test/suite/test_bug022.py b/src/third_party/wiredtiger/test/suite/test_bug022.py index 8e7b355133e..9f0d833f7a0 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug022.py +++ b/src/third_party/wiredtiger/test/suite/test_bug022.py @@ -35,7 +35,6 @@ from wtscenario import make_scenarios class test_bug022(wttest.WiredTigerTestCase): uri = 'file:test_bug022' conn_config = 'cache_size=50MB' - session_config = 'isolation=snapshot' key_format_values = [ ('string-row', dict(key_format='S', usestrings=True)), diff --git a/src/third_party/wiredtiger/test/suite/test_bug027.py b/src/third_party/wiredtiger/test/suite/test_bug027.py index 7863fa052b1..472e467189e 100644 --- a/src/third_party/wiredtiger/test/suite/test_bug027.py +++ b/src/third_party/wiredtiger/test/suite/test_bug027.py @@ -35,7 +35,6 @@ from wtscenario import make_scenarios # Attempt to create a snapshot with more than 256 transactions in it. class test_bug(wttest.WiredTigerTestCase): conn_config = 'session_max=512' - session_config = 'isolation=snapshot' key_format='i' value_format='S' diff --git a/src/third_party/wiredtiger/test/suite/test_calc_modify.py b/src/third_party/wiredtiger/test/suite/test_calc_modify.py index 0381bed25c3..7a426c5afb2 100755 --- a/src/third_party/wiredtiger/test/suite/test_calc_modify.py +++ b/src/third_party/wiredtiger/test/suite/test_calc_modify.py @@ -108,7 +108,7 @@ class test_calc_modify(wttest.WiredTigerTestCase): self.assertIsNotNone(mods) c[k] = oldv - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() c.set_key(k) c.modify(mods) self.session.commit_transaction() diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint03.py b/src/third_party/wiredtiger/test/suite/test_checkpoint03.py index 121ece8304c..809e2288e31 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint03.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint03.py @@ -43,12 +43,11 @@ class test_checkpoint03(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_checkpoint03' conn_config = 'statistics=(all)' uri = 'table:' + tablename - session_config = 'isolation=snapshot, ' format_values = [ ('column-fix', dict(key_format='r', value_format='8t')), ('column', dict(key_format='r', value_format='i')), - ('integer_row', dict(key_format='i', value_format='i')), + ('row_integer', dict(key_format='i', value_format='i')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint04.py b/src/third_party/wiredtiger/test/suite/test_checkpoint04.py index eda62c33f66..4cf1ce530d6 100755 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint04.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint04.py @@ -35,7 +35,6 @@ from wtdataset import SimpleDataSet class test_checkpoint04(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB,log=(enabled),statistics=(all)' - session_config = 'isolation=snapshot' def create_tables(self, ntables): tables = {} diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint06.py b/src/third_party/wiredtiger/test/suite/test_checkpoint06.py index 1c5bdf48af4..6570bda56fa 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint06.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint06.py @@ -35,12 +35,11 @@ from wtscenario import make_scenarios # timestamp in the checkpoint. class test_checkpoint06(wttest.WiredTigerTestCase): conn_config = 'create,cache_size=50MB' - session_config = 'isolation=snapshot' format_values = [ ('column-fix', dict(key_format='r', value_format='8t')), ('column', dict(key_format='r', value_format='S')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint07.py b/src/third_party/wiredtiger/test/suite/test_checkpoint07.py index a876d1ac807..0a03a6787a0 100755 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint07.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint07.py @@ -35,7 +35,6 @@ from wtdataset import SimpleDataSet class test_checkpoint07(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB,log=(enabled),statistics=(all)' - session_config = 'isolation=snapshot' def get_stat(self, uri): stat_uri = 'statistics:' + uri diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint08.py b/src/third_party/wiredtiger/test/suite/test_checkpoint08.py index 49de9c5f163..200a4d73535 100755 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint08.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint08.py @@ -39,7 +39,6 @@ from wtdataset import SimpleDataSet class test_checkpoint08(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB,log=(enabled),statistics=(all)' - session_config = 'isolation=snapshot' def get_stat(self, uri): stat_uri = 'statistics:' + uri diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint09.py b/src/third_party/wiredtiger/test/suite/test_checkpoint09.py index b4ea33ff75f..63372a3d7a4 100755 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint09.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint09.py @@ -36,12 +36,11 @@ from wtscenario import make_scenarios class test_checkpoint09(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB,log=(enabled),statistics=(all)' - session_config = 'isolation=snapshot' format_values = [ ('column-fix', dict(key_format='r', value_format='8t')), ('column', dict(key_format='r', value_format='u')), - ('string_row', dict(key_format='S', value_format='u')), + ('row_string', dict(key_format='S', value_format='u')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot01.py b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot01.py index 63dabc178d8..50be13e7d61 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot01.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot01.py @@ -48,7 +48,7 @@ class test_checkpoint_snapshot01(wttest.WiredTigerTestCase): format_values = [ ('column-fix', dict(key_format='r', value_format='8t')), ('column', dict(key_format='r', value_format='u')), - ('string_row', dict(key_format='S', value_format='u')), + ('row_string', dict(key_format='S', value_format='u')), ] scenarios = make_scenarios(format_values) @@ -75,7 +75,7 @@ class test_checkpoint_snapshot01(wttest.WiredTigerTestCase): for j in range (0, self.nsessions): sessions[j] = self.conn.open_session() cursors[j] = sessions[j].open_cursor(self.uri) - sessions[j].begin_transaction('isolation=snapshot') + sessions[j].begin_transaction() start = (j * self.nkeys) end = start + self.nkeys diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot02.py b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot02.py index 7678b48899a..7a011aa181d 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot02.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot02.py @@ -48,7 +48,7 @@ class test_checkpoint_snapshot02(wttest.WiredTigerTestCase): format_values = [ ('column_fix', dict(key_format='r', value_format='8t')), ('column', dict(key_format='r', value_format='S')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] restart_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot03.py b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot03.py index d1823c50c3f..9ce0a92fb42 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot03.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot03.py @@ -50,7 +50,7 @@ class test_checkpoint_snapshot03(wttest.WiredTigerTestCase): format_values = [ ('column_fix', dict(key_format='r', value_format='8t')), ('column', dict(key_format='r', value_format='S')), - ('string_row', dict(key_format='S', value_format='S')), + ('row_string', dict(key_format='S', value_format='S')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot04.py b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot04.py index baa262d89d4..c5e8d67356a 100644 --- a/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot04.py +++ b/src/third_party/wiredtiger/test/suite/test_checkpoint_snapshot04.py @@ -45,7 +45,7 @@ class test_checkpoint_snapshot04(backup_base): format_values = [ ('column_fix', dict(key_format='r', value_format='8t')), ('column', dict(key_format='r', value_format='S')), - ('string_row', dict(key_format='S', value_format='S')), + ('row_string', dict(key_format='S', value_format='S')), ] target_backup = [ diff --git a/src/third_party/wiredtiger/test/suite/test_compat01.py b/src/third_party/wiredtiger/test/suite/test_compat01.py index 0ec831c989a..3f109e865e0 100644 --- a/src/third_party/wiredtiger/test/suite/test_compat01.py +++ b/src/third_party/wiredtiger/test/suite/test_compat01.py @@ -199,7 +199,7 @@ class test_reconfig_fail(wttest.WiredTigerTestCase): compat_str = 'compatibility=(release="2.6")' self.conn.reconfigure(compat_str) - self.session.begin_transaction("isolation=snapshot") + self.session.begin_transaction() c = self.session.open_cursor(uri, None) c.set_key(ds.key(20)) c.set_value("abcde") diff --git a/src/third_party/wiredtiger/test/suite/test_debug_mode01.py b/src/third_party/wiredtiger/test/suite/test_debug_mode01.py index f1232a96081..e4644d4bd40 100644 --- a/src/third_party/wiredtiger/test/suite/test_debug_mode01.py +++ b/src/third_party/wiredtiger/test/suite/test_debug_mode01.py @@ -32,7 +32,6 @@ import wiredtiger, wttest # Test the debug mode settings. Test rollback_error in this one. class test_debug_mode01(wttest.WiredTigerTestCase): conn_config = 'log=(enabled=true),debug_mode=(rollback_error=5)' - session_config = 'isolation=snapshot' uri = 'file:test_debug' entries = 22 diff --git a/src/third_party/wiredtiger/test/suite/test_debug_mode05.py b/src/third_party/wiredtiger/test/suite/test_debug_mode05.py index bb480138997..aa548a83240 100644 --- a/src/third_party/wiredtiger/test/suite/test_debug_mode05.py +++ b/src/third_party/wiredtiger/test/suite/test_debug_mode05.py @@ -35,7 +35,6 @@ import wiredtiger, wttest # This test is to confirm the fix and prevent similar regressions. class test_debug_mode05(wttest.WiredTigerTestCase): conn_config = 'log=(enabled),debug_mode=(table_logging=true)' - session_config = 'isolation=snapshot' uri = 'file:test_debug_mode05' def test_table_logging_rollback_to_stable(self): diff --git a/src/third_party/wiredtiger/test/suite/test_durable_rollback_to_stable.py b/src/third_party/wiredtiger/test/suite/test_durable_rollback_to_stable.py index a07199cc717..db00d289f80 100644 --- a/src/third_party/wiredtiger/test/suite/test_durable_rollback_to_stable.py +++ b/src/third_party/wiredtiger/test/suite/test_durable_rollback_to_stable.py @@ -36,7 +36,6 @@ from wtscenario import make_scenarios # Checking visibility and durability of updates with durable_timestamp and # with rollback to stable. class test_durable_rollback_to_stable(wttest.WiredTigerTestCase, suite_subprocess): - session_config = 'isolation=snapshot' format_values = [ ('row-string', dict(keyfmt='S', valfmt='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_durable_ts01.py b/src/third_party/wiredtiger/test/suite/test_durable_ts01.py index cea0ae3196e..2770bd4a24b 100644 --- a/src/third_party/wiredtiger/test/suite/test_durable_ts01.py +++ b/src/third_party/wiredtiger/test/suite/test_durable_ts01.py @@ -35,7 +35,6 @@ from wtscenario import make_scenarios # Checking visibility and durability of updates with durable_timestamp and # with restart. class test_durable_ts01(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' format_values = [ ('row-string', dict(keyfmt='S', valfmt='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_durable_ts02.py b/src/third_party/wiredtiger/test/suite/test_durable_ts02.py index 3a5f8aabaef..2411e3c08a8 100644 --- a/src/third_party/wiredtiger/test/suite/test_durable_ts02.py +++ b/src/third_party/wiredtiger/test/suite/test_durable_ts02.py @@ -34,7 +34,6 @@ from wtscenario import make_scenarios # test_durable_ts03.py # Checking visibility and durability of updates with durable_timestamp class test_durable_ts03(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' format_values = [ ('row-string', dict(keyfmt='S', valfmt='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_durable_ts03.py b/src/third_party/wiredtiger/test/suite/test_durable_ts03.py index 4f0d66ab8ae..435688b27bf 100755 --- a/src/third_party/wiredtiger/test/suite/test_durable_ts03.py +++ b/src/third_party/wiredtiger/test/suite/test_durable_ts03.py @@ -34,7 +34,6 @@ from wtscenario import make_scenarios # Check that the checkpoint honors the durable timestamp of updates. class test_durable_ts03(wttest.WiredTigerTestCase): conn_config = 'cache_size=10MB' - session_config = 'isolation=snapshot' format_values = [ ('integer-row', dict(key_format='i', value_format='u')), diff --git a/src/third_party/wiredtiger/test/suite/test_flcs01.py b/src/third_party/wiredtiger/test/suite/test_flcs01.py index 9969f70fd0f..d420b75638b 100644 --- a/src/third_party/wiredtiger/test/suite/test_flcs01.py +++ b/src/third_party/wiredtiger/test/suite/test_flcs01.py @@ -39,7 +39,6 @@ from wtscenario import make_scenarios # in-memory update records. (Testing on an in-memory database does not have that # effect.) class test_flcs01(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' conn_config = 'in_memory=false' # Evict the page to force reconciliation. diff --git a/src/third_party/wiredtiger/test/suite/test_flcs02.py b/src/third_party/wiredtiger/test/suite/test_flcs02.py index e320b3f3500..59376cefa43 100644 --- a/src/third_party/wiredtiger/test/suite/test_flcs02.py +++ b/src/third_party/wiredtiger/test/suite/test_flcs02.py @@ -40,7 +40,6 @@ from wtscenario import make_scenarios # in-memory update records. (Testing on an in-memory database does not have that # effect.) class test_flcs01(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' conn_config = 'in_memory=false' prepare_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_flcs03.py b/src/third_party/wiredtiger/test/suite/test_flcs03.py index 9ace77ddbf6..30932a9e1f0 100644 --- a/src/third_party/wiredtiger/test/suite/test_flcs03.py +++ b/src/third_party/wiredtiger/test/suite/test_flcs03.py @@ -40,7 +40,6 @@ from wtscenario import make_scenarios # pages are still reconciled and that can eliminate the update configuration we're # trying to test. class test_flcs03(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' in_memory_values = [ ('no_inmem', dict(in_memory=False)), diff --git a/src/third_party/wiredtiger/test/suite/test_flcs04.py b/src/third_party/wiredtiger/test/suite/test_flcs04.py index 556ee03dcb3..aa42fa80825 100644 --- a/src/third_party/wiredtiger/test/suite/test_flcs04.py +++ b/src/third_party/wiredtiger/test/suite/test_flcs04.py @@ -34,7 +34,6 @@ from wtdataset import SimpleDataSet # Make sure modify fails cleanly on FLCS tables. class test_flcs04(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' conn_config = 'in_memory=false' def test_flcs(self): diff --git a/src/third_party/wiredtiger/test/suite/test_gc01.py b/src/third_party/wiredtiger/test/suite/test_gc01.py index 8cec5461881..6053cbba384 100755 --- a/src/third_party/wiredtiger/test/suite/test_gc01.py +++ b/src/third_party/wiredtiger/test/suite/test_gc01.py @@ -84,7 +84,6 @@ class test_gc01(test_gc_base): # Force a small cache. conn_config = ('cache_size=50MB,eviction_updates_trigger=95,eviction_updates_target=80,' 'log=(enabled),statistics=(all)') - session_config = 'isolation=snapshot' def test_gc(self): nrows = 10000 diff --git a/src/third_party/wiredtiger/test/suite/test_gc02.py b/src/third_party/wiredtiger/test/suite/test_gc02.py index 7af18d02186..8d2dfc30e4a 100755 --- a/src/third_party/wiredtiger/test/suite/test_gc02.py +++ b/src/third_party/wiredtiger/test/suite/test_gc02.py @@ -34,7 +34,6 @@ from wtdataset import SimpleDataSet # Test that checkpoint cleans the obsolete history store internal pages. class test_gc02(test_gc_base): conn_config = 'cache_size=1GB,log=(enabled),statistics=(all)' - session_config = 'isolation=snapshot' def test_gc(self): nrows = 100000 diff --git a/src/third_party/wiredtiger/test/suite/test_gc03.py b/src/third_party/wiredtiger/test/suite/test_gc03.py index 386a7bea801..1ec66c5fd69 100755 --- a/src/third_party/wiredtiger/test/suite/test_gc03.py +++ b/src/third_party/wiredtiger/test/suite/test_gc03.py @@ -34,7 +34,6 @@ from wtdataset import SimpleDataSet # Test that checkpoint cleans the obsolete history store pages that are in-memory. class test_gc03(test_gc_base): conn_config = 'cache_size=4GB,log=(enabled),statistics=(all),statistics_log=(wait=0,on_close=true)' - session_config = 'isolation=snapshot' def get_stat(self, stat): stat_cursor = self.session.open_cursor('statistics:') diff --git a/src/third_party/wiredtiger/test/suite/test_gc04.py b/src/third_party/wiredtiger/test/suite/test_gc04.py index 4504bd3f75e..ce814079b3a 100755 --- a/src/third_party/wiredtiger/test/suite/test_gc04.py +++ b/src/third_party/wiredtiger/test/suite/test_gc04.py @@ -34,7 +34,6 @@ from wtdataset import SimpleDataSet # Test that checkpoint must not clean the pages that are not obsolete. class test_gc04(test_gc_base): conn_config = 'cache_size=50MB,log=(enabled),statistics=(all)' - session_config = 'isolation=snapshot' def get_stat(self, stat): stat_cursor = self.session.open_cursor('statistics:') diff --git a/src/third_party/wiredtiger/test/suite/test_gc05.py b/src/third_party/wiredtiger/test/suite/test_gc05.py index 75bf3d253e8..d5af63255b9 100755 --- a/src/third_party/wiredtiger/test/suite/test_gc05.py +++ b/src/third_party/wiredtiger/test/suite/test_gc05.py @@ -33,7 +33,6 @@ from wtdataset import SimpleDataSet # Verify a locked checkpoint is not removed during garbage collection. class test_gc05(test_gc_base): conn_config = 'cache_size=50MB,log=(enabled),statistics=(all)' - session_config = 'isolation=snapshot' def test_gc(self): uri = "table:gc05" diff --git a/src/third_party/wiredtiger/test/suite/test_hs01.py b/src/third_party/wiredtiger/test/suite/test_hs01.py index ffa35c144b7..c0e14571f06 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs01.py +++ b/src/third_party/wiredtiger/test/suite/test_hs01.py @@ -37,7 +37,6 @@ from wtscenario import make_scenarios # Additionally test that checkpoint inserts content into the history store. class test_hs01(wttest.WiredTigerTestCase): conn_config = 'cache_size=200MB,statistics=(all)' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='u')), ('column_fix', dict(key_format='r', value_format='8t')), @@ -136,7 +135,7 @@ class test_hs01(wttest.WiredTigerTestCase): # Check to see if the history store is working with the old reader. # Open session 2. session2 = self.conn.open_session() - session2.begin_transaction('isolation=snapshot') + session2.begin_transaction() # Large updates with session 1. self.large_updates(self.session, uri, bigvalue2, ds, nrows) @@ -154,7 +153,7 @@ class test_hs01(wttest.WiredTigerTestCase): # Check to see the history store working with modify operations. # Open session 2. session2 = self.conn.open_session() - session2.begin_transaction('isolation=snapshot') + session2.begin_transaction() # Apply two modify operations (session1)- replacing the first two letters with 'A'. self.large_modifies(self.session, uri, 0, ds, nrows) self.large_modifies(self.session, uri, 1, ds, nrows) diff --git a/src/third_party/wiredtiger/test/suite/test_hs02.py b/src/third_party/wiredtiger/test/suite/test_hs02.py index 0388646cfb8..3f5477c7f82 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs02.py +++ b/src/third_party/wiredtiger/test/suite/test_hs02.py @@ -36,7 +36,6 @@ from wtscenario import make_scenarios class test_hs02(wttest.WiredTigerTestCase): # Force a small cache. conn_config = 'cache_size=50MB,log=(enabled)' - session_config = 'isolation=snapshot' format_values = [ ('string-row', dict(key_format='S', value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs03.py b/src/third_party/wiredtiger/test/suite/test_hs03.py index 768b8598a1a..2a267bc6825 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs03.py +++ b/src/third_party/wiredtiger/test/suite/test_hs03.py @@ -37,7 +37,6 @@ from wtscenario import make_scenarios class test_hs03(wttest.WiredTigerTestCase): # Force a small cache. conn_config = 'cache_size=50MB,statistics=(fast)' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='u')), ('column_fix', dict(key_format='r', value_format='8t')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs05.py b/src/third_party/wiredtiger/test/suite/test_hs05.py index 021ffc35538..4d59f909465 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs05.py +++ b/src/third_party/wiredtiger/test/suite/test_hs05.py @@ -40,7 +40,6 @@ class test_hs05(wttest.WiredTigerTestCase): conn_config += 'eviction_trigger=100,' conn_config += 'eviction_dirty_target=95,eviction_dirty_trigger=100,' conn_config += 'eviction_updates_target=95,eviction_updates_trigger=100' - session_config = 'isolation=snapshot' stable = 1 format_values = [ ('column', dict(key_format='r', value_format='u')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs06.py b/src/third_party/wiredtiger/test/suite/test_hs06.py index 918e1dd9fa8..42b502df4b2 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs06.py +++ b/src/third_party/wiredtiger/test/suite/test_hs06.py @@ -42,7 +42,6 @@ from wtscenario import make_scenarios class test_hs06(wttest.WiredTigerTestCase): # Force a small cache. conn_config = 'cache_size=50MB,statistics=(fast)' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column-fix', dict(key_format='r', value_format='8t')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs07.py b/src/third_party/wiredtiger/test/suite/test_hs07.py index 549868b5ef3..10fc559bad4 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs07.py +++ b/src/third_party/wiredtiger/test/suite/test_hs07.py @@ -38,7 +38,6 @@ class test_hs07(wttest.WiredTigerTestCase): # Force a small cache. conn_config = ('cache_size=50MB,eviction_updates_trigger=95,' 'eviction_updates_target=80,log=(enabled)') - session_config = 'isolation=snapshot' format_values = ( ('column', dict(key_format='r', value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs08.py b/src/third_party/wiredtiger/test/suite/test_hs08.py index 13769f2f19f..05505663c32 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs08.py +++ b/src/third_party/wiredtiger/test/suite/test_hs08.py @@ -34,7 +34,6 @@ from wtscenario import make_scenarios # Verify modify insert into history store logic. class test_hs08(wttest.WiredTigerTestCase): conn_config = 'cache_size=100MB,statistics=(all)' - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r')), ('integer-row', dict(key_format='i')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs09.py b/src/third_party/wiredtiger/test/suite/test_hs09.py index 3980e0b275c..c00a93e48ac 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs09.py +++ b/src/third_party/wiredtiger/test/suite/test_hs09.py @@ -40,7 +40,6 @@ from wtscenario import make_scenarios class test_hs09(wttest.WiredTigerTestCase): # Force a small cache. conn_config = 'cache_size=20MB' - session_config = 'isolation=snapshot' uri = "table:test_hs09" format_values = [ ('column', dict(key_format='r', value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs10.py b/src/third_party/wiredtiger/test/suite/test_hs10.py index 256ecff4f7b..e4607671da2 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs10.py +++ b/src/third_party/wiredtiger/test/suite/test_hs10.py @@ -34,7 +34,6 @@ from wtscenario import make_scenarios # Verify modify read after eviction. class test_hs10(wttest.WiredTigerTestCase): conn_config = 'cache_size=2MB,statistics=(all),eviction=(threads_max=1)' - session_config = 'isolation=snapshot' key_format_values = ( ('column', dict(key_format='r')), ('integer-row', dict(key_format='i')) diff --git a/src/third_party/wiredtiger/test/suite/test_hs11.py b/src/third_party/wiredtiger/test/suite/test_hs11.py index 6188633dfc7..f8209c71ad1 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs11.py +++ b/src/third_party/wiredtiger/test/suite/test_hs11.py @@ -34,7 +34,6 @@ from wiredtiger import stat # Ensure that updates without timestamps clear the history store records. class test_hs11(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB,statistics=(all)' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column-fix', dict(key_format='r', value_format='8t')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs12.py b/src/third_party/wiredtiger/test/suite/test_hs12.py index e92e338737c..5490ad1acdb 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs12.py +++ b/src/third_party/wiredtiger/test/suite/test_hs12.py @@ -33,7 +33,6 @@ from wtscenario import make_scenarios # Verify we can correctly append modifies to the end of string values class test_hs12(wttest.WiredTigerTestCase): conn_config = 'cache_size=2MB,eviction=(threads_max=1)' - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r')), ('integer-row', dict(key_format='i')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs13.py b/src/third_party/wiredtiger/test/suite/test_hs13.py index 3781ab200ad..612d562eaf7 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs13.py +++ b/src/third_party/wiredtiger/test/suite/test_hs13.py @@ -33,7 +33,6 @@ from wtscenario import make_scenarios # Verify reverse modify traversal after eviction. class test_hs13(wttest.WiredTigerTestCase): conn_config = 'cache_size=2MB,eviction=(threads_max=1)' - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r')), ('integer-row', dict(key_format='i')) diff --git a/src/third_party/wiredtiger/test/suite/test_hs14.py b/src/third_party/wiredtiger/test/suite/test_hs14.py index ad2d98ad7b1..75bdb11f470 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs14.py +++ b/src/third_party/wiredtiger/test/suite/test_hs14.py @@ -34,7 +34,6 @@ from wtscenario import make_scenarios # damage performance. class test_hs14(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column-fix', dict(key_format='r', value_format='8t')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs15.py b/src/third_party/wiredtiger/test/suite/test_hs15.py index 3628f79ea0f..4326d9f7cc7 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs15.py +++ b/src/third_party/wiredtiger/test/suite/test_hs15.py @@ -38,7 +38,6 @@ from wtscenario import make_scenarios # Ensure eviction doesn't clear the history store again after checkpoint has done so because of the same update without timestamp. class test_hs15(wttest.WiredTigerTestCase): conn_config = 'cache_size=5MB' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column-fix', dict(key_format='r', value_format='8t')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs16.py b/src/third_party/wiredtiger/test/suite/test_hs16.py index fca22579713..253495cd6e7 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs16.py +++ b/src/third_party/wiredtiger/test/suite/test_hs16.py @@ -33,7 +33,6 @@ from wtscenario import make_scenarios # Ensure that we don't panic when inserting an update without timestamp to the history store. class test_hs16(wttest.WiredTigerTestCase): conn_config = 'cache_size=5MB' - session_config = 'isolation=snapshot' format_values = ( ('column', dict(key_format='r', value_format='S')), ('column-fix', dict(key_format='r', value_format='8t')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs18.py b/src/third_party/wiredtiger/test/suite/test_hs18.py index b47bb2b66ed..e85d71dd898 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs18.py +++ b/src/third_party/wiredtiger/test/suite/test_hs18.py @@ -33,7 +33,6 @@ from wtscenario import make_scenarios # Test various older reader scenarios class test_hs18(wttest.WiredTigerTestCase): conn_config = 'cache_size=5MB,eviction=(threads_max=1)' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column-fix', dict(key_format='r', value_format='8t')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs19.py b/src/third_party/wiredtiger/test/suite/test_hs19.py index 2e3452ae0ca..bf648a0f4e8 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs19.py +++ b/src/third_party/wiredtiger/test/suite/test_hs19.py @@ -33,7 +33,6 @@ from wtscenario import make_scenarios # Ensure eviction doesn't clear the history store again after checkpoint has done so because of the same update without timestamp. class test_hs19(wttest.WiredTigerTestCase): conn_config = 'cache_size=5MB,eviction=(threads_max=1)' - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r')), ('string-row', dict(key_format='S')) diff --git a/src/third_party/wiredtiger/test/suite/test_hs20.py b/src/third_party/wiredtiger/test/suite/test_hs20.py index 8a8a89ffe4f..babca59fc9a 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs20.py +++ b/src/third_party/wiredtiger/test/suite/test_hs20.py @@ -33,7 +33,6 @@ from wtscenario import make_scenarios # Ensure we never reconstruct a reverse modify update in the history store based on the onpage overflow value class test_hs20(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB,eviction=(threads_max=1)' - session_config = 'isolation=snapshot' # Return the k'th (0-based) key. def make_column_key(k): diff --git a/src/third_party/wiredtiger/test/suite/test_hs21.py b/src/third_party/wiredtiger/test/suite/test_hs21.py index ff43c04355c..7630b4fcc28 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs21.py +++ b/src/third_party/wiredtiger/test/suite/test_hs21.py @@ -42,7 +42,6 @@ class test_hs21(wttest.WiredTigerTestCase): # Configure handle sweeping to occur within a specific amount of time. conn_config = 'file_manager=(close_handle_minimum=0,close_idle_time=2,close_scan_interval=1),' + \ 'statistics=(all),operation_tracking=(enabled=false)' - session_config = 'isolation=snapshot' file_name = 'test_hs21' numfiles = 10 nrows = 1000 diff --git a/src/third_party/wiredtiger/test/suite/test_hs22.py b/src/third_party/wiredtiger/test/suite/test_hs22.py index b453c43602a..c822af7f886 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs22.py +++ b/src/third_party/wiredtiger/test/suite/test_hs22.py @@ -34,7 +34,6 @@ from wtscenario import make_scenarios # update is followed by a tombstone. class test_hs22(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', key1=1, key2=2, value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs23.py b/src/third_party/wiredtiger/test/suite/test_hs23.py index d3898722620..b251688f594 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs23.py +++ b/src/third_party/wiredtiger/test/suite/test_hs23.py @@ -34,7 +34,6 @@ from wtscenario import make_scenarios # update, and update again in the same transaction class test_hs23(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', key=1, value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_hs24.py b/src/third_party/wiredtiger/test/suite/test_hs24.py index 7da624b7e3c..2dc3c314c84 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs24.py +++ b/src/third_party/wiredtiger/test/suite/test_hs24.py @@ -38,7 +38,7 @@ class test_hs24(wttest.WiredTigerTestCase): format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] checkpoint_stress_scenarios = [ @@ -51,7 +51,6 @@ class test_hs24(wttest.WiredTigerTestCase): def conn_config(self): return 'timing_stress_for_test=({})'.format(self.checkpoint_stress) - session_config = 'isolation=snapshot' uri = 'table:test_hs24' numrows = 2000 diff --git a/src/third_party/wiredtiger/test/suite/test_hs25.py b/src/third_party/wiredtiger/test/suite/test_hs25.py index 514440c350c..56e158847e8 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs25.py +++ b/src/third_party/wiredtiger/test/suite/test_hs25.py @@ -33,13 +33,12 @@ from wtscenario import make_scenarios # Ensure updates structure is correct when processing each key. class test_hs25(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB' - session_config = 'isolation=snapshot' uri = 'table:test_hs25' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_hs26.py b/src/third_party/wiredtiger/test/suite/test_hs26.py index acb3bd07790..c849f9fd397 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs26.py +++ b/src/third_party/wiredtiger/test/suite/test_hs26.py @@ -45,7 +45,6 @@ from wtscenario import make_scenarios # history store accesses to go off the rails. class test_hs26(wttest.WiredTigerTestCase): conn_config = '' - session_config = 'isolation=snapshot' # We control the duplication of values by appending a number computed from the key. # Because the keys are 1..N (not 0..N-1), to get aligned RLE groups the suffix is diff --git a/src/third_party/wiredtiger/test/suite/test_hs27.py b/src/third_party/wiredtiger/test/suite/test_hs27.py index 47725808319..42642b31337 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs27.py +++ b/src/third_party/wiredtiger/test/suite/test_hs27.py @@ -41,7 +41,6 @@ from wtscenario import make_scenarios # making sure they read back correctly. (The eviction is necessary to go through the RLE code.) class test_hs27(wttest.WiredTigerTestCase): conn_config = '' - session_config = 'isolation=snapshot' nrows = 100 value_1 = 'a' * 119 diff --git a/src/third_party/wiredtiger/test/suite/test_hs28.py b/src/third_party/wiredtiger/test/suite/test_hs28.py index 3768262e86e..5bea78518f6 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs28.py +++ b/src/third_party/wiredtiger/test/suite/test_hs28.py @@ -35,11 +35,10 @@ from wtscenario import make_scenarios class test_hs28(wttest.WiredTigerTestCase): conn_config = '' - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r')), - ('integer_row', dict(key_format='i')), + ('row_integer', dict(key_format='i')), ] scenarios = make_scenarios(key_format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_hs_evict_race01.py b/src/third_party/wiredtiger/test/suite/test_hs_evict_race01.py index 9c3cf62eb24..64dc5ae8c7f 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs_evict_race01.py +++ b/src/third_party/wiredtiger/test/suite/test_hs_evict_race01.py @@ -46,13 +46,12 @@ from wtscenario import make_scenarios # 6. Read the value and see if it matches the expected value. class test_hs_evict_race01(wttest.WiredTigerTestCase): conn_config = 'timing_stress_for_test=(checkpoint_slow)' - session_config = 'isolation=snapshot' uri = 'table:hs_evict_race01' numrows = 1 key_format_values = [ ('column', dict(key_format='r')), - ('integer_row', dict(key_format='i')), + ('row_integer', dict(key_format='i')), ] scenarios = make_scenarios(key_format_values) value1 = 'aaaaa' diff --git a/src/third_party/wiredtiger/test/suite/test_import01.py b/src/third_party/wiredtiger/test/suite/test_import01.py index daaae5f95e3..d2b1eca41db 100644 --- a/src/third_party/wiredtiger/test/suite/test_import01.py +++ b/src/third_party/wiredtiger/test/suite/test_import01.py @@ -107,7 +107,6 @@ class test_import_base(wttest.WiredTigerTestCase): class test_import01(test_import_base): conn_config = 'cache_size=50MB,log=(enabled)' - session_config = 'isolation=snapshot' original_db_file = 'original_db_file' uri = 'file:' + original_db_file diff --git a/src/third_party/wiredtiger/test/suite/test_import02.py b/src/third_party/wiredtiger/test/suite/test_import02.py index 9dbb7b6f66a..402dec3c206 100644 --- a/src/third_party/wiredtiger/test/suite/test_import02.py +++ b/src/third_party/wiredtiger/test/suite/test_import02.py @@ -35,7 +35,6 @@ from test_import01 import test_import_base class test_import02(test_import_base): conn_config = 'cache_size=50MB,log=(enabled)' - session_config = 'isolation=snapshot' original_db_file = 'original_db_file' uri = 'file:' + original_db_file diff --git a/src/third_party/wiredtiger/test/suite/test_import03.py b/src/third_party/wiredtiger/test/suite/test_import03.py index 278daafa98e..b35ade851ae 100644 --- a/src/third_party/wiredtiger/test/suite/test_import03.py +++ b/src/third_party/wiredtiger/test/suite/test_import03.py @@ -35,7 +35,6 @@ from test_import01 import test_import_base class test_import03(test_import_base): conn_config = 'cache_size=50MB,log=(enabled)' - session_config = 'isolation=snapshot' ntables = 10 nrows = 100 diff --git a/src/third_party/wiredtiger/test/suite/test_import04.py b/src/third_party/wiredtiger/test/suite/test_import04.py index f64aefdee70..30f276cf73d 100644 --- a/src/third_party/wiredtiger/test/suite/test_import04.py +++ b/src/third_party/wiredtiger/test/suite/test_import04.py @@ -55,7 +55,6 @@ from test_import01 import test_import_base class test_import04(test_import_base): conn_config = 'cache_size=50MB,log=(enabled)' - session_config = 'isolation=snapshot' ntables = 10 nrows = 100 diff --git a/src/third_party/wiredtiger/test/suite/test_import05.py b/src/third_party/wiredtiger/test/suite/test_import05.py index edddad2c2a0..8f7a56d4dd3 100644 --- a/src/third_party/wiredtiger/test/suite/test_import05.py +++ b/src/third_party/wiredtiger/test/suite/test_import05.py @@ -36,7 +36,6 @@ from test_import01 import test_import_base class test_import05(test_import_base): conn_config = 'cache_size=50MB,log=(enabled)' - session_config = 'isolation=snapshot' ntables = 10 nrows = 100 diff --git a/src/third_party/wiredtiger/test/suite/test_import06.py b/src/third_party/wiredtiger/test/suite/test_import06.py index 7d1360bacba..5fe45a71f70 100644 --- a/src/third_party/wiredtiger/test/suite/test_import06.py +++ b/src/third_party/wiredtiger/test/suite/test_import06.py @@ -34,7 +34,6 @@ from test_import01 import test_import_base from wtscenario import make_scenarios class test_import06(test_import_base): - session_config = 'isolation=snapshot' original_db_file = 'original_db_file' uri = 'file:' + original_db_file diff --git a/src/third_party/wiredtiger/test/suite/test_import08.py b/src/third_party/wiredtiger/test/suite/test_import08.py index ed5578d02d2..ec6606b0c12 100644 --- a/src/third_party/wiredtiger/test/suite/test_import08.py +++ b/src/third_party/wiredtiger/test/suite/test_import08.py @@ -35,7 +35,6 @@ from wtscenario import make_scenarios class test_import08(test_import_base): conn_config = 'cache_size=50MB,log=(enabled)' - session_config = 'isolation=snapshot' original_db_file = 'original_db_file' uri = 'file:' + original_db_file diff --git a/src/third_party/wiredtiger/test/suite/test_import09.py b/src/third_party/wiredtiger/test/suite/test_import09.py index cc13688d7a1..ae0def18d3d 100644 --- a/src/third_party/wiredtiger/test/suite/test_import09.py +++ b/src/third_party/wiredtiger/test/suite/test_import09.py @@ -36,7 +36,6 @@ from wtscenario import make_scenarios class test_import09(test_import_base): nrows = 100 ntables = 1 - session_config = 'isolation=snapshot' # To test the sodium encryptor, we use secretkey= rather than # setting a keyid, because for a "real" (vs. test-only) encryptor, diff --git a/src/third_party/wiredtiger/test/suite/test_prepare01.py b/src/third_party/wiredtiger/test/suite/test_prepare01.py index 96269530e60..998a6ac3c62 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare01.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare01.py @@ -32,7 +32,6 @@ from wtscenario import make_scenarios # test_prepare01.py # Transactions: basic functionality with prepare class test_prepare01(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' nentries = 1000 scenarios = make_scenarios([ diff --git a/src/third_party/wiredtiger/test/suite/test_prepare02.py b/src/third_party/wiredtiger/test/suite/test_prepare02.py index 9f796d6a50e..23caf1f7512 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare02.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare02.py @@ -34,7 +34,6 @@ from suite_subprocess import suite_subprocess import wiredtiger, wttest class test_prepare02(wttest.WiredTigerTestCase, suite_subprocess): - session_config = 'isolation=snapshot' def test_prepare_session_operations(self): diff --git a/src/third_party/wiredtiger/test/suite/test_prepare03.py b/src/third_party/wiredtiger/test/suite/test_prepare03.py index 44a2268dd57..c686f8d380b 100755 --- a/src/third_party/wiredtiger/test/suite/test_prepare03.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare03.py @@ -41,7 +41,6 @@ class test_prepare03(wttest.WiredTigerTestCase): """ table_name = 'test_prepare_cursor' nentries = 10 - session_config = 'isolation=snapshot' scenarios = make_scenarios([ ('file-col', dict(tablekind='col',uri='file', format='key_format=r,value_format=S')), diff --git a/src/third_party/wiredtiger/test/suite/test_prepare04.py b/src/third_party/wiredtiger/test/suite/test_prepare04.py index 1771613d88c..b692a36ed00 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare04.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare04.py @@ -41,7 +41,6 @@ def timestamp_str(t): class test_prepare04(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_prepare_cursor' uri = 'table:' + tablename - session_config = 'isolation=snapshot' before_ts = timestamp_str(150) prepare_ts = timestamp_str(200) @@ -56,9 +55,9 @@ class test_prepare04(wttest.WiredTigerTestCase, suite_subprocess): # Various begin_transaction config txncfg = [ - ('before_ts', dict(txn_config='isolation=snapshot,read_timestamp=' + before_ts, after_ts=False)), - ('after_ts', dict(txn_config='isolation=snapshot,read_timestamp=' + after_ts, after_ts=True)), - ('no_ts', dict(txn_config='isolation=snapshot', after_ts=True)), + ('before_ts', dict(txn_config='read_timestamp=' + before_ts, after_ts=False)), + ('after_ts', dict(txn_config='read_timestamp=' + after_ts, after_ts=True)), + ('no_ts', dict(txn_config='', after_ts=True)), ] preparecfg = [ @@ -92,7 +91,7 @@ class test_prepare04(wttest.WiredTigerTestCase, suite_subprocess): # make prepared updates. k = 1 - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() c.set_key(1) c.set_value(2) c.update() diff --git a/src/third_party/wiredtiger/test/suite/test_prepare05.py b/src/third_party/wiredtiger/test/suite/test_prepare05.py index 922fcb8a241..107b7470f7e 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare05.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare05.py @@ -37,12 +37,11 @@ from wtscenario import make_scenarios class test_prepare05(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_prepare05' uri = 'table:' + tablename - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='i')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='i')), + ('row_integer', dict(key_format='i', value_format='i')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_prepare06.py b/src/third_party/wiredtiger/test/suite/test_prepare06.py index 5348f11ef1e..2079b64f501 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare06.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare06.py @@ -37,12 +37,11 @@ from wtscenario import make_scenarios class test_prepare06(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_prepare06' uri = 'table:' + tablename - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='i')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='i')), + ('row_integer', dict(key_format='i', value_format='i')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_prepare07.py b/src/third_party/wiredtiger/test/suite/test_prepare07.py index d0986efce94..d167ef868d2 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare07.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare07.py @@ -56,12 +56,12 @@ class test_prepare07(wttest.WiredTigerTestCase): # Commit some updates. cursor = self.session.open_cursor(uri) - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() cursor.set_key(ds.key(nrows + 1)) cursor.set_value(value_b) self.assertEquals(cursor.update(), 0) self.session.commit_transaction('commit_timestamp=' + self.timestamp_str(110)) - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() cursor.set_key(ds.key(nrows + 2)) cursor.set_value(value_b) self.assertEquals(cursor.update(), 0) @@ -70,19 +70,19 @@ class test_prepare07(wttest.WiredTigerTestCase): # Prepare a transaction and keep it open. session_p = self.conn.open_session() cursor_p = session_p.open_cursor(uri) - session_p.begin_transaction('isolation=snapshot') + session_p.begin_transaction() cursor_p.set_key(ds.key(nrows + 3)) cursor_p.set_value(value_b) self.assertEquals(cursor_p.update(), 0) session_p.prepare_transaction('prepare_timestamp=' + self.timestamp_str(130)) # Commit some more updates. - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() cursor.set_key(ds.key(nrows + 4)) cursor.set_value(value_b) self.assertEquals(cursor.update(), 0) self.session.commit_transaction('commit_timestamp=' + self.timestamp_str(140)) - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() cursor.set_key(ds.key(nrows + 5)) cursor.set_value(value_b) self.assertEquals(cursor.update(), 0) @@ -93,7 +93,7 @@ class test_prepare07(wttest.WiredTigerTestCase): self.conn.set_timestamp('oldest_timestamp=' + self.timestamp_str(155)) # Commit an update newer than the stable timestamp. - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() cursor.set_key(ds.key(nrows + 6)) cursor.set_value(value_b) self.assertEquals(cursor.update(), 0) diff --git a/src/third_party/wiredtiger/test/suite/test_prepare08.py b/src/third_party/wiredtiger/test/suite/test_prepare08.py index 9598ca1f81a..6acbe49cb9b 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare08.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare08.py @@ -49,7 +49,7 @@ class test_prepare08(wttest.WiredTigerTestCase): def updates(self, ds, uri, nrows, value, ts): cursor = self.session.open_cursor(uri) - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() for i in range(1, nrows): cursor.set_key(ds.key(i)) cursor.set_value(value) @@ -59,7 +59,7 @@ class test_prepare08(wttest.WiredTigerTestCase): def removes(self, ds, uri, nrows, ts): cursor = self.session.open_cursor(uri) - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() for i in range(1, nrows): cursor.set_key(ds.key(i)) self.assertEquals(cursor.remove(), 0) @@ -135,7 +135,7 @@ class test_prepare08(wttest.WiredTigerTestCase): # Remove the updates from a prepare session and keep it open. session_p = self.conn.open_session() cursor_p = session_p.open_cursor(uri_1) - session_p.begin_transaction('isolation=snapshot') + session_p.begin_transaction() for i in range(1, nrows): cursor_p.set_key(ds_1.key(i)) self.assertEquals(cursor_p.remove(), 0) @@ -213,7 +213,7 @@ class test_prepare08(wttest.WiredTigerTestCase): # Remove the updates from a prepare session and keep it open. session_p = self.conn.open_session() cursor_p = session_p.open_cursor(uri_1) - session_p.begin_transaction('isolation=snapshot') + session_p.begin_transaction() for i in range(1, nrows): cursor_p.set_key(ds_1.key(i)) cursor_p.set_value(value_c) @@ -289,7 +289,7 @@ class test_prepare08(wttest.WiredTigerTestCase): # Remove the updates from a prepare session and and keep it open. session_p = self.conn.open_session() cursor_p = session_p.open_cursor(uri_1) - session_p.begin_transaction('isolation=snapshot') + session_p.begin_transaction() for i in range(1, nrows): cursor_p.set_key(ds_1.key(i)) cursor_p.set_value(value_c) diff --git a/src/third_party/wiredtiger/test/suite/test_prepare09.py b/src/third_party/wiredtiger/test/suite/test_prepare09.py index 14acd175c57..1d23179e4b2 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare09.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare09.py @@ -37,12 +37,11 @@ from wtscenario import make_scenarios # Validate scenarios involving inserting tombstones when rolling back prepares class test_prepare09(wttest.WiredTigerTestCase): conn_config = 'cache_size=2MB' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_prepare10.py b/src/third_party/wiredtiger/test/suite/test_prepare10.py index 2dacafbf7be..a4acf46c73c 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare10.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare10.py @@ -38,7 +38,6 @@ from wtscenario import make_scenarios class test_prepare10(wttest.WiredTigerTestCase): # Force a small cache. conn_config = 'cache_size=10MB,eviction_dirty_trigger=80,eviction_updates_trigger=80' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='u')), diff --git a/src/third_party/wiredtiger/test/suite/test_prepare11.py b/src/third_party/wiredtiger/test/suite/test_prepare11.py index beaf69bca46..72fd7ebef2c 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare11.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare11.py @@ -33,7 +33,6 @@ from wtscenario import make_scenarios # Test prepare rollback with a reserved update between updates. class test_prepare11(wttest.WiredTigerTestCase): conn_config = 'cache_size=2MB' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', key1=17, value_format='S')), @@ -60,7 +59,7 @@ class test_prepare11(wttest.WiredTigerTestCase): value_x = 'xxxx' value_y = 'yyyy' - self.session.begin_transaction("isolation=snapshot") + self.session.begin_transaction() # In the scenario where we have a reserved update in between two updates, the key repeated # flag won't get set and we'll call resolve prepared op on both prepared updates. diff --git a/src/third_party/wiredtiger/test/suite/test_prepare12.py b/src/third_party/wiredtiger/test/suite/test_prepare12.py index b852545024c..09f00ac288b 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare12.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare12.py @@ -37,12 +37,11 @@ from wtscenario import make_scenarios # Test update restore of a page with prepared update. class test_prepare12(wttest.WiredTigerTestCase): conn_config = 'cache_size=2MB' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_prepare14.py b/src/third_party/wiredtiger/test/suite/test_prepare14.py index d6127bb7f9c..ea1d9300c90 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare14.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare14.py @@ -36,7 +36,6 @@ from wtscenario import make_scenarios # 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)), @@ -46,7 +45,7 @@ class test_prepare14(wttest.WiredTigerTestCase): format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] scenarios = make_scenarios(in_memory_values, format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_prepare15.py b/src/third_party/wiredtiger/test/suite/test_prepare15.py index d3a49d1a857..c89bbd10e0b 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare15.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare15.py @@ -43,7 +43,7 @@ class test_prepare15(wttest.WiredTigerTestCase): format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] txn_end_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_prepare16.py b/src/third_party/wiredtiger/test/suite/test_prepare16.py index 6d22b28e06d..975bbfb9c4e 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare16.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare16.py @@ -42,7 +42,7 @@ class test_prepare16(wttest.WiredTigerTestCase): format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('string_row', dict(key_format='S', value_format='S')), + ('row_string', dict(key_format='S', value_format='S')), ] txn_end_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_prepare17.py b/src/third_party/wiredtiger/test/suite/test_prepare17.py index eb1e33ab594..1a5746c5d8e 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare17.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare17.py @@ -35,7 +35,6 @@ from helper import simulate_crash_restart # previous commit and durable timestamps(for a transaction, say T1), the durable timestamp of T1 changes to # the commit timestamp of T2. class test_prepare17(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' uri = 'table:test_prepare17' nrows = 1000 diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_conflict.py b/src/third_party/wiredtiger/test/suite/test_prepare_conflict.py index a2b8eb97cd8..f5179404fb4 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_conflict.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_conflict.py @@ -38,7 +38,7 @@ class test_prepare_conflict(wttest.WiredTigerTestCase): format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] scenarios = make_scenarios(format_values) @@ -63,7 +63,7 @@ class test_prepare_conflict(wttest.WiredTigerTestCase): self.reopen_conn() # Start a transaction. - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() # Truncate the middle chunk. c1 = self.session.open_cursor(uri, None) diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_cursor02.py b/src/third_party/wiredtiger/test/suite/test_prepare_cursor02.py index 09321f9a1b6..6fb41a1d8b6 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_cursor02.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_cursor02.py @@ -34,7 +34,6 @@ from wtscenario import make_scenarios # test_prepare_cursor02.py # WT_CURSOR navigation (next/prev) tests with prepared transactions class test_prepare_cursor02(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' keyfmt = [ ('row-store', dict(keyfmt='i', valfmt='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_hs01.py b/src/third_party/wiredtiger/test/suite/test_prepare_hs01.py index ddb57cf6496..f55fe7ba9db 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_hs01.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_hs01.py @@ -85,7 +85,7 @@ class test_prepare_hs01(wttest.WiredTigerTestCase): # Commit some updates to get eviction and history store fired up cursor = self.session.open_cursor(uri) for i in range(1, nsessions * nkeys): - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() cursor.set_key(ds.key(nrows + i)) cursor.set_value(bigvalue1) self.assertEquals(cursor.insert(), 0) @@ -97,7 +97,7 @@ class test_prepare_hs01(wttest.WiredTigerTestCase): cursors = [0] * nsessions for j in range (0, nsessions): sessions[j] = self.conn.open_session() - sessions[j].begin_transaction('isolation=snapshot') + sessions[j].begin_transaction() cursors[j] = sessions[j].open_cursor(uri) # Each session will update many consecutive keys. start = (j * nkeys) diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_hs02.py b/src/third_party/wiredtiger/test/suite/test_prepare_hs02.py index 3790dbbadcc..39fb0c576e5 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_hs02.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_hs02.py @@ -39,7 +39,6 @@ from wtscenario import make_scenarios class test_prepare_hs02(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_prepare_cursor' uri = 'table:' + tablename - txn_config = 'isolation=snapshot' types = [ ('col', dict(s_config='key_format=r,value_format=i,log=(enabled=false)')), @@ -67,7 +66,7 @@ class test_prepare_hs02(wttest.WiredTigerTestCase, suite_subprocess): # Scenario: 1 # Check insert operation - self.session.begin_transaction(self.txn_config) + self.session.begin_transaction() c[1] = 1 # update the value with in this transaction self.session.prepare_transaction('prepare_timestamp=' + self.timestamp_str(100)) @@ -86,7 +85,7 @@ class test_prepare_hs02(wttest.WiredTigerTestCase, suite_subprocess): # Check update operation # update a existing key. # update a newly inserted key with in this transaction - self.session.begin_transaction(self.txn_config) + self.session.begin_transaction() # update a committed value, key 1 is inserted above. c[1] = 2 # update a uncommitted value, insert and update a key. @@ -109,7 +108,7 @@ class test_prepare_hs02(wttest.WiredTigerTestCase, suite_subprocess): # remove an existing key. # remove a previously updated key. # remove a newly inserted and updated key. - self.session.begin_transaction(self.txn_config) + self.session.begin_transaction() # update a committed value, key 1 is inserted above. c.set_key(1) c.remove() @@ -127,7 +126,7 @@ class test_prepare_hs02(wttest.WiredTigerTestCase, suite_subprocess): self.session.rollback_transaction() # commit some keys, to generate the update chain subsequently. - self.session.begin_transaction(self.txn_config) + self.session.begin_transaction() c[1] = 1 c[2] = 1 c[3] = 1 @@ -148,7 +147,7 @@ class test_prepare_hs02(wttest.WiredTigerTestCase, suite_subprocess): self.session.create(self.uri, self.s_config) cur = self.session.open_cursor(self.uri) - self.session.begin_transaction(self.txn_config) + self.session.begin_transaction() cur[1] = 2 cur[2] = 2 cur[3] = 2 diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_hs03.py b/src/third_party/wiredtiger/test/suite/test_prepare_hs03.py index 5f6b6588b54..bdf4234aaca 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_hs03.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_hs03.py @@ -103,7 +103,7 @@ class test_prepare_hs03(wttest.WiredTigerTestCase): # Commit some updates to get eviction and history store fired up cursor = self.session.open_cursor(self.uri) for i in range(1, nsessions * nkeys): - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() cursor.set_key(ds.key(nrows + i)) cursor.set_value(commit_value) self.assertEquals(cursor.insert(), 0) @@ -125,7 +125,7 @@ class test_prepare_hs03(wttest.WiredTigerTestCase): cursors = [0] * nsessions for j in range (0, nsessions): sessions[j] = self.conn.open_session() - sessions[j].begin_transaction('isolation=snapshot') + sessions[j].begin_transaction() cursors[j] = sessions[j].open_cursor(self.uri) # Each session will update many consecutive keys. start = (j * nkeys) diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_hs04.py b/src/third_party/wiredtiger/test/suite/test_prepare_hs04.py index fd12cfe270f..1d1384cce74 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_hs04.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_hs04.py @@ -108,7 +108,7 @@ class test_prepare_hs04(wttest.WiredTigerTestCase): # Insert a key at timestamp 1. cursor = self.session.open_cursor(self.uri) for i in range(1, self.nsessions * self.nkeys): - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() key = commit_key + ds.key(self.nrows + i) cursor.set_key(key) cursor.set_value(commit_value) @@ -121,7 +121,7 @@ class test_prepare_hs04(wttest.WiredTigerTestCase): cursor = self.session.open_cursor(self.uri) for i in range(1, self.nsessions * self.nkeys): - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() key = commit_key + ds.key(self.nrows + i) cursor.set_key(key) self.assertEquals(cursor.remove(), 0) @@ -138,7 +138,7 @@ class test_prepare_hs04(wttest.WiredTigerTestCase): cursors = [0] * self.nsessions for j in range (0, self.nsessions): sessions[j] = self.conn.open_session() - sessions[j].begin_transaction('isolation=snapshot') + sessions[j].begin_transaction() cursors[j] = sessions[j].open_cursor(self.uri) # Each session will update many consecutive keys. start = (j * self.nkeys) diff --git a/src/third_party/wiredtiger/test/suite/test_prepare_hs05.py b/src/third_party/wiredtiger/test/suite/test_prepare_hs05.py index a668bd100e2..98a363540cd 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare_hs05.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare_hs05.py @@ -34,7 +34,6 @@ from wiredtiger import stat, WT_NOTFOUND # Test that after aborting prepare transaction, correct update from the history store is restored. class test_prepare_hs05(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', key=1, value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_reserve.py b/src/third_party/wiredtiger/test/suite/test_reserve.py index b99d1465da3..cc385402961 100644 --- a/src/third_party/wiredtiger/test/suite/test_reserve.py +++ b/src/third_party/wiredtiger/test/suite/test_reserve.py @@ -73,35 +73,35 @@ class test_reserve(wttest.WiredTigerTestCase): # Repeatedly update a record. for i in range(1, 5): - s.begin_transaction('isolation=snapshot') + s.begin_transaction() c.set_key(ds.key(100)) c.set_value(ds.value(100)) self.assertEquals(c.update(), 0) s.commit_transaction() # Confirm reserve fails if the record doesn't exist. - s.begin_transaction('isolation=snapshot') + s.begin_transaction() c.set_key(ds.key(600)) self.assertRaises(wiredtiger.WiredTigerError, lambda:c.reserve()) s.rollback_transaction() # Repeatedly reserve a record and commit. for i in range(1, 5): - s.begin_transaction('isolation=snapshot') + s.begin_transaction() c.set_key(ds.key(100)) self.assertEquals(c.reserve(), 0) s.commit_transaction() # Repeatedly reserve a record and rollback. for i in range(1, 5): - s.begin_transaction('isolation=snapshot') + s.begin_transaction() c.set_key(ds.key(100)) self.assertEquals(c.reserve(), 0) s.rollback_transaction() # Repeatedly reserve, then update, a record, and commit. for i in range(1, 5): - s.begin_transaction('isolation=snapshot') + s.begin_transaction() c.set_key(ds.key(100)) self.assertEquals(c.reserve(), 0) c.set_value(ds.value(100)) @@ -110,7 +110,7 @@ class test_reserve(wttest.WiredTigerTestCase): # Repeatedly reserve, then update, a record, and rollback. for i in range(1, 5): - s.begin_transaction('isolation=snapshot') + s.begin_transaction() c.set_key(ds.key(100)) self.assertEquals(c.reserve(), 0) c.set_value(ds.value(100)) @@ -123,11 +123,11 @@ class test_reserve(wttest.WiredTigerTestCase): s2 = self.conn.open_session() c2 = s2.open_cursor(uri, None) for i in range(1, 2): - s.begin_transaction('isolation=snapshot') + s.begin_transaction() c.set_key(ds.key(100)) self.assertEquals(c.reserve(), 0) - s2.begin_transaction('isolation=snapshot') + s2.begin_transaction() c2.set_key(ds.key(100)) c2.set_value(ds.value(100)) self.assertRaises(wiredtiger.WiredTigerError, lambda:c2.update()) @@ -147,7 +147,7 @@ class test_reserve(wttest.WiredTigerTestCase): ds.populate() s = self.conn.open_session() c = s.open_cursor(uri, None) - s.begin_transaction('isolation=snapshot') + s.begin_transaction() msg = "/requires key be set/" self.assertRaisesWithMessage( wiredtiger.WiredTigerError, lambda:c.reserve(), msg) @@ -175,7 +175,7 @@ class test_reserve(wttest.WiredTigerTestCase): ds.populate() s = self.conn.open_session() c = s.open_cursor(uri, None) - s.begin_transaction('isolation=snapshot') + s.begin_transaction() c.set_key(ds.key(5)) self.assertEquals(c.reserve(), 0) self.assertEqual(c.get_value(), ds.comparable_value(5)) diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable01.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable01.py index 0def121250b..fc2a589e142 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable01.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable01.py @@ -52,7 +52,7 @@ class test_rollback_to_stable_base(wttest.WiredTigerTestCase): txn_session.rollback_transaction() sleep(0.1) if txn_session: - txn_session.begin_transaction('isolation=snapshot') + txn_session.begin_transaction() self.pr("Began new transaction for " + name) try: code() @@ -185,12 +185,11 @@ class test_rollback_to_stable_base(wttest.WiredTigerTestCase): # Test that rollback to stable clears the remove operation. class test_rollback_to_stable01(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] in_memory_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable02.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable02.py index a041bb925cb..47ad3ac3f00 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable02.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable02.py @@ -37,7 +37,6 @@ from test_rollback_to_stable01 import test_rollback_to_stable_base # test_rollback_to_stable02.py # Test that rollback to stable brings back the history value to replace on-disk value. class test_rollback_to_stable02(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' # For FLCS, set the page size down. Otherwise for the in-memory scenarios we get enough # updates on the page that the in-memory page footprint exceeds the default maximum @@ -52,7 +51,7 @@ class test_rollback_to_stable02(test_rollback_to_stable_base): format_values = [ ('column', dict(key_format='r', value_format='S', extraconfig='')), ('column_fix', dict(key_format='r', value_format='8t', extraconfig=',leaf_page_max=4096')), - ('integer_row', dict(key_format='i', value_format='S', extraconfig='')), + ('row_integer', dict(key_format='i', value_format='S', extraconfig='')), ] in_memory_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable03.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable03.py index 715e0fd23c3..2adbf8a0d19 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable03.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable03.py @@ -37,12 +37,11 @@ from test_rollback_to_stable01 import test_rollback_to_stable_base # test_rollback_to_stable03.py # Test that rollback to stable clears the history store updates from reconciled pages. class test_rollback_to_stable01(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] in_memory_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable04.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable04.py index 0528548b94c..ae445b4bff2 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable04.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable04.py @@ -38,12 +38,11 @@ def mod_val(value, char, location, nbytes=1): # Test that rollback to stable always replaces the on-disk value with a full update # from the history store. class test_rollback_to_stable04(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] in_memory_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable05.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable05.py index 92a63d273e1..42f2c9ed919 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable05.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable05.py @@ -37,12 +37,11 @@ from test_rollback_to_stable01 import test_rollback_to_stable_base # test_rollback_to_stable05.py # Test that rollback to stable cleans history store for non-timestamp tables. class test_rollback_to_stable05(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] in_memory_values = [ @@ -100,7 +99,7 @@ class test_rollback_to_stable05(test_rollback_to_stable_base): # Start a long running transaction and keep it open. session_2 = self.conn.open_session() - session_2.begin_transaction('isolation=snapshot') + session_2.begin_transaction() self.large_updates(uri_1, valueb, ds_1, nrows, self.prepare, 0) self.check(valueb, uri_1, nrows, None, 0) diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable06.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable06.py index eb2a3c16d02..f7fe6129487 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable06.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable06.py @@ -35,12 +35,11 @@ from test_rollback_to_stable01 import test_rollback_to_stable_base # Test that rollback to stable removes all keys when the stable timestamp is earlier than # all commit timestamps. class test_rollback_to_stable06(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] in_memory_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable07.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable07.py index ef59be0a089..19cdba56446 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable07.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable07.py @@ -39,12 +39,11 @@ from wtscenario import make_scenarios # (a) the on-disk value is replaced by the correct value from the history store, and # (b) newer updates are removed. class test_rollback_to_stable07(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] prepare_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable08.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable08.py index 5eca9a16f6b..04a303fef2b 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable08.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable08.py @@ -35,12 +35,11 @@ from test_rollback_to_stable01 import test_rollback_to_stable_base # Test that rollback to stable does not abort updates when the stable timestamp is # set to the latest commit. class test_rollback_to_stable08(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] in_memory_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable09.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable09.py index eaa5ce49b73..9f5ced5ccfc 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable09.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable09.py @@ -36,7 +36,6 @@ from test_rollback_to_stable01 import test_rollback_to_stable_base # Test that rollback to stable does not abort schema operations that are done # as they don't have transaction support class test_rollback_to_stable09(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' # Don't bother testing FLCS tables as well as they're highly unlikely to # behave differently at this level. diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable10.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable10.py index 0ba9bba786a..369e387ac65 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable10.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable10.py @@ -37,13 +37,12 @@ from wtthread import checkpoint_thread # test_rollback_to_stable10.py # Test the rollback to stable operation performs sweeping history store. class test_rollback_to_stable10(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S', prepare_extraconfig='')), ('column_fix', dict(key_format='r', value_format='8t', prepare_extraconfig=',allocation_size=512,leaf_page_max=512')), - ('integer_row', dict(key_format='i', value_format='S', prepare_extraconfig='')), + ('row_integer', dict(key_format='i', value_format='S', prepare_extraconfig='')), ] prepare_values = [ @@ -286,7 +285,7 @@ class test_rollback_to_stable10(test_rollback_to_stable_base): # Perform several updates in parallel with checkpoint. session_p1 = self.conn.open_session() cursor_p1 = session_p1.open_cursor(uri_1) - session_p1.begin_transaction('isolation=snapshot') + session_p1.begin_transaction() self.retry_rollback('update ds1', session_p1, lambda: prepare_range_updates( session_p1, cursor_p1, ds_1, value_e, nrows, @@ -296,7 +295,7 @@ class test_rollback_to_stable10(test_rollback_to_stable_base): # Perform several updates in parallel with checkpoint. session_p2 = self.conn.open_session() cursor_p2 = session_p2.open_cursor(uri_2) - session_p2.begin_transaction('isolation=snapshot') + session_p2.begin_transaction() self.retry_rollback('update ds2', session_p2, lambda: prepare_range_updates( session_p2, cursor_p2, ds_2, value_e, nrows, diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable11.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable11.py index 067d8c341f1..a517ce47a7d 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable11.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable11.py @@ -36,12 +36,11 @@ from wtscenario import make_scenarios # test_rollback_to_stable11.py # Test the rollback to stable is retrieving the proper history store update. class test_rollback_to_stable11(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] prepare_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable12.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable12.py index 372263a73f4..dc25343a558 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable12.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable12.py @@ -36,7 +36,6 @@ from wtscenario import make_scenarios # test_rollback_to_stable12.py # Test the rollback to stable operation skipping subtrees in during tree walk. class test_rollback_to_stable12(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' # This test is slow, and the value of running it on every access method maybe somewhat # questionable, since the code for skipping over subtrees during RTS is not dependent on @@ -47,7 +46,7 @@ class test_rollback_to_stable12(test_rollback_to_stable_base): format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] prepare_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable13.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable13.py index e4d27e53a87..9ca468d38b5 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable13.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable13.py @@ -35,12 +35,11 @@ from wtscenario import make_scenarios # Test the rollback to stable should retain/restore the tombstone from # the update list or from the history store for on-disk database. class test_rollback_to_stable13(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] prepare_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable14.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable14.py index e213818ce96..6930b91ed07 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable14.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable14.py @@ -45,11 +45,10 @@ def append_val(value, char): # history store. Since FLCS inherently doesn't support modify, there's no need to run this on # FLCS. (Note that self.value_format needs to exist anyway for the base class to use.) class test_rollback_to_stable14(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r')), - ('integer_row', dict(key_format='i')), + ('row_integer', dict(key_format='i')), ] value_format='S' diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable15.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable15.py index 080fcddfe9a..466d6154e11 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable15.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable15.py @@ -37,7 +37,6 @@ from wtscenario import make_scenarios # update-list for both fixed length and variable length column store. # Eviction is set to false, so that everything persists in memory. class test_rollback_to_stable15(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r')), ('integer-row', dict(key_format='i')), diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py index e371801a60a..7a797683efc 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable16.py @@ -41,11 +41,10 @@ from wtscenario import make_scenarios # Test that rollback to stable removes updates present on disk for column store. # (This test is now probably redundant with others, and could maybe be removed?) class test_rollback_to_stable16(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r')), - ('integer_row', dict(key_format='i')), + ('row_integer', dict(key_format='i')), ] value_format_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable17.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable17.py index f5e1fea379f..6139783890e 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable17.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable17.py @@ -36,12 +36,11 @@ from wtscenario import make_scenarios # test_rollback_to_stable17.py # Test that rollback to stable handles updates present on history store and data store. class test_rollback_to_stable17(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] in_memory_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable18.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable18.py index d341d27610a..06bb15a4ecd 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable18.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable18.py @@ -39,12 +39,11 @@ from wtscenario import make_scenarios # test_rollback_to_stable18.py # Test the rollback to stable shouldn't skip any pages that don't have aggregated time window. class test_rollback_to_stable18(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] prepare_values = [ 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 b88c4720426..ae94cadf164 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 @@ -35,7 +35,6 @@ from wtscenario import make_scenarios # test_rollback_to_stable19.py # Test that rollback to stable aborts both insert and remove updates from a single prepared transaction class test_rollback_to_stable19(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' in_memory_values = [ ('no_inmem', dict(in_memory=False)), @@ -45,7 +44,7 @@ class test_rollback_to_stable19(test_rollback_to_stable_base): format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] restart_options = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable20.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable20.py index 6e4e68535c5..045c6f698af 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable20.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable20.py @@ -37,12 +37,11 @@ from test_rollback_to_stable01 import test_rollback_to_stable_base # Test that rollback to stable does not open any dhandles that don't have unstable updates. class test_rollback_to_stable20(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable21.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable21.py index 0f6a1e2eea0..a729357fd99 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable21.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable21.py @@ -43,7 +43,7 @@ class test_rollback_to_stable21(test_rollback_to_stable_base): format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable22.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable22.py index d89f37b217c..1613a1fb58b 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable22.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable22.py @@ -40,7 +40,6 @@ from wtdataset import SimpleDataSet # this explicitly on VLCS or FLCS. class test_rollback_to_stable22(test_rollback_to_stable_base): conn_config = 'cache_size=100MB' - session_config = 'isolation=snapshot' prepare = False def test_rollback_to_stable(self): diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable23.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable23.py index 0ae13de928f..17aeda9e37c 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable23.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable23.py @@ -41,11 +41,10 @@ def mod_val(value, char, location, nbytes=1): # inherently doesn't support modify, there's no need to run this on FLCS. (Note that # self.value_format needs to exist anyway for the base class to use.) class test_rollback_to_stable23(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' key_format_values = [ ('column', dict(key_format='r')), - ('integer_row', dict(key_format='i')), + ('row_integer', dict(key_format='i')), ] value_format='S' diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable24.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable24.py index ac067c1ce67..da9a7c72b1c 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable24.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable24.py @@ -60,12 +60,11 @@ from wtscenario import make_scenarios # # Don't run it on FLCS because FLCS doesn't do RLE encoding so there's no point. class test_rollback_to_stable24(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' conn_config = 'in_memory=false' key_format_values = [ ('column', dict(key_format='r')), - ('integer_row', dict(key_format='i')), + ('row_integer', dict(key_format='i')), ] scenarios = make_scenarios(key_format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable25.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable25.py index 2d800a17d32..d24b4db3077 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable25.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable25.py @@ -64,7 +64,6 @@ def keys_of_write(write): return [2 + my_rle_size - 1] class test_rollback_to_stable25(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' conn_config = 'in_memory=false' write_10_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py index 2c2c8896487..a7f5a98b1b1 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py @@ -38,12 +38,11 @@ from wtthread import checkpoint_thread # Test the rollback to stable does properly restore the prepare rollback entry # from the history store. class test_rollback_to_stable26(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] hs_remove_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable27.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable27.py index ee0499e72da..d8b7622e5be 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable27.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable27.py @@ -35,13 +35,12 @@ from wtscenario import make_scenarios # # Test mixing timestamped and non-timestamped updates on the same VLCS RLE cell. class test_rollback_to_stable27(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' # Run it all on row-store as well as a control group: if something odd arises from the # RLE cell handling it won't happen in row-store. key_format_values = [ ('column', dict(key_format='r')), - ('integer_row', dict(key_format='i')), + ('row_integer', dict(key_format='i')), ] in_memory_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable28.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable28.py index f3ed5aa2461..fda11c9c63c 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable28.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable28.py @@ -58,7 +58,7 @@ class test_rollback_to_stable28(test_rollback_to_stable_base): #('column', dict(key_format='r', value_format='S', extraconfig='')), #('column_fix', dict(key_format='r', value_format='8t', # extraconfig=',allocation_size=512,leaf_page_max=512')), - ('integer_row', dict(key_format='i', value_format='S', extraconfig='')), + ('row_integer', dict(key_format='i', value_format='S', extraconfig='')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable29.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable29.py index ac6d37f4e70..161cbd31daa 100755 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable29.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable29.py @@ -43,7 +43,7 @@ class test_rollback_to_stable29(test_rollback_to_stable_base): format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable31.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable31.py index c4fdef9c4df..926a58dae91 100644 --- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable31.py +++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable31.py @@ -35,12 +35,11 @@ from wtscenario import make_scenarios # Check what happens with RTS if you never set the stable timestamp. class test_rollback_to_stable31(test_rollback_to_stable_base): - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] checkpoint_modes = [ ('no-checkpoint', dict(checkpoint=False)), 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 058704f9d1b..c9a466063ff 100755 --- a/src/third_party/wiredtiger/test/suite/test_search_near01.py +++ b/src/third_party/wiredtiger/test/suite/test_search_near01.py @@ -34,7 +34,6 @@ from wiredtiger import stat # Test various prefix search near scenarios. class test_search_near01(wttest.WiredTigerTestCase): conn_config = 'statistics=(all)' - session_config = 'isolation=snapshot' def get_stat(self, stat, local_session = None): if (local_session != None): diff --git a/src/third_party/wiredtiger/test/suite/test_stat09.py b/src/third_party/wiredtiger/test/suite/test_stat09.py index 5345449581e..a67487d2401 100644 --- a/src/third_party/wiredtiger/test/suite/test_stat09.py +++ b/src/third_party/wiredtiger/test/suite/test_stat09.py @@ -35,7 +35,6 @@ class test_stat09(wttest.WiredTigerTestCase): tablename = 'test_stat09' uri = 'table:' + tablename conn_config = 'statistics=(all)' - session_config = 'isolation=snapshot' # Check the oldest active read statistic to be at the expected values def check_stat_oldest_read(self, statcursor, expected_oldest, all_committed): diff --git a/src/third_party/wiredtiger/test/suite/test_stat10.py b/src/third_party/wiredtiger/test/suite/test_stat10.py index f5c65a9e606..cb5212439a2 100644 --- a/src/third_party/wiredtiger/test/suite/test_stat10.py +++ b/src/third_party/wiredtiger/test/suite/test_stat10.py @@ -50,12 +50,11 @@ from wiredtiger import stat class test_stat10(wttest.WiredTigerTestCase): uri = 'table:test_stat10' conn_config = 'statistics=(all)' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='u')), ('column_fix', dict(key_format='r', value_format='8t')), - ('string_row', dict(key_format='S', value_format='u')), + ('row_string', dict(key_format='S', value_format='u')), ] oldest_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp01.py b/src/third_party/wiredtiger/test/suite/test_timestamp01.py index f8c768eb2f8..f201af72784 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp01.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp01.py @@ -34,7 +34,6 @@ from suite_subprocess import suite_subprocess import wiredtiger, wttest class test_timestamp01(wttest.WiredTigerTestCase, suite_subprocess): - session_config = 'isolation=snapshot' def test_timestamp_range(self): # Cannot set a timestamp on a non-running transaction diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp02.py b/src/third_party/wiredtiger/test/suite/test_timestamp02.py index cc2c7423576..88ea9e688f1 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp02.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp02.py @@ -47,7 +47,6 @@ class test_timestamp02(wttest.WiredTigerTestCase, suite_subprocess): ]) conn_config = 'log=(enabled)' - session_config = 'isolation=snapshot' # Check that a cursor (optionally started in a new transaction), sees the # expected values. diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp03.py b/src/third_party/wiredtiger/test/suite/test_timestamp03.py index 0fb3f5be7de..0d342f87593 100755 --- a/src/third_party/wiredtiger/test/suite/test_timestamp03.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp03.py @@ -77,7 +77,6 @@ class test_timestamp03(wttest.WiredTigerTestCase, suite_subprocess): ('V1', dict(conn_config='create,log=(archive=false,enabled),compatibility=(release="2.9")', using_log=True)), ('V2', dict(conn_config='create,log=(archive=false,enabled)', using_log=True)), ] - session_config = 'isolation=snapshot' scenarios = make_scenarios(types, ckpt, conncfg) diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp04.py b/src/third_party/wiredtiger/test/suite/test_timestamp04.py index c35fdbc2a55..971f3efcc7a 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp04.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp04.py @@ -49,7 +49,6 @@ class test_timestamp04(wttest.WiredTigerTestCase, suite_subprocess): ('V2', dict(conn_config=',eviction_dirty_trigger=50,eviction_updates_trigger=50,' \ 'log=(enabled)', using_log=True)), ] - session_config = 'isolation=snapshot' # Minimum cache_size requirement of lsm is 31MB. types = [ diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp05.py b/src/third_party/wiredtiger/test/suite/test_timestamp05.py index 05347ced247..1c8a416515b 100755 --- a/src/third_party/wiredtiger/test/suite/test_timestamp05.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp05.py @@ -37,7 +37,6 @@ from wtscenario import make_scenarios class test_timestamp05(wttest.WiredTigerTestCase, suite_subprocess): uri = 'table:ts05' - session_config = 'isolation=snapshot' format_values = [ ('integer-row', dict(key_format='i', value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp06.py b/src/third_party/wiredtiger/test/suite/test_timestamp06.py index d0e8f89ba6c..55fd95c22ed 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp06.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp06.py @@ -57,7 +57,6 @@ class test_timestamp06(wttest.WiredTigerTestCase, suite_subprocess): ('V1', dict(conn_config='create,log=(archive=false,enabled),compatibility=(release="2.9")', using_log=True)), ('V2', dict(conn_config='create,log=(archive=false,enabled)', using_log=True)), ] - session_config = 'isolation=snapshot' scenarios = make_scenarios(conncfg, types, ckpt) diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp07.py b/src/third_party/wiredtiger/test/suite/test_timestamp07.py index 4af4123913f..1d02e2b5db5 100755 --- a/src/third_party/wiredtiger/test/suite/test_timestamp07.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp07.py @@ -56,7 +56,6 @@ class test_timestamp07(wttest.WiredTigerTestCase, suite_subprocess): ('nolog', dict(conn_config='create,cache_size=2M', using_log=False)), ('log', dict(conn_config='create,log=(file_max=1M,archive=false,enabled),cache_size=2M', using_log=True)), ] - session_config = 'isolation=snapshot' nkeys = [ ('100keys', dict(nkeys=100)), diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp09.py b/src/third_party/wiredtiger/test/suite/test_timestamp09.py index 1a813c31ff5..f0857b21c98 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp09.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp09.py @@ -36,7 +36,6 @@ import wiredtiger, wttest class test_timestamp09(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_timestamp09' uri = 'table:' + tablename - session_config = 'isolation=snapshot' def test_timestamp_api(self): self.session.create(self.uri, 'key_format=i,value_format=i') diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp10.py b/src/third_party/wiredtiger/test/suite/test_timestamp10.py index d8fb817a3a0..15fd788010d 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp10.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp10.py @@ -36,7 +36,6 @@ from wtscenario import make_scenarios class test_timestamp10(wttest.WiredTigerTestCase, suite_subprocess): conn_config = 'config_base=false,create,log=(enabled)' - session_config = 'isolation=snapshot' coll1_uri = 'table:collection10.1' coll2_uri = 'table:collection10.2' coll3_uri = 'table:collection10.3' diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp11.py b/src/third_party/wiredtiger/test/suite/test_timestamp11.py index 4d0af0562cf..5b72628942f 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp11.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp11.py @@ -35,7 +35,6 @@ import wiredtiger, wttest from wtscenario import make_scenarios class test_timestamp11(wttest.WiredTigerTestCase, suite_subprocess): - session_config = 'isolation=snapshot' format_values = [ ('string-row', dict(key_format='S', value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp12.py b/src/third_party/wiredtiger/test/suite/test_timestamp12.py index a4bab3a4e48..03408863f74 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp12.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp12.py @@ -35,7 +35,6 @@ from wtscenario import make_scenarios class test_timestamp12(wttest.WiredTigerTestCase): conn_config = 'config_base=false,create,log=(enabled)' - session_config = 'isolation=snapshot' coll_uri = 'table:collection12' oplog_uri = 'table:oplog12' diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp13.py b/src/third_party/wiredtiger/test/suite/test_timestamp13.py index 0a09864c22e..2bb121391ac 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp13.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp13.py @@ -47,7 +47,6 @@ class test_timestamp13(wttest.WiredTigerTestCase, suite_subprocess): ]) conn_config = 'log=(enabled)' - session_config = 'isolation=snapshot' def test_degenerate_timestamps(self): self.session.create(self.uri, @@ -82,7 +81,7 @@ class test_timestamp13(wttest.WiredTigerTestCase, suite_subprocess): self.session.create(self.uri, 'key_format=i,value_format=i' + self.extra_config) - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() self.session.timestamp_transaction('read_timestamp=10') self.assertTimestampsEqual( self.session.query_timestamp('get=read'), '10') @@ -112,7 +111,7 @@ class test_timestamp13(wttest.WiredTigerTestCase, suite_subprocess): # Rounding to the oldest timestamp will allow the stale read_timestamp # to succeed. The follow-up call to get the read timestamp returns the # chosen read timestamp. - self.session.begin_transaction('isolation=snapshot,roundup_timestamps=(read=true)') + self.session.begin_transaction('roundup_timestamps=(read=true)') self.session.timestamp_transaction('read_timestamp=5') self.assertTimestampsEqual( self.session.query_timestamp('get=read'), '10') diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp14.py b/src/third_party/wiredtiger/test/suite/test_timestamp14.py index 0d6f9c05a8e..8e93885b3a7 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp14.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp14.py @@ -38,7 +38,6 @@ from wtscenario import make_scenarios class test_timestamp14(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_timestamp14' uri = 'table:' + tablename - session_config = 'isolation=snapshot' format_values = [ ('integer-row', dict(key_format='i', value_format='i')), diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp16.py b/src/third_party/wiredtiger/test/suite/test_timestamp16.py index 2485a14be12..990a08b3528 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp16.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp16.py @@ -38,7 +38,6 @@ import wiredtiger, wttest class test_timestamp16(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_timestamp16' uri = 'table:' + tablename - session_config = 'isolation=snapshot' def test_read_timestamp_cleared(self): # Ensure that the read timestamp doesn't move our checkpoint. diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp17.py b/src/third_party/wiredtiger/test/suite/test_timestamp17.py index af96e2e0c3f..f9ff1537fe5 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp17.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp17.py @@ -41,7 +41,6 @@ from wtscenario import make_scenarios class test_timestamp17(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_timestamp17' uri = 'table:' + tablename - session_config = 'isolation=snapshot' format_values = [ ('integer-row', dict(key_format='i', value_format='i')), diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp18.py b/src/third_party/wiredtiger/test/suite/test_timestamp18.py index b6a92651ff6..8af6ec59104 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp18.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp18.py @@ -40,7 +40,6 @@ from wtscenario import make_scenarios class test_timestamp18(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB' - session_config = 'isolation=snapshot' format_values = [ ('string-row', dict(key_format='S', value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp19.py b/src/third_party/wiredtiger/test/suite/test_timestamp19.py index a9ed894ae64..3ab88bd8858 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp19.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp19.py @@ -34,7 +34,6 @@ from wtscenario import make_scenarios class test_timestamp19(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB,log=(enabled)' - session_config = 'isolation=snapshot' format_values = [ ('integer-row', dict(key_format='i', value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp20.py b/src/third_party/wiredtiger/test/suite/test_timestamp20.py index b4b017d8560..4eca70f1f30 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp20.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp20.py @@ -33,7 +33,6 @@ from wtscenario import make_scenarios # Exercise fixing up of out-of-order updates in the history store. class test_timestamp20(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB' - session_config = 'isolation=snapshot' format_values = [ ('string-row', dict(key_format='S', value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp21.py b/src/third_party/wiredtiger/test/suite/test_timestamp21.py index 59f16c4d7a9..f201785e43a 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp21.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp21.py @@ -31,7 +31,6 @@ import wiredtiger, wttest # test_timestamp21.py # Test read timestamp configuration that allows read timestamp to be older than oldest. class test_timestamp21(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' def test_timestamp21(self): uri = 'table:test_timestamp21' diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp22.py b/src/third_party/wiredtiger/test/suite/test_timestamp22.py index 753aed00489..4768c63aba7 100755 --- a/src/third_party/wiredtiger/test/suite/test_timestamp22.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp22.py @@ -35,7 +35,6 @@ from wtscenario import make_scenarios class test_timestamp22(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB' - session_config = 'isolation=snapshot' # Keep the number of rows low, as each additional row does # not test any new code paths. diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp23.py b/src/third_party/wiredtiger/test/suite/test_timestamp23.py index 9c394d97570..a366a4d844c 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp23.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp23.py @@ -35,12 +35,11 @@ from wtscenario import make_scenarios # delete keys repeatedly at successive timestamps class test_timestamp23(wttest.WiredTigerTestCase): conn_config = '' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp24.py b/src/third_party/wiredtiger/test/suite/test_timestamp24.py index 541280a5a0e..cacbc7804a9 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp24.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp24.py @@ -36,12 +36,11 @@ from wtscenario import make_scenarios class test_timestamp24(wttest.WiredTigerTestCase): conn_config = '' - session_config = 'isolation=snapshot' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column_fix', dict(key_format='r', value_format='8t')), - ('integer_row', dict(key_format='i', value_format='S')), + ('row_integer', dict(key_format='i', value_format='S')), ] scenarios = make_scenarios(format_values) diff --git a/src/third_party/wiredtiger/test/suite/test_truncate03.py b/src/third_party/wiredtiger/test/suite/test_truncate03.py index 51157ab2f25..952c6ab166c 100644 --- a/src/third_party/wiredtiger/test/suite/test_truncate03.py +++ b/src/third_party/wiredtiger/test/suite/test_truncate03.py @@ -54,7 +54,7 @@ class test_truncate_address_deleted(wttest.WiredTigerTestCase): # Create a new session and start a transaction to force the upcoming # checkpoint operation to write address-deleted cells to disk. tmp_session = self.conn.open_session(None) - tmp_session.begin_transaction("isolation=snapshot") + tmp_session.begin_transaction() # Truncate a big range of rows; the leaf pages aren't in memory, so # leaf page references will be deleted without being read. diff --git a/src/third_party/wiredtiger/test/suite/test_truncate05.py b/src/third_party/wiredtiger/test/suite/test_truncate05.py index 73f9f5444ed..189756e5c15 100644 --- a/src/third_party/wiredtiger/test/suite/test_truncate05.py +++ b/src/third_party/wiredtiger/test/suite/test_truncate05.py @@ -32,7 +32,6 @@ import wiredtiger, wttest # Test various fast truncate visibility scenarios class test_truncate05(wttest.WiredTigerTestCase): conn_config = 'cache_size=2MB' - session_config = 'isolation=snapshot' def test_truncate_read_older_than_newest(self): uri = 'table:test_truncate05' diff --git a/src/third_party/wiredtiger/test/suite/test_truncate06.py b/src/third_party/wiredtiger/test/suite/test_truncate06.py index 33347f9854d..34e5fb259d3 100644 --- a/src/third_party/wiredtiger/test/suite/test_truncate06.py +++ b/src/third_party/wiredtiger/test/suite/test_truncate06.py @@ -41,7 +41,6 @@ from wtscenario import make_scenarios class test_truncate06(wttest.WiredTigerTestCase): conn_config = '' - session_config = 'isolation=snapshot' # Hook to run using remove instead of truncate for reference. This should not alter the # behavior... but may if things are broken. Disable the reference version by default as it's @@ -56,7 +55,7 @@ class test_truncate06(wttest.WiredTigerTestCase): ('column', dict(key_format='r', value_format='S', extraconfig='')), ('column_fix', dict(key_format='r', value_format='8t', extraconfig=',allocation_size=512,leaf_page_max=512')), - ('integer_row', dict(key_format='i', value_format='S', extraconfig='')), + ('row_integer', dict(key_format='i', value_format='S', extraconfig='')), ] munge_values = [ ('update', dict(munge_with_update=True)), diff --git a/src/third_party/wiredtiger/test/suite/test_truncate07.py b/src/third_party/wiredtiger/test/suite/test_truncate07.py index 32ec6c2fd90..26a9dd894cf 100644 --- a/src/third_party/wiredtiger/test/suite/test_truncate07.py +++ b/src/third_party/wiredtiger/test/suite/test_truncate07.py @@ -37,7 +37,6 @@ from wtscenario import make_scenarios class test_truncate07(wttest.WiredTigerTestCase): conn_config = '' - session_config = 'isolation=snapshot' # Hook to run using remove instead of truncate for reference. This should not alter the # behavior... but may if things are broken. Disable the reference version by default as it's @@ -52,7 +51,7 @@ class test_truncate07(wttest.WiredTigerTestCase): ('column', dict(key_format='r', value_format='S', extraconfig='')), ('column_fix', dict(key_format='r', value_format='8t', extraconfig=',allocation_size=512,leaf_page_max=512')), - ('integer_row', dict(key_format='i', value_format='S', extraconfig='')), + ('row_integer', dict(key_format='i', value_format='S', extraconfig='')), ] munge_values = [ ('update', dict(munge_with_update=True)), diff --git a/src/third_party/wiredtiger/test/suite/test_txn03.py b/src/third_party/wiredtiger/test/suite/test_txn03.py index 151b98ca8e2..7d528d7efd5 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn03.py +++ b/src/third_party/wiredtiger/test/suite/test_txn03.py @@ -73,7 +73,7 @@ class test_txn03(wttest.WiredTigerTestCase): # Open another session and some transactional cursors. self.session2 = self.conn.open_session() - self.session2.begin_transaction("isolation=snapshot") + self.session2.begin_transaction() t1c = self.session2.open_cursor(self.uri1, None, 'overwrite') t2c = self.session2.open_cursor(self.uri2, None, 'overwrite') diff --git a/src/third_party/wiredtiger/test/suite/test_txn12.py b/src/third_party/wiredtiger/test/suite/test_txn12.py index c70a65eda64..e836ef2bbbb 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn12.py +++ b/src/third_party/wiredtiger/test/suite/test_txn12.py @@ -43,7 +43,7 @@ class test_txn12(wttest.WiredTigerTestCase, suite_subprocess): # Setup the session and table. session = self.conn.open_session(None) session.create(self.uri, self.create_params) - session.begin_transaction("isolation=snapshot") + session.begin_transaction() # Create a read only transaction. c = session.open_cursor(self.uri, None) @@ -56,7 +56,7 @@ class test_txn12(wttest.WiredTigerTestCase, suite_subprocess): session.commit_transaction() # Create a read/write transaction. - session.begin_transaction("isolation=snapshot") + session.begin_transaction() c = session.open_cursor(self.uri, None) c[123] = 123 self.assertRaisesWithMessage(wiredtiger.WiredTigerError, diff --git a/src/third_party/wiredtiger/test/suite/test_txn23.py b/src/third_party/wiredtiger/test/suite/test_txn23.py index 1a1d77a9e50..1a194ba77ce 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn23.py +++ b/src/third_party/wiredtiger/test/suite/test_txn23.py @@ -35,7 +35,6 @@ from wtdataset import SimpleDataSet from wtscenario import make_scenarios class test_txn23(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' conn_config = 'cache_size=5MB' format_values = [ diff --git a/src/third_party/wiredtiger/test/suite/test_txn24.py b/src/third_party/wiredtiger/test/suite/test_txn24.py index 4ecb540cfb7..406faf5608f 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn24.py +++ b/src/third_party/wiredtiger/test/suite/test_txn24.py @@ -37,7 +37,6 @@ from wtscenario import make_scenarios class test_txn24(wttest.WiredTigerTestCase): - session_config = 'isolation=snapshot' table_params_values = [ ('integer-row', dict(key_format='i', value_format='S', extraconfig='')), @@ -85,7 +84,7 @@ class test_txn24(wttest.WiredTigerTestCase): # Start a transaction, make an update and keep it running. cursor = self.session.open_cursor(uri, None) - self.session.begin_transaction('isolation=snapshot') + self.session.begin_transaction() cursor[1] = new_val # Start few sessions and transactions, make updates and try committing them. diff --git a/src/third_party/wiredtiger/test/suite/test_txn25.py b/src/third_party/wiredtiger/test/suite/test_txn25.py index b9930a0011f..31e00d7479e 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn25.py +++ b/src/third_party/wiredtiger/test/suite/test_txn25.py @@ -35,7 +35,6 @@ from wtscenario import make_scenarios class test_txn25(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB,log=(enabled)' - session_config = 'isolation=snapshot' format_values = [ ('string-row', dict(key_format='S', usestrings=True, value_format='S')), diff --git a/src/third_party/wiredtiger/test/suite/test_txn26.py b/src/third_party/wiredtiger/test/suite/test_txn26.py index c5edd0eb2f2..1765db8a097 100644 --- a/src/third_party/wiredtiger/test/suite/test_txn26.py +++ b/src/third_party/wiredtiger/test/suite/test_txn26.py @@ -39,7 +39,6 @@ from wtscenario import make_scenarios # expected. class test_txn26(wttest.WiredTigerTestCase): conn_config = 'cache_size=50MB' - session_config = 'isolation=snapshot' format_values = [ ('string-row', dict(key_format='S', value_format='S', key=str(0))), diff --git a/src/third_party/wiredtiger/test/suite/test_util01.py b/src/third_party/wiredtiger/test/suite/test_util01.py index 20c6cea62d6..324120e47e2 100755 --- a/src/third_party/wiredtiger/test/suite/test_util01.py +++ b/src/third_party/wiredtiger/test/suite/test_util01.py @@ -44,7 +44,6 @@ class test_util01(wttest.WiredTigerTestCase, suite_subprocess): tablename = 'test_util01.a' nentries = 1000 - session_config = 'isolation=snapshot' stringclass = ''.__class__ def compare_config(self, expected_cfg, actual_cfg): diff --git a/src/third_party/wiredtiger/test/suite/test_util21.py b/src/third_party/wiredtiger/test/suite/test_util21.py index 6dc3e05e042..fa763c59ba5 100644 --- a/src/third_party/wiredtiger/test/suite/test_util21.py +++ b/src/third_party/wiredtiger/test/suite/test_util21.py @@ -34,7 +34,6 @@ from helper import compare_files # Ensure that wt dump can dump obsolete data in the history store. class test_util21(wttest.WiredTigerTestCase, suite_subprocess): conn_config = 'cache_size=50MB' - session_config = 'isolation=snapshot' def add_data_with_timestamp(self, uri, value, ts): # Apply a series of updates with commit timestamp. |