Skip to content

[CALCITE-7354] Add assertion that the size of the Project's variablesSet should be less than or equal to 1 #4865

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
AestheticAkhmad wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −0
Open

[CALCITE-7354] Add assertion that the size of the Project's variablesSet should be less than or equal to 1 #4865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@
import java.util.List;
import java.util.Set;

import static com.google.common.base.Preconditions.checkArgument;

import static java.util.Objects.requireNonNull;

/**
Expand Down Expand Up @@ -533,6 +535,8 @@ public TrimResult trimFields(
Project project,
ImmutableBitSet fieldsUsed,
Set<RelDataTypeField> extraFields) {
checkArgument(project.getVariablesSet().size() <= 1,
"RelFieldTrimmer allows only one correlation variable in variablesSet");
final RelDataType rowType = project.getRowType();
final int fieldCount = rowType.getFieldCount();
final RelNode input = project.getInput();
Expand Down
28 changes: 28 additions & 0 deletions core/src/test/java/org/apache/calcite/sql2rel/RelFieldTrimmerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.core.Aggregate;
import org.apache.calcite.rel.core.Calc;
import org.apache.calcite.rel.core.CorrelationId;
import org.apache.calcite.rel.core.Join;
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.calcite.rel.core.Project;
import org.apache.calcite.rel.hint.HintPredicates;
import org.apache.calcite.rel.hint.HintStrategyTable;
import org.apache.calcite.rel.hint.RelHint;
import org.apache.calcite.rel.logical.LogicalProject;
import org.apache.calcite.rel.rules.CoreRules;
import org.apache.calcite.rex.RexCorrelVariable;
import org.apache.calcite.rex.RexNode;
Expand All @@ -57,6 +59,8 @@

import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

/** Test for {@link RelFieldTrimmer}. */
Expand Down Expand Up @@ -826,4 +830,28 @@ public static Frameworks.ConfigBuilder config() {
assertThat(trimmed, hasTree(expected));
}

/**
* Test case for
* <a href="https://issues.apache.org/jira/browse/CALCITE-7354">[CALCITE-7354]
* Project's variablesSet should be less than or equal to 1.</a>.
*/
@Test void testTrimProjectRejectsMultipleCorrelationVariables() {
final RelBuilder builder = RelBuilder.create(config().build());
final RelNode scan = builder.scan("EMP").build();
final RexNode empno =
scan.getCluster().getRexBuilder().makeInputRef(scan, 0);
final LogicalProject project =
LogicalProject.create(
scan,
ImmutableList.of(),
ImmutableList.of(empno),
ImmutableList.of("EMPNO"),
ImmutableSet.of(new CorrelationId(0), new CorrelationId(1)));

final RelFieldTrimmer fieldTrimmer = new RelFieldTrimmer(null, builder);
final IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> fieldTrimmer.trim(project));
assertThat(ex.getMessage(), containsString("variablesSet"));
}

}
Loading