Merge branch 'main' of https://github.com/elastic/elasticsearch into esql-reranker-boostrap

Author: afoucret

docs/changelog/120302.yaml

@@ -0,0 +1,6 @@
+pr: 120302
+summary: "ESQL: Enhanced `DATE_TRUNC` with arbitrary intervals"
+area: ES|QL
+type: enhancement
+issues:
+  - 120094

docs/changelog/125896.yaml

@@ -0,0 +1,5 @@
+pr: 125896
+summary: Support explicit Z/M attributes using WKT geometry
+area: Geo
+type: enhancement
+issues: [123111]

docs/reference/query-languages/esql/_snippets/functions/description/date_trunc.md

@@ -44,6 +44,8 @@ public class WellKnownText {
     public static final String RPAREN = ")";
     public static final String COMMA = ",";
     public static final String NAN = "NaN";
+    public static final String Z = "Z";
+    public static final String M = "M";
     public static final int MAX_NESTED_DEPTH = 1000;
 
     private static final String NUMBER = "<NUMBER>";
@@ -440,7 +442,8 @@ public static Geometry fromWKT(GeometryValidator validator, boolean coerce, Stri
      */
     private static Geometry parseGeometry(StreamTokenizer stream, boolean coerce, int depth) throws IOException, ParseException {
         final String type = nextWord(stream).toLowerCase(Locale.ROOT);
-        return switch (type) {
+        final boolean isExplicitlySpecifiesZorM = isZOrMNext(stream);
+        Geometry geometry = switch (type) {
             case "point" -> parsePoint(stream);
             case "multipoint" -> parseMultiPoint(stream);
             case "linestring" -> parseLine(stream);
@@ -453,6 +456,16 @@ private static Geometry parseGeometry(StreamTokenizer stream, boolean coerce, in
                 parseCircle(stream);
             default -> throw new IllegalArgumentException("Unknown geometry type: " + type);
         };
+        checkZorMAttribute(isExplicitlySpecifiesZorM, geometry.hasZ());
+        return geometry;
+    }
+
+    private static void checkZorMAttribute(boolean isExplicitlySpecifiesZorM, boolean hasZ) {
+        if (isExplicitlySpecifiesZorM && hasZ == false) {
+            throw new IllegalArgumentException(
+                "When specifying 'Z' or 'M', coordinates must include three values. Only two coordinates were provided"
+            );
+        }
     }
 
     private static GeometryCollection<Geometry> parseGeometryCollection(StreamTokenizer stream, boolean coerce, int depth)
@@ -710,6 +723,21 @@ private static boolean isNumberNext(StreamTokenizer stream) throws IOException {
         return type == StreamTokenizer.TT_WORD;
     }
 
+    private static boolean isZOrMNext(StreamTokenizer stream) {
+        String token;
+        try {
+            token = nextWord(stream);
+            if (token.equals(Z) || token.equals(M)) {
+                return true;
+            }
+            stream.pushBack();
+            return false;
+        } catch (ParseException | IOException e) {
+            return false;
+        }
+
+    }
+
     private static String nextEmptyOrOpen(StreamTokenizer stream) throws IOException, ParseException {
         final String next = nextWord(stream);
         if (next.equals(EMPTY) || next.equals(LPAREN)) {

docs/reference/query-languages/esql/_snippets/functions/examples/bucket.md

@@ -21,6 +21,9 @@
 
 abstract class BaseGeometryTestCase<T extends Geometry> extends AbstractWireTestCase<T> {
 
+    public static final String ZorMMustIncludeThreeValuesMsg =
+        "When specifying 'Z' or 'M', coordinates must include three values. Only two coordinates were provided";
+
     @Override
     protected final T createTestInstance() {
         boolean hasAlt = randomBoolean();

docs/reference/query-languages/esql/kibana/definition/functions/date_trunc.json

@@ -19,6 +19,7 @@
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 
 import static org.hamcrest.Matchers.containsString;
 
@@ -93,6 +94,35 @@ private int countNestedGeometryCollections(GeometryCollection<?> geometry) {
         return count;
     }
 
+    public void testParseGeometryCollectionZorMWithThreeCoordinates() throws IOException, ParseException {
+        GeometryValidator validator = GeographyValidator.instance(true);
+
+        GeometryCollection<Geometry> expected = new GeometryCollection<>(
+            Arrays.asList(
+                new Point(20.0, 10.0, 100.0),
+                new Line(new double[] { 10.0, 20.0 }, new double[] { 5.0, 15.0 }, new double[] { 50.0, 150.0 })
+            )
+        );
+
+        String point = "(POINT Z (20.0 10.0 100.0)";
+        String lineString = "LINESTRING M (10.0 5.0 50.0, 20.0 15.0 150.0)";
+        assertEquals(expected, WellKnownText.fromWKT(validator, true, "GEOMETRYCOLLECTION Z " + point + ", " + lineString + ")"));
+
+        assertEquals(expected, WellKnownText.fromWKT(validator, true, "GEOMETRYCOLLECTION M " + point + ", " + lineString + ")"));
+    }
+
+    public void testParseGeometryCollectionZorMWithTwoCoordinatesThrowsException() {
+        GeometryValidator validator = GeographyValidator.instance(true);
+        List<String> gcWkt = List.of(
+            "GEOMETRYCOLLECTION Z (POINT (20.0 10.0), LINESTRING (10.0 5.0, 20.0 15.0))",
+            "GEOMETRYCOLLECTION M (POINT (20.0 10.0), LINESTRING (10.0 5.0, 20.0 15.0))"
+        );
+        for (String gc : gcWkt) {
+            IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, () -> WellKnownText.fromWKT(validator, true, gc));
+            assertEquals(ZorMMustIncludeThreeValuesMsg, ex.getMessage());
+        }
+    }
+
     @Override
     protected GeometryCollection<Geometry> mutateInstance(GeometryCollection<Geometry> instance) {
         return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929

docs/reference/query-languages/esql/kibana/docs/functions/date_trunc.md

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.List;
 
 public class LineTests extends BaseGeometryTestCase<Line> {
     @Override
@@ -82,6 +83,25 @@ public void testWKTValidation() {
         assertEquals("found Z value [6.0] but [ignore_z_value] parameter is [false]", ex.getMessage());
     }
 
+    public void testParseLineZorMWithThreeCoordinates() throws IOException, ParseException {
+        GeometryValidator validator = GeographyValidator.instance(true);
+
+        Line expectedZ = new Line(new double[] { 20.0, 30.0 }, new double[] { 10.0, 15.0 }, new double[] { 100.0, 200.0 });
+        assertEquals(expectedZ, WellKnownText.fromWKT(validator, true, "LINESTRING Z (20.0 10.0 100.0, 30.0 15.0 200.0)"));
+
+        Line expectedM = new Line(new double[] { 20.0, 30.0 }, new double[] { 10.0, 15.0 }, new double[] { 100.0, 200.0 });
+        assertEquals(expectedM, WellKnownText.fromWKT(validator, true, "LINESTRING M (20.0 10.0 100.0, 30.0 15.0 200.0)"));
+    }
+
+    public void testParseLineZorMWithTwoCoordinatesThrowsException() {
+        GeometryValidator validator = GeographyValidator.instance(true);
+        List<String> linesWkt = List.of("LINESTRING Z (20.0 10.0, 30.0 15.0)", "LINESTRING M (20.0 10.0, 30.0 15.0)");
+        for (String line : linesWkt) {
+            IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, () -> WellKnownText.fromWKT(validator, true, line));
+            assertEquals(ZorMMustIncludeThreeValuesMsg, ex.getMessage());
+        }
+    }
+
     @Override
     protected Line mutateInstance(Line instance) {
         return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929