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

Fix geogrid with bounds test edge cases (#51118) 

This commit modifies the bounding box for geogrid unit tests
to only consider bounding boxes that have significant longitudinal
width and whose coordinates are normalized to quantized space

Closes #51103.
This commit is contained in:
Tal Levy 2020-01-27 12:14:40 -08:00 committed by Tal Levy
parent e22f501018
commit fc2d875c9f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java
View File

@ -46,12 +46,14 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Function;
import static org.hamcrest.Matchers.equalTo;
public abstract class GeoGridAggregatorTestCase<T extends InternalGeoGridBucket> extends AggregatorTestCase {
private static final String FIELD_NAME = "location";
protected static final double GEOHASH_TOLERANCE = 1E-5D;
/**
* Generate a random precision according to the rules of the given aggregation.
@ -126,7 +128,6 @@ public abstract class GeoGridAggregatorTestCase<T extends InternalGeoGridBucket>
});
}
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/51103")
public void testBounds() throws IOException {
final int numDocs = randomIntBetween(64, 256);
final GeoGridAggregationBuilder builder = createBuilder("_name");
@ -134,7 +135,14 @@ public abstract class GeoGridAggregatorTestCase<T extends InternalGeoGridBucket>
expectThrows(IllegalArgumentException.class, () -> builder.precision(-1));
expectThrows(IllegalArgumentException.class, () -> builder.precision(30));
GeoBoundingBox bbox = GeoBoundingBoxTests.randomBBox();
// only consider bounding boxes that are at least GEOHASH_TOLERANCE wide and have quantized coordinates
GeoBoundingBox bbox = randomValueOtherThanMany(
(b) -> Math.abs(GeoUtils.normalizeLon(b.right()) - GeoUtils.normalizeLon(b.left())) < GEOHASH_TOLERANCE,
GeoBoundingBoxTests::randomBBox);
Function<Double, Double> encodeDecodeLat = (lat) -> GeoEncodingUtils.decodeLatitude(GeoEncodingUtils.encodeLatitude(lat));
Function<Double, Double> encodeDecodeLon = (lon) -> GeoEncodingUtils.decodeLongitude(GeoEncodingUtils.encodeLongitude(lon));
bbox.topLeft().reset(encodeDecodeLat.apply(bbox.top()), encodeDecodeLon.apply(bbox.left()));
bbox.bottomRight().reset(encodeDecodeLat.apply(bbox.bottom()), encodeDecodeLon.apply(bbox.right()));
int in = 0, out = 0;
List<LatLonDocValuesField> docs = new ArrayList<>();