From 3822c3b796cc5d2c5b176505138134f58dd1e332 Mon Sep 17 00:00:00 2001 From: "siddhartha.mahajan" Date: Fri, 24 Jun 2022 05:29:12 +0000 Subject: Import wiredtiger: a1f21fe61929c12b360d8b50f03bc1584d7b10fd from branch mongodb-master ref: cec4e577d9..a1f21fe619 for: 6.1.0-rc0 WT-9310 Cut WiredTiger 11.0.0 release (#8056) --- src/third_party/wiredtiger/INSTALL | 4 ++-- src/third_party/wiredtiger/NEWS | 12 ------------ src/third_party/wiredtiger/README | 8 ++++---- src/third_party/wiredtiger/RELEASE_INFO | 4 ++-- src/third_party/wiredtiger/cmake/configs/version.cmake | 8 ++++---- src/third_party/wiredtiger/import.data | 2 +- src/third_party/wiredtiger/src/docs/upgrading.dox | 2 +- .../test/evergreen/compatibility_test_for_releases.sh | 4 ---- 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 ++ 12 files changed, 23 insertions(+), 32 deletions(-) delete mode 100644 src/third_party/wiredtiger/NEWS diff --git a/src/third_party/wiredtiger/INSTALL b/src/third_party/wiredtiger/INSTALL index ef25361a312..bda8fa4a68a 100644 --- a/src/third_party/wiredtiger/INSTALL +++ b/src/third_party/wiredtiger/INSTALL @@ -1,6 +1,6 @@ -WiredTiger 10.0.2: (November 30, 2021) +WiredTiger 11.0.0: (May 12, 2022) -This is version 10.0.2 of WiredTiger. +This is version 11.0.0 of WiredTiger. Instructions for configuring, building, and installing WiredTiger are available online. diff --git a/src/third_party/wiredtiger/NEWS b/src/third_party/wiredtiger/NEWS deleted file mode 100644 index d6428243a15..00000000000 --- a/src/third_party/wiredtiger/NEWS +++ /dev/null @@ -1,12 +0,0 @@ -Ticket reference tags refer to tickets in the MongoDB JIRA tracking system: -https://jira.mongodb.org - -WiredTiger release 11.0.1, 2022-XX-XX ------------------------------------- - -The WiredTiger 11.0 release is a complete refresh of the WiredTiger storage engine. -Applications written to earlier versions of the WiredTiger API will require review -(although the API structure is substantially the same as previous releases). Applications -using row-store data objects can use those objects without change. Applications using -fixed- or variable-length column-store data objects will require a dump and reload cycle -to import those objects into a 11.0 release environment. diff --git a/src/third_party/wiredtiger/README b/src/third_party/wiredtiger/README index df921a6d884..bc5b9b822c0 100644 --- a/src/third_party/wiredtiger/README +++ b/src/third_party/wiredtiger/README @@ -1,14 +1,14 @@ -WiredTiger 10.0.2: (November 30, 2021) +WiredTiger 11.0.0: (May 12, 2022) -This is version 10.0.2 of WiredTiger. +This is version 11.0.0 of WiredTiger. WiredTiger release packages and documentation can be found at: https://source.wiredtiger.com/ -The documentation for this specific release can be found at: +The documentation can be found at: - https://source.wiredtiger.com/develop/index.html + https://source.wiredtiger.com The WiredTiger source code can be found at: diff --git a/src/third_party/wiredtiger/RELEASE_INFO b/src/third_party/wiredtiger/RELEASE_INFO index 954ca8646b1..65b6ccda24f 100644 --- a/src/third_party/wiredtiger/RELEASE_INFO +++ b/src/third_party/wiredtiger/RELEASE_INFO @@ -1,6 +1,6 @@ -WIREDTIGER_VERSION_MAJOR=10 +WIREDTIGER_VERSION_MAJOR=11 WIREDTIGER_VERSION_MINOR=0 -WIREDTIGER_VERSION_PATCH=2 +WIREDTIGER_VERSION_PATCH=0 WIREDTIGER_VERSION="$WIREDTIGER_VERSION_MAJOR.$WIREDTIGER_VERSION_MINOR.$WIREDTIGER_VERSION_PATCH" WIREDTIGER_RELEASE_DATE=`date "+%B %e, %Y"` diff --git a/src/third_party/wiredtiger/cmake/configs/version.cmake b/src/third_party/wiredtiger/cmake/configs/version.cmake index 714da8bb3de..287a2582d71 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 10) +# Generated by dist/s_version. Do not modify. +set(WT_VERSION_MAJOR 11) set(WT_VERSION_MINOR 0) -set(WT_VERSION_PATCH 2) -set(WT_VERSION_STRING "WiredTiger 10.0.2: (December 21, 2021)") +set(WT_VERSION_PATCH 0) +set(WT_VERSION_STRING "WiredTiger 11.0.0: (May 12, 2022)") diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 7e794490e76..19049b0995e 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": "cec4e577d97ddbb2c87ba676e8644636b6e366ca" + "commit": "a1f21fe61929c12b360d8b50f03bc1584d7b10fd" } diff --git a/src/third_party/wiredtiger/src/docs/upgrading.dox b/src/third_party/wiredtiger/src/docs/upgrading.dox index d1cc9902ad0..4130cecd6a4 100644 --- a/src/third_party/wiredtiger/src/docs/upgrading.dox +++ b/src/third_party/wiredtiger/src/docs/upgrading.dox @@ -1,6 +1,6 @@ /*! @page upgrading Upgrading WiredTiger applications -@section version_1101 Upgrading to Version 11.0.1 +@section version_1100 Upgrading to Version 11.0.0 The WiredTiger 11.0 release is a complete refresh of the WiredTiger storage engine. Applications written to earlier versions of the WiredTiger API will require review diff --git a/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh b/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh index 259a9c82c18..3adcf139075 100755 --- a/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh +++ b/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh @@ -820,10 +820,6 @@ if [ "$newer" = true ]; then [[ $((i+1)) < ${#newer_release_branches[@]} ]] && \ (verify_test_format ${newer_release_branches[$((i+1))]} ${newer_release_branches[$i]} "row" false) done - for i in ${!test_checkpoint_release_branches[@]}; do - [[ $((i+1)) < ${#test_checkpoint_release_branches[@]} ]] && \ - (verify_test_checkpoint ${test_checkpoint_release_branches[$((i+1))]} ${test_checkpoint_release_branches[$i]} "row") - done fi # Upgrade/downgrade testing for supported access methods. diff --git a/src/third_party/wiredtiger/test/suite/test_compat01.py b/src/third_party/wiredtiger/test/suite/test_compat01.py index 3979693a16a..082246baa25 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)), + ('110', dict(compat1='11.0', logv1=5)), ('100', dict(compat1='10.0', logv1=5)), ('33', dict(compat1='3.3', logv1=4)), ('32', dict(compat1='3.2', logv1=3)), @@ -65,6 +66,7 @@ class test_compat01(wttest.WiredTigerTestCase, suite_subprocess): ] restart_compat = [ ('def2', dict(compat2='none', logv2=5)), + ('110_2', dict(compat2='11.0', logv2=5)), ('100_2', dict(compat2='10.0', logv2=5)), ('33_2', dict(compat2='3.3', logv2=4)), ('32_2', dict(compat2='3.2', logv2=3)), diff --git a/src/third_party/wiredtiger/test/suite/test_compat02.py b/src/third_party/wiredtiger/test/suite/test_compat02.py index 8f4fee9569d..3ed1c9c1457 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)), + ('110', dict(create_rel="11.0", log_create=5)), ('100', dict(create_rel="10.0", log_create=5)), ('33', dict(create_rel="3.3", log_create=4)), ('32', dict(create_rel="3.2", log_create=3)), @@ -67,6 +68,7 @@ class test_compat02(wttest.WiredTigerTestCase, suite_subprocess): compat_release = [ ('def_rel', dict(rel='none', log_rel=5)), + ('110_rel', dict(rel="11.0", log_rel=5)), ('100_rel', dict(rel="10.0", log_rel=5)), ('33_rel', dict(rel="3.3", log_rel=4)), ('32_rel', dict(rel="3.2", log_rel=3)), @@ -85,7 +87,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)), - ('100_max', dict(max_req="10.0", log_max=5)), + ('110_max', dict(max_req="11.0", 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 fcbc7be2cda..71a21ec22c4 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)), + ('110_rel', dict(rel="11.0", log_rel=5)), ('100_rel', dict(rel="10.0", log_rel=5)), ('33_rel', dict(rel="3.3", log_rel=4)), ('32_rel', dict(rel="3.2", log_rel=3)), @@ -76,7 +77,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)), - ('100_max', dict(max_req="10.0", log_max=5)), + ('110_max', dict(max_req="11.0", 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 ea393f03ee9..9d59aff4b6d 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)), + ('110_rel', dict(create_rel="11.0", log_crrel=5)), ('100_rel', dict(create_rel="10.0", log_crrel=5)), ('33_rel', dict(create_rel="3.3", log_crrel=4)), ('32_rel', dict(create_rel="3.2", log_crrel=3)), @@ -62,6 +63,7 @@ class test_compat04(wttest.WiredTigerTestCase, suite_subprocess): ('26_rel', dict(create_rel="2.6", log_crrel=1)), ] reconfig_release = [ + ('110_rel', dict(rel="11.0", log_rel=5)), ('100_rel', dict(rel="10.0", log_rel=5)), ('33_rel', dict(rel="3.3", log_rel=4)), ('32_rel', dict(rel="3.2", log_rel=3)), -- cgit v1.2.1