Skip to content

Commit 319dc7e

Browse files
committed
[FLINK-37431]We should use guava Lists instead of curator shade Lists to avoid unnecessary error
1 parent 45fcd56 commit 319dc7e

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/EventTimeTemporalJoinRewriteRule.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
import org.apache.flink.table.planner.plan.schema.TimeIndicatorRelDataType;
2929
import org.apache.flink.table.planner.plan.utils.TemporalTableJoinUtil;
3030

31-
import org.apache.flink.shaded.curator5.org.apache.curator.shaded.com.google.common.collect.Lists;
32-
31+
import com.google.common.collect.Lists;
3332
import org.apache.calcite.plan.RelOptRule;
3433
import org.apache.calcite.plan.RelOptRuleCall;
3534
import org.apache.calcite.plan.RelRule;

flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/JoinDeriveNullFilterRule.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020

2121
import org.apache.flink.table.planner.plan.metadata.FlinkRelMetadataQuery;
2222

23-
import org.apache.flink.shaded.curator5.org.apache.curator.shaded.com.google.common.collect.Lists;
24-
23+
import com.google.common.collect.Lists;
2524
import org.apache.calcite.plan.RelOptRuleCall;
2625
import org.apache.calcite.plan.RelRule;
2726
import org.apache.calcite.rel.RelNode;

flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/WindowPropertiesRules.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
import org.apache.flink.table.runtime.groupwindow.WindowEnd;
3131
import org.apache.flink.table.runtime.groupwindow.WindowStart;
3232

33-
import org.apache.flink.shaded.guava33.com.google.common.collect.Iterables;
34-
import org.apache.flink.shaded.guava33.com.google.common.collect.Lists;
35-
33+
import com.google.common.collect.Iterables;
34+
import com.google.common.collect.Lists;
3635
import org.apache.calcite.plan.RelOptRuleCall;
3736
import org.apache.calcite.plan.RelRule;
3837
import org.apache.calcite.rel.RelNode;

0 commit comments

Comments
 (0)