Renamed isPresentable to be more specific with counter types

ivancea · ivancea · commit 48cf5de751f2 · 2025-07-23T14:10:08.000+02:00
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/TypeResolutions.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/TypeResolutions.java
@@ -75,11 +75,11 @@ public static TypeResolution isDate(Expression e, String operationName, ParamOrd
     /**
      * @see DataType#isRepresentable(DataType)
      */
-    public static TypeResolution isRepresentable(Expression e, String operationName, ParamOrdinal paramOrd) {
+    public static TypeResolution isRepresentableExceptCounters(Expression e, String operationName, ParamOrdinal paramOrd) {
         return isType(e, DataType::isRepresentable, operationName, paramOrd, "any type except counter types");
     }
 
-    public static TypeResolution isRepresentableNotSpatial(Expression e, String operationName, ParamOrdinal paramOrd) {
+    public static TypeResolution isRepresentableExceptCountersAndSpatial(Expression e, String operationName, ParamOrdinal paramOrd) {
         return isType(e, (t) -> isSpatial(t) == false && DataType.isRepresentable(t), operationName, paramOrd, "any type except counter and spatial types");
     }
 
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAppend.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAppend.java
@@ -39,7 +39,7 @@
 
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.FIRST;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.SECOND;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentable;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCounters;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isType;
 
 /**
@@ -138,14 +138,14 @@ protected TypeResolution resolveType() {
             return new TypeResolution("Unresolved children");
         }
 
-        TypeResolution resolution = isRepresentable(field1, sourceText(), FIRST);
+        TypeResolution resolution = isRepresentableExceptCounters(field1, sourceText(), FIRST);
         if (resolution.unresolved()) {
             return resolution;
         }
         dataType = field1.dataType().noText();
         if (dataType == DataType.NULL) {
             dataType = field2.dataType().noText();
-            return isRepresentable(field2, sourceText(), SECOND);
+            return isRepresentableExceptCounters(field2, sourceText(), SECOND);
         }
         return isType(field2, t -> t.noText() == dataType, sourceText(), SECOND, dataType.typeName());
     }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvCount.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvCount.java
@@ -25,7 +25,7 @@
 import java.util.List;
 
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.DEFAULT;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentable;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCounters;
 
 /**
  * Reduce a multivalued field to a single valued field containing the count of values.
@@ -75,7 +75,7 @@ public String getWriteableName() {
 
     @Override
     protected TypeResolution resolveFieldType() {
-        return isRepresentable(field(), sourceText(), DEFAULT);
+        return isRepresentableExceptCounters(field(), sourceText(), DEFAULT);
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvDedupe.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvDedupe.java
@@ -23,7 +23,7 @@
 import java.util.List;
 
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.DEFAULT;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentable;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCounters;
 
 /**
  * Removes duplicate values from a multivalued field.
@@ -89,7 +89,7 @@ public String getWriteableName() {
 
     @Override
     protected TypeResolution resolveFieldType() {
-        return isRepresentable(field(), sourceText(), DEFAULT);
+        return isRepresentableExceptCounters(field(), sourceText(), DEFAULT);
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirst.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirst.java
@@ -31,7 +31,7 @@
 import java.util.List;
 
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.DEFAULT;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentable;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCounters;
 
 /**
  * Reduce a multivalued field to a single valued field containing the minimum value.
@@ -104,7 +104,7 @@ public String getWriteableName() {
 
     @Override
     protected TypeResolution resolveFieldType() {
-        return isRepresentable(field(), sourceText(), DEFAULT);
+        return isRepresentableExceptCounters(field(), sourceText(), DEFAULT);
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLast.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLast.java
@@ -31,7 +31,7 @@
 import java.util.List;
 
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.DEFAULT;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentable;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCounters;
 
 /**
  * Reduce a multivalued field to a single valued field containing the minimum value.
@@ -104,7 +104,7 @@ public String getWriteableName() {
 
     @Override
     protected TypeResolution resolveFieldType() {
-        return isRepresentable(field(), sourceText(), DEFAULT);
+        return isRepresentableExceptCounters(field(), sourceText(), DEFAULT);
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMax.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMax.java
@@ -26,7 +26,7 @@
 import java.util.List;
 
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.DEFAULT;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableNotSpatial;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCountersAndSpatial;
 
 /**
  * Reduce a multivalued field to a single valued field containing the maximum value.
@@ -68,7 +68,7 @@ public String getWriteableName() {
 
     @Override
     protected TypeResolution resolveFieldType() {
-        return isRepresentableNotSpatial(field(), sourceText(), DEFAULT);
+        return isRepresentableExceptCountersAndSpatial(field(), sourceText(), DEFAULT);
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMin.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMin.java
@@ -26,7 +26,7 @@
 import java.util.List;
 
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.DEFAULT;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableNotSpatial;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCountersAndSpatial;
 
 /**
  * Reduce a multivalued field to a single valued field containing the minimum value.
@@ -68,7 +68,7 @@ public String getWriteableName() {
 
     @Override
     protected TypeResolution resolveFieldType() {
-        return isRepresentableNotSpatial(field(), sourceText(), DEFAULT);
+        return isRepresentableExceptCountersAndSpatial(field(), sourceText(), DEFAULT);
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSlice.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSlice.java
@@ -41,7 +41,7 @@
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.FIRST;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.SECOND;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.THIRD;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentable;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCounters;
 import static org.elasticsearch.xpack.esql.core.type.DataType.INTEGER;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.stringToInt;
 
@@ -161,7 +161,7 @@ protected TypeResolution resolveType() {
             return new TypeResolution("Unresolved children");
         }
 
-        TypeResolution resolution = isRepresentable(field, sourceText(), FIRST);
+        TypeResolution resolution = isRepresentableExceptCounters(field, sourceText(), FIRST);
         if (resolution.unresolved()) {
             return resolution;
         }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSort.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSort.java
@@ -53,7 +53,7 @@
 
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.FIRST;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.SECOND;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentable;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCounters;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isString;
 import static org.elasticsearch.xpack.esql.expression.Validations.isFoldable;
 
@@ -128,7 +128,7 @@ protected TypeResolution resolveType() {
             return new TypeResolution("Unresolved children");
         }
 
-        TypeResolution resolution = isRepresentable(field, sourceText(), FIRST);
+        TypeResolution resolution = isRepresentableExceptCounters(field, sourceText(), FIRST);
 
         if (resolution.unresolved()) {
             return resolution;

Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,11 @@ public static TypeResolution isDate(Expression e, String operationName, ParamOrd`
`75`	`75`	`/**`
`76`	`76`	`* @see DataType#isRepresentable(DataType)`
`77`	`77`	`*/`
`78`		`- public static TypeResolution isRepresentable(Expression e, String operationName, ParamOrdinal paramOrd) {`
	`78`	`+ public static TypeResolution isRepresentableExceptCounters(Expression e, String operationName, ParamOrdinal paramOrd) {`
`79`	`79`	`return isType(e, DataType::isRepresentable, operationName, paramOrd, "any type except counter types");`
`80`	`80`	`}`
`81`	`81`
`82`		`- public static TypeResolution isRepresentableNotSpatial(Expression e, String operationName, ParamOrdinal paramOrd) {`
	`82`	`+ public static TypeResolution isRepresentableExceptCountersAndSpatial(Expression e, String operationName, ParamOrdinal paramOrd) {`
`83`	`83`	`return isType(e, (t) -> isSpatial(t) == false && DataType.isRepresentable(t), operationName, paramOrd, "any type except counter and spatial types");`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`
`40`	`40`	`import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.FIRST;`
`41`	`41`	`import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.SECOND;`
`42`		`-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentable;`
	`42`	`+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCounters;`
`43`	`43`	`import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isType;`
`44`	`44`
`45`	`45`	`/**`
`@@ -138,14 +138,14 @@ protected TypeResolution resolveType() {`
`138`	`138`	`return new TypeResolution("Unresolved children");`
`139`	`139`	`}`
`140`	`140`
`141`		`- TypeResolution resolution = isRepresentable(field1, sourceText(), FIRST);`
	`141`	`+ TypeResolution resolution = isRepresentableExceptCounters(field1, sourceText(), FIRST);`
`142`	`142`	`if (resolution.unresolved()) {`
`143`	`143`	`return resolution;`
`144`	`144`	`}`
`145`	`145`	`dataType = field1.dataType().noText();`
`146`	`146`	`if (dataType == DataType.NULL) {`
`147`	`147`	`dataType = field2.dataType().noText();`
`148`		`- return isRepresentable(field2, sourceText(), SECOND);`
	`148`	`+ return isRepresentableExceptCounters(field2, sourceText(), SECOND);`
`149`	`149`	`}`
`150`	`150`	`return isType(field2, t -> t.noText() == dataType, sourceText(), SECOND, dataType.typeName());`
`151`	`151`	`}`