Skip to content

ESQL: Fix ShapeGeometryFieldMapperTests (and rename) #122871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 5, 2025
Merged

ESQL: Fix ShapeGeometryFieldMapperTests (and rename) #122871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebe7e39
ESQL: Fix ShapeGeometryFieldMapperTests (and rename)
GalLalouche Feb 18, 2025
c4b5b99
Merge branch 'main' into test/shape_geo
GalLalouche Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,6 @@ tests:
issue: https://github.com/elastic/elasticsearch/issues/118914
- class: org.elasticsearch.xpack.security.authc.ldap.ActiveDirectoryRunAsIT
issue: https://github.com/elastic/elasticsearch/issues/115727
- class: org.elasticsearch.index.mapper.AbstractShapeGeometryFieldMapperTests
method: testCartesianBoundsBlockLoader
issue: https://github.com/elastic/elasticsearch/issues/119201
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=transform/transforms_start_stop/Test start/stop/start transform}
issue: https://github.com/elastic/elasticsearch/issues/119508
Expand Down Expand Up @@ -266,9 +263,6 @@ tests:
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
method: test {yaml=reference/snapshot-restore/apis/get-snapshot-api/line_488}
issue: https://github.com/elastic/elasticsearch/issues/121611
- class: org.elasticsearch.index.mapper.ShapeGeometryFieldMapperTests
method: testCartesianBoundsBlockLoader
issue: https://github.com/elastic/elasticsearch/issues/122661
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
method: test {yaml=reference/snapshot-restore/apis/get-snapshot-api/line_408}
issue: https://github.com/elastic/elasticsearch/issues/122681
Expand Down
15 changes: 9 additions & 6 deletions ...mapper/ShapeGeometryFieldMapperTests.java → ...bstractShapeGeometryFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
import org.apache.lucene.document.Document;
import org.apache.lucene.geo.GeoEncodingUtils;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.store.Directory;
import org.apache.lucene.tests.index.RandomIndexWriter;
import org.elasticsearch.common.geo.GeometryNormalizer;
import org.elasticsearch.core.Strings;
import org.elasticsearch.geo.GeometryTestUtils;
Expand All @@ -39,14 +40,14 @@
import static org.apache.lucene.geo.GeoEncodingUtils.decodeLongitude;
import static org.elasticsearch.common.geo.Orientation.RIGHT;

public class ShapeGeometryFieldMapperTests extends ESTestCase {
public class AbstractShapeGeometryFieldMapperTests extends ESTestCase {
public void testCartesianBoundsBlockLoader() throws IOException {
testBoundsBlockLoader(
CoordinateEncoder.CARTESIAN,
() -> ShapeTestUtils.randomGeometryWithoutCircle(0, false),
CartesianShapeIndexer::new,
SpatialEnvelopeVisitor::visitCartesian,
ShapeGeometryFieldMapperTests::makeCartesianRectangle
AbstractShapeGeometryFieldMapperTests::makeCartesianRectangle
);
}

Expand All @@ -58,7 +59,7 @@ public void ignoreTestGeoBoundsBlockLoader() throws IOException {
() -> normalize(GeometryTestUtils.randomGeometryWithoutCircle(0, false)),
field -> new GeoShapeIndexer(RIGHT, field),
g -> SpatialEnvelopeVisitor.visitGeo(g, SpatialEnvelopeVisitor.WrapLongitude.WRAP),
ShapeGeometryFieldMapperTests::makeGeoRectangle
AbstractShapeGeometryFieldMapperTests::makeGeoRectangle
);
}

Expand All @@ -72,7 +73,7 @@ public void ignoreTestRectangleCrossingDateline() throws IOException {
geometries,
field -> new GeoShapeIndexer(RIGHT, field),
g -> SpatialEnvelopeVisitor.visitGeo(g, SpatialEnvelopeVisitor.WrapLongitude.WRAP),
ShapeGeometryFieldMapperTests::makeGeoRectangle
AbstractShapeGeometryFieldMapperTests::makeGeoRectangle
);
}

Expand Down Expand Up @@ -100,7 +101,9 @@ private static void testBoundsBlockLoaderAux(
) throws IOException {
var loader = new AbstractShapeGeometryFieldMapper.AbstractShapeGeometryFieldType.BoundsBlockLoader("field");
try (Directory directory = newDirectory()) {
try (var iw = new RandomIndexWriter(random(), directory)) {
// Since we also test that the documents are loaded in the correct order, we need to write them in order, so we can't use
// RandomIndexWriter here.
try (var iw = new IndexWriter(directory, new IndexWriterConfig(null /* analyzer */))) {
for (Geometry geometry : geometries) {
var shape = new BinaryShapeDocValuesField("field", encoder);
shape.add(indexerFactory.apply("field").indexShape(geometry), geometry);
Expand Down