From 942719f40be8488c3644ebc4dbf4f18fb3220e93 Mon Sep 17 00:00:00 2001 From: Etienne Petrel Date: Tue, 15 Nov 2022 02:28:46 +0000 Subject: Import wiredtiger: 5ade1afb8313b7eaeb7e0b14271d0f88e483bd62 from branch mongodb-master ref: aff91a0de3..5ade1afb83 for: 6.2.0-rc0 WT-10135 Bump WiredTiger version to 11.2.0 --- src/third_party/wiredtiger/INSTALL | 4 ++-- src/third_party/wiredtiger/README | 4 ++-- src/third_party/wiredtiger/RELEASE_INFO | 2 +- src/third_party/wiredtiger/cmake/configs/version.cmake | 4 ++-- src/third_party/wiredtiger/import.data | 2 +- src/third_party/wiredtiger/test/suite/test_compat01.py | 2 ++ src/third_party/wiredtiger/test/suite/test_compat02.py | 4 +++- src/third_party/wiredtiger/test/suite/test_compat03.py | 3 ++- src/third_party/wiredtiger/test/suite/test_compat04.py | 2 ++ 9 files changed, 17 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/third_party/wiredtiger/INSTALL b/src/third_party/wiredtiger/INSTALL index 05991812256..c77c5cd0250 100644 --- a/src/third_party/wiredtiger/INSTALL +++ b/src/third_party/wiredtiger/INSTALL @@ -1,6 +1,6 @@ -WiredTiger 11.1.0: (November 2, 2022) +WiredTiger 11.2.0: (November 10, 2022) -This is version 11.1.0 of WiredTiger. +This is version 11.2.0 of WiredTiger. Instructions for configuring, building, and installing WiredTiger are available online. diff --git a/src/third_party/wiredtiger/README b/src/third_party/wiredtiger/README index b460abb8efe..2c8db450a73 100644 --- a/src/third_party/wiredtiger/README +++ b/src/third_party/wiredtiger/README @@ -1,6 +1,6 @@ -WiredTiger 11.1.0: (November 2, 2022) +WiredTiger 11.2.0: (November 10, 2022) -This is version 11.1.0 of WiredTiger. +This is version 11.2.0 of WiredTiger. WiredTiger release packages and documentation can be found at: diff --git a/src/third_party/wiredtiger/RELEASE_INFO b/src/third_party/wiredtiger/RELEASE_INFO index c0b5dffa341..1b5a21b4d87 100644 --- a/src/third_party/wiredtiger/RELEASE_INFO +++ b/src/third_party/wiredtiger/RELEASE_INFO @@ -1,5 +1,5 @@ WIREDTIGER_VERSION_MAJOR=11 -WIREDTIGER_VERSION_MINOR=1 +WIREDTIGER_VERSION_MINOR=2 WIREDTIGER_VERSION_PATCH=0 WIREDTIGER_VERSION="$WIREDTIGER_VERSION_MAJOR.$WIREDTIGER_VERSION_MINOR.$WIREDTIGER_VERSION_PATCH" diff --git a/src/third_party/wiredtiger/cmake/configs/version.cmake b/src/third_party/wiredtiger/cmake/configs/version.cmake index 06b8000b5d7..7b51fbbc509 100644 --- a/src/third_party/wiredtiger/cmake/configs/version.cmake +++ b/src/third_party/wiredtiger/cmake/configs/version.cmake @@ -1,5 +1,5 @@ # Generated by dist/s_version. Do not modify. set(WT_VERSION_MAJOR 11) -set(WT_VERSION_MINOR 1) +set(WT_VERSION_MINOR 2) set(WT_VERSION_PATCH 0) -set(WT_VERSION_STRING "WiredTiger 11.1.0: (November 2, 2022)") +set(WT_VERSION_STRING "WiredTiger 11.2.0: (November 10, 2022)") diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 5c0fbcda906..3ff1ffa7eb8 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-master", - "commit": "aff91a0de3bbe8278616ce60c8a31b2ff22bb155" + "commit": "5ade1afb8313b7eaeb7e0b14271d0f88e483bd62" } diff --git a/src/third_party/wiredtiger/test/suite/test_compat01.py b/src/third_party/wiredtiger/test/suite/test_compat01.py index b3533cde004..56f4e0f092f 100644 --- a/src/third_party/wiredtiger/test/suite/test_compat01.py +++ b/src/third_party/wiredtiger/test/suite/test_compat01.py @@ -53,6 +53,7 @@ class test_compat01(wttest.WiredTigerTestCase, suite_subprocess): # and without the patch number. Test both. start_compat = [ ('def', dict(compat1='none', logv1=5)), + ('112', dict(compat1='11.2', logv1=5)), ('111', dict(compat1='11.1', logv1=5)), ('110', dict(compat1='11.0', logv1=5)), ('100', dict(compat1='10.0', logv1=5)), @@ -67,6 +68,7 @@ class test_compat01(wttest.WiredTigerTestCase, suite_subprocess): ] restart_compat = [ ('def2', dict(compat2='none', logv2=5)), + ('112_2', dict(compat2='11.2', logv2=5)), ('111_2', dict(compat2='11.1', logv2=5)), ('110_2', dict(compat2='11.0', logv2=5)), ('100_2', dict(compat2='10.0', logv2=5)), diff --git a/src/third_party/wiredtiger/test/suite/test_compat02.py b/src/third_party/wiredtiger/test/suite/test_compat02.py index bfe9bef6814..923e6d3d75f 100644 --- a/src/third_party/wiredtiger/test/suite/test_compat02.py +++ b/src/third_party/wiredtiger/test/suite/test_compat02.py @@ -57,6 +57,7 @@ class test_compat02(wttest.WiredTigerTestCase, suite_subprocess): compat_create = [ ('def', dict(create_rel='none', log_create=5)), + ('112', dict(create_rel="11.2", log_create=5)), ('111', dict(create_rel="11.1", log_create=5)), ('110', dict(create_rel="11.0", log_create=5)), ('100', dict(create_rel="10.0", log_create=5)), @@ -69,6 +70,7 @@ class test_compat02(wttest.WiredTigerTestCase, suite_subprocess): compat_release = [ ('def_rel', dict(rel='none', log_rel=5)), + ('112_rel', dict(rel="11.2", log_rel=5)), ('111_rel', dict(rel="11.1", log_rel=5)), ('110_rel', dict(rel="11.0", log_rel=5)), ('100_rel', dict(rel="10.0", log_rel=5)), @@ -89,7 +91,7 @@ class test_compat02(wttest.WiredTigerTestCase, suite_subprocess): compat_max = [ ('future_max', dict(max_req=future_rel, log_max=future_logv)), ('def_max', dict(max_req='none', log_max=5)), - ('111_max', dict(max_req="11.1", log_max=5)), + ('112_max', dict(max_req="11.2", log_max=5)), ('33_max', dict(max_req="3.3", log_max=4)), ('32_max', dict(max_req="3.2", log_max=3)), ('30_max', dict(max_req="3.0", log_max=2)), diff --git a/src/third_party/wiredtiger/test/suite/test_compat03.py b/src/third_party/wiredtiger/test/suite/test_compat03.py index a6185a0ce02..b0e6c510858 100644 --- a/src/third_party/wiredtiger/test/suite/test_compat03.py +++ b/src/third_party/wiredtiger/test/suite/test_compat03.py @@ -58,6 +58,7 @@ class test_compat03(wttest.WiredTigerTestCase, suite_subprocess): compat_release = [ ('future_rel', dict(rel=future_rel, log_rel=future_logv)), ('def_rel', dict(rel='none', log_rel=5)), + ('112_rel', dict(rel="11.2", log_rel=5)), ('111_rel', dict(rel="11.1", log_rel=5)), ('110_rel', dict(rel="11.0", log_rel=5)), ('100_rel', dict(rel="10.0", log_rel=5)), @@ -78,7 +79,7 @@ class test_compat03(wttest.WiredTigerTestCase, suite_subprocess): compat_max = [ ('future_max', dict(max_req=future_rel, log_max=future_logv)), ('def_max', dict(max_req='none', log_max=5)), - ('111_max', dict(max_req="11.1", log_max=5)), + ('112_max', dict(max_req="11.2", log_max=5)), ('33_max', dict(max_req="3.3", log_max=4)), ('32_max', dict(max_req="3.2", log_max=3)), ('30_max', dict(max_req="3.0", log_max=2)), diff --git a/src/third_party/wiredtiger/test/suite/test_compat04.py b/src/third_party/wiredtiger/test/suite/test_compat04.py index 4d704a3ebcb..96691351ba5 100644 --- a/src/third_party/wiredtiger/test/suite/test_compat04.py +++ b/src/third_party/wiredtiger/test/suite/test_compat04.py @@ -54,6 +54,7 @@ class test_compat04(wttest.WiredTigerTestCase, suite_subprocess): # create_release = [ ('def_rel', dict(create_rel='none', log_crrel=5)), + ('112_rel', dict(create_rel="11.2", log_crrel=5)), ('111_rel', dict(create_rel="11.1", log_crrel=5)), ('110_rel', dict(create_rel="11.0", log_crrel=5)), ('100_rel', dict(create_rel="10.0", log_crrel=5)), @@ -64,6 +65,7 @@ class test_compat04(wttest.WiredTigerTestCase, suite_subprocess): ('26_rel', dict(create_rel="2.6", log_crrel=1)), ] reconfig_release = [ + ('112_rel', dict(rel="11.2", log_rel=5)), ('111_rel', dict(rel="11.1", log_rel=5)), ('110_rel', dict(rel="11.0", log_rel=5)), ('100_rel', dict(rel="10.0", log_rel=5)), -- cgit v1.2.1