diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-08-10 12:00:49 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-08-10 02:26:27 +0000 |
| commit | b7c45595aa3fa89f7fa9b45c64a1f3f3f5a73b9c (patch) | |
| tree | 3618fa320a8f09ef05e8a762e423ec136dc552d0 /src | |
| parent | ba6ab14ef75a8492fb5fff98c9d17c24ebb0acfe (diff) | |
| download | mongo-b7c45595aa3fa89f7fa9b45c64a1f3f3f5a73b9c.tar.gz | |
Import wiredtiger: 2cb88aba972de7fa49879ee3616fa49905efbb7c from branch mongodb-5.0
ref: ff7311530d..2cb88aba97
for: 5.0.11
Revert "WT-9595 Disable FLCS in test_prepare21 (#8180)"
Diffstat (limited to 'src')
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/suite/test_prepare21.py | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index a78518d2ed9..45063fb9329 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-5.0", - "commit": "ff7311530da905f46e26bb1690302fb4b1da1a6f" + "commit": "2cb88aba972de7fa49879ee3616fa49905efbb7c" } diff --git a/src/third_party/wiredtiger/test/suite/test_prepare21.py b/src/third_party/wiredtiger/test/suite/test_prepare21.py index bd4e0a215b5..d522c90f0e5 100644 --- a/src/third_party/wiredtiger/test/suite/test_prepare21.py +++ b/src/third_party/wiredtiger/test/suite/test_prepare21.py @@ -40,6 +40,7 @@ class test_prepare21(test_rollback_to_stable_base): format_values = [ ('column', dict(key_format='r', value_format='S')), + ('column_fix', dict(key_format='r', value_format='8t')), ('row_integer', dict(key_format='i', value_format='S')), ] @@ -68,10 +69,16 @@ class test_prepare21(test_rollback_to_stable_base): ds = SimpleDataSet(self, uri, 0, key_format=self.key_format, value_format=self.value_format) ds.populate() - value_a = "aaaaa" * 100 - value_b = "bbbbb" * 100 - value_c = "ccccc" * 100 - value_d = "ddddd" * 100 + if self.value_format == '8t': + value_a = 97 + value_b = 98 + value_c = 99 + value_d = 100 + else: + value_a = "aaaaa" * 100 + value_b = "bbbbb" * 100 + value_c = "ccccc" * 100 + value_d = "ddddd" * 100 # Pin oldest and stable to timestamp 10. self.conn.set_timestamp('oldest_timestamp=' + self.timestamp_str(10) + |