Skip to content

Commit f5b2547

Browse files
elasticsearchmachineshmuelhanoch
authored andcommitted
Without comments. Eveything passes with passing false (default).
1 parent f91cc68 commit f5b2547

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,10 @@ public static ElementType toElementType(DataType dataType, MappedFieldType.Field
320320
case LONG, DATETIME, DATE_NANOS, UNSIGNED_LONG, COUNTER_LONG -> ElementType.LONG;
321321
case INTEGER, COUNTER_INTEGER -> ElementType.INT;
322322
case DOUBLE, COUNTER_DOUBLE -> ElementType.DOUBLE;
323+
<<<<<<< HEAD
324+
=======
325+
case FLOAT, COUNTER_FLOAT -> ElementType.FLOAT;
326+
>>>>>>> db1a3e23e2b (Without comments. Eveything passes with passing `false` (default).)
323327
// unsupported fields are passed through as a BytesRef
324328
case KEYWORD, TEXT, IP, SOURCE, VERSION, UNSUPPORTED -> ElementType.BYTES_REF;
325329
case NULL -> ElementType.NULL;
@@ -331,7 +335,7 @@ public static ElementType toElementType(DataType dataType, MappedFieldType.Field
331335
case PARTIAL_AGG -> ElementType.COMPOSITE;
332336
case AGGREGATE_METRIC_DOUBLE -> ElementType.AGGREGATE_METRIC_DOUBLE;
333337
case DENSE_VECTOR -> ElementType.FLOAT;
334-
case SHORT, BYTE, DATE_PERIOD, TIME_DURATION, OBJECT, FLOAT, HALF_FLOAT, SCALED_FLOAT -> throw EsqlIllegalArgumentException
338+
case SHORT, BYTE, DATE_PERIOD, TIME_DURATION, OBJECT, HALF_FLOAT, SCALED_FLOAT -> throw EsqlIllegalArgumentException
335339
.illegalDataType(dataType);
336340
};
337341
}

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponseTests.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,10 @@ static Page valuesToPage(BlockFactory blockFactory, List<ColumnInfoImpl> columns
11751175
case LONG, COUNTER_LONG -> ((LongBlock.Builder) builder).appendLong(((Number) value).longValue());
11761176
case INTEGER, COUNTER_INTEGER -> ((IntBlock.Builder) builder).appendInt(((Number) value).intValue());
11771177
case DOUBLE, COUNTER_DOUBLE -> ((DoubleBlock.Builder) builder).appendDouble(((Number) value).doubleValue());
1178+
<<<<<<< HEAD
1179+
=======
1180+
case FLOAT, COUNTER_FLOAT -> ((FloatBlock.Builder) builder).appendFloat(((Number) value).floatValue());
1181+
>>>>>>> db1a3e23e2b (Without comments. Eveything passes with passing `false` (default).)
11781182
case KEYWORD, TEXT -> ((BytesRefBlock.Builder) builder).appendBytesRef(new BytesRef(value.toString()));
11791183
case UNSUPPORTED -> ((BytesRefBlock.Builder) builder).appendNull();
11801184
case IP -> ((BytesRefBlock.Builder) builder).appendBytesRef(stringToIP(value.toString()));
@@ -1227,6 +1231,9 @@ static Page valuesToPage(BlockFactory blockFactory, List<ColumnInfoImpl> columns
12271231
}
12281232
floatBuilder.endPositionEntry();
12291233
}
1234+
default -> throw new IllegalArgumentException(
1235+
"Unsupported data type [" + dataTypes.get(c) + "] for value [" + value + "] at column " + c
1236+
);
12301237
}
12311238
}
12321239
}

0 commit comments

Comments
 (0)