Merge branch 'main' into tsdb-consider-metric-names-duplicate-detection

.buildkite/pipelines/intake.yml

@@ -56,7 +56,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.16.3", "8.17.1", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

.buildkite/pipelines/periodic-packaging.yml

@@ -287,8 +287,8 @@ steps:
         env:
           BWC_VERSION: 8.15.5
 
-      - label: "{{matrix.image}} / 8.16.3 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.3
+      - label: "{{matrix.image}} / 8.16.4 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.4
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -301,10 +301,10 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.16.3
+          BWC_VERSION: 8.16.4
 
-      - label: "{{matrix.image}} / 8.17.1 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.1
+      - label: "{{matrix.image}} / 8.17.2 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.2
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -317,7 +317,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.17.1
+          BWC_VERSION: 8.17.2
 
       - label: "{{matrix.image}} / 8.18.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.0

.buildkite/pipelines/periodic.yml

@@ -306,8 +306,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 8.16.3 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.3#bwcTest
+      - label: 8.16.4 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.4#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -316,7 +316,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 8.16.3
+          BWC_VERSION: 8.16.4
         retry:
           automatic:
             - exit_status: "-1"
@@ -325,8 +325,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 8.17.1 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.1#bwcTest
+      - label: 8.17.2 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.2#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -335,7 +335,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 8.17.1
+          BWC_VERSION: 8.17.2
         retry:
           automatic:
             - exit_status: "-1"
@@ -448,7 +448,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-            BWC_VERSION: ["8.16.3", "8.17.1", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
@@ -490,7 +490,7 @@ steps:
             ES_RUNTIME_JAVA:
               - openjdk21
               - openjdk23
-            BWC_VERSION: ["8.16.3", "8.17.1", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

.ci/bwcVersions

@@ -15,7 +15,7 @@ BWC_VERSION:
   - "8.13.4"
   - "8.14.3"
   - "8.15.5"
-  - "8.16.3"
-  - "8.17.1"
+  - "8.16.4"
+  - "8.17.2"
   - "8.18.0"
   - "9.0.0"

.ci/snapshotBwcVersions

@@ -1,5 +1,5 @@
 BWC_VERSION:
-  - "8.16.3"
-  - "8.17.1"
+  - "8.16.4"
+  - "8.17.2"
   - "8.18.0"
   - "9.0.0"

docs/changelog/120538.yaml

@@ -0,0 +1,5 @@
+pr: 120538
+summary: "Revert unwanted ES|QL lexer changes from PR #120354"
+area: ES|QL
+type: bug
+issues: []

server/src/main/java/org/elasticsearch/Version.java

@@ -192,8 +192,10 @@ public class Version implements VersionId<Version>, ToXContentFragment {
     public static final Version V_8_16_1 = new Version(8_16_01_99);
     public static final Version V_8_16_2 = new Version(8_16_02_99);
     public static final Version V_8_16_3 = new Version(8_16_03_99);
+    public static final Version V_8_16_4 = new Version(8_16_04_99);
     public static final Version V_8_17_0 = new Version(8_17_00_99);
     public static final Version V_8_17_1 = new Version(8_17_01_99);
+    public static final Version V_8_17_2 = new Version(8_17_02_99);
     public static final Version V_8_18_0 = new Version(8_18_00_99);
     public static final Version V_9_0_0 = new Version(9_00_00_99);
     public static final Version CURRENT = V_9_0_0;

server/src/main/resources/org/elasticsearch/TransportVersions.csv

@@ -136,4 +136,6 @@
 8.16.0,8772001
 8.16.1,8772004
 8.16.2,8772004
+8.16.3,8772004
 8.17.0,8797002
+8.17.1,8797002

server/src/main/resources/org/elasticsearch/index/IndexVersions.csv

@@ -136,4 +136,6 @@
 8.16.0,8518000
 8.16.1,8518000
 8.16.2,8518000
+8.16.3,8518000
 8.17.0,8521000
+8.17.1,8521000

x-pack/plugin/esql/qa/testFixtures/src/main/resources/date.csv-spec

@@ -1452,6 +1452,7 @@ cnt:long
 ;
 
 implicit casting strings to dates for IN operator
+required_capability: string_literal_auto_casting
 FROM employees
 | WHERE birth_date IN ("1953-04-20", "1958-10-31")
 | KEEP emp_no, first_name;
@@ -1462,7 +1463,7 @@ emp_no:integer | first_name:keyword
 10025          | Prasadram 
 ;
 
-IN operator with null in list, finds match
+IN operator with null in list, finds match#[skip:-8.13.99, reason: default date formatter is changed in 8.14]
 
 FROM employees
 | EVAL x = NULL
@@ -1473,7 +1474,7 @@ birth_date:datetime      | first_name:keyword
 1958-02-19T00:00:00.000Z | Saniya     
 ;
 
-IN operator with null in list, doesn't find match
+IN operator with null in list, doesn't find match#[skip:-8.13.99, reason: default date formatter is changed in 8.14]
 
 FROM employees
 | EVAL x = NULL
@@ -1483,7 +1484,7 @@ FROM employees
 birth_date:datetime      | first_name:keyword
 ;
 
-IN operator with null in list, doesn't find match, EVAL to check value
+IN operator with null in list, doesn't find match, EVAL to check value#[skip:-8.13.99, reason: default date formatter is changed in 8.14]
 
 FROM employees
 | EVAL x = NULL

x-pack/plugin/esql/qa/testFixtures/src/main/resources/date_nanos.csv-spec

@@ -748,6 +748,7 @@ ct:long | mo:date_nanos
 Bucket Date nanos by 10 minutes
 required_capability: date_trunc_date_nanos
 required_capability: date_nanos_bucket
+required_capability: string_literal_auto_casting
 
 FROM date_nanos 
 | WHERE millis > "2020-01-01"