Merge branch 'main' into esql-data-type-conversion-2

fang-xing-esql · Mar 27, 2024 · e188c2c · e188c2c
2 parents 627c3d5 + 9e6b893
commit e188c2c
Show file tree

Hide file tree

Showing 398 changed files with 4,272 additions and 2,553 deletions.
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -48,7 +48,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.19", "8.12.3", "8.13.0", "8.14.0"]
+            BWC_VERSION: ["7.17.20", "8.13.1", "8.14.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -1137,6 +1137,22 @@ steps:
         env:
           BWC_VERSION: 7.17.19
 
+      - label: "{{matrix.image}} / 7.17.20 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.20
+        timeout_in_minutes: 300
+        matrix:
+          setup:
+            image:
+              - rocky-8
+              - ubuntu-2004
+        agents:
+          provider: gcp
+          image: family/elasticsearch-{{matrix.image}}
+          machineType: custom-16-32768
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 7.17.20
+
       - label: "{{matrix.image}} / 8.0.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.0.0
         timeout_in_minutes: 300
@@ -1873,8 +1889,8 @@ steps:
         env:
           BWC_VERSION: 8.12.2
 
-      - label: "{{matrix.image}} / 8.12.3 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.12.3
+      - label: "{{matrix.image}} / 8.13.0 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.13.0
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -1887,10 +1903,10 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.12.3
+          BWC_VERSION: 8.13.0
 
-      - label: "{{matrix.image}} / 8.13.0 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.13.0
+      - label: "{{matrix.image}} / 8.13.1 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.13.1
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -1903,7 +1919,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.13.0
+          BWC_VERSION: 8.13.1
 
       - label: "{{matrix.image}} / 8.14.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.14.0

diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -692,6 +692,16 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 7.17.19
+      - label: 7.17.20 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.20#bwcTest
+        timeout_in_minutes: 300
+        agents:
+          provider: gcp
+          image: family/elasticsearch-ubuntu-2004
+          machineType: n1-standard-32
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 7.17.20
       - label: 8.0.0 / bwc
         command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.0.0#bwcTest
         timeout_in_minutes: 300
@@ -1152,26 +1162,26 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 8.12.2
-      - label: 8.12.3 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.12.3#bwcTest
+      - label: 8.13.0 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.13.0#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
           machineType: n1-standard-32
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.12.3
-      - label: 8.13.0 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.13.0#bwcTest
+          BWC_VERSION: 8.13.0
+      - label: 8.13.1 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.13.1#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
           machineType: n1-standard-32
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.13.0
+          BWC_VERSION: 8.13.1
       - label: 8.14.0 / bwc
         command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.14.0#bwcTest
         timeout_in_minutes: 300
@@ -1246,7 +1256,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk17
-            BWC_VERSION: ["7.17.19", "8.12.3", "8.13.0", "8.14.0"]
+            BWC_VERSION: ["7.17.20", "8.13.1", "8.14.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
@@ -1290,7 +1300,7 @@ steps:
               - openjdk17
               - openjdk21
               - openjdk22
-            BWC_VERSION: ["7.17.19", "8.12.3", "8.13.0", "8.14.0"]
+            BWC_VERSION: ["7.17.20", "8.13.1", "8.14.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -68,6 +68,7 @@ BWC_VERSION:
   - "7.17.17"
   - "7.17.18"
   - "7.17.19"
+  - "7.17.20"
   - "8.0.0"
   - "8.0.1"
   - "8.1.0"
@@ -114,6 +115,6 @@ BWC_VERSION:
   - "8.12.0"
   - "8.12.1"
   - "8.12.2"
-  - "8.12.3"
   - "8.13.0"
+  - "8.13.1"
   - "8.14.0"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,5 +1,4 @@
 BWC_VERSION:
-  - "7.17.19"
-  - "8.12.3"
-  - "8.13.0"
+  - "7.17.20"
+  - "8.13.1"
   - "8.14.0"
diff --git a/branches.json b/branches.json
@@ -7,9 +7,6 @@
     {
       "branch": "8.13"
     },
-    {
-      "branch": "8.12"
-    },
     {
       "branch": "7.17"
     }

diff --git a/docs/changelog/100740.yaml b/docs/changelog/100740.yaml
diff --git a/docs/changelog/100813.yaml b/docs/changelog/100813.yaml
diff --git a/docs/changelog/101209.yaml b/docs/changelog/101209.yaml
diff --git a/docs/changelog/101487.yaml b/docs/changelog/101487.yaml
diff --git a/docs/changelog/101640.yaml b/docs/changelog/101640.yaml
diff --git a/docs/changelog/101656.yaml b/docs/changelog/101656.yaml
diff --git a/docs/changelog/101717.yaml b/docs/changelog/101717.yaml
diff --git a/docs/changelog/101872.yaml b/docs/changelog/101872.yaml
diff --git a/docs/changelog/102078.yaml b/docs/changelog/102078.yaml
diff --git a/docs/changelog/102207.yaml b/docs/changelog/102207.yaml
diff --git a/docs/changelog/102371.yaml b/docs/changelog/102371.yaml
diff --git a/docs/changelog/102428.yaml b/docs/changelog/102428.yaml
diff --git a/docs/changelog/102435.yaml b/docs/changelog/102435.yaml
diff --git a/docs/changelog/102557.yaml b/docs/changelog/102557.yaml
diff --git a/docs/changelog/102559.yaml b/docs/changelog/102559.yaml
diff --git a/docs/changelog/102584.yaml b/docs/changelog/102584.yaml
diff --git a/docs/changelog/102726.yaml b/docs/changelog/102726.yaml
diff --git a/docs/changelog/102759.yaml b/docs/changelog/102759.yaml
diff --git a/docs/changelog/102765.yaml b/docs/changelog/102765.yaml
diff --git a/docs/changelog/102782.yaml b/docs/changelog/102782.yaml
diff --git a/docs/changelog/102798.yaml b/docs/changelog/102798.yaml
diff --git a/docs/changelog/102824.yaml b/docs/changelog/102824.yaml
diff --git a/docs/changelog/102862.yaml b/docs/changelog/102862.yaml
diff --git a/docs/changelog/102879.yaml b/docs/changelog/102879.yaml
diff --git a/docs/changelog/102885.yaml b/docs/changelog/102885.yaml
diff --git a/docs/changelog/103025.yaml b/docs/changelog/103025.yaml
diff --git a/docs/changelog/103032.yaml b/docs/changelog/103032.yaml
diff --git a/docs/changelog/103033.yaml b/docs/changelog/103033.yaml
diff --git a/docs/changelog/103035.yaml b/docs/changelog/103035.yaml
diff --git a/docs/changelog/103084.yaml b/docs/changelog/103084.yaml
diff --git a/docs/changelog/103091.yaml b/docs/changelog/103091.yaml
diff --git a/docs/changelog/103099.yaml b/docs/changelog/103099.yaml
diff --git a/docs/changelog/103130.yaml b/docs/changelog/103130.yaml
diff --git a/docs/changelog/103160.yaml b/docs/changelog/103160.yaml
diff --git a/docs/changelog/103171.yaml b/docs/changelog/103171.yaml
diff --git a/docs/changelog/103176.yaml b/docs/changelog/103176.yaml
diff --git a/docs/changelog/103178.yaml b/docs/changelog/103178.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,9 +7,6 @@ @@
         {
           "branch": "8.13"
         },
-        {
-          "branch": "8.12"
-        },
         {
           "branch": "7.17"
         }
@@ Expand Down @@