Skip to content

Commit 355c18d

Browse files
committed
Rename function to improve clarity
1 parent f12945e commit 355c18d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/BinarySpatialFunction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ protected TypeResolution resolveType() {
153153
}
154154
}
155155

156-
protected Expression.TypeResolution isSpatial(Expression e, TypeResolutions.ParamOrdinal paramOrd) {
156+
protected Expression.TypeResolution isCompatibleSpatial(Expression e, TypeResolutions.ParamOrdinal paramOrd) {
157157
return pointsOnly
158158
? EsqlTypeResolutions.isSpatialPoint(e, sourceText(), paramOrd)
159159
: (supportsGrid
@@ -171,8 +171,8 @@ private TypeResolution resolveType(
171171
TypeResolutions.ParamOrdinal leftOrdinal,
172172
TypeResolutions.ParamOrdinal rightOrdinal
173173
) {
174-
TypeResolution leftResolution = isSpatial(leftExpression, leftOrdinal);
175-
TypeResolution rightResolution = isSpatial(rightExpression, rightOrdinal);
174+
TypeResolution leftResolution = isCompatibleSpatial(leftExpression, leftOrdinal);
175+
TypeResolution rightResolution = isCompatibleSpatial(rightExpression, rightOrdinal);
176176
if (leftResolution.resolved()) {
177177
return resolveType(leftExpression, rightExpression, rightOrdinal);
178178
} else if (rightResolution.resolved()) {
@@ -188,7 +188,7 @@ protected TypeResolution resolveType(
188188
TypeResolutions.ParamOrdinal otherParamOrdinal
189189
) {
190190
if (isNull(spatialExpression.dataType())) {
191-
return isSpatial(otherExpression, otherParamOrdinal);
191+
return isCompatibleSpatial(otherExpression, otherParamOrdinal);
192192
}
193193
TypeResolution resolution = isSameSpatialType(spatialExpression.dataType(), otherExpression, sourceText(), otherParamOrdinal);
194194
// TODO Remove these grid checks once we support geo_shape relation to geoGrid

0 commit comments

Comments
 (0)