Corrected Strict NON NULL return type checks #16279
Merged
Conversation
This file contains 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
kgyrtkirk
reviewed
Apr 15, 2024
...in/java/org/apache/druid/sql/calcite/planner/convertlet/TimeInIntervalConvertletFactory.java
Show resolved
Hide resolved
sreemanamala
changed the title
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
sql/src/test/java/org/apache/druid/sql/calcite/expression/ExpressionsTest.java
Fixed
Show fixed
Hide fixed
sql/src/test/java/org/apache/druid/sql/calcite/expression/ExpressionsTest.java
Fixed
Show fixed
Hide fixed
sql/src/test/java/org/apache/druid/sql/calcite/expression/ExpressionsTest.java
Fixed
Show fixed
Hide fixed
sql/src/test/java/org/apache/druid/sql/calcite/expression/ExpressionsTest.java
Fixed
Show fixed
Hide fixed
kgyrtkirk
reviewed
Apr 16, 2024
| @@ -45,7 +46,7 @@ public class SubstringOperatorConversion implements SqlOperatorConversion | |||
| .operatorBuilder("SUBSTRING") | |||
| .operandTypes(SqlTypeFamily.CHARACTER, SqlTypeFamily.INTEGER, SqlTypeFamily.INTEGER) | |||
| .functionCategory(SqlFunctionCategory.STRING) | |||
| .returnTypeInference(ReturnTypes.ARG0) | |||
| .returnTypeInference(ReturnTypes.ARG0.andThen(SqlTypeTransforms.FORCE_NULLABLE)) | |||
There was a problem hiding this comment.
afaik these are appied during calcite planning ; I see some tests in ExpressionTest ; aren't those only excercise the native layer?
| @@ -270,6 +270,16 @@ public void testSubstring() | |||
| makeExpression("substring(\"spacey\", (\"p\" - 1), \"p\")"), | |||
| "hey" | |||
| ); | |||
| testHelper.testExpressionString( | |||
There was a problem hiding this comment.
I've unpatched all non-test changes - and these cases still pass...did I miss something?
There was a problem hiding this comment.
I guess these tests here are only running on the native layer. And the issue which we face is more of coming in the calcite layer. Let me change the tests. Thanks for pointing these.
Moreover
select CONTAINS_STRING(null, 'a') -- gives INVALID use of null
select CONTAINS_STRING(dim3, 'a') from numFoo where dim3 is null -- fails the strict check
kgyrtkirk
reviewed
Apr 17, 2024
sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
Outdated
Show resolved
Hide resolved
kgyrtkirk
reviewed
Apr 17, 2024
sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
Outdated
Show resolved
Hide resolved
kgyrtkirk
reviewed
Apr 17, 2024
sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
Outdated
Show resolved
Hide resolved
kgyrtkirk
approved these changes
Apr 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
aims to fix strict type compare issue (Boolean vs Boolean not null) in TIME_IN_INTERVAL
Key changed/added classes in this PR
TimeInIntervalConvertletFactory.javaContainsOperatorConversion.javaRegexpLikeOperatorConversion.javaSubstringOperatorConversion.javaThis PR has: