Skip to content

[CALCITE-5733] Simplify "a = ARRAY[1,2] AND a = ARRAY[2,3]" to "false" #3247

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

Open
YasuoStudyJava wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[CALCITE-5733] Simplify "a = ARRAY[1,2] AND a = ARRAY[2,3]" to "false" #3247

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02501cb
[CALCITE-5733][core]Simplification should also simplify for array type
YasuoStudyJava Jun 6, 2023
fc7c332
[CALCITE-5733][core]Simplification should also simplify for array type
YasuoStudyJava Jun 6, 2023
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
79 changes: 75 additions & 4 deletions core/src/main/java/org/apache/calcite/rex/RexSimplify.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.BitSet;
import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -86,6 +87,8 @@ public class RexSimplify {
private final RexExecutor executor;

private static final Strong STRONG = new Strong();

private Object[] recordedArray;

/**
* Creates a RexSimplify.
Expand Down Expand Up @@ -672,9 +675,28 @@ private void simplifyAndTerms(List<RexNode> terms, RexUnknownAs unknownAs) {
RexSimplify simplify = this;
for (int i = 0; i < terms.size(); i++) {
RexNode t = terms.get(i);
if (Predicate.of(t) == null) {
Predicate predicate = Predicate.of(t);
if (predicate == null) {
continue;
}

//add for array-type
if (predicate instanceof Comparison) {
Comparison cmp = (Comparison) predicate;
if (cmp.rexCall != null && cmp.rexCall.getKind().equals(SqlKind.ARRAY_VALUE_CONSTRUCTOR)) {
RexCall arrayCall = cmp.rexCall;
if (i == 0) {
recordedArray = arrayCall.operands.toArray();
continue;
} else {
if (!Arrays.equals(arrayCall.operands.toArray(), recordedArray)) {
terms.set(i, rexBuilder.makeLiteral(false));
break;
}
}
}
}

terms.set(i, simplify.simplify(t, unknownAs));
RelOptPredicateList newPredicates =
simplify.predicates.union(rexBuilder,
Expand Down Expand Up @@ -2622,21 +2644,34 @@ private static class VariableCollector extends RexVisitorImpl<Void> {

/** Represents a simple Comparison.
*
* <p>Left hand side is a {@link RexNode}, right hand side is a literal.
* <p>Left hand side is a {@link RexNode}, right hand side is a literal/array-call.
*/
private static class Comparison implements Predicate {
final RexNode ref;
final SqlKind kind;
//RexCall or RexLiteral
final RexLiteral literal;
final RexCall rexCall;

private Comparison(RexNode ref, SqlKind kind, RexLiteral literal) {
this.ref = requireNonNull(ref, "ref");
this.kind = requireNonNull(kind, "kind");
this.literal = requireNonNull(literal, "literal");
this.rexCall = null;
}

/**
* Add for RexCall, such as ARRAY[...,...].
*/
private Comparison(RexNode ref, SqlKind kind, RexCall arrayCall) {
this.ref = requireNonNull(ref, "ref");
this.kind = requireNonNull(kind, "kind");
this.rexCall = requireNonNull(arrayCall, "arrayCall");
this.literal = null;
}

/** Creates a comparison, between a {@link RexInputRef} or {@link RexFieldAccess} or
* deterministic {@link RexCall} and a literal. */
* deterministic {@link RexCall} and a literal/array-call. */
static @Nullable Comparison of(RexNode e) {
return of(e, node -> RexUtil.isReferenceOrAccess(node, true)
|| RexUtil.isDeterministic(node));
Expand All @@ -2660,6 +2695,24 @@ private Comparison(RexNode ref, SqlKind kind, RexLiteral literal) {
return new Comparison(left, e.getKind(), (RexLiteral) right);
}
break;
//add for RexCall like "CAST(ARRAY(..., ...))..."
case CAST:
final RexCall castCall = (RexCall) right;
final RexNode castLeft = castCall.getOperands().get(0);
switch (castLeft.getKind()) {
case ARRAY_VALUE_CONSTRUCTOR:
//array-type RexCall --> create a comparison of RexCall
if (nodePredicate.test(left)) {
return new Comparison(left, e.getKind(), (RexCall) castLeft);
}
}
break;
case ARRAY_VALUE_CONSTRUCTOR:
//array-type RexCall --> create a comparison of RexCall
if (nodePredicate.test(left)) {
return new Comparison(left, e.getKind(), (RexCall) right);
}
break;
default:
break;
}
Expand All @@ -2669,10 +2722,28 @@ private Comparison(RexNode ref, SqlKind kind, RexLiteral literal) {
return new Comparison(right, e.getKind().reverse(), (RexLiteral) left);
}
break;
//add for RexCall like "CAST(ARRAY(..., ...))..."
case CAST:
final RexCall castCall = (RexCall) left;
final RexNode castLeft = castCall.getOperands().get(0);
switch (castLeft.getKind()) {
case ARRAY_VALUE_CONSTRUCTOR:
//array-type RexCall --> create a comparison of RexCall
if (nodePredicate.test(right)) {
return new Comparison(right, e.getKind().reverse(), (RexCall) castLeft);
}
}
break;
case ARRAY_VALUE_CONSTRUCTOR:
//array-type RexCall --> create a comparison of RexCall
if (nodePredicate.test(right)) {
return new Comparison(right, e.getKind().reverse(), (RexCall) left);
}
break;
default:
break;
}
break;
break;
default:
break;
}
Expand Down