Skip to content

Commit b553d47

Browse files
craigtavernercraigtaverner
committed
[8.x] Add integration tests that verify ST_EXTENT_AGG needs a license (elastic#125584) (elastic#125712) (elastic#125719)
* Add integration tests that verify ST_EXTENT_AGG needs a license (elastic#125584) (elastic#125712) * Fix java version problem on backport * Use PLATINUM as license level for spatial features
1 parent 51b715f commit b553d47

File tree

3 files changed

+208
-0
lines changed

3 files changed

+208
-0
lines changed

‎x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/spatial/SpatialExtentAggregationIT.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
8+
package org.elasticsearch.xpack.esql.spatial;
9+
10+
import org.elasticsearch.plugins.Plugin;
11+
import org.elasticsearch.xpack.esql.action.EsqlPluginWithEnterpriseOrTrialLicense;
12+
import org.elasticsearch.xpack.spatial.SpatialPlugin;
13+
14+
import java.util.Collection;
15+
import java.util.List;
16+
17+
public class SpatialExtentAggregationIT extends SpatialExtentAggregationTestCase {
18+
@Override
19+
protected Collection<Class<? extends Plugin>> nodePlugins() {
20+
return List.of(SpatialPlugin.class, EsqlPluginWithEnterpriseOrTrialLicense.class);
21+
}
22+
23+
@Override
24+
public void testStExtentAggregationWithShapes() {
25+
assertStExtentFromIndex("index_geo_shape");
26+
}
27+
}

‎x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/spatial/SpatialExtentAggregationNoLicenseIT.java‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
8+
package org.elasticsearch.xpack.esql.spatial;
9+
10+
import org.elasticsearch.license.License;
11+
import org.elasticsearch.license.XPackLicenseState;
12+
import org.elasticsearch.license.internal.XPackLicenseStatus;
13+
import org.elasticsearch.plugins.Plugin;
14+
import org.elasticsearch.xpack.esql.plugin.EsqlPlugin;
15+
import org.elasticsearch.xpack.spatial.SpatialPlugin;
16+
17+
import java.util.Collection;
18+
import java.util.List;
19+
20+
public class SpatialExtentAggregationNoLicenseIT extends SpatialExtentAggregationTestCase {
21+
22+
@Override
23+
protected Collection<Class<? extends Plugin>> nodePlugins() {
24+
return List.of(TestSpatialPlugin.class, TestEsqlPlugin.class);
25+
}
26+
27+
@Override
28+
public void testStExtentAggregationWithShapes() {
29+
assertStExtentFailsWith("index_geo_shape");
30+
}
31+
32+
private static XPackLicenseState getLicenseState() {
33+
License.OperationMode operationMode;
34+
boolean active;
35+
if (randomBoolean()) {
36+
operationMode = randomFrom(
37+
License.OperationMode.GOLD,
38+
License.OperationMode.BASIC,
39+
License.OperationMode.MISSING,
40+
License.OperationMode.STANDARD
41+
);
42+
active = true;
43+
} else {
44+
operationMode = randomFrom(License.OperationMode.PLATINUM, License.OperationMode.ENTERPRISE, License.OperationMode.TRIAL);
45+
active = false; // expired
46+
}
47+
48+
return new XPackLicenseState(
49+
() -> System.currentTimeMillis(),
50+
new XPackLicenseStatus(operationMode, active, "Test license expired")
51+
);
52+
}
53+
54+
public static class TestEsqlPlugin extends EsqlPlugin {
55+
protected XPackLicenseState getLicenseState() {
56+
return SpatialExtentAggregationNoLicenseIT.getLicenseState();
57+
}
58+
}
59+
60+
public static class TestSpatialPlugin extends SpatialPlugin {
61+
protected XPackLicenseState getLicenseState() {
62+
return SpatialExtentAggregationNoLicenseIT.getLicenseState();
63+
}
64+
}
65+
}

‎x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/spatial/SpatialExtentAggregationTestCase.java‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
8+
package org.elasticsearch.xpack.esql.spatial;
9+
10+
import org.elasticsearch.ElasticsearchException;
11+
import org.elasticsearch.action.bulk.BulkRequestBuilder;
12+
import org.elasticsearch.action.index.IndexRequest;
13+
import org.elasticsearch.action.support.WriteRequest;
14+
import org.elasticsearch.xpack.esql.VerificationException;
15+
import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase;
16+
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
17+
import org.junit.Before;
18+
19+
import java.util.List;
20+
import java.util.Locale;
21+
22+
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
23+
import static org.elasticsearch.xpack.esql.EsqlTestUtils.getValuesList;
24+
import static org.hamcrest.Matchers.containsString;
25+
import static org.hamcrest.Matchers.equalTo;
26+
27+
public abstract class SpatialExtentAggregationTestCase extends AbstractEsqlIntegTestCase {
28+
29+
@Before
30+
public void setupIndex() throws Exception {
31+
assumeTrue("requires ST_EXTENT_AGG capability", EsqlCapabilities.Cap.ST_EXTENT_AGG.isEnabled());
32+
createAndPopulateIndexes(-10, 10, -10, 10);
33+
}
34+
35+
/**
36+
* This test should pass only with an enterprise license
37+
*/
38+
public abstract void testStExtentAggregationWithShapes();
39+
40+
/**
41+
* This test should pass with and without enterprise licenses
42+
*/
43+
public void testStExtentAggregationWithPoints() throws Exception {
44+
assertStExtentFromIndex("index_geo_point");
45+
}
46+
47+
protected void assertStExtentFromIndex(String index) {
48+
var query = String.format(Locale.ROOT, """
49+
FROM %s
50+
| STATS extent = ST_EXTENT_AGG(location)
51+
| EVAL minX = ROUND(ST_XMIN(extent))
52+
| EVAL maxX = ROUND(ST_XMAX(extent))
53+
| EVAL minY = ROUND(ST_YMIN(extent))
54+
| EVAL maxY = ROUND(ST_YMAX(extent))
55+
""", index);
56+
try (var resp = run(query)) {
57+
assertColumnNames(resp.columns(), List.of("extent", "minX", "maxX", "minY", "maxY"));
58+
assertColumnTypes(resp.columns(), List.of("geo_shape", "double", "double", "double", "double"));
59+
List<List<Object>> values = getValuesList(resp.values());
60+
assertThat(values.size(), equalTo(1));
61+
List<Object> row = values.get(0);
62+
List<Object> expectedValues = List.of(-10.0, 10.0, -10.0, 10.0);
63+
assertThat(row.subList(1, row.size()), equalTo(expectedValues));
64+
}
65+
}
66+
67+
protected void assertStExtentFailsWith(String index) {
68+
var query = String.format(Locale.ROOT, """
69+
FROM %s
70+
| STATS extent = ST_EXTENT_AGG(location)
71+
| EVAL minX = ROUND(ST_XMIN(extent))
72+
| EVAL maxX = ROUND(ST_XMAX(extent))
73+
| EVAL minY = ROUND(ST_YMIN(extent))
74+
| EVAL maxY = ROUND(ST_YMAX(extent))
75+
""", index);
76+
ElasticsearchException e = expectThrows(VerificationException.class, () -> run(query));
77+
assertThat(e.getMessage(), containsString("current license is non-compliant for [ST_EXTENT_AGG(location)]"));
78+
}
79+
80+
private void createAndPopulateIndexes(double minX, double maxX, double minY, double maxY) throws Exception {
81+
int numX = 21;
82+
int numY = 21;
83+
initIndex("index_", "geo_point");
84+
initIndex("index_", "geo_shape");
85+
BulkRequestBuilder points = client().prepareBulk();
86+
BulkRequestBuilder shapes = client().prepareBulk();
87+
for (int xi = 0; xi < numX; xi++) {
88+
for (int yi = 0; yi < numY; yi++) {
89+
double x = minX + xi * (maxX - minX) / (numX - 1);
90+
double y = minY + yi * (maxY - minY) / (numY - 1);
91+
String point = "POINT(" + x + " " + y + ")";
92+
points.add(new IndexRequest("index_geo_point").id(x + ":" + y).source("location", point));
93+
if (xi > 0 && yi > 0) {
94+
double px = minX + (xi - 1) * (maxX - minX) / numX;
95+
double py = minY + (yi - 1) * (maxY - minY) / numY;
96+
String shape = "BBOX(" + px + ", " + x + ", " + y + ", " + py + ")";
97+
shapes.add(new IndexRequest("index_geo_shape").id(x + ":" + y).source("location", shape));
98+
}
99+
}
100+
}
101+
points.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
102+
shapes.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
103+
ensureYellow("index_geo_point");
104+
ensureYellow("index_geo_shape");
105+
}
106+
107+
protected void initIndex(String prefix, String fieldType) {
108+
assertAcked(prepareCreate(prefix + fieldType).setMapping(String.format(Locale.ROOT, """
109+
{
110+
"properties" : {
111+
"location": { "type" : "%s" }
112+
}
113+
}
114+
""", fieldType)));
115+
}
116+
}

0 commit comments

Comments
 (0)