Skip to content

Remove geometry check for st_contain and st_within #8620

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
Jackie-Jiang merged 4 commits into from
May 5, 2022
Merged

Remove geometry check for st_contain and st_within #8620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86dcc7d
Adding DML definition and parse SQL InsertFile (#8557)
xiangfu0 Apr 30, 2022
e5115ad
small optimization on fully contain
May 2, 2022
f2b0f5b
remove geometry check on st contain and st within
May 5, 2022
180fc82
Merge branch 'master' into cwang/nest_st
May 5, 2022
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
5 changes: 3 additions & 2 deletions ...src/main/java/org/apache/pinot/core/geospatial/transform/function/StContainsFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {

@Override
public int transformGeometryToInt(Geometry firstGeometry, Geometry secondGeometry) {
if (GeometryUtils.isGeography(firstGeometry) || GeometryUtils.isGeography(secondGeometry)) {
throw new RuntimeException(String.format("%s is available for Geometry objects only", FUNCTION_NAME));
if (GeometryUtils.isGeography(firstGeometry) != GeometryUtils.isGeography(secondGeometry)) {
throw new RuntimeException("The first and second arguments shall either all be geometry or all geography");
}
// TODO: to fully support Geography contains operation.
return firstGeometry.contains(secondGeometry) ? 1 : 0;
}
}
5 changes: 3 additions & 2 deletions ...e/src/main/java/org/apache/pinot/core/geospatial/transform/function/StWithinFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {

@Override
public int transformGeometryToInt(Geometry firstGeometry, Geometry secondGeometry) {
if (GeometryUtils.isGeography(firstGeometry) || GeometryUtils.isGeography(secondGeometry)) {
throw new RuntimeException(String.format("%s is available for Geometry objects only", FUNCTION_NAME));
if (GeometryUtils.isGeography(firstGeometry) != GeometryUtils.isGeography(secondGeometry)) {
throw new RuntimeException("The first and second arguments shall either all be geometry or all geography");
}
// TODO: to fully support Geography within operation.
return firstGeometry.within(secondGeometry) ? 1 : 0;
}
}
4 changes: 2 additions & 2 deletions pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/H3Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ private static Pair<LongSet, LongSet> coverPolygonInH3(Polygon polygon, int reso
} else {
potentialH3Cells.addAll(polyfillCells);
}
potentialH3Cells
.addAll(potentialH3Cells.stream().flatMap(cell -> H3_CORE.kRing(cell, 1).stream()).collect(Collectors.toSet()));
LongSet fullyContainedCell = new LongOpenHashSet(
potentialH3Cells.stream().filter(h3Cell -> polygon.contains(createPolygonFromH3Cell(h3Cell)))
.collect(Collectors.toSet()));
potentialH3Cells
.addAll(potentialH3Cells.stream().flatMap(cell -> H3_CORE.kRing(cell, 1).stream()).collect(Collectors.toSet()));
return Pair.of(fullyContainedCell, potentialH3Cells);
}

Expand Down