Skip to content

Commit 62c4778

Browse files
committed
Fix snapshot/release for geogrid spatial changepoint tests
1 parent 814ae97 commit 62c4778

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,7 +2077,9 @@ public void testChangePoint() {
20772077
public void testChangePoint_keySortable() {
20782078
assumeTrue("change_point must be enabled", EsqlCapabilities.Cap.CHANGE_POINT.isEnabled());
20792079
List<DataType> sortableTypes = List.of(BOOLEAN, DOUBLE, DATE_NANOS, DATETIME, INTEGER, IP, KEYWORD, LONG, UNSIGNED_LONG, VERSION);
2080-
List<DataType> unsortableTypes = List.of(CARTESIAN_POINT, CARTESIAN_SHAPE, GEO_POINT, GEO_SHAPE, GEOHASH, GEOTILE, GEOHEX);
2080+
List<DataType> unsortableTypes = Build.current().isSnapshot()
2081+
? List.of(CARTESIAN_POINT, CARTESIAN_SHAPE, GEO_POINT, GEO_SHAPE, GEOHASH, GEOTILE, GEOHEX)
2082+
: List.of(CARTESIAN_POINT, CARTESIAN_SHAPE, GEO_POINT, GEO_SHAPE);
20812083
for (DataType type : sortableTypes) {
20822084
query(Strings.format("ROW key=NULL::%s, value=0\n | CHANGE_POINT value ON key", type));
20832085
}
@@ -2092,21 +2094,23 @@ public void testChangePoint_keySortable() {
20922094
public void testChangePoint_valueNumeric() {
20932095
assumeTrue("change_point must be enabled", EsqlCapabilities.Cap.CHANGE_POINT.isEnabled());
20942096
List<DataType> numericTypes = List.of(DOUBLE, INTEGER, LONG, UNSIGNED_LONG);
2095-
List<DataType> nonNumericTypes = List.of(
2096-
BOOLEAN,
2097-
CARTESIAN_POINT,
2098-
CARTESIAN_SHAPE,
2099-
DATE_NANOS,
2100-
DATETIME,
2101-
GEO_POINT,
2102-
GEO_SHAPE,
2103-
GEOHASH,
2104-
GEOTILE,
2105-
GEOHEX,
2106-
IP,
2107-
KEYWORD,
2108-
VERSION
2109-
);
2097+
List<DataType> nonNumericTypes = Build.current().isSnapshot()
2098+
? List.of(
2099+
BOOLEAN,
2100+
CARTESIAN_POINT,
2101+
CARTESIAN_SHAPE,
2102+
DATE_NANOS,
2103+
DATETIME,
2104+
GEO_POINT,
2105+
GEO_SHAPE,
2106+
GEOHASH,
2107+
GEOTILE,
2108+
GEOHEX,
2109+
IP,
2110+
KEYWORD,
2111+
VERSION
2112+
)
2113+
: List.of(BOOLEAN, CARTESIAN_POINT, CARTESIAN_SHAPE, DATE_NANOS, DATETIME, GEO_POINT, GEO_SHAPE, IP, KEYWORD, VERSION);
21102114
for (DataType type : numericTypes) {
21112115
query(Strings.format("ROW key=0, value=NULL::%s\n | CHANGE_POINT value ON key", type));
21122116
}

0 commit comments

Comments
 (0)