Fix StPoint scalar function usage in multi-stage engine intermediate stage #11731
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xiangfu0
added
backward-incompat
xiangfu0
changed the title
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #11731 +/- ##
============================================
- Coverage 63.12% 63.10% -0.02%
Complexity 1118 1118
============================================
Files 2342 2342
Lines 125889 125924 +35
Branches 19360 19364 +4
============================================
+ Hits 79462 79469 +7
- Misses 40783 40799 +16
- Partials 5644 5656 +12
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
walterddr
reviewed
Oct 3, 2023
...-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/ScalarFunctions.java
Outdated
Show resolved
Hide resolved
xiangfu0
force-pushed
the
fixing-binary-intermediate-stage
branch
from
db36255 to
35d3db4
Compare
walterddr
reviewed
Oct 3, 2023
...ntegration-tests/src/test/java/org/apache/pinot/integration/tests/custom/GeoSpatialTest.java
Outdated
Show resolved
Hide resolved
xiangfu0
force-pushed
the
fixing-binary-intermediate-stage
branch
3 times, most recently
from
3bb7b74 to
ad55f9f
Compare
xiangfu0
commented
Oct 3, 2023
...-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StPointFunction.java
Outdated
Show resolved
Hide resolved
walterddr
reviewed
Oct 3, 2023
...-core/src/main/java/org/apache/pinot/core/geospatial/transform/function/StPointFunction.java
Outdated
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Suggested change
| OperandTypes.family(ImmutableList.of(SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC, SqlTypeFamily.ANY), | |
| OperandTypes.or( | |
| OperandTypes.family(ImmutableList.of(SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC)), | |
| OperandTypes.family(ImmutableList.of(SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC, SqlTypeFamily.BOOLEAN)) | |
| ), |
Contributor
Author
There was a problem hiding this comment.
somehow this doesn't honor ordinal -> ordinal > 1 && ordinal < 4 to handle variable number of parameters.
Contributor
Author
There was a problem hiding this comment.
When I try to define this as:
ST_POINT("ST_Point", ReturnTypes.explicit(SqlTypeName.VARBINARY),
OperandTypes.or(
OperandTypes.family(ImmutableList.of(SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC),
ordinal -> ordinal > 1 && ordinal < 4),
OperandTypes.family(ImmutableList.of(SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC, SqlTypeFamily.BOOLEAN),
ordinal -> ordinal > 1 && ordinal < 4)),
"stPoint"),
The StPoint(1,2) will fail.
Contributor
There was a problem hiding this comment.
ah. i see. that's fine for now
xiangfu0
force-pushed
the
fixing-binary-intermediate-stage
branch
2 times, most recently
from
702a0a5 to
8b03ee5
Compare
xiangfu0
force-pushed
the
fixing-binary-intermediate-stage
branch
from
8b03ee5 to
e7481da
Compare
yupeng9
reviewed
Oct 4, 2023
| public static byte[] stPoint(double x, double y, Object isGeography) { | ||
| Point point = GeometryUtils.GEOMETRY_FACTORY.createPoint(new Coordinate(x, y)); | ||
| if (isGeography) { | ||
| if (BooleanUtils.toBoolean(isGeography)) { |
Contributor
There was a problem hiding this comment.
what if isGeography is not given boolean up?
Contributor
There was a problem hiding this comment.
BooleanUtils.toBoolean actually works for number/string/boolean type.
Contributor
There was a problem hiding this comment.
I see. for non-boolean value, will it handle exception?
Contributor
Author
There was a problem hiding this comment.
this is our internal boolean util, it can handle number/string/boolean
public static boolean toBoolean(Object booleanObject) {
if (booleanObject == null) {
return false;
} else if (booleanObject instanceof String) {
return BooleanUtils.toBoolean((String) booleanObject);
} else if (booleanObject instanceof Number) {
return ((Number) booleanObject).intValue() == INTERNAL_TRUE;
} else if (booleanObject instanceof Boolean) {
return (boolean) booleanObject;
} else {
throw new IllegalArgumentException("Illegal type for boolean conversion: " + booleanObject.getClass());
}
}
walterddr
approved these changes
Oct 4, 2023
Contributor
walterddr
left a comment
walterddr
left a comment
There was a problem hiding this comment.
lgtm we should add more tests for other ST later
xiangfu0
removed
the
backward-incompat
xiangfu0
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Current
stPointonly supports boolean as 3rd argument, this is not aligned with Transformer function which can be eitherINTorBOOLEAN.stPointto useObjectas 3rd argumentBYTESandSTRINGin H3IndexFilterOperator to handle binary literal values.org.apache.pinot.integration.tests.custom.GeoSpatialTest