honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix RandomShapeGenerator to retry on JTS Assertion and RandomShapeException 

A JTS bug causes a misinterpretation of polygon coordinates leading to an unhelpful "geom" AssertionError. While this assertion occurs approx 0.02% of the time it can lead to a misleading test failure. This patch catches the geom assertion and retries randomShapeCreation. For safety a threshold is set to prevent unlimited retrying - though 1 retry is typically sufficient for correcting the invalid shape.

closes #13551
This commit is contained in:
Nicholas Knize 2015-09-17 13:23:46 -05:00
parent 887399eebf
commit 9a67d6641b
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java
View File

@ -139,13 +139,21 @@ public class RandomShapeGenerator {
}
private static ShapeBuilder createShape(Random r, Point nearPoint, Rectangle within, ShapeType st) throws InvalidShapeException {
return createShape(r, nearPoint, within, st, ST_VALIDATE);
ShapeBuilder shape;
short i=0;
do {
shape = createShape(r, nearPoint, within, st, ST_VALIDATE);
if (shape != null) {
return shape;
}
} while (++i != 100);
throw new InvalidShapeException("Unable to create a valid random shape with provided seed");
}
/**
* Creates a random shape useful for randomized testing, NOTE: exercise caution when using this to build random GeometryCollections
* as creating a large random number of random shapes can result in massive resource consumption
* see: {@link org.elasticsearch.search.geo.GeoShapeIntegrationTests#testShapeFilterWithRandomGeoCollection}
* see: {@link org.elasticsearch.search.geo.GeoShapeIntegrationIT#testShapeFilterWithRandomGeoCollection}
*
* The following options are included
* @param nearPoint Create a shape near a provided point
@ -218,9 +226,14 @@ public class RandomShapeGenerator {
// The validate flag will check for these possibilities and bail if an incorrect geometry is created
try {
pgb.build();
} catch (InvalidShapeException e) {
// jts bug rarely results in an invalid shape, if it does happen we try again instead of returning null
return createShape(r, nearPoint, within, st, validate);
} catch (Throwable e) {
// jts bug may occasionally misinterpret coordinate order causing an unhelpful ('geom' assertion)
// or InvalidShapeException
if (e instanceof InvalidShapeException || e instanceof AssertionError) {
return null;
}
// throw any other exception
throw e;
}
}
return pgb;