summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Petrel <etienne.petrel@mongodb.com>2022-06-22 11:45:11 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-06-22 12:37:32 +0000
commita182192a647b03bc91be48d94dd14f3bb2325bbf (patch)
treeeab26d0fe095997b6f2fe939b0b81fc378f0d836
parent636312d3b279cdc03222780122b272f811e3c2a2 (diff)
downloadmongo-a182192a647b03bc91be48d94dd14f3bb2325bbf.tar.gz
Import wiredtiger: f8635d2114e04b0eb12b1884c1f6d76013a3e3fc from branch mongodb-master
ref: 3a5e2b974e..f8635d2114 for: 6.1.0-rc0 Reverted ticket(s): WT-9310 Cut WiredTiger 11.0.0 release
-rw-r--r--src/third_party/wiredtiger/INSTALL4
-rw-r--r--src/third_party/wiredtiger/NEWS12
-rw-r--r--src/third_party/wiredtiger/README8
-rw-r--r--src/third_party/wiredtiger/RELEASE_INFO4
-rw-r--r--src/third_party/wiredtiger/cmake/configs/version.cmake8
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/docs/upgrading.dox2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_compat01.py2
-rw-r--r--src/third_party/wiredtiger/test/suite/test_compat02.py4
-rw-r--r--src/third_party/wiredtiger/test/suite/test_compat03.py3
-rw-r--r--src/third_party/wiredtiger/test/suite/test_compat04.py2
11 files changed, 28 insertions, 23 deletions
diff --git a/src/third_party/wiredtiger/INSTALL b/src/third_party/wiredtiger/INSTALL
index bda8fa4a68a..ef25361a312 100644
--- a/src/third_party/wiredtiger/INSTALL
+++ b/src/third_party/wiredtiger/INSTALL
@@ -1,6 +1,6 @@
-WiredTiger 11.0.0: (May 12, 2022)
+WiredTiger 10.0.2: (November 30, 2021)
-This is version 11.0.0 of WiredTiger.
+This is version 10.0.2 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
new file mode 100644
index 00000000000..d6428243a15
--- /dev/null
+++ b/src/third_party/wiredtiger/NEWS
@@ -0,0 +1,12 @@
+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 bc5b9b822c0..df921a6d884 100644
--- a/src/third_party/wiredtiger/README
+++ b/src/third_party/wiredtiger/README
@@ -1,14 +1,14 @@
-WiredTiger 11.0.0: (May 12, 2022)
+WiredTiger 10.0.2: (November 30, 2021)
-This is version 11.0.0 of WiredTiger.
+This is version 10.0.2 of WiredTiger.
WiredTiger release packages and documentation can be found at:
https://source.wiredtiger.com/
-The documentation can be found at:
+The documentation for this specific release can be found at:
- https://source.wiredtiger.com
+ https://source.wiredtiger.com/develop/index.html
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 65b6ccda24f..954ca8646b1 100644
--- a/src/third_party/wiredtiger/RELEASE_INFO
+++ b/src/third_party/wiredtiger/RELEASE_INFO
@@ -1,6 +1,6 @@
-WIREDTIGER_VERSION_MAJOR=11
+WIREDTIGER_VERSION_MAJOR=10
WIREDTIGER_VERSION_MINOR=0
-WIREDTIGER_VERSION_PATCH=0
+WIREDTIGER_VERSION_PATCH=2
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 287a2582d71..714da8bb3de 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)
+# Generated by dist/s_version. Do not modify.
+set(WT_VERSION_MAJOR 10)
set(WT_VERSION_MINOR 0)
-set(WT_VERSION_PATCH 0)
-set(WT_VERSION_STRING "WiredTiger 11.0.0: (May 12, 2022)")
+set(WT_VERSION_PATCH 2)
+set(WT_VERSION_STRING "WiredTiger 10.0.2: (December 21, 2021)")
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 431405508e2..e985432246c 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": "3a5e2b974eae2b5ebe2a7cc007b46aaea79516c0"
+ "commit": "f8635d2114e04b0eb12b1884c1f6d76013a3e3fc"
}
diff --git a/src/third_party/wiredtiger/src/docs/upgrading.dox b/src/third_party/wiredtiger/src/docs/upgrading.dox
index 4130cecd6a4..d1cc9902ad0 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_1100 Upgrading to Version 11.0.0
+@section version_1101 Upgrading to Version 11.0.1
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/suite/test_compat01.py b/src/third_party/wiredtiger/test/suite/test_compat01.py
index 082246baa25..3979693a16a 100644
--- a/src/third_party/wiredtiger/test/suite/test_compat01.py
+++ b/src/third_party/wiredtiger/test/suite/test_compat01.py
@@ -53,7 +53,6 @@ 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)),
@@ -66,7 +65,6 @@ 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 3ed1c9c1457..8f4fee9569d 100644
--- a/src/third_party/wiredtiger/test/suite/test_compat02.py
+++ b/src/third_party/wiredtiger/test/suite/test_compat02.py
@@ -57,7 +57,6 @@ 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)),
@@ -68,7 +67,6 @@ 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)),
@@ -87,7 +85,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)),
- ('110_max', dict(max_req="11.0", log_max=5)),
+ ('100_max', dict(max_req="10.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 71a21ec22c4..fcbc7be2cda 100644
--- a/src/third_party/wiredtiger/test/suite/test_compat03.py
+++ b/src/third_party/wiredtiger/test/suite/test_compat03.py
@@ -58,7 +58,6 @@ 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)),
@@ -77,7 +76,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)),
- ('110_max', dict(max_req="11.0", log_max=5)),
+ ('100_max', dict(max_req="10.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 9d59aff4b6d..ea393f03ee9 100644
--- a/src/third_party/wiredtiger/test/suite/test_compat04.py
+++ b/src/third_party/wiredtiger/test/suite/test_compat04.py
@@ -54,7 +54,6 @@ 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)),
@@ -63,7 +62,6 @@ 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)),