Skip to content
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

[FLINK-37591][table] Add some PruneEmptyRules #25826

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FLINK-37591][table] Add some PruneEmptyRules #25826

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
11 changes: 7 additions & 4 deletions ...planner/src/main/scala/org/apache/flink/table/planner/plan/rules/FlinkBatchRuleSets.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,16 @@ object FlinkBatchRuleSets {

/** RuleSet to prune empty results rules */
val PRUNE_EMPTY_RULES: RuleSet = RuleSets.ofList(
PruneEmptyRules.AGGREGATE_INSTANCE,
PruneEmptyRules.UNION_INSTANCE,
PruneEmptyRules.INTERSECT_INSTANCE,
PruneEmptyRules.MINUS_INSTANCE,
PruneEmptyRules.PROJECT_INSTANCE,
PruneEmptyRules.FILTER_INSTANCE,
PruneEmptyRules.SORT_INSTANCE,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder is there a way to put these rules in Java rather than Scala - as I believe the direction is to remove Scala from the table planner.

PruneEmptyRules.AGGREGATE_INSTANCE,
PruneEmptyRules.JOIN_LEFT_INSTANCE,
PruneEmptyRules.JOIN_RIGHT_INSTANCE,
PruneEmptyRules.PROJECT_INSTANCE,
PruneEmptyRules.SORT_INSTANCE,
PruneEmptyRules.UNION_INSTANCE
PruneEmptyRules.EMPTY_TABLE_INSTANCE
)

/** RuleSet about project */
Expand Down
11 changes: 7 additions & 4 deletions ...lanner/src/main/scala/org/apache/flink/table/planner/plan/rules/FlinkStreamRuleSets.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,16 @@ object FlinkStreamRuleSets {

/** RuleSet to prune empty results rules */
val PRUNE_EMPTY_RULES: RuleSet = RuleSets.ofList(
PruneEmptyRules.AGGREGATE_INSTANCE,
PruneEmptyRules.UNION_INSTANCE,
PruneEmptyRules.INTERSECT_INSTANCE,
PruneEmptyRules.MINUS_INSTANCE,
PruneEmptyRules.PROJECT_INSTANCE,
PruneEmptyRules.FILTER_INSTANCE,
PruneEmptyRules.SORT_INSTANCE,
PruneEmptyRules.AGGREGATE_INSTANCE,
PruneEmptyRules.JOIN_LEFT_INSTANCE,
PruneEmptyRules.JOIN_RIGHT_INSTANCE,
PruneEmptyRules.PROJECT_INSTANCE,
PruneEmptyRules.SORT_INSTANCE,
PruneEmptyRules.UNION_INSTANCE
PruneEmptyRules.EMPTY_TABLE_INSTANCE
)

/** RuleSet about project */
Expand Down
7 changes: 2 additions & 5 deletions ...ner/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/SetOperatorsTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,8 @@ LogicalMinus(all=[false])
</Resource>
<Resource name="optimized exec plan">
<![CDATA[
HashAggregate(isMerge=[true], groupBy=[c], select=[c])
+- Exchange(distribution=[hash[c]])
+- LocalHashAggregate(groupBy=[c], select=[c])
+- Calc(select=[c])
+- TableSourceScan(table=[[default_catalog, default_database, T1]], fields=[a, b, c])
Calc(select=[c])
+- TableSourceScan(table=[[default_catalog, default_database, T1]], fields=[a, b, c])
]]>
</Resource>
</TestCase>
Expand Down
6 changes: 2 additions & 4 deletions ...er/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/SetOperatorsTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,8 @@ LogicalMinus(all=[false])
</Resource>
<Resource name="optimized exec plan">
<![CDATA[
GroupAggregate(groupBy=[c], select=[c])
+- Exchange(distribution=[hash[c]])
+- Calc(select=[c])
+- TableSourceScan(table=[[default_catalog, default_database, T1]], fields=[a, b, c])
Calc(select=[c])
+- TableSourceScan(table=[[default_catalog, default_database, T1]], fields=[a, b, c])
]]>
</Resource>
</TestCase>
Expand Down