-
Notifications
You must be signed in to change notification settings - Fork 13.5k
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.
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-37431]We should use guava Lists instead of curator shade Lists… #26263
base: master
Are you sure you want to change the base?
Conversation
@@ -28,7 +28,7 @@ | |||
import org.apache.flink.table.planner.plan.schema.TimeIndicatorRelDataType; | |||
import org.apache.flink.table.planner.plan.utils.TemporalTableJoinUtil; | |||
|
|||
import org.apache.flink.shaded.curator5.org.apache.curator.shaded.com.google.common.collect.Lists; | |||
import org.apache.flink.shaded.guava33.com.google.common.collect.Lists; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should use the non shaded version and get rid of shaded imports unless there is a really good reason to keep them. Other parts of the table planner use the non shaded version as an import.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should use the non shaded version and get rid of shaded imports unless there is a really good reason to keep them. Other parts of the table planner use the non shaded version as an import.
ok, I have changed this and some other places which have the same problem.
48e2721
to
662a80f
Compare
662a80f
to
45fcd56
Compare
… to avoid unnecessary error
319dc7e
to
cdab228
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I notice the CI is failing with
03:33:57.572 [ERROR] src/main/java/org/apache/flink/table/planner/plan/rules/logical/WindowPropertiesRules.java:[33,1] (imports) IllegalImport: com.google.common.collect.Iterables; Use flink-shaded-guava instead.
03:33:57.572 [ERROR] src/main/java/org/apache/flink/table/planner/plan/rules/logical/WindowPropertiesRules.java:[34,1] (imports) IllegalImport: com.google.common.collect.Lists; Use flink-shaded-guava instead.
03:33:57.572 [ERROR] src/main/java/org/apache/flink/table/planner/plan/rules/logical/JoinDeriveNullFilterRule.java:[23,1] (imports) IllegalImport: com.google.common.collect.Lists; Use flink-shaded-guava instead.
03:33:57.572 [ERROR] src/main/java/org/apache/flink/table/planner/plan/rules/logical/EventTimeTemporalJoinRewriteRule.java:[31,1] (imports) IllegalImport: com.google.common.collect.Lists; Use flink-shaded-guava instead.
03:33:57.572 [ERROR] src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecIntervalJoin.java:[60,1] (imports) IllegalImport: com.google.common.collect.Lists; Use flink-shaded-guava instead.
03:33:57.572 [ERROR] src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecJoin.java:[54,1] (imports) IllegalImport: com.google.common.collect.Lists; Use flink-shaded-guava instead.
03:33:57.572 [ERROR] src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecWindowJoin.java:[52,1] (imports) IllegalImport: com.google.common.collect.Lists; Use flink-shaded-guava instead.
03:33:57.572 [ERROR] src/test/java/org/apache/flink/table/planner/plan/hints/batch/JoinHintTestBase.java:[34,1] (imports) IllegalImport: com.google.common.collect.Lists; Use flink-shaded-guava instead.
0
It would be good to understand why we are using the shading - what more do we need to do to remove it.
IMO we should use the shaded jar version in case of jar version conflict, maybe we should change them to shading version to get rid of conflict between flink cluster jars and user jars, WDYT? |
What is the purpose of the change
Brief change log
Verifying this change
This change is a trivial rework / code cleanup without any test coverage.
Does this pull request potentially affect one of the following parts:
@Public(Evolving)
: (no)Documentation