Skip to content

Verify that TableScanNode's assignments match the output symbols #24764

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

Merged
merged 1 commit into from
Jan 22, 2025
+4 −3
Merged

Verify that TableScanNode's assignments match the output symbols #24764

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
5 changes: 3 additions & 2 deletions core/trino-main/src/main/java/io/trino/sql/planner/plan/TableScanNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.DoNotCall;
import com.google.errorprone.annotations.Immutable;
import io.trino.cost.PlanNodeStatsEstimate;
Expand Down Expand Up @@ -89,7 +90,7 @@ private TableScanNode(
this.table = requireNonNull(table, "table is null");
this.outputSymbols = ImmutableList.copyOf(requireNonNull(outputs, "outputs is null"));
this.assignments = ImmutableMap.copyOf(requireNonNull(assignments, "assignments is null"));
checkArgument(assignments.keySet().containsAll(outputs), "assignments does not cover all of outputs");
checkArgument(ImmutableSet.copyOf(outputs).equals(assignments.keySet()), "assignments and outputs do not match");
this.enforcedConstraint = null;
this.statistics = null;
this.updateTarget = updateTarget;
Expand All @@ -110,7 +111,7 @@ public TableScanNode(
this.table = requireNonNull(table, "table is null");
this.outputSymbols = ImmutableList.copyOf(requireNonNull(outputs, "outputs is null"));
this.assignments = ImmutableMap.copyOf(requireNonNull(assignments, "assignments is null"));
checkArgument(assignments.keySet().containsAll(outputs), "assignments does not cover all of outputs");
checkArgument(ImmutableSet.copyOf(outputs).equals(assignments.keySet()), "assignments and outputs do not match");
requireNonNull(enforcedConstraint, "enforcedConstraint is null");
validateEnforcedConstraint(enforcedConstraint, outputs, assignments);
this.enforcedConstraint = enforcedConstraint;
Expand Down
2 changes: 1 addition & 1 deletion ...ava/io/trino/sql/planner/iterative/rule/TestMultipleDistinctAggregationsToSubqueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@ public void testGroupByWithDistinctToSubqueries()
.source(
p.tableScan(
testTableHandle(ruleTester),
ImmutableList.of(input1Symbol, input2Symbol),
ImmutableList.of(input1Symbol, input2Symbol, groupingKey),
ImmutableMap.of(
input1Symbol, COLUMN_1_HANDLE,
input2Symbol, COLUMN_2_HANDLE,
Expand Down
Loading