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.

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

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

Conversation

zlzhang0122
Copy link
Contributor

What is the purpose of the change

  • This pull request use guava Lists instead of curator shade Lists to avoid unnecessary error *

Brief change log

  • Change curator Lists to guava Lists like other places

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:

  • Dependencies (does it add or upgrade a dependency): (no)
  • The public API, i.e., is any changed class annotated with @Public(Evolving): (no)
  • The serializers: (no)
  • The runtime per-record code paths (performance sensitive): (no)
  • Anything that affects deployment or recovery: JobManager (and its components), Checkpointing, Kubernetes/Yarn, ZooKeeper: (no)
  • The S3 file system connector: (no)

Documentation

  • Does this pull request introduce a new feature? (no)
  • If yes, how is the feature documented? (not applicable)

@flinkbot
Copy link
Collaborator

flinkbot commented Mar 6, 2025

CI report:

Bot commands The @flinkbot bot supports the following commands:
  • @flinkbot run azure re-run the last Azure build

@@ -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;
Copy link
Contributor

@davidradl davidradl Mar 6, 2025

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.

Copy link
Contributor Author

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.

@zlzhang0122 zlzhang0122 force-pushed the dev-flink-37431 branch 2 times, most recently from 48e2721 to 662a80f Compare March 8, 2025 02:20
@zlzhang0122 zlzhang0122 closed this Mar 8, 2025
@zlzhang0122 zlzhang0122 reopened this Mar 8, 2025
Copy link
Contributor

@davidradl davidradl left a 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.

@zlzhang0122
Copy link
Contributor Author

zlzhang0122 commented Mar 20, 2025

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?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants