From f5b2547a31e1cdc348d8b9f8fbe74c02594e69f0 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Thu, 14 Aug 2025 13:34:01 +0000 Subject: [PATCH] Without comments. Eveything passes with passing `false` (default). --- .../org/elasticsearch/xpack/esql/planner/PlannerUtils.java | 6 +++++- .../xpack/esql/action/EsqlQueryResponseTests.java | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java index 825219f9817e5..dea8f834ef1f1 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java @@ -320,6 +320,10 @@ public static ElementType toElementType(DataType dataType, MappedFieldType.Field case LONG, DATETIME, DATE_NANOS, UNSIGNED_LONG, COUNTER_LONG -> ElementType.LONG; case INTEGER, COUNTER_INTEGER -> ElementType.INT; case DOUBLE, COUNTER_DOUBLE -> ElementType.DOUBLE; +<<<<<<< HEAD +======= + case FLOAT, COUNTER_FLOAT -> ElementType.FLOAT; +>>>>>>> db1a3e23e2b (Without comments. Eveything passes with passing `false` (default).) // unsupported fields are passed through as a BytesRef case KEYWORD, TEXT, IP, SOURCE, VERSION, UNSUPPORTED -> ElementType.BYTES_REF; case NULL -> ElementType.NULL; @@ -331,7 +335,7 @@ public static ElementType toElementType(DataType dataType, MappedFieldType.Field case PARTIAL_AGG -> ElementType.COMPOSITE; case AGGREGATE_METRIC_DOUBLE -> ElementType.AGGREGATE_METRIC_DOUBLE; case DENSE_VECTOR -> ElementType.FLOAT; - case SHORT, BYTE, DATE_PERIOD, TIME_DURATION, OBJECT, FLOAT, HALF_FLOAT, SCALED_FLOAT -> throw EsqlIllegalArgumentException + case SHORT, BYTE, DATE_PERIOD, TIME_DURATION, OBJECT, HALF_FLOAT, SCALED_FLOAT -> throw EsqlIllegalArgumentException .illegalDataType(dataType); }; } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponseTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponseTests.java index 981384ca70a10..79a7bb1e64c4d 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponseTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponseTests.java @@ -1175,6 +1175,10 @@ static Page valuesToPage(BlockFactory blockFactory, List columns case LONG, COUNTER_LONG -> ((LongBlock.Builder) builder).appendLong(((Number) value).longValue()); case INTEGER, COUNTER_INTEGER -> ((IntBlock.Builder) builder).appendInt(((Number) value).intValue()); case DOUBLE, COUNTER_DOUBLE -> ((DoubleBlock.Builder) builder).appendDouble(((Number) value).doubleValue()); +<<<<<<< HEAD +======= + case FLOAT, COUNTER_FLOAT -> ((FloatBlock.Builder) builder).appendFloat(((Number) value).floatValue()); +>>>>>>> db1a3e23e2b (Without comments. Eveything passes with passing `false` (default).) case KEYWORD, TEXT -> ((BytesRefBlock.Builder) builder).appendBytesRef(new BytesRef(value.toString())); case UNSUPPORTED -> ((BytesRefBlock.Builder) builder).appendNull(); case IP -> ((BytesRefBlock.Builder) builder).appendBytesRef(stringToIP(value.toString())); @@ -1227,6 +1231,9 @@ static Page valuesToPage(BlockFactory blockFactory, List columns } floatBuilder.endPositionEntry(); } + default -> throw new IllegalArgumentException( + "Unsupported data type [" + dataTypes.get(c) + "] for value [" + value + "] at column " + c + ); } } }