rubenada commented on a change in pull request #1322: [CALCITE-3198] Enhance
RexSimplify to handle (x<>a or x<>b)
URL: https://github.com/apache/calcite/pull/1322#discussion_r310143370
##########
File path: core/src/main/java/org/apache/calcite/rex/RexSimplify.java
##########
@@ -1624,6 +1632,46 @@ private RexNode simplifyOrs(List<RexNode> terms,
RexUnknownAs unknownAs) {
continue;
}
}
+ break;
+ case NOT_EQUALS:
+ final Comparison notEqualsComparison = Comparison.of(term);
+ if (notEqualsComparison != null) {
+ // We are dealing with a X<>A term, check if we saw before another
NOT_EQUALS involving X
+ final RexNode prevNotEquals =
notEqualsComparisonMap.get(notEqualsComparison.ref);
+ if (prevNotEquals == null) {
+ // This is the first NOT_EQUALS involving X, put it in the map
+ notEqualsComparisonMap.put(notEqualsComparison.ref, term);
+ } else {
+ // There is already in the map another NOT_EQUALS involving X:
+ // - if it is already an IS_NOT_NULL: it was already simplified,
ignore this term
+ // - if it is not an IS_NOT_NULL (i.e. it is a NOT_EQUALS):
check comparison values
+ if (prevNotEquals.getKind() != SqlKind.IS_NOT_NULL) {
+ final Comparable comparable1 =
notEqualsComparison.literal.getValue();
+ //noinspection ConstantConditions
+ final Comparable comparable2 =
Comparison.of(prevNotEquals).literal.getValue();
+ //noinspection unchecked
+ if (comparable1.compareTo(comparable2) != 0) {
+ // X <> A OR X <> B => X IS NOT NULL OR NULL
+ final RexNode isNotNull =
+ rexBuilder.makeCall(SqlStdOperatorTable.IS_NOT_NULL,
notEqualsComparison.ref);
+ final RexNode constantNull = rexBuilder.constantNull();
Review comment:
Thanks for the feedback @kgyrtkirk .
I've corrected the null issue and changed the Jira & PR titles according to
your suggestion.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
