You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by li...@apache.org on 2024/09/24 15:49:47 UTC
(flink) 02/02: [FLINK-36327][table] Remove dependency about flink-scala and flink-streaming-scala in table module
This is an automated email from the ASF dual-hosted git repository.
lincoln pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 7a06c3ba00ef0840ad59707cece2b9d3fcbd2409
Author: xuyang <xy...@163.com>
AuthorDate: Fri Sep 20 13:54:57 2024 +0800
[FLINK-36327][table] Remove dependency about flink-scala and flink-streaming-scala in table module
---
.../e5126cae-f3fe-48aa-b6fb-60ae6cc3fcd5 | 1 -
.../formats/parquet/ParquetTimestampITCase.java | 50 ++---
.../chain/PythonOperatorChainingOptimizerTest.java | 2 +-
flink-table/flink-table-api-scala-bridge/pom.xml | 11 -
.../api/bridge/scala/DataStreamConversions.scala | 10 +-
.../api/bridge/scala/StreamStatementSet.scala | 3 +-
.../api/bridge/scala/StreamTableEnvironment.scala | 5 +-
.../table/api/bridge/scala/TableConversions.scala | 4 +-
.../internal/StreamTableEnvironmentImpl.scala | 47 ++---
.../flink/table/api/bridge/scala/package.scala | 2 +-
.../internal/StreamTableEnvironmentImplTest.scala | 7 +-
.../types/TypeInfoDataTypeConverterScalaTest.scala | 3 +-
.../flink-table-planner-loader-bundle/pom.xml | 2 +-
flink-table/flink-table-planner/pom.xml | 12 +-
.../table/planner/codegen/SinkCodeGenerator.scala | 4 +-
.../flink/table/planner/sinks/TableSinkUtils.scala | 2 +-
.../runtime/stream/sql/CompactionITCaseBase.java | 13 +-
.../stream/table/TimeAttributesITCase.scala | 58 +++--
.../flink/table/api/TableEnvironmentITCase.scala | 12 +-
.../flink/table/api/TableEnvironmentTest.scala | 21 +-
.../apache/flink/table/api/batch/ExplainTest.scala | 1 -
.../flink/table/api/stream/ExplainTest.scala | 1 -
.../sql/validation/OverWindowValidationTest.scala | 2 -
.../table/planner/codegen/agg/AggTestBase.scala | 3 +-
.../expressions/utils/CompositeTypeTestBase.scala | 2 +-
.../planner/match/PatternTranslatorTestBase.scala | 12 +-
.../table/planner/plan/batch/sql/CalcTest.scala | 1 -
.../plan/batch/sql/DagOptimizationTest.scala | 1 -
.../plan/batch/sql/DeadlockBreakupTest.scala | 1 -
.../planner/plan/batch/sql/LegacyLimitTest.scala | 1 -
.../planner/plan/batch/sql/LegacySinkTest.scala | 1 -
.../table/planner/plan/batch/sql/LimitTest.scala | 1 -
.../plan/batch/sql/MultipleInputCreationTest.scala | 1 -
.../plan/batch/sql/PartitionableSinkTest.scala | 1 -
.../table/planner/plan/batch/sql/RankTest.scala | 1 -
.../planner/plan/batch/sql/SetOperatorsTest.scala | 1 -
.../planner/plan/batch/sql/SortLimitTest.scala | 1 -
.../table/planner/plan/batch/sql/SortTest.scala | 1 -
.../planner/plan/batch/sql/SubplanReuseTest.scala | 1 -
.../planner/plan/batch/sql/TableScanTest.scala | 1 -
.../planner/plan/batch/sql/TableSinkTest.scala | 1 -
.../table/planner/plan/batch/sql/UnionTest.scala | 1 -
.../plan/batch/sql/WindowTableFunctionTest.scala | 1 -
.../plan/batch/sql/agg/AggregateTestBase.scala | 1 -
.../plan/batch/sql/agg/GroupWindowTest.scala | 1 -
.../plan/batch/sql/agg/GroupingSetsTest.scala | 1 -
.../plan/batch/sql/agg/OverAggregateTest.scala | 1 -
.../planner/plan/batch/sql/join/JoinTestBase.scala | 1 -
.../plan/batch/sql/join/LookupJoinTest.scala | 1 -
.../plan/batch/sql/join/SemiAntiJoinTestBase.scala | 1 -
.../plan/batch/sql/join/SingleRowJoinTest.scala | 1 -
.../batch/sql/join/TemporalFunctionJoinTest.scala | 1 -
.../planner/plan/batch/table/AggregateTest.scala | 1 -
.../table/planner/plan/batch/table/CalcTest.scala | 1 -
.../plan/batch/table/ColumnFunctionsTest.scala | 1 -
.../planner/plan/batch/table/CorrelateTest.scala | 1 -
.../planner/plan/batch/table/GroupWindowTest.scala | 1 -
.../table/planner/plan/batch/table/JoinTest.scala | 1 -
.../plan/batch/table/PythonAggregateTest.scala | 1 -
.../planner/plan/batch/table/PythonCalcTest.scala | 1 -
.../table/PythonGroupWindowAggregateTest.scala | 1 -
.../table/PythonOverWindowAggregateTest.scala | 1 -
.../plan/batch/table/SetOperatorsTest.scala | 1 -
.../table/TemporalTableFunctionJoinTest.scala | 1 -
.../table/validation/AggregateValidationTest.scala | 1 -
.../table/validation/CalcValidationTest.scala | 1 -
.../table/validation/CorrelateValidationTest.scala | 1 -
.../validation/GroupWindowValidationTest.scala | 1 -
.../table/validation/JoinValidationTest.scala | 1 -
.../validation/OverWindowValidationTest.scala | 1 -
.../validation/SetOperatorsValidationTest.scala | 1 -
.../table/validation/SortValidationTest.scala | 1 -
.../plan/common/DistinctAggregateTestBase.scala | 1 -
.../planner/plan/common/PartialInsertTest.scala | 1 -
.../table/planner/plan/common/UnnestTestBase.scala | 1 -
.../planner/plan/common/ViewsExpandingTest.scala | 1 -
.../CalcPythonCorrelateTransposeRuleTest.scala | 1 -
.../rules/logical/CalcRankTransposeRuleTest.scala | 1 -
.../rules/logical/ConvertToNotInOrInRuleTest.scala | 1 -
.../logical/DecomposeGroupingSetsRuleTest.scala | 1 -
.../logical/ExpressionReductionRulesTest.scala | 1 -
.../FlinkAggregateJoinTransposeRuleTest.scala | 1 -
.../logical/FlinkAggregateRemoveRuleTest.scala | 1 -
.../rules/logical/FlinkCalcMergeRuleTest.scala | 1 -
.../logical/FlinkJoinPushExpressionsRuleTest.scala | 1 -
.../logical/FlinkJoinToMultiJoinRuleTest.scala | 1 -
.../rules/logical/FlinkLimit0RemoveRuleTest.scala | 1 -
.../FlinkLogicalRankRuleForConstantRangeTest.scala | 1 -
.../FlinkLogicalRankRuleForRangeEndTest.scala | 1 -
.../rules/logical/FlinkPruneEmptyRulesTest.scala | 1 -
.../FlinkSemiAntiJoinFilterTransposeRuleTest.scala | 1 -
.../FlinkSemiAntiJoinJoinTransposeRuleTest.scala | 1 -
...FlinkSemiAntiJoinProjectTransposeRuleTest.scala | 1 -
.../JoinConditionEqualityTransferRuleTest.scala | 1 -
.../logical/JoinConditionTypeCoerceRuleTest.scala | 1 -
.../JoinDependentConditionDerivationRuleTest.scala | 1 -
...lCorrelateToJoinFromTemporalTableRuleTest.scala | 1 -
.../ProjectSemiAntiJoinTransposeRuleTest.scala | 1 -
.../logical/PruneAggregateCallRuleTestBase.scala | 1 -
.../rules/logical/PythonCalcSplitRuleTest.scala | 1 -
.../logical/PythonCorrelateSplitRuleTest.scala | 1 -
.../rules/logical/PythonMapMergeRuleTest.scala | 1 -
.../logical/RankNumberColumnRemoveRuleTest.scala | 1 -
.../logical/RemoveSingleAggregateRuleTest.scala | 1 -
.../ReplaceIntersectWithSemiJoinRuleTest.scala | 1 -
.../logical/ReplaceMinusWithAntiJoinRuleTest.scala | 1 -
.../logical/RewriteIntersectAllRuleTest.scala | 1 -
.../rules/logical/RewriteMinusAllRuleTest.scala | 1 -
.../RewriteMultiJoinConditionRuleTest.scala | 1 -
.../logical/SimplifyFilterConditionRuleTest.scala | 1 -
.../logical/SimplifyJoinConditionRuleTest.scala | 1 -
.../rules/logical/SplitAggregateRuleTest.scala | 1 -
...SplitPythonConditionFromCorrelateRuleTest.scala | 1 -
.../SplitPythonConditionFromJoinRuleTest.scala | 1 -
.../rules/logical/WindowGroupReorderRuleTest.scala | 1 -
.../subquery/FlinkRewriteSubQueryRuleTest.scala | 1 -
.../logical/subquery/SubQueryAntiJoinTest.scala | 1 -
.../logical/subquery/SubQuerySemiJoinTest.scala | 1 -
.../SubqueryCorrelateVariablesValidationTest.scala | 1 -
.../batch/EnforceLocalAggRuleTestBase.scala | 1 -
.../RemoveRedundantLocalHashAggRuleTest.scala | 1 -
.../batch/RemoveRedundantLocalRankRuleTest.scala | 1 -
.../RemoveRedundantLocalSortAggRuleTest.scala | 1 -
.../table/planner/plan/stream/sql/CalcTest.scala | 1 -
.../plan/stream/sql/DagOptimizationTest.scala | 1 -
.../planner/plan/stream/sql/DeduplicateTest.scala | 1 -
.../planner/plan/stream/sql/LegacySinkTest.scala | 1 -
.../table/planner/plan/stream/sql/LimitTest.scala | 1 -
.../stream/sql/MiniBatchIntervalInferTest.scala | 1 -
.../plan/stream/sql/ModifiedMonotonicityTest.scala | 1 -
.../plan/stream/sql/NonDeterministicDagTest.scala | 1 -
.../plan/stream/sql/PartitionableSinkTest.scala | 1 -
.../table/planner/plan/stream/sql/RankTest.scala | 1 -
.../stream/sql/RelTimeIndicatorConverterTest.scala | 1 -
.../planner/plan/stream/sql/SetOperatorsTest.scala | 1 -
.../planner/plan/stream/sql/SortLimitTest.scala | 1 -
.../table/planner/plan/stream/sql/SortTest.scala | 1 -
.../planner/plan/stream/sql/SubplanReuseTest.scala | 1 -
.../planner/plan/stream/sql/TableScanTest.scala | 1 -
.../planner/plan/stream/sql/TableSinkTest.scala | 1 -
.../table/planner/plan/stream/sql/UnionTest.scala | 1 -
.../table/planner/plan/stream/sql/UnnestTest.scala | 1 -
.../plan/stream/sql/agg/AggregateTest.scala | 1 -
.../stream/sql/agg/DistinctAggregateTest.scala | 2 -
.../plan/stream/sql/agg/GroupWindowTest.scala | 1 -
.../plan/stream/sql/agg/GroupingSetsTest.scala | 1 -
.../plan/stream/sql/agg/OverAggregateTest.scala | 1 -
.../stream/sql/agg/TwoStageAggregateTest.scala | 1 -
.../plan/stream/sql/join/IntervalJoinTest.scala | 1 -
.../planner/plan/stream/sql/join/JoinTest.scala | 1 -
.../plan/stream/sql/join/LookupJoinTest.scala | 1 -
.../plan/stream/sql/join/SemiAntiJoinTest.scala | 1 -
.../stream/sql/join/TemporalFunctionJoinTest.scala | 1 -
.../planner/plan/stream/table/AggregateTest.scala | 2 -
.../table/planner/plan/stream/table/CalcTest.scala | 1 -
.../plan/stream/table/ColumnFunctionsTest.scala | 1 -
.../planner/plan/stream/table/CorrelateTest.scala | 1 -
.../table/GroupWindowTableAggregateTest.scala | 1 -
.../plan/stream/table/GroupWindowTest.scala | 1 -
.../table/planner/plan/stream/table/JoinTest.scala | 1 -
.../plan/stream/table/OverAggregateTest.scala | 1 -
.../plan/stream/table/PythonAggregateTest.scala | 1 -
.../planner/plan/stream/table/PythonCalcTest.scala | 1 -
.../table/PythonGroupWindowAggregateTest.scala | 1 -
.../table/PythonOverWindowAggregateTest.scala | 1 -
.../stream/table/PythonTableAggregateTest.scala | 1 -
.../plan/stream/table/SetOperatorsTest.scala | 1 -
.../plan/stream/table/TableAggregateTest.scala | 1 -
.../table/TemporalTableFunctionJoinTest.scala | 1 -
.../plan/stream/table/TwoStageAggregateTest.scala | 1 -
.../table/validation/AggregateValidationTest.scala | 2 -
.../table/validation/CalcValidationTest.scala | 1 -
.../table/validation/CorrelateValidationTest.scala | 1 -
.../GroupWindowTableAggregateValidationTest.scala | 1 -
.../validation/GroupWindowValidationTest.scala | 1 -
.../validation/LegacyTableSinkValidationTest.scala | 39 +++-
.../validation/OverWindowValidationTest.scala | 1 -
.../validation/SetOperatorsValidationTest.scala | 25 ++-
.../validation/TableAggregateValidationTest.scala | 1 -
.../TemporalTableJoinValidationTest.scala | 1 -
.../validation/UnsupportedOpsValidationTest.scala | 29 ++-
.../planner/plan/utils/FlinkRelOptUtilTest.scala | 11 +-
.../planner/runtime/batch/sql/CalcITCase.scala | 3 +-
.../planner/runtime/batch/sql/MiscITCase.scala | 3 +-
.../runtime/batch/sql/SetOperatorsITCase.scala | 2 +-
.../batch/sql/agg/AggregateITCaseBase.scala | 3 +-
.../runtime/batch/sql/agg/HashAggITCase.scala | 3 +-
.../runtime/batch/table/AggregationITCase.scala | 1 -
.../planner/runtime/batch/table/CalcITCase.scala | 1 -
.../runtime/batch/table/CorrelateITCase.scala | 1 -
.../runtime/batch/table/GroupWindowITCase.scala | 1 -
.../planner/runtime/batch/table/JoinITCase.scala | 1 -
.../runtime/batch/table/SetOperatorsITCase.scala | 1 -
.../runtime/catalog/CatalogListenerTest.scala | 2 +-
.../harness/GroupAggregateHarnessTest.scala | 14 +-
.../planner/runtime/harness/HarnessTestBase.scala | 6 +-
.../runtime/harness/OverAggregateHarnessTest.scala | 23 +-
.../planner/runtime/harness/RankHarnessTest.scala | 9 +-
.../harness/TableAggregateHarnessTest.scala | 8 +-
.../harness/WindowAggregateHarnessTest.scala | 2 +-
...WindowAggregateUseDaylightTimeHarnessTest.scala | 2 -
.../harness/WindowTableFunctionHarnessTest.scala | 2 -
.../runtime/stream/FsStreamingSinkITCaseBase.scala | 18 +-
.../runtime/stream/sql/AggregateITCase.scala | 13 +-
.../runtime/stream/sql/AggregateRemoveITCase.scala | 12 +-
.../runtime/stream/sql/AsyncLookupJoinITCase.scala | 3 +-
.../planner/runtime/stream/sql/CalcITCase.scala | 40 ++--
.../runtime/stream/sql/ChangelogSourceITCase.scala | 8 +-
.../runtime/stream/sql/CorrelateITCase.scala | 65 ++++--
.../runtime/stream/sql/DataStreamScalaITCase.scala | 14 +-
.../runtime/stream/sql/DeduplicateITCase.scala | 25 ++-
.../stream/sql/FilterableSourceITCase.scala | 2 -
.../runtime/stream/sql/GroupWindowITCase.scala | 1 -
.../runtime/stream/sql/IntervalJoinITCase.scala | 165 ++++++++-------
.../planner/runtime/stream/sql/JoinITCase.scala | 1 -
.../runtime/stream/sql/Limit0RemoveITCase.scala | 29 ++-
.../planner/runtime/stream/sql/LimitITCase.scala | 3 +-
.../runtime/stream/sql/LimitableSourceITCase.scala | 2 +-
.../runtime/stream/sql/LookupJoinITCase.scala | 1 -
.../runtime/stream/sql/MatchRecognizeITCase.scala | 150 ++++++++-----
.../runtime/stream/sql/OverAggregateITCase.scala | 85 +++++---
.../stream/sql/PartitionableSourceITCase.scala | 2 -
.../stream/sql/PruneAggregateCallITCase.scala | 5 +-
.../planner/runtime/stream/sql/RankITCase.scala | 3 +-
.../stream/sql/SemiAntiJoinStreamITCase.scala | 1 -
.../runtime/stream/sql/SetOperatorsITCase.scala | 1 -
.../planner/runtime/stream/sql/SortITCase.scala | 3 +-
.../runtime/stream/sql/SortLimitITCase.scala | 1 -
.../runtime/stream/sql/SourceWatermarkITCase.scala | 2 -
.../runtime/stream/sql/SplitAggregateITCase.scala | 1 -
.../stream/sql/StreamFileSystemITCaseBase.scala | 1 -
.../stream/sql/StreamTableEnvironmentITCase.scala | 28 +--
.../runtime/stream/sql/TableScanITCase.scala | 1 -
.../runtime/stream/sql/TableSourceITCase.scala | 9 +-
.../runtime/stream/sql/TemporalSortITCase.scala | 1 -
.../sql/TemporalTableFunctionJoinITCase.scala | 46 ++--
.../runtime/stream/sql/TimeAttributeITCase.scala | 2 -
.../runtime/stream/sql/TimestampITCase.scala | 1 -
.../planner/runtime/stream/sql/UnnestITCase.scala | 21 +-
.../runtime/stream/sql/WindowAggregateITCase.scala | 1 -
.../runtime/stream/table/AggregateITCase.scala | 11 +-
.../planner/runtime/stream/table/CalcITCase.scala | 112 ++++++----
.../runtime/stream/table/CorrelateITCase.scala | 10 +-
.../runtime/stream/table/GroupWindowITCase.scala | 4 +-
.../table/GroupWindowTableAggregateITCase.scala | 5 +-
.../planner/runtime/stream/table/JoinITCase.scala | 187 ++++++++++++-----
.../stream/table/LegacyTableSinkITCase.scala | 227 ++++++++++++++++----
.../runtime/stream/table/OverAggregateITCase.scala | 59 ++++--
.../runtime/stream/table/RetractionITCase.scala | 16 +-
.../runtime/stream/table/SetOperatorsITCase.scala | 39 ++--
.../runtime/stream/table/SubQueryITCase.scala | 19 +-
.../stream/table/TableAggregateITCase.scala | 7 +-
.../runtime/stream/table/TableSinkITCase.scala | 233 ++++++++++++++++-----
.../stream/table/TableToDataStreamITCase.scala | 44 +++-
.../runtime/utils/CollectionBatchExecTable.scala | 3 +-
.../planner/runtime/utils/StreamingEnvUtil.scala | 42 ++++
.../planner/runtime/utils/StreamingTestBase.scala | 2 +-
.../runtime/utils/StreamingWithStateTestBase.scala | 4 +-
.../utils/UserDefinedFunctionTestUtils.scala | 14 +-
.../flink/table/planner/utils/TableTestBase.scala | 17 +-
.../planner/utils/UserDefinedTableFunctions.scala | 2 +-
pom.xml | 2 +
262 files changed, 1431 insertions(+), 1032 deletions(-)
diff --git a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/e5126cae-f3fe-48aa-b6fb-60ae6cc3fcd5 b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/e5126cae-f3fe-48aa-b6fb-60ae6cc3fcd5
index cefc1520e85..1ac0d8bb6ed 100644
--- a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/e5126cae-f3fe-48aa-b6fb-60ae6cc3fcd5
+++ b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/e5126cae-f3fe-48aa-b6fb-60ae6cc3fcd5
@@ -1,6 +1,5 @@
Constructor <org.apache.flink.runtime.state.heap.CopyOnWriteStateMapSnapshot.<init>(org.apache.flink.runtime.state.heap.CopyOnWriteStateMap)> calls method <org.apache.flink.runtime.state.heap.CopyOnWriteStateMap.snapshotMapArrays()> in (CopyOnWriteStateMapSnapshot.java:86)
Constructor <org.apache.flink.streaming.runtime.io.StreamTaskExternallyInducedSourceInput.<init>(org.apache.flink.streaming.api.operators.SourceOperator, java.util.function.Consumer, int, int)> calls method <org.apache.flink.streaming.api.operators.SourceOperator.getSourceReader()> in (StreamTaskExternallyInducedSourceInput.java:41)
-Method <org.apache.flink.api.java.typeutils.runtime.TupleSerializerSnapshot.getNestedSerializers(org.apache.flink.api.java.typeutils.runtime.TupleSerializer)> calls method <org.apache.flink.api.java.typeutils.runtime.TupleSerializer.getFieldSerializers()> in (TupleSerializerSnapshot.java:67)
Method <org.apache.flink.cep.nfa.sharedbuffer.LockableTypeSerializerSnapshot.getNestedSerializers(org.apache.flink.cep.nfa.sharedbuffer.Lockable$LockableTypeSerializer)> calls method <org.apache.flink.cep.nfa.sharedbuffer.Lockable$LockableTypeSerializer.getElementSerializer()> in (LockableTypeSerializerSnapshot.java:58)
Method <org.apache.flink.runtime.blob.BlobInputStream.read()> calls method <org.apache.flink.runtime.blob.BlobKey.getHash()> in (BlobInputStream.java:127)
Method <org.apache.flink.runtime.blob.BlobInputStream.read([B, int, int)> calls method <org.apache.flink.runtime.blob.BlobKey.getHash()> in (BlobInputStream.java:163)
diff --git a/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/ParquetTimestampITCase.java b/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/ParquetTimestampITCase.java
index 90c130e22f5..515d00e0c00 100644
--- a/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/ParquetTimestampITCase.java
+++ b/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/ParquetTimestampITCase.java
@@ -21,7 +21,7 @@ package org.apache.flink.formats.parquet;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.common.typeinfo.Types;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
-import org.apache.flink.streaming.api.scala.DataStream;
+import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.table.planner.runtime.stream.FiniteTestSource;
import org.apache.flink.table.planner.runtime.stream.FsStreamingSinkITCaseBase;
import org.apache.flink.table.planner.runtime.utils.TestSinkUtil;
@@ -169,36 +169,32 @@ public class ParquetTimestampITCase extends FsStreamingSinkITCaseBase {
@Override
public DataStream<Row> getDataStream2(Function1<Row, Object> fun) {
- return new DataStream<Row>(
- env().getJavaEnv()
- .addSource(
- new FiniteTestSource(getData2(), fun),
- new RowTypeInfo(
- new TypeInformation[] {
- Types.INT,
- Types.STRING,
- Types.SQL_TIMESTAMP,
- Types.STRING,
- Types.STRING
- },
- new String[] {"f0", "f1", "f2", "f3", "f4"})));
+ return env().addSource(
+ new FiniteTestSource(getData2(), fun),
+ new RowTypeInfo(
+ new TypeInformation[] {
+ Types.INT,
+ Types.STRING,
+ Types.SQL_TIMESTAMP,
+ Types.STRING,
+ Types.STRING
+ },
+ new String[] {"f0", "f1", "f2", "f3", "f4"}));
}
@Override
public DataStream<Row> getDataStream(Function1<Row, Object> fun) {
- return new DataStream<Row>(
- env().getJavaEnv()
- .addSource(
- new FiniteTestSource(getData(), fun),
- new RowTypeInfo(
- new TypeInformation[] {
- Types.INT,
- Types.STRING,
- Types.SQL_TIMESTAMP,
- Types.STRING,
- Types.STRING
- },
- new String[] {"f0", "f1", "f2", "f3", "f4"})));
+ return env().addSource(
+ new FiniteTestSource(getData(), fun),
+ new RowTypeInfo(
+ new TypeInformation[] {
+ Types.INT,
+ Types.STRING,
+ Types.SQL_TIMESTAMP,
+ Types.STRING,
+ Types.STRING
+ },
+ new String[] {"f0", "f1", "f2", "f3", "f4"}));
}
@Override
diff --git a/flink-python/src/test/java/org/apache/flink/python/chain/PythonOperatorChainingOptimizerTest.java b/flink-python/src/test/java/org/apache/flink/python/chain/PythonOperatorChainingOptimizerTest.java
index 7c1d26a4212..86cdaebe4d1 100644
--- a/flink-python/src/test/java/org/apache/flink/python/chain/PythonOperatorChainingOptimizerTest.java
+++ b/flink-python/src/test/java/org/apache/flink/python/chain/PythonOperatorChainingOptimizerTest.java
@@ -21,7 +21,6 @@ package org.apache.flink.python.chain;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.dag.Transformation;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
-import org.apache.flink.api.scala.typeutils.Types;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.memory.ManagedMemoryUseCase;
import org.apache.flink.streaming.api.functions.python.DataStreamPythonFunction;
@@ -35,6 +34,7 @@ import org.apache.flink.streaming.api.operators.python.process.ExternalPythonPro
import org.apache.flink.streaming.api.transformations.OneInputTransformation;
import org.apache.flink.streaming.api.transformations.SourceTransformation;
import org.apache.flink.streaming.api.transformations.TwoInputTransformation;
+import org.apache.flink.table.api.Types;
import org.junit.jupiter.api.Test;
diff --git a/flink-table/flink-table-api-scala-bridge/pom.xml b/flink-table/flink-table-api-scala-bridge/pom.xml
index 89e19e9ac8a..6aaf06a8537 100644
--- a/flink-table/flink-table-api-scala-bridge/pom.xml
+++ b/flink-table/flink-table-api-scala-bridge/pom.xml
@@ -47,17 +47,6 @@ under the License.
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
diff --git a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/DataStreamConversions.scala b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/DataStreamConversions.scala
index 8980ddd6559..7ae9234b506 100644
--- a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/DataStreamConversions.scala
+++ b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/DataStreamConversions.scala
@@ -18,7 +18,7 @@
package org.apache.flink.table.api.bridge.scala
import org.apache.flink.annotation.PublicEvolving
-import org.apache.flink.streaming.api.scala.DataStream
+import org.apache.flink.streaming.api.datastream.DataStream
import org.apache.flink.table.api.{Schema, Table, TableEnvironment, ValidationException}
import org.apache.flink.table.connector.ChangelogMode
import org.apache.flink.table.expressions.Expression
@@ -39,7 +39,7 @@ import org.apache.flink.util.Preconditions
* @see
* <a href="https://s.apache.org/flip-265">FLIP-265 Deprecate and remove Scala API support</a>
*/
-@deprecated(org.apache.flink.api.scala.FLIP_265_WARNING, since = "1.18.0")
+@deprecated(org.apache.flink.table.api.FLIP_265_WARNING, since = "1.18.0")
@PublicEvolving
class DataStreamConversions[T](dataStream: DataStream[T]) {
@@ -122,7 +122,7 @@ class DataStreamConversions[T](dataStream: DataStream[T]) {
*/
def toChangelogTable(tableEnv: StreamTableEnvironment): Table = {
Preconditions.checkNotNull(tableEnv, "Table environment must not be null.")
- if (dataStream.dataType.getTypeClass != classOf[Row]) {
+ if (dataStream.getType.getTypeClass != classOf[Row]) {
throw new ValidationException(
"DataStream cannot be converted to a Table. It must contain instances of Row.")
}
@@ -143,7 +143,7 @@ class DataStreamConversions[T](dataStream: DataStream[T]) {
*/
def toChangelogTable(tableEnv: StreamTableEnvironment, schema: Schema): Table = {
Preconditions.checkNotNull(tableEnv, "Table environment must not be null.")
- if (dataStream.dataType.getTypeClass != classOf[Row]) {
+ if (dataStream.getType.getTypeClass != classOf[Row]) {
throw new ValidationException(
"DataStream cannot be converted to a Table. It must contain instances of Row.")
}
@@ -169,7 +169,7 @@ class DataStreamConversions[T](dataStream: DataStream[T]) {
schema: Schema,
changelogMode: ChangelogMode): Table = {
Preconditions.checkNotNull(tableEnv, "Table environment must not be null.")
- if (dataStream.dataType.getTypeClass != classOf[Row]) {
+ if (dataStream.getType.getTypeClass != classOf[Row]) {
throw new ValidationException(
"DataStream cannot be converted to a Table. It must contain instances of Row.")
}
diff --git a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamStatementSet.scala b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamStatementSet.scala
index f5fa28be364..cacb6cea6ff 100644
--- a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamStatementSet.scala
+++ b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamStatementSet.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.api.bridge.scala
import org.apache.flink.annotation.PublicEvolving
-import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment}
import org.apache.flink.table.api.{ExplainDetail, StatementSet, Table, TableDescriptor, TablePipeline}
/**
@@ -38,7 +37,7 @@ import org.apache.flink.table.api.{ExplainDetail, StatementSet, Table, TableDesc
* @see
* <a href="https://s.apache.org/flip-265">FLIP-265 Deprecate and remove Scala API support</a>
*/
-@deprecated(org.apache.flink.api.scala.FLIP_265_WARNING, since = "1.18.0")
+@deprecated(org.apache.flink.table.api.FLIP_265_WARNING, since = "1.18.0")
@PublicEvolving
trait StreamStatementSet extends StatementSet {
diff --git a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamTableEnvironment.scala b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamTableEnvironment.scala
index bb7ea04b4c5..2bed5ca258a 100644
--- a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamTableEnvironment.scala
+++ b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamTableEnvironment.scala
@@ -20,7 +20,8 @@ package org.apache.flink.table.api.bridge.scala
import org.apache.flink.annotation.PublicEvolving
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.common.typeutils.CompositeType
-import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment}
+import org.apache.flink.streaming.api.datastream.DataStream
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api.{TableEnvironment, _}
import org.apache.flink.table.api.bridge.scala.internal.StreamTableEnvironmentImpl
import org.apache.flink.table.connector.ChangelogMode
@@ -55,7 +56,7 @@ import org.apache.flink.types.{Row, RowKind}
* @see
* <a href="https://s.apache.org/flip-265">FLIP-265 Deprecate and remove Scala API support</a>
*/
-@deprecated(org.apache.flink.api.scala.FLIP_265_WARNING, since = "1.18.0")
+@deprecated(org.apache.flink.table.api.FLIP_265_WARNING, since = "1.18.0")
@PublicEvolving
trait StreamTableEnvironment extends TableEnvironment {
diff --git a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/TableConversions.scala b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/TableConversions.scala
index 1d88d8cdc96..bf33ecfddd3 100644
--- a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/TableConversions.scala
+++ b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/TableConversions.scala
@@ -19,7 +19,7 @@ package org.apache.flink.table.api.bridge.scala
import org.apache.flink.annotation.PublicEvolving
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.streaming.api.scala.DataStream
+import org.apache.flink.streaming.api.datastream.DataStream
import org.apache.flink.table.api.{DataTypes, Schema, Table, TableException, ValidationException}
import org.apache.flink.table.api.internal.TableImpl
import org.apache.flink.table.connector.ChangelogMode
@@ -38,7 +38,7 @@ import org.apache.flink.types.Row
* @see
* <a href="https://s.apache.org/flip-265">FLIP-265 Deprecate and remove Scala API support</a>
*/
-@deprecated(org.apache.flink.api.scala.FLIP_265_WARNING, since = "1.18.0")
+@deprecated(org.apache.flink.table.api.FLIP_265_WARNING, since = "1.18.0")
@PublicEvolving
class TableConversions(table: Table) {
diff --git a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/internal/StreamTableEnvironmentImpl.scala b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/internal/StreamTableEnvironmentImpl.scala
index d31f231075a..8b6a7cda224 100644
--- a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/internal/StreamTableEnvironmentImpl.scala
+++ b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/internal/StreamTableEnvironmentImpl.scala
@@ -19,9 +19,9 @@ package org.apache.flink.table.api.bridge.scala.internal
import org.apache.flink.annotation.Internal
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.api.TimeCharacteristic
-import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment}
+import org.apache.flink.streaming.api.datastream.DataStream
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.internal.AbstractStreamTableEnvironmentImpl
import org.apache.flink.table.api.bridge.scala.{StreamStatementSet, StreamTableEnvironment}
@@ -38,7 +38,7 @@ import org.apache.flink.table.sources.{TableSource, TableSourceValidation}
import org.apache.flink.table.types.AbstractDataType
import org.apache.flink.table.types.utils.TypeConversions
import org.apache.flink.types.Row
-import org.apache.flink.util.{FlinkUserCodeClassLoaders, InstantiationUtil, MutableURLClassLoader, Preconditions}
+import org.apache.flink.util.{FlinkUserCodeClassLoaders, MutableURLClassLoader, Preconditions}
import java.net.URL
import java.util.Optional
@@ -56,7 +56,7 @@ class StreamTableEnvironmentImpl(
resourceManager: ResourceManager,
functionCatalog: FunctionCatalog,
tableConfig: TableConfig,
- scalaExecutionEnvironment: StreamExecutionEnvironment,
+ executionEnvironment: StreamExecutionEnvironment,
planner: Planner,
executor: Executor,
isStreaming: Boolean)
@@ -69,29 +69,29 @@ class StreamTableEnvironmentImpl(
functionCatalog,
planner,
isStreaming,
- scalaExecutionEnvironment.getWrappedStreamExecutionEnvironment)
+ executionEnvironment)
with StreamTableEnvironment {
override def fromDataStream[T](dataStream: DataStream[T]): Table = {
Preconditions.checkNotNull(dataStream, "Data stream must not be null.")
- fromStreamInternal(dataStream.javaStream, null, null, ChangelogMode.insertOnly())
+ fromStreamInternal(dataStream, null, null, ChangelogMode.insertOnly())
}
override def fromDataStream[T](dataStream: DataStream[T], schema: Schema): Table = {
Preconditions.checkNotNull(dataStream, "Data stream must not be null.")
Preconditions.checkNotNull(schema, "Schema must not be null.")
- fromStreamInternal(dataStream.javaStream, schema, null, ChangelogMode.insertOnly())
+ fromStreamInternal(dataStream, schema, null, ChangelogMode.insertOnly())
}
override def fromChangelogStream(dataStream: DataStream[Row]): Table = {
Preconditions.checkNotNull(dataStream, "Data stream must not be null.")
- fromStreamInternal(dataStream.javaStream, null, null, ChangelogMode.all())
+ fromStreamInternal(dataStream, null, null, ChangelogMode.all())
}
override def fromChangelogStream(dataStream: DataStream[Row], schema: Schema): Table = {
Preconditions.checkNotNull(dataStream, "Data stream must not be null.")
Preconditions.checkNotNull(schema, "Schema must not be null.")
- fromStreamInternal(dataStream.javaStream, schema, null, ChangelogMode.all())
+ fromStreamInternal(dataStream, schema, null, ChangelogMode.all())
}
override def fromChangelogStream(
@@ -100,14 +100,14 @@ class StreamTableEnvironmentImpl(
changelogMode: ChangelogMode): Table = {
Preconditions.checkNotNull(dataStream, "Data stream must not be null.")
Preconditions.checkNotNull(schema, "Schema must not be null.")
- fromStreamInternal(dataStream.javaStream, schema, null, changelogMode)
+ fromStreamInternal(dataStream, schema, null, changelogMode)
}
override def createTemporaryView[T](path: String, dataStream: DataStream[T]): Unit = {
Preconditions.checkNotNull(dataStream, "Data stream must not be null.")
createTemporaryView(
path,
- fromStreamInternal(dataStream.javaStream, null, path, ChangelogMode.insertOnly()))
+ fromStreamInternal(dataStream, null, path, ChangelogMode.insertOnly()))
}
override def createTemporaryView[T](
@@ -118,7 +118,7 @@ class StreamTableEnvironmentImpl(
Preconditions.checkNotNull(schema, "Schema must not be null.")
createTemporaryView(
path,
- fromStreamInternal(dataStream.javaStream, schema, path, ChangelogMode.insertOnly()))
+ fromStreamInternal(dataStream, schema, path, ChangelogMode.insertOnly()))
}
override def toDataStream(table: Table): DataStream[Row] = {
@@ -148,7 +148,7 @@ class StreamTableEnvironmentImpl(
table.getResolvedSchema,
targetDataType)
- new DataStream[T](toStreamInternal(table, schemaTranslationResult, ChangelogMode.insertOnly()))
+ toStreamInternal(table, schemaTranslationResult, ChangelogMode.insertOnly())
}
override def toChangelogStream(table: Table): DataStream[Row] = {
@@ -157,7 +157,7 @@ class StreamTableEnvironmentImpl(
val schemaTranslationResult =
SchemaTranslator.createProducingResult(table.getResolvedSchema, null)
- new DataStream[Row](toStreamInternal(table, schemaTranslationResult, null))
+ toStreamInternal(table, schemaTranslationResult, null)
}
override def toChangelogStream(table: Table, targetSchema: Schema): DataStream[Row] = {
@@ -167,7 +167,7 @@ class StreamTableEnvironmentImpl(
val schemaTranslationResult =
SchemaTranslator.createProducingResult(table.getResolvedSchema, targetSchema)
- new DataStream[Row](toStreamInternal(table, schemaTranslationResult, null))
+ toStreamInternal(table, schemaTranslationResult, null)
}
override def toChangelogStream(
@@ -181,7 +181,7 @@ class StreamTableEnvironmentImpl(
val schemaTranslationResult =
SchemaTranslator.createProducingResult(table.getResolvedSchema, targetSchema)
- new DataStream[Row](toStreamInternal(table, schemaTranslationResult, changelogMode))
+ toStreamInternal(table, schemaTranslationResult, changelogMode)
}
override def createStatementSet(): StreamStatementSet = {
@@ -189,7 +189,7 @@ class StreamTableEnvironmentImpl(
}
override def fromDataStream[T](dataStream: DataStream[T], fields: Expression*): Table = {
- val queryOperation = asQueryOperation(dataStream.javaStream, Optional.of(fields.toList.asJava))
+ val queryOperation = asQueryOperation(dataStream, Optional.of(fields.toList.asJava))
createTable(queryOperation)
}
@@ -211,7 +211,7 @@ class StreamTableEnvironmentImpl(
table.getQueryOperation,
TypeConversions.fromLegacyInfoToDataType(returnType),
OutputConversionModifyOperation.UpdateMode.APPEND)
- new DataStream[T](toStreamInternal[T](table, modifyOperation))
+ toStreamInternal[T](table, modifyOperation)
}
override def toRetractStream[T: TypeInformation](table: Table): DataStream[(Boolean, T)] = {
@@ -221,7 +221,7 @@ class StreamTableEnvironmentImpl(
table.getQueryOperation,
TypeConversions.fromLegacyInfoToDataType(returnType),
OutputConversionModifyOperation.UpdateMode.RETRACT)
- new DataStream[(Boolean, T)](toStreamInternal(table, modifyOperation))
+ toStreamInternal(table, modifyOperation)
}
override def registerFunction[T: TypeInformation](name: String, tf: TableFunction[T]): Unit = {
@@ -269,13 +269,13 @@ class StreamTableEnvironmentImpl(
// check that event-time is enabled if table source includes rowtime attributes
if (
TableSourceValidation.hasRowtimeAttribute(tableSource) &&
- scalaExecutionEnvironment.getStreamTimeCharacteristic != TimeCharacteristic.EventTime
+ executionEnvironment.getStreamTimeCharacteristic != TimeCharacteristic.EventTime
) {
throw new TableException(
String.format(
"A rowtime attribute requires an EventTime time characteristic in stream " +
"environment. But is: %s}",
- scalaExecutionEnvironment.getStreamTimeCharacteristic
+ executionEnvironment.getStreamTimeCharacteristic
))
}
}
@@ -299,9 +299,8 @@ object StreamTableEnvironmentImpl {
settings.getUserClassLoader,
settings.getConfiguration)
- val executor = AbstractStreamTableEnvironmentImpl.lookupExecutor(
- userClassLoader,
- executionEnvironment.getWrappedStreamExecutionEnvironment)
+ val executor =
+ AbstractStreamTableEnvironmentImpl.lookupExecutor(userClassLoader, executionEnvironment)
val tableConfig = TableConfig.getDefault
tableConfig.setRootConfiguration(executor.getConfiguration)
diff --git a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/package.scala b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/package.scala
index b32d71df6f4..2e6b6606e41 100644
--- a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/package.scala
+++ b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/package.scala
@@ -17,7 +17,7 @@
*/
package org.apache.flink.table.api.bridge
-import org.apache.flink.streaming.api.scala.DataStream
+import org.apache.flink.streaming.api.datastream.DataStream
import org.apache.flink.table.api.{ImplicitExpressionConversions, ImplicitExpressionOperations, Table, ValidationException}
import org.apache.flink.table.api.internal.TableImpl
import org.apache.flink.types.Row
diff --git a/flink-table/flink-table-api-scala-bridge/src/test/scala/org/apache/flink/table/api/bridge/scala/internal/StreamTableEnvironmentImplTest.scala b/flink-table/flink-table-api-scala-bridge/src/test/scala/org/apache/flink/table/api/bridge/scala/internal/StreamTableEnvironmentImplTest.scala
index 66c6459379c..ff80521e21d 100644
--- a/flink-table/flink-table-api-scala-bridge/src/test/scala/org/apache/flink/table/api/bridge/scala/internal/StreamTableEnvironmentImplTest.scala
+++ b/flink-table/flink-table-api-scala-bridge/src/test/scala/org/apache/flink/table/api/bridge/scala/internal/StreamTableEnvironmentImplTest.scala
@@ -18,8 +18,9 @@
package org.apache.flink.table.api.bridge.scala.internal
import org.apache.flink.api.dag.Transformation
-import org.apache.flink.streaming.api.scala.{StreamExecutionEnvironment, _}
-import org.apache.flink.table.api.TableConfig
+import org.apache.flink.streaming.api.datastream.DataStream
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
+import org.apache.flink.table.api.{createTypeInformation, TableConfig}
import org.apache.flink.table.catalog.FunctionCatalog
import org.apache.flink.table.module.ModuleManager
import org.apache.flink.table.operations.ModifyOperation
@@ -84,7 +85,7 @@ class StreamTableEnvironmentImplTest {
new FunctionCatalog(tableConfig, resourceManager, catalogManager, moduleManager),
tableConfig,
env,
- new TestPlanner(elements.javaStream.getTransformation),
+ new TestPlanner(elements.getTransformation),
new ExecutorMock,
true)
}
diff --git a/flink-table/flink-table-api-scala-bridge/src/test/scala/org/apache/flink/table/types/TypeInfoDataTypeConverterScalaTest.scala b/flink-table/flink-table-api-scala-bridge/src/test/scala/org/apache/flink/table/types/TypeInfoDataTypeConverterScalaTest.scala
index c6900d45331..a86130ead3e 100644
--- a/flink-table/flink-table-api-scala-bridge/src/test/scala/org/apache/flink/table/types/TypeInfoDataTypeConverterScalaTest.scala
+++ b/flink-table/flink-table-api-scala-bridge/src/test/scala/org/apache/flink/table/types/TypeInfoDataTypeConverterScalaTest.scala
@@ -17,8 +17,7 @@
*/
package org.apache.flink.table.types
-import org.apache.flink.api.scala.createTypeInformation
-import org.apache.flink.table.api.DataTypes
+import org.apache.flink.table.api.{createTypeInformation, DataTypes}
import org.apache.flink.table.types.TypeInfoDataTypeConverterTest.TestSpec
import org.apache.flink.table.types.utils.DataTypeFactoryMock.dummyRaw
import org.apache.flink.table.types.utils.TypeInfoDataTypeConverter
diff --git a/flink-table/flink-table-planner-loader-bundle/pom.xml b/flink-table/flink-table-planner-loader-bundle/pom.xml
index 4307c41f31d..6e91e8873ff 100644
--- a/flink-table/flink-table-planner-loader-bundle/pom.xml
+++ b/flink-table/flink-table-planner-loader-bundle/pom.xml
@@ -89,7 +89,7 @@
<include>org.apache.flink:flink-table-planner_${scala.binary.version}</include>
<!-- flink-table-planner scala dependencies -->
<include>org.scala-lang:*</include>
- <include>org.apache.flink:flink-scala_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-table-api-scala_${scala.binary.version}</include>
</includes>
</artifactSet>
</configuration>
diff --git a/flink-table/flink-table-planner/pom.xml b/flink-table/flink-table-planner/pom.xml
index 3f2aeeb0aaf..acd91491a29 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -96,11 +96,11 @@ under the License.
<version>${project.version}</version>
</dependency>
- <!-- Flink Scala (included only in the loader-bundle) -->
+ <!-- Flink Table API Scala (included only in the loader-bundle) -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-scala_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
@@ -158,14 +158,6 @@ under the License.
<scope>test</scope>
</dependency>
- <!-- Table API Scala dependencies -->
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table-api-scala_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-api-scala-bridge_${scala.binary.version}</artifactId>
diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/SinkCodeGenerator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/SinkCodeGenerator.scala
index 2c8e8b31e68..7692499c212 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/SinkCodeGenerator.scala
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/SinkCodeGenerator.scala
@@ -17,14 +17,12 @@
*/
package org.apache.flink.table.planner.codegen
-import org.apache.flink.api.common.ExecutionConfig
import org.apache.flink.api.common.serialization.SerializerConfigImpl
import org.apache.flink.api.common.typeinfo.{TypeInformation, Types}
import org.apache.flink.api.java.tuple.{Tuple2 => JTuple2}
import org.apache.flink.api.java.typeutils.{PojoTypeInfo, TupleTypeInfo}
import org.apache.flink.api.java.typeutils.runtime.TupleSerializerBase
-import org.apache.flink.api.scala.createTuple2TypeInformation
-import org.apache.flink.table.api.TableException
+import org.apache.flink.table.api.{createTuple2TypeInformation, TableException}
import org.apache.flink.table.data.{GenericRowData, RowData}
import org.apache.flink.table.data.util.RowDataUtil
import org.apache.flink.table.planner.codegen.CodeGenUtils.genToExternalConverterWithLegacy
diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/sinks/TableSinkUtils.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/sinks/TableSinkUtils.scala
index f820a263837..ef36e19dc84 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/sinks/TableSinkUtils.scala
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/sinks/TableSinkUtils.scala
@@ -19,8 +19,8 @@ package org.apache.flink.table.planner.sinks
import org.apache.flink.api.java.tuple.{Tuple2 => JTuple2}
import org.apache.flink.api.java.typeutils.{GenericTypeInfo, PojoTypeInfo, TupleTypeInfo}
-import org.apache.flink.api.scala.typeutils.CaseClassTypeInfo
import org.apache.flink.table.api._
+import org.apache.flink.table.api.typeutils.CaseClassTypeInfo
import org.apache.flink.table.catalog.{CatalogTable, ObjectIdentifier}
import org.apache.flink.table.data.RowData
import org.apache.flink.table.operations.SinkModifyOperation
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/CompactionITCaseBase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/CompactionITCaseBase.java
index c5ea9732565..ae1ceeff041 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/CompactionITCaseBase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/CompactionITCaseBase.java
@@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeinfo.Types;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.connector.datagen.source.TestDataGenerators;
import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
-import org.apache.flink.streaming.api.scala.DataStream;
+import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.table.planner.runtime.utils.StreamingTestBase;
import org.apache.flink.test.junit5.MiniClusterExtension;
import org.apache.flink.testutils.junit.utils.TempDirUtils;
@@ -88,13 +88,10 @@ public abstract class CompactionITCaseBase extends StreamingTestBase {
new String[] {"a", "b", "c"});
DataStream<Row> stream =
- new DataStream<>(
- env().getJavaEnv()
- .fromSource(
- TestDataGenerators.fromDataWithSnapshotsLatch(
- rows, rowTypeInfo),
- WatermarkStrategy.noWatermarks(),
- "Test Source"))
+ env().fromSource(
+ TestDataGenerators.fromDataWithSnapshotsLatch(rows, rowTypeInfo),
+ WatermarkStrategy.noWatermarks(),
+ "Test Source")
.filter((FilterFunction<Row>) value -> true)
.setParallelism(3); // to parallel tasks
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/table/TimeAttributesITCase.scala b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/table/TimeAttributesITCase.scala
index 49c154c5fee..c862e88624d 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/table/TimeAttributesITCase.scala
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/table/TimeAttributesITCase.scala
@@ -19,25 +19,26 @@
package org.apache.flink.table.planner.runtime.stream.table
import org.apache.flink.api.common.eventtime.{SerializableTimestampAssigner, WatermarkStrategy}
-import org.apache.flink.api.scala.createTypeInformation
import org.apache.flink.streaming.api.functions.source.SourceFunction
import org.apache.flink.table.api._
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, StreamingWithStateTestBase, TestingAppendSink}
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
-import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestingAppendSink}
import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension
-import org.apache.flink.types.Row
+
import org.assertj.core.api.Assertions.{assertThat, assertThatThrownBy}
import org.junit.jupiter.api.TestTemplate
import org.junit.jupiter.api.extension.ExtendWith
-import java.time.{Duration, Instant, LocalDateTime, ZoneId, ZoneOffset}
+import java.time.{Duration, Instant, LocalDateTime, ZoneId}
@ExtendWith(Array(classOf[ParameterizedTestExtension]))
class TimeAttributesITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode) {
@TestTemplate
def testMissingTimeAttributeInLegacySourceThrowsCorrectException(): Unit = {
- //TODO: this test can be removed when SourceFunction gets removed (FLIP-27 sources set TimestampAssigner.NO_TIMESTAMP value as event time when no timestamp is provided. See SourceOutputWithWatermarks#collect())
+ // TODO: this test can be removed when SourceFunction gets removed
+ // (FLIP-27 sources set TimestampAssigner.NO_TIMESTAMP value as event
+ // time when no timestamp is provided. See SourceOutputWithWatermarks#collect())
val stream = env
.addSource(new SourceFunction[(Long, String)]() {
def run(ctx: SourceFunction.SourceContext[(Long, String)]) {
@@ -47,37 +48,48 @@ class TimeAttributesITCase(mode: StateBackendMode) extends StreamingWithStateTes
def cancel() {}
})
- tEnv.createTemporaryView("test", stream, Schema.newBuilder()
- .columnByMetadata("event_time", DataTypes.TIMESTAMP(3), "rowtime", true)
- .build())
+ tEnv.createTemporaryView(
+ "test",
+ stream,
+ Schema
+ .newBuilder()
+ .columnByMetadata("event_time", DataTypes.TIMESTAMP(3), "rowtime", true)
+ .build())
val result = tEnv.sqlQuery("SELECT * FROM test")
val sink = new TestingAppendSink()
tEnv.toDataStream(result).addSink(sink)
assertThatThrownBy(() => env.execute())
- .hasMessageNotContaining("Rowtime timestamp is not defined. Please make sure that a " +
- "proper TimestampAssigner is defined and the stream environment uses the EventTime " +
- "time characteristic.")
+ .hasMessageNotContaining(
+ "Rowtime timestamp is not defined. Please make sure that a " +
+ "proper TimestampAssigner is defined and the stream environment uses the EventTime " +
+ "time characteristic.")
}
@TestTemplate
def testTimestampAttributesWithWatermarkStrategy(): Unit = {
val data = List(Instant.now().toEpochMilli -> "hello", Instant.now().toEpochMilli -> "world")
- val stream = env.fromCollection[(Long, String)](data).assignTimestampsAndWatermarks(
- WatermarkStrategy
- .forBoundedOutOfOrderness[(Long, String)](Duration.ofMinutes(5))
- .withTimestampAssigner {
- new SerializableTimestampAssigner[(Long, String)] {
- override def extractTimestamp(element: (Long, String), recordTimestamp: Long): Long =
- element._1
+ val stream = StreamingEnvUtil
+ .fromCollection(env, data)
+ .assignTimestampsAndWatermarks(
+ WatermarkStrategy
+ .forBoundedOutOfOrderness[(Long, String)](Duration.ofMinutes(5))
+ .withTimestampAssigner {
+ new SerializableTimestampAssigner[(Long, String)] {
+ override def extractTimestamp(element: (Long, String), recordTimestamp: Long): Long =
+ element._1
+ }
}
- }
- )
+ )
- tEnv.createTemporaryView("test", stream, Schema.newBuilder()
- .columnByMetadata("event_time", DataTypes.TIMESTAMP(3), "rowtime", true)
- .build())
+ tEnv.createTemporaryView(
+ "test",
+ stream,
+ Schema
+ .newBuilder()
+ .columnByMetadata("event_time", DataTypes.TIMESTAMP(3), "rowtime", true)
+ .build())
val result = tEnv.sqlQuery("SELECT * FROM test")
val sink = new TestingAppendSink()
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentITCase.scala
index 83682428ad0..6ca6a80e3a3 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentITCase.scala
@@ -18,18 +18,16 @@
package org.apache.flink.table.api
import org.apache.flink.api.common.typeinfo.Types.STRING
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
-import org.apache.flink.streaming.api.scala.{StreamExecutionEnvironment => ScalaStreamExecutionEnvironment}
import org.apache.flink.table.api.bridge.java.StreamTableEnvironment
-import org.apache.flink.table.api.bridge.scala.{StreamTableEnvironment => ScalaStreamTableEnvironment, _}
+import org.apache.flink.table.api.bridge.scala.{dataStreamConversions, StreamTableEnvironment => ScalaStreamTableEnvironment}
import org.apache.flink.table.api.config.TableConfigOptions
import org.apache.flink.table.api.internal.TableEnvironmentImpl
import org.apache.flink.table.catalog._
import org.apache.flink.table.planner.factories.TestValuesTableFactory
import org.apache.flink.table.planner.factories.utils.TestCollectionTableFactory
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, TestingAppendSink}
import org.apache.flink.table.planner.runtime.utils.BatchTestBase.{row => buildRow}
-import org.apache.flink.table.planner.runtime.utils.TestingAppendSink
import org.apache.flink.table.planner.utils.{TableTestUtil, TestTableSourceSinks}
import org.apache.flink.table.planner.utils.TableTestUtil.{readFromResource, replaceStageId}
import org.apache.flink.testutils.junit.extensions.parameterized.{ParameterizedTestExtension, Parameters}
@@ -270,10 +268,10 @@ class TableEnvironmentITCase(tableEnvName: String, isStreaming: Boolean) {
if (!tableEnvName.equals("StreamTableEnvironment")) {
return
}
- val streamEnv = ScalaStreamExecutionEnvironment.getExecutionEnvironment
+ val streamEnv = StreamExecutionEnvironment.getExecutionEnvironment
val streamTableEnv = ScalaStreamTableEnvironment.create(streamEnv, settings)
- val t = streamEnv
- .fromCollection(getPersonData)
+ val t = StreamingEnvUtil
+ .fromCollection(streamEnv, getPersonData)
.toTable(streamTableEnv, 'first, 'id, 'score, 'last)
streamTableEnv.createTemporaryView("MyTable", t)
val sink1Path = TestTableSourceSinks.createCsvTemporarySinkTable(
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala
index 7c377393d69..87fb7e7b299 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala
@@ -19,11 +19,9 @@ package org.apache.flink.table.api
import org.apache.flink.api.common.RuntimeExecutionMode
import org.apache.flink.api.common.typeinfo.Types.STRING
-import org.apache.flink.api.scala._
import org.apache.flink.configuration.{Configuration, CoreOptions, ExecutionOptions}
import org.apache.flink.core.testutils.FlinkAssertions.anyCauseMatches
-import org.apache.flink.streaming.api.environment.LocalStreamEnvironment
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
+import org.apache.flink.streaming.api.environment.{LocalStreamEnvironment, StreamExecutionEnvironment}
import org.apache.flink.table.api.bridge.scala.{StreamTableEnvironment, _}
import org.apache.flink.table.api.internal.TableEnvironmentInternal
import org.apache.flink.table.catalog._
@@ -33,6 +31,7 @@ import org.apache.flink.table.module.ModuleEntry
import org.apache.flink.table.planner.factories.utils.TestCollectionTableFactory._
import org.apache.flink.table.planner.runtime.stream.sql.FunctionITCase.TestUDF
import org.apache.flink.table.planner.runtime.stream.table.FunctionITCase.SimpleScalarFunction
+import org.apache.flink.table.planner.runtime.utils.StreamingEnvUtil
import org.apache.flink.table.planner.utils.{TableTestUtil, TestTableSourceSinks}
import org.apache.flink.table.planner.utils.TableTestUtil.{replaceNodeIdInOperator, replaceStageId, replaceStreamNodeId}
import org.apache.flink.table.types.DataType
@@ -59,7 +58,7 @@ class TableEnvironmentTest {
@TempDir
var tempFolder: Path = _
- val env = new StreamExecutionEnvironment(new LocalStreamEnvironment())
+ val env = new LocalStreamEnvironment()
val tableEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
val batchTableEnv = StreamTableEnvironment.create(env, TableTestUtil.BATCH_SETTING)
@@ -72,7 +71,9 @@ class TableEnvironmentTest {
@Test
def testRegisterDataStream(): Unit = {
- val table = env.fromElements[(Int, Long, String, Boolean)]().toTable(tableEnv, 'a, 'b, 'c, 'd)
+ val table = StreamingEnvUtil
+ .fromElements[(Int, Long, String, Boolean)](env)
+ .toTable(tableEnv, 'a, 'b, 'c, 'd)
tableEnv.createTemporaryView("MyTable", table)
val scanTable = tableEnv.from("MyTable")
val relNode = TableTestUtil.toRelNode(scanTable)
@@ -81,7 +82,11 @@ class TableEnvironmentTest {
assertEquals(expected, actual)
assertThatThrownBy(
- () => tableEnv.createTemporaryView("MyTable", env.fromElements[(Int, Long)]()))
+ () =>
+ tableEnv.createTemporaryView(
+ "MyTable",
+ StreamingEnvUtil
+ .fromElements[(Int, Long)](env)))
.hasMessageContaining(
"Temporary table '`default_catalog`.`default_database`.`MyTable`' already exists")
.isInstanceOf[ValidationException]
@@ -89,7 +94,9 @@ class TableEnvironmentTest {
@Test
def testSimpleQuery(): Unit = {
- val table = env.fromElements[(Int, Long, String, Boolean)]().toTable(tableEnv, 'a, 'b, 'c, 'd)
+ val table = StreamingEnvUtil
+ .fromElements[(Int, Long, String, Boolean)](env)
+ .toTable(tableEnv, 'a, 'b, 'c, 'd)
tableEnv.createTemporaryView("MyTable", table)
val queryTable = tableEnv.sqlQuery("SELECT a, c, d FROM MyTable")
val relNode = TableTestUtil.toRelNode(queryTable)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/ExplainTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/ExplainTest.scala
index 715bee95477..936bc58ae82 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/ExplainTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/ExplainTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.api.batch
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.api.internal.TableEnvironmentInternal
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/ExplainTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/ExplainTest.scala
index 8fce44b2dac..91016686ac7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/ExplainTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/ExplainTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.api.stream
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.api.internal.TableEnvironmentInternal
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/OverWindowValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/OverWindowValidationTest.scala
index a7f4cee47dd..f0cda98c1c6 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/OverWindowValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/OverWindowValidationTest.scala
@@ -17,12 +17,10 @@
*/
package org.apache.flink.table.api.stream.sql.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.OverAgg0
import org.apache.flink.table.planner.utils.TableTestBase
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThatExceptionOfType
import org.junit.jupiter.api.Test
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/codegen/agg/AggTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/codegen/agg/AggTestBase.scala
index 0f52aa0665f..b6c760a4cca 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/codegen/agg/AggTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/codegen/agg/AggTestBase.scala
@@ -19,7 +19,6 @@ package org.apache.flink.table.planner.codegen.agg
import org.apache.flink.api.common.functions.RuntimeContext
import org.apache.flink.streaming.api.environment.LocalStreamEnvironment
-import org.apache.flink.streaming.api.scala.{StreamExecutionEnvironment => ScalaStreamExecEnv}
import org.apache.flink.table.api.{DataTypes, EnvironmentSettings}
import org.apache.flink.table.api.bridge.scala.StreamTableEnvironment
import org.apache.flink.table.api.internal.TableEnvironmentImpl
@@ -42,7 +41,7 @@ abstract class AggTestBase(isBatchMode: Boolean) {
val typeFactory: FlinkTypeFactory =
new FlinkTypeFactory(Thread.currentThread().getContextClassLoader, FlinkTypeSystem.INSTANCE)
- val env = new ScalaStreamExecEnv(new LocalStreamEnvironment)
+ val env = new LocalStreamEnvironment
private val tEnv = if (isBatchMode) {
val settings = EnvironmentSettings.newInstance().inBatchMode().build()
// use impl class instead of interface class to avoid
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/expressions/utils/CompositeTypeTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/expressions/utils/CompositeTypeTestBase.scala
index ecf52c5f1c1..22460a5509d 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/expressions/utils/CompositeTypeTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/expressions/utils/CompositeTypeTestBase.scala
@@ -19,7 +19,7 @@ package org.apache.flink.table.planner.expressions.utils
import org.apache.flink.api.common.typeinfo.Types
import org.apache.flink.api.java.typeutils.{RowTypeInfo, TupleTypeInfo, TypeExtractor}
-import org.apache.flink.api.scala.createTypeInformation
+import org.apache.flink.table.api.createTypeInformation
import org.apache.flink.table.planner.expressions.utils.CompositeTypeTestBase.{MyCaseClass, MyCaseClass2, MyCaseClass3, MyPojo}
import org.apache.flink.types.Row
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/match/PatternTranslatorTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/match/PatternTranslatorTestBase.scala
index 82344d73aac..6537c329eb3 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/match/PatternTranslatorTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/match/PatternTranslatorTestBase.scala
@@ -21,8 +21,8 @@ import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation}
import org.apache.flink.api.java.typeutils.RowTypeInfo
import org.apache.flink.cep.pattern.Pattern
import org.apache.flink.configuration.Configuration
-import org.apache.flink.streaming.api.datastream.{DataStream => JDataStream}
-import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment}
+import org.apache.flink.streaming.api.datastream.DataStream
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala.StreamTableEnvironment
import org.apache.flink.table.api.internal.TableEnvironmentImpl
@@ -56,17 +56,15 @@ abstract class PatternTranslatorTestBase {
typeInfo: TypeInformation[Row]): (RelBuilder, PlannerBase, StreamExecutionEnvironment) = {
// create DataStreamTable
val dataStreamMock = mock(classOf[DataStream[Row]])
- val jDataStreamMock = mock(classOf[JDataStream[Row]])
- when(dataStreamMock.javaStream).thenReturn(jDataStreamMock)
- when(jDataStreamMock.getType).thenReturn(typeInfo)
- when(jDataStreamMock.getId).thenReturn(0)
+ when(dataStreamMock.getType).thenReturn(typeInfo)
+ when(dataStreamMock.getId).thenReturn(0)
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
TableTestUtil.createTemporaryView(
tEnv,
tableName,
- dataStreamMock.javaStream,
+ dataStreamMock,
Some(Array[Expression]('f0, 'proctime.proctime)))
// prepare RelBuilder
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/CalcTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/CalcTest.scala
index 49bd11af112..7d63dea41d7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/CalcTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/CalcTest.scala
@@ -19,7 +19,6 @@ package org.apache.flink.table.planner.plan.batch.sql
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.TypeExtractor
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.MyPojo
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedScalarFunctions.NonDeterministicUdf
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/DagOptimizationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/DagOptimizationTest.scala
index 051fabca5e6..1442f3aacae 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/DagOptimizationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/DagOptimizationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.OptimizerConfigOptions
import org.apache.flink.table.api.internal.TableEnvironmentInternal
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/DeadlockBreakupTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/DeadlockBreakupTest.scala
index 20868e298da..871de38edf2 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/DeadlockBreakupTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/DeadlockBreakupTest.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.plan.batch.sql
import org.apache.flink.api.common.BatchShuffleMode
-import org.apache.flink.api.scala._
import org.apache.flink.configuration.ExecutionOptions
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.{ExecutionConfigOptions, OptimizerConfigOptions}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacyLimitTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacyLimitTest.scala
index 9eb46335111..c7abdd5f318 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacyLimitTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacyLimitTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api.{SqlParserException, _}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacySinkTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacySinkTest.scala
index 34d345808b6..dfe63780b63 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacySinkTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacySinkTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.OptimizerConfigOptions
import org.apache.flink.table.api.internal.TableEnvironmentInternal
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LimitTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LimitTest.scala
index 86fe1c7c965..be175d7288f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LimitTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LimitTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.connector.source.abilities.SupportsProjectionPushDown
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/MultipleInputCreationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/MultipleInputCreationTest.scala
index 11a8f5c5ef5..49292e9f1ef 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/MultipleInputCreationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/MultipleInputCreationTest.scala
@@ -21,7 +21,6 @@ import org.apache.flink.api.common.BatchShuffleMode
import org.apache.flink.api.common.eventtime.WatermarkStrategy
import org.apache.flink.api.connector.source.Boundedness
import org.apache.flink.api.connector.source.mocks.MockSource
-import org.apache.flink.api.scala._
import org.apache.flink.configuration.{ExecutionOptions, JobManagerOptions}
import org.apache.flink.configuration.JobManagerOptions.SchedulerType
import org.apache.flink.table.api._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/PartitionableSinkTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/PartitionableSinkTest.scala
index 80ddcb839ec..5c45e20217e 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/PartitionableSinkTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/PartitionableSinkTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/RankTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/RankTest.scala
index 49ff3aaa033..06d7c7688a8 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/RankTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/RankTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SetOperatorsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SetOperatorsTest.scala
index 943e6c766e0..2a2ce36e983 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SetOperatorsTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SetOperatorsTest.scala
@@ -19,7 +19,6 @@ package org.apache.flink.table.planner.plan.batch.sql
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.GenericTypeInfo
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.planner.plan.utils.NonPojo
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SortLimitTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SortLimitTest.scala
index 92441780369..80fdc14559f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SortLimitTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SortLimitTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.planner.plan.rules.physical.batch.BatchPhysicalSortRule.TABLE_EXEC_RANGE_SORT_ENABLED
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SortTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SortTest.scala
index 32149d42f9c..ac79592b153 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SortTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SortTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.planner.plan.rules.physical.batch.BatchPhysicalSortRule.TABLE_EXEC_RANGE_SORT_ENABLED
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SubplanReuseTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SubplanReuseTest.scala
index 85d1e319341..3d46d4fcb85 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SubplanReuseTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/SubplanReuseTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.{ExecutionConfigOptions, OptimizerConfigOptions}
import org.apache.flink.table.planner.plan.rules.physical.batch.BatchPhysicalSortMergeJoinRule
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableScanTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableScanTest.scala
index 63aece2a139..8360bafdca7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableScanTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableScanTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.expressions.utils.Func0
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableSinkTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableSinkTest.scala
index 07888ed2c4b..2dc3faa96db 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableSinkTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableSinkTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.OptimizerConfigOptions
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/UnionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/UnionTest.scala
index f3b7bce4409..a7ff550c885 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/UnionTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/UnionTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/WindowTableFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/WindowTableFunctionTest.scala
index 6fbc1d4314e..5472f0e40e7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/WindowTableFunctionTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/WindowTableFunctionTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/AggregateTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/AggregateTestBase.scala
index 1c182e55236..e76d12389c2 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/AggregateTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/AggregateTestBase.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.plan.batch.sql.agg
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api.{TableException, Types, _}
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.{VarSum1AggFunction, VarSum2AggFunction}
import org.apache.flink.table.planner.utils.{BatchTableTestUtil, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/GroupWindowTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/GroupWindowTest.scala
index 2e8e29a6bcd..dc38aa53fc3 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/GroupWindowTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/GroupWindowTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql.agg
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.{AggregatePhaseStrategy, OptimizerConfigOptions}
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.WeightedAvgWithMerge
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/GroupingSetsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/GroupingSetsTest.scala
index 55cd258d578..c9fa04e61a8 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/GroupingSetsTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/GroupingSetsTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql.agg
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.FlinkRelOptUtil
import org.apache.flink.table.planner.utils.{TableTestBase, TableTestUtil}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/OverAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/OverAggregateTest.scala
index fb95adbf319..e3a42ef304c 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/OverAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/agg/OverAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql.agg
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.OverAgg0
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/JoinTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/JoinTestBase.scala
index f4c0301d13a..f0dc81568a6 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/JoinTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/JoinTestBase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql.join
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{BatchTableTestUtil, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/LookupJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/LookupJoinTest.scala
index 968717a0ff2..0d8ded4b534 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/LookupJoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/LookupJoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql.join
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.OptimizerConfigOptions
import org.apache.flink.table.planner.plan.optimize.program.FlinkBatchProgram
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/SemiAntiJoinTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/SemiAntiJoinTestBase.scala
index c3e91ea235f..4881aa085ef 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/SemiAntiJoinTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/SemiAntiJoinTestBase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql.join
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedTableFunctions.StringSplit
import org.apache.flink.table.planner.utils.{BatchTableTestUtil, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/SingleRowJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/SingleRowJoinTest.scala
index a243c112d64..d002a890cfe 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/SingleRowJoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/SingleRowJoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql.join
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/TemporalFunctionJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/TemporalFunctionJoinTest.scala
index e52041d5430..7eb1e3a1ef2 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/TemporalFunctionJoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/join/TemporalFunctionJoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.sql.join
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{BatchTableTestUtil, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/AggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/AggregateTest.scala
index 91ad63060b9..561eb11e1ba 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/AggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/AggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/CalcTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/CalcTest.scala
index 8e404067089..a8c2acb85c6 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/CalcTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/CalcTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table
-import org.apache.flink.api.scala.createTypeInformation
import org.apache.flink.table.api._
import org.apache.flink.table.functions.ScalarFunction
import org.apache.flink.table.planner.plan.batch.table.CalcTest.{giveMeCaseClass, MyHashCode, TestCaseClass, WC}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/ColumnFunctionsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/ColumnFunctionsTest.scala
index bfc45f93d0c..41061b6d477 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/ColumnFunctionsTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/ColumnFunctionsTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.functions.ScalarFunction
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/CorrelateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/CorrelateTest.scala
index da8f7a5e9f7..66cfe012fea 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/CorrelateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/CorrelateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.FlinkBatchProgram
import org.apache.flink.table.planner.utils.{MockPythonTableFunction, TableFunc0, TableFunc1, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/GroupWindowTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/GroupWindowTest.scala
index 4c5bd55eeb7..05c4ab5ac7b 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/GroupWindowTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/GroupWindowTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.WeightedAvgWithMerge
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/JoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/JoinTest.scala
index be5228bcaf2..7ee9f475f03 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/JoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/JoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.functions.ScalarFunction
import org.apache.flink.table.planner.plan.batch.table.JoinTest.Merger
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonAggregateTest.scala
index f09e7604294..a56ebaea67f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.PandasAggregateFunction
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonCalcTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonCalcTest.scala
index 46c3bfcdc79..0a7c66b9d73 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonCalcTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonCalcTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedScalarFunctions.PythonScalarFunction
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonGroupWindowAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonGroupWindowAggregateTest.scala
index d27d74922d9..f1b8bfd558d 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonGroupWindowAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonGroupWindowAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.{PandasAggregateFunction, TestPythonAggregateFunction}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonOverWindowAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonOverWindowAggregateTest.scala
index a337ae7a2a6..d5ffbde6c8b 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonOverWindowAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/PythonOverWindowAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.{PandasAggregateFunction, TestPythonAggregateFunction}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/SetOperatorsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/SetOperatorsTest.scala
index 8efbce6e873..4ae213b95e4 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/SetOperatorsTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/SetOperatorsTest.scala
@@ -19,7 +19,6 @@ package org.apache.flink.table.planner.plan.batch.table
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.GenericTypeInfo
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.NonPojo
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/TemporalTableFunctionJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/TemporalTableFunctionJoinTest.scala
index 5d7d914e61a..38e2b1a865f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/TemporalTableFunctionJoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/TemporalTableFunctionJoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{TableTestBase, TableTestUtil}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/AggregateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/AggregateValidationTest.scala
index 69e693e216d..1f4dce9edd6 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/AggregateValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/AggregateValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.WeightedAvgWithMergeAndReset
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/CalcValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/CalcValidationTest.scala
index c81918456ff..8a0a73d223e 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/CalcValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/CalcValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/CorrelateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/CorrelateValidationTest.scala
index ae28906e823..f6a8f5ab874 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/CorrelateValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/CorrelateValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{TableFunc1, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/GroupWindowValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/GroupWindowValidationTest.scala
index 45f1704e082..a4f94d6207a 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/GroupWindowValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/GroupWindowValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api.{Session, Slide, Tumble, ValidationException, _}
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.WeightedAvgWithMerge
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/JoinValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/JoinValidationTest.scala
index 860f88ec697..3e1c5247c09 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/JoinValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/JoinValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.internal.TableEnvironmentImpl
import org.apache.flink.table.planner.runtime.utils.CollectionBatchExecTable
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/OverWindowValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/OverWindowValidationTest.scala
index 060c58b1bf9..2c07e0bba61 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/OverWindowValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/OverWindowValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api.{Tumble, ValidationException, _}
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.OverAgg0
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/SetOperatorsValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/SetOperatorsValidationTest.scala
index acff005d7af..6592a0e7c71 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/SetOperatorsValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/SetOperatorsValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.internal.TableEnvironmentImpl
import org.apache.flink.table.planner.runtime.utils.CollectionBatchExecTable
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/SortValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/SortValidationTest.scala
index 823a1758c66..9d8f8645bdc 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/SortValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/table/validation/SortValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.batch.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/DistinctAggregateTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/DistinctAggregateTestBase.scala
index cba75862fad..95d190f7b86 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/DistinctAggregateTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/DistinctAggregateTestBase.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.plan.common
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{BatchTableTestUtil, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/PartialInsertTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/PartialInsertTest.scala
index 2c91b5b421f..574d07b3ecf 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/PartialInsertTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/PartialInsertTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.common
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
import org.apache.flink.testutils.junit.extensions.parameterized.{ParameterizedTestExtension, Parameters}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/UnnestTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/UnnestTestBase.scala
index 4d187ce9848..f7c76ee7516 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/UnnestTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/UnnestTestBase.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.plan.common
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{TableTestBase, TableTestUtil}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/ViewsExpandingTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/ViewsExpandingTest.scala
index 0e5e449d7ea..6a496f5bffd 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/ViewsExpandingTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/common/ViewsExpandingTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.common
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.catalog._
import org.apache.flink.table.functions.ScalarFunction
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/CalcPythonCorrelateTransposeRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/CalcPythonCorrelateTransposeRuleTest.scala
index a73507d9c5e..79fb55b2ae4 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/CalcPythonCorrelateTransposeRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/CalcPythonCorrelateTransposeRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.nodes.FlinkConventions
import org.apache.flink.table.planner.plan.optimize.program._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/CalcRankTransposeRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/CalcRankTransposeRuleTest.scala
index 1b36fd04333..a14d5cd510f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/CalcRankTransposeRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/CalcRankTransposeRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.FlinkStreamProgram
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ConvertToNotInOrInRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ConvertToNotInOrInRuleTest.scala
index 83f022d5363..872163ca0b1 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ConvertToNotInOrInRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ConvertToNotInOrInRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/DecomposeGroupingSetsRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/DecomposeGroupingSetsRuleTest.scala
index 4b011eb459f..2c6a6fa2cda 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/DecomposeGroupingSetsRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/DecomposeGroupingSetsRuleTest.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.plan.rules.logical
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.FlinkBatchProgram
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ExpressionReductionRulesTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ExpressionReductionRulesTest.scala
index 607c89605de..af267a017d2 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ExpressionReductionRulesTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ExpressionReductionRulesTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.functions.ScalarFunction
import org.apache.flink.table.functions.python.{PythonEnv, PythonFunction}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRuleTest.scala
index 46606382e9d..9d6032277f1 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRuleTest.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.plan.rules.logical
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program._
import org.apache.flink.table.planner.plan.stats.FlinkStatistic
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateRemoveRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateRemoveRuleTest.scala
index 3f7f3c28fc9..d6734319991 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateRemoveRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateRemoveRuleTest.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.plan.rules.logical
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.nodes.FlinkConventions
import org.apache.flink.table.planner.plan.nodes.logical._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkCalcMergeRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkCalcMergeRuleTest.scala
index 9011ce399f6..6ee1fa45023 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkCalcMergeRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkCalcMergeRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.nodes.FlinkConventions
import org.apache.flink.table.planner.plan.nodes.logical.{FlinkLogicalCalc, FlinkLogicalLegacyTableSourceScan}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinPushExpressionsRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinPushExpressionsRuleTest.scala
index 8ae98ea7557..3b04f9d5671 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinPushExpressionsRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinPushExpressionsRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{BatchOptimizeContext, FlinkChainedProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinToMultiJoinRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinToMultiJoinRuleTest.scala
index 5b3d6aaddfb..0941713238b 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinToMultiJoinRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinToMultiJoinRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{FlinkBatchProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.{TableConfigUtils, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLimit0RemoveRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLimit0RemoveRuleTest.scala
index 839d1f77654..fc54ca68432 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLimit0RemoveRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLimit0RemoveRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{BatchOptimizeContext, FlinkChainedProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLogicalRankRuleForConstantRangeTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLogicalRankRuleForConstantRangeTest.scala
index e12d306e602..f33d040457f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLogicalRankRuleForConstantRangeTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLogicalRankRuleForConstantRangeTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.FlinkBatchProgram
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLogicalRankRuleForRangeEndTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLogicalRankRuleForRangeEndTest.scala
index e06a78ba224..f4ee678359d 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLogicalRankRuleForRangeEndTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkLogicalRankRuleForRangeEndTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.FlinkStreamProgram
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkPruneEmptyRulesTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkPruneEmptyRulesTest.scala
index 1285d0600eb..2bf3ed89445 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkPruneEmptyRulesTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkPruneEmptyRulesTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{BatchOptimizeContext, FlinkChainedProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinFilterTransposeRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinFilterTransposeRuleTest.scala
index 7aa04829f42..a71e57c1f46 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinFilterTransposeRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinFilterTransposeRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{FlinkBatchProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.{TableConfigUtils, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinJoinTransposeRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinJoinTransposeRuleTest.scala
index 1d82048b2ec..95baf827605 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinJoinTransposeRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinJoinTransposeRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{FlinkBatchProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.{TableConfigUtils, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinProjectTransposeRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinProjectTransposeRuleTest.scala
index 5fdfd816037..85c935b447f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinProjectTransposeRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinProjectTransposeRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{FlinkBatchProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.{TableConfigUtils, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinConditionEqualityTransferRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinConditionEqualityTransferRuleTest.scala
index edcabf8454f..dad91fbbc4e 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinConditionEqualityTransferRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinConditionEqualityTransferRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{FlinkBatchProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.{TableConfigUtils, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinConditionTypeCoerceRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinConditionTypeCoerceRuleTest.scala
index d22d325be63..cd6d13b2f0d 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinConditionTypeCoerceRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinConditionTypeCoerceRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{FlinkBatchProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.{TableConfigUtils, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinDependentConditionDerivationRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinDependentConditionDerivationRuleTest.scala
index 649121c0c75..91cfdc9dfa0 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinDependentConditionDerivationRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/JoinDependentConditionDerivationRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{FlinkBatchProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.{TableConfigUtils, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/LogicalCorrelateToJoinFromTemporalTableRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/LogicalCorrelateToJoinFromTemporalTableRuleTest.scala
index a9a8037e147..15effa54b9a 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/LogicalCorrelateToJoinFromTemporalTableRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/LogicalCorrelateToJoinFromTemporalTableRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{FlinkChainedProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE, StreamOptimizeContext}
import org.apache.flink.table.planner.utils.{StreamTableTestUtil, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ProjectSemiAntiJoinTransposeRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ProjectSemiAntiJoinTransposeRuleTest.scala
index 35d311c35ea..589972b79dd 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ProjectSemiAntiJoinTransposeRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ProjectSemiAntiJoinTransposeRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{FlinkBatchProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedTableFunctions.StringSplit
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PruneAggregateCallRuleTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PruneAggregateCallRuleTestBase.scala
index 9ceaec78c00..38af091c4ab 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PruneAggregateCallRuleTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PruneAggregateCallRuleTestBase.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.plan.rules.logical
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.stats.FlinkStatistic
import org.apache.flink.table.planner.utils.{BatchTableTestUtil, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonCalcSplitRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonCalcSplitRuleTest.scala
index 9fc9090ee95..45aae6c812b 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonCalcSplitRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonCalcSplitRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.nodes.FlinkConventions
import org.apache.flink.table.planner.plan.optimize.program._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonCorrelateSplitRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonCorrelateSplitRuleTest.scala
index d6c3f5ca876..ea6ad614c96 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonCorrelateSplitRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonCorrelateSplitRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.nodes.FlinkConventions
import org.apache.flink.table.planner.plan.optimize.program._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonMapMergeRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonMapMergeRuleTest.scala
index fbee5a25a05..5212d4a487f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonMapMergeRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/PythonMapMergeRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.nodes.FlinkConventions
import org.apache.flink.table.planner.plan.optimize.program._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RankNumberColumnRemoveRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RankNumberColumnRemoveRuleTest.scala
index 5334a51dc88..ab4d63d6bd1 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RankNumberColumnRemoveRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RankNumberColumnRemoveRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.FlinkStreamProgram
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RemoveSingleAggregateRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RemoveSingleAggregateRuleTest.scala
index 93af994c6c9..007130ca8e8 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RemoveSingleAggregateRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RemoveSingleAggregateRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ReplaceIntersectWithSemiJoinRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ReplaceIntersectWithSemiJoinRuleTest.scala
index 4804949b5c0..35cee9fd601 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ReplaceIntersectWithSemiJoinRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ReplaceIntersectWithSemiJoinRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{BatchOptimizeContext, FlinkChainedProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ReplaceMinusWithAntiJoinRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ReplaceMinusWithAntiJoinRuleTest.scala
index d1cec8e88de..d8001aba4e4 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ReplaceMinusWithAntiJoinRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/ReplaceMinusWithAntiJoinRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{BatchOptimizeContext, FlinkChainedProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteIntersectAllRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteIntersectAllRuleTest.scala
index 6af0c912f93..73b5c60966a 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteIntersectAllRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteIntersectAllRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{BatchOptimizeContext, FlinkChainedProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteMinusAllRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteMinusAllRuleTest.scala
index aa2a3eb04d9..a9e4c082a01 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteMinusAllRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteMinusAllRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{BatchOptimizeContext, FlinkChainedProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteMultiJoinConditionRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteMultiJoinConditionRuleTest.scala
index 00cd68a7e65..f749e33d54e 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteMultiJoinConditionRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/RewriteMultiJoinConditionRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.OptimizerConfigOptions
import org.apache.flink.table.planner.plan.optimize.program._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SimplifyFilterConditionRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SimplifyFilterConditionRuleTest.scala
index fae4bb6d705..659b5128321 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SimplifyFilterConditionRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SimplifyFilterConditionRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{BatchOptimizeContext, FlinkChainedProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SimplifyJoinConditionRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SimplifyJoinConditionRuleTest.scala
index 0b398096835..e414d7b60e2 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SimplifyJoinConditionRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SimplifyJoinConditionRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program.{FlinkBatchProgram, FlinkHepRuleSetProgramBuilder, HEP_RULES_EXECUTION_TYPE}
import org.apache.flink.table.planner.utils.{TableConfigUtils, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitAggregateRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitAggregateRuleTest.scala
index be22d7b46a4..8efa08fa3fe 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitAggregateRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitAggregateRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.OptimizerConfigOptions
import org.apache.flink.table.planner.plan.optimize.program.FlinkStreamProgram
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitPythonConditionFromCorrelateRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitPythonConditionFromCorrelateRuleTest.scala
index 59f6545562b..47fff2396eb 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitPythonConditionFromCorrelateRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitPythonConditionFromCorrelateRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.nodes.FlinkConventions
import org.apache.flink.table.planner.plan.optimize.program._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitPythonConditionFromJoinRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitPythonConditionFromJoinRuleTest.scala
index 757409616ea..200e4ece219 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitPythonConditionFromJoinRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/SplitPythonConditionFromJoinRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.nodes.FlinkConventions
import org.apache.flink.table.planner.plan.optimize.program._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/WindowGroupReorderRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/WindowGroupReorderRuleTest.scala
index 36840e18610..7b8070b3152 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/WindowGroupReorderRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/WindowGroupReorderRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.optimize.program._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/FlinkRewriteSubQueryRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/FlinkRewriteSubQueryRuleTest.scala
index a18f74148f7..da20ce4254c 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/FlinkRewriteSubQueryRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/FlinkRewriteSubQueryRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical.subquery
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.junit.jupiter.api.{BeforeEach, Test}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQueryAntiJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQueryAntiJoinTest.scala
index b12dd24818a..7ecef1016c0 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQueryAntiJoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQueryAntiJoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical.subquery
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedTableFunctions.StringSplit
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQuerySemiJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQuerySemiJoinTest.scala
index 4952f65ebda..d2a2c686cf8 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQuerySemiJoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQuerySemiJoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical.subquery
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedTableFunctions.StringSplit
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubqueryCorrelateVariablesValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubqueryCorrelateVariablesValidationTest.scala
index 8b9339913e5..01064e57978 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubqueryCorrelateVariablesValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/logical/subquery/SubqueryCorrelateVariablesValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.logical.subquery
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.assertj.core.api.Assertions.assertThatExceptionOfType
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/EnforceLocalAggRuleTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/EnforceLocalAggRuleTestBase.scala
index 714baa21623..ef28c36eff0 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/EnforceLocalAggRuleTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/EnforceLocalAggRuleTestBase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.physical.batch
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalHashAggRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalHashAggRuleTest.scala
index 52f3f53f894..e2b6f45ba53 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalHashAggRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalHashAggRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.physical.batch
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.{ExecutionConfigOptions, OptimizerConfigOptions}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalRankRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalRankRuleTest.scala
index 56a90cb44ba..bc505806a7d 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalRankRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalRankRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.physical.batch
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalSortAggRuleTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalSortAggRuleTest.scala
index 11be16997f2..25b939905b7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalSortAggRuleTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/rules/physical/batch/RemoveRedundantLocalSortAggRuleTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.rules.physical.batch
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.{ExecutionConfigOptions, OptimizerConfigOptions}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/CalcTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/CalcTest.scala
index 7df283295db..76c053d6193 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/CalcTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/CalcTest.scala
@@ -19,7 +19,6 @@ package org.apache.flink.table.planner.plan.stream.sql
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.TypeExtractor
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.MyPojo
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedScalarFunctions.NonDeterministicUdf
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/DagOptimizationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/DagOptimizationTest.scala
index b051bb60d36..aebfec5f493 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/DagOptimizationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/DagOptimizationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.OptimizerConfigOptions
import org.apache.flink.table.api.internal.TableEnvironmentInternal
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/DeduplicateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/DeduplicateTest.scala
index 093b3a12415..f0fe449386a 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/DeduplicateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/DeduplicateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.ExecutionConfigOptions.{TABLE_EXEC_MINIBATCH_ALLOW_LATENCY, TABLE_EXEC_MINIBATCH_ENABLED, TABLE_EXEC_MINIBATCH_SIZE}
import org.apache.flink.table.planner.utils.{StreamTableTestUtil, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/LegacySinkTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/LegacySinkTest.scala
index 82cdbfbf371..949b229e5e4 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/LegacySinkTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/LegacySinkTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.internal.TableEnvironmentInternal
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/LimitTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/LimitTest.scala
index 2d5333ddca9..c9d331a8f37 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/LimitTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/LimitTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/MiniBatchIntervalInferTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/MiniBatchIntervalInferTest.scala
index e339e684faf..fe729dbbbc6 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/MiniBatchIntervalInferTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/MiniBatchIntervalInferTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.api.internal.TableEnvironmentInternal
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/ModifiedMonotonicityTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/ModifiedMonotonicityTest.scala
index c78735fc111..0a54acccd87 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/ModifiedMonotonicityTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/ModifiedMonotonicityTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.functions.ScalarFunction
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/NonDeterministicDagTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/NonDeterministicDagTest.scala
index f861558ed9b..e16f747dd39 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/NonDeterministicDagTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/NonDeterministicDagTest.scala
@@ -19,7 +19,6 @@ package org.apache.flink.table.planner.plan.stream.sql
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.tuple
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.api.datastream.{DataStream, DataStreamSink}
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.{ExecutionConfigOptions, OptimizerConfigOptions}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/PartitionableSinkTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/PartitionableSinkTest.scala
index 90c40210984..86c55bdadf7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/PartitionableSinkTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/PartitionableSinkTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/RankTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/RankTest.scala
index 9992bb71a45..8cfec66a3cb 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/RankTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/RankTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.OptimizerConfigOptions
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/RelTimeIndicatorConverterTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/RelTimeIndicatorConverterTest.scala
index b3b76930e7a..8dcbd267902 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/RelTimeIndicatorConverterTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/RelTimeIndicatorConverterTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.annotation.{DataTypeHint, FunctionHint}
import org.apache.flink.table.api._
import org.apache.flink.table.api.internal.TableEnvironmentInternal
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SetOperatorsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SetOperatorsTest.scala
index 40dea1bc89e..a84f2d00a18 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SetOperatorsTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SetOperatorsTest.scala
@@ -19,7 +19,6 @@ package org.apache.flink.table.planner.plan.stream.sql
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.GenericTypeInfo
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.NonPojo
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SortLimitTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SortLimitTest.scala
index 2fc7d30f67b..bc874910858 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SortLimitTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SortLimitTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SortTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SortTest.scala
index df554c3bbfc..042842e7d2e 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SortTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SortTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SubplanReuseTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SubplanReuseTest.scala
index eda013aac05..02e3255e68f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SubplanReuseTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/SubplanReuseTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.{ExecutionConfigOptions, OptimizerConfigOptions}
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedScalarFunctions.NonDeterministicUdf
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/TableScanTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/TableScanTest.scala
index e55cf641991..674355e1219 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/TableScanTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/TableScanTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.FlinkAssertions
import org.apache.flink.core.testutils.FlinkAssertions.anyCauseMatches
import org.apache.flink.table.api._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/TableSinkTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/TableSinkTest.scala
index 6da87288e99..a5e9e0c1e84 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/TableSinkTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/TableSinkTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.configuration.ConfigOption
import org.apache.flink.streaming.api.functions.source.{ParallelSourceFunction, SourceFunction}
import org.apache.flink.table.api._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/UnionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/UnionTest.scala
index d8e4ac1daeb..eb1ca7e8a93 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/UnionTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/UnionTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/UnnestTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/UnnestTest.scala
index 0eccb2947ca..940fcb16a78 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/UnnestTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/UnnestTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.common.UnnestTestBase
import org.apache.flink.table.planner.utils.TableTestUtil
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/AggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/AggregateTest.scala
index affe9b33ecd..0ee8bb8f232 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/AggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/AggregateTest.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.plan.stream.sql.agg
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.planner.utils.{StreamTableTestUtil, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/DistinctAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/DistinctAggregateTest.scala
index 48e223fb9c4..861f58728e5 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/DistinctAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/DistinctAggregateTest.scala
@@ -17,10 +17,8 @@
*/
package org.apache.flink.table.planner.plan.stream.sql.agg
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.{AggregatePhaseStrategy, OptimizerConfigOptions}
-import org.apache.flink.table.planner.plan.rules.physical.stream.IncrementalAggregateRule
import org.apache.flink.table.planner.utils.{StreamTableTestUtil, TableTestBase}
import org.apache.flink.testutils.junit.extensions.parameterized.{ParameterizedTestExtension, Parameters}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/GroupWindowTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/GroupWindowTest.scala
index 9a9af1c04cb..5aac062f40d 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/GroupWindowTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/GroupWindowTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql.agg
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.WeightedAvgWithMerge
import org.apache.flink.table.planner.plan.utils.WindowEmitStrategy.{TABLE_EXEC_EMIT_ALLOW_LATENESS, TABLE_EXEC_EMIT_LATE_FIRE_DELAY, TABLE_EXEC_EMIT_LATE_FIRE_ENABLED}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/GroupingSetsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/GroupingSetsTest.scala
index 0bfa78fc1c1..7f40c6b8d83 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/GroupingSetsTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/GroupingSetsTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql.agg
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.FlinkRelOptUtil
import org.apache.flink.table.planner.utils.{TableTestBase, TableTestUtil}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/OverAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/OverAggregateTest.scala
index e290bbce225..beb16551af9 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/OverAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/OverAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql.agg
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.FlinkRelOptUtil
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.OverAgg0
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/TwoStageAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/TwoStageAggregateTest.scala
index 2f0b4d169df..ff4fb2aae5d 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/TwoStageAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/agg/TwoStageAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql.agg
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.{AggregatePhaseStrategy, OptimizerConfigOptions}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/IntervalJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/IntervalJoinTest.scala
index 9d6f67d4fa1..773403112a1 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/IntervalJoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/IntervalJoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql.join
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.IntervalJoinUtil
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedScalarFunctions.PythonScalarFunction
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/JoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/JoinTest.scala
index 221ecb0edce..f8e34d9ce2d 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/JoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/JoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql.join
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.planner.utils.{StreamTableTestUtil, TableFunc1, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/LookupJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/LookupJoinTest.scala
index 3495355fccd..16a8cb604ce 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/LookupJoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/LookupJoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql.join
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.api.datastream.DataStream
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/SemiAntiJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/SemiAntiJoinTest.scala
index 4a3e9b3a660..ad2769cb162 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/SemiAntiJoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/SemiAntiJoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql.join
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedTableFunctions.StringSplit
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/TemporalFunctionJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/TemporalFunctionJoinTest.scala
index 3b4ea69d25b..221d8d86217 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/TemporalFunctionJoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/sql/join/TemporalFunctionJoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.sql.join
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{StreamTableTestUtil, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/AggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/AggregateTest.scala
index 829ea0ba9fb..8f22dc39f14 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/AggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/AggregateTest.scala
@@ -17,8 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.common.typeinfo.BasicTypeInfo
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.WeightedAvg
import org.apache.flink.table.planner.utils.{CountMinMax, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/CalcTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/CalcTest.scala
index e5cacf54ded..a261f0635a1 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/CalcTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/CalcTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.expressions.utils.{Func1, Func23, Func24}
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/ColumnFunctionsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/ColumnFunctionsTest.scala
index 00c980d7a9f..5a17daeb4f7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/ColumnFunctionsTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/ColumnFunctionsTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.annotation.DataTypeHint
import org.apache.flink.table.api._
import org.apache.flink.table.functions.ScalarFunction
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/CorrelateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/CorrelateTest.scala
index deedcf48680..f9b6c9b620c 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/CorrelateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/CorrelateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.expressions.utils.Func13
import org.apache.flink.table.planner.plan.optimize.program.FlinkStreamProgram
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/GroupWindowTableAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/GroupWindowTableAggregateTest.scala
index a20ce81d374..08918a2794f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/GroupWindowTableAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/GroupWindowTableAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{EmptyTableAggFunc, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/GroupWindowTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/GroupWindowTest.scala
index 49bfe1210e5..0a0df8e8650 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/GroupWindowTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/GroupWindowTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.{WeightedAvg, WeightedAvgWithMerge}
import org.apache.flink.table.planner.utils.{EmptyTableAggFunc, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/JoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/JoinTest.scala
index 4296b0c8417..200b4a2405a 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/JoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/JoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/OverAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/OverAggregateTest.scala
index 8227a97cac2..68edf5def3e 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/OverAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/OverAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.expressions.utils.Func1
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.WeightedAvgWithRetract
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonAggregateTest.scala
index 14d30421fa0..dc49606907d 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonAggregateTest.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.plan.stream.table
import org.apache.flink.api.java.tuple.Tuple1
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.dataview.{ListView, MapView}
import org.apache.flink.table.planner.plan.nodes.exec.utils.CommonPythonUtil
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonCalcTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonCalcTest.scala
index 5c323bbe977..41d7c6e28e5 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonCalcTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonCalcTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedScalarFunctions.PythonScalarFunction
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonGroupWindowAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonGroupWindowAggregateTest.scala
index a254f337dc5..2577f33115a 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonGroupWindowAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonGroupWindowAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.WindowEmitStrategy.{TABLE_EXEC_EMIT_EARLY_FIRE_DELAY, TABLE_EXEC_EMIT_EARLY_FIRE_ENABLED}
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.{PandasAggregateFunction, TestPythonAggregateFunction}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonOverWindowAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonOverWindowAggregateTest.scala
index e297ecf25e4..3c4cc9a68d7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonOverWindowAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonOverWindowAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.PandasAggregateFunction
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonTableAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonTableAggregateTest.scala
index 834cfa93e10..e12534d4fc5 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonTableAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/PythonTableAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{PythonEmptyTableAggFunc, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/SetOperatorsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/SetOperatorsTest.scala
index f5f8e2b81b4..74ac698bc6e 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/SetOperatorsTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/SetOperatorsTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TableAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TableAggregateTest.scala
index 0d566db60d1..21efc6489a2 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TableAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TableAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.expressions.utils.Func0
import org.apache.flink.table.planner.utils.{EmptyTableAggFunc, EmptyTableAggFuncWithIntResultType, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TemporalTableFunctionJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TemporalTableFunctionJoinTest.scala
index 47a915290df..ff98d68d23b 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TemporalTableFunctionJoinTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TemporalTableFunctionJoinTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.expressions.FieldReferenceExpression
import org.apache.flink.table.functions.{TemporalTableFunction, TemporalTableFunctionImpl}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TwoStageAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TwoStageAggregateTest.scala
index e6eceee0f77..71ba9c5bfb5 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TwoStageAggregateTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/TwoStageAggregateTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.config.{AggregatePhaseStrategy, ExecutionConfigOptions, OptimizerConfigOptions}
import org.apache.flink.table.planner.utils.{StreamTableTestUtil, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/AggregateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/AggregateValidationTest.scala
index b81f8b5829b..b3b76bb3a82 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/AggregateValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/AggregateValidationTest.scala
@@ -17,10 +17,8 @@
*/
package org.apache.flink.table.planner.plan.stream.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{TableFunc0, TableTestBase}
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThatExceptionOfType
import org.assertj.core.api.ThrowableAssert.ThrowingCallable
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/CalcValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/CalcValidationTest.scala
index 78a9fa798b6..187efdec35f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/CalcValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/CalcValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.WeightedAvg
import org.apache.flink.table.planner.utils.{TableFunc0, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/CorrelateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/CorrelateValidationTest.scala
index ae97fbd7c9e..6e1835bfc75 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/CorrelateValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/CorrelateValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.expressions.utils._
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.WeightedAvg
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/GroupWindowTableAggregateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/GroupWindowTableAggregateValidationTest.scala
index 4275b411ec9..34c50d9989b 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/GroupWindowTableAggregateValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/GroupWindowTableAggregateValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.WindowEmitStrategy.{TABLE_EXEC_EMIT_EARLY_FIRE_DELAY, TABLE_EXEC_EMIT_EARLY_FIRE_ENABLED}
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.WeightedAvgWithMerge
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/GroupWindowValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/GroupWindowValidationTest.scala
index ed500721fcf..514bdafc64e 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/GroupWindowValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/GroupWindowValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.WeightedAvgWithMerge
import org.apache.flink.table.planner.utils.TableTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/LegacyTableSinkValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/LegacyTableSinkValidationTest.scala
index 2f37db536d9..8a95965b1c1 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/LegacyTableSinkValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/LegacyTableSinkValidationTest.scala
@@ -17,14 +17,13 @@
*/
package org.apache.flink.table.planner.plan.stream.table.validation
-import org.apache.flink.api.scala._
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
+import org.apache.flink.api.common.eventtime._
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.internal.TableEnvironmentInternal
-import org.apache.flink.table.planner.runtime.utils.{TestData, TestingAppendSink, TestingUpsertTableSink}
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, TestData, TestingAppendSink, TestingUpsertTableSink}
import org.apache.flink.table.planner.utils.{MemoryTableSourceSinkUtil, TableTestBase, TableTestUtil}
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThatExceptionOfType
import org.junit.jupiter.api.Test
@@ -36,7 +35,9 @@ class LegacyTableSinkValidationTest extends TableTestBase {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env.fromCollection(TestData.smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil
+ .fromCollection(env, TestData.smallTupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
// must fail because table is not append-only
assertThatExceptionOfType(classOf[ValidationException])
@@ -55,9 +56,20 @@ class LegacyTableSinkValidationTest extends TableTestBase {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(TestData.tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, TestData.tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text)
val sink = new TestingUpsertTableSink(Array(0, 1))
@@ -83,8 +95,12 @@ class LegacyTableSinkValidationTest extends TableTestBase {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val ds1 = env.fromCollection(TestData.tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(TestData.tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, TestData.tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, TestData.tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
// must fail because table is not append-only
assertThatExceptionOfType(classOf[TableException])
@@ -104,7 +120,8 @@ class LegacyTableSinkValidationTest extends TableTestBase {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val sourceTable = env.fromCollection(TestData.tupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val sourceTable =
+ StreamingEnvUtil.fromCollection(env, TestData.tupleData3).toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("source", sourceTable)
val resultTable = tEnv.sqlQuery("select a, b, c, b as d from source")
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/OverWindowValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/OverWindowValidationTest.scala
index 26cc005fdc8..a3df1134dcd 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/OverWindowValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/OverWindowValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.internal.TableEnvironmentImpl
import org.apache.flink.table.planner.delegation.PlannerBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/SetOperatorsValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/SetOperatorsValidationTest.scala
index 6743e6fc80a..783ae350b64 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/SetOperatorsValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/SetOperatorsValidationTest.scala
@@ -17,13 +17,11 @@
*/
package org.apache.flink.table.planner.plan.stream.table.validation
-import org.apache.flink.api.scala._
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
-import org.apache.flink.table.planner.runtime.utils.{TestData, TestingAppendSink}
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, TestData, TestingAppendSink}
import org.apache.flink.table.planner.utils.{TableTestBase, TableTestUtil}
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.{assertThat, assertThatExceptionOfType}
import org.junit.jupiter.api.Test
@@ -35,8 +33,10 @@ class SetOperatorsValidationTest extends TableTestBase {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val ds1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(TestData.tupleData5).toTable(tEnv, 'a, 'b, 'd, 'c, 'e)
+ val ds1 =
+ StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val ds2 =
+ StreamingEnvUtil.fromCollection(env, TestData.tupleData5).toTable(tEnv, 'a, 'b, 'd, 'c, 'e)
val sink = new TestingAppendSink
@@ -55,9 +55,10 @@ class SetOperatorsValidationTest extends TableTestBase {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val ds1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env
- .fromCollection(TestData.tupleData5)
+ val ds1 =
+ StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, TestData.tupleData5)
.toTable(tEnv, 'a, 'b, 'c, 'd, 'e)
.select('a, 'b, 'c)
@@ -79,8 +80,10 @@ class SetOperatorsValidationTest extends TableTestBase {
val tEnv1 = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
val tEnv2 = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val ds1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv1, 'a, 'b, 'c)
- val ds2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv2, 'a, 'b, 'c)
+ val ds1 =
+ StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv1, 'a, 'b, 'c)
+ val ds2 =
+ StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv2, 'a, 'b, 'c)
// Must fail. Tables are bound to different TableEnvironments.
assertThatExceptionOfType(classOf[ValidationException])
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/TableAggregateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/TableAggregateValidationTest.scala
index a30aedefb14..5ca74db7d11 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/TableAggregateValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/TableAggregateValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{EmptyTableAggFunc, TableTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/TemporalTableJoinValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/TemporalTableJoinValidationTest.scala
index 407d4914ad3..196a885779e 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/TemporalTableJoinValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/TemporalTableJoinValidationTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.plan.stream.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.utils.{TableTestBase, TableTestUtil}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/UnsupportedOpsValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/UnsupportedOpsValidationTest.scala
index 1f7ed6dbc19..3d1e6cad946 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/UnsupportedOpsValidationTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/stream/table/validation/UnsupportedOpsValidationTest.scala
@@ -17,12 +17,11 @@
*/
package org.apache.flink.table.planner.plan.stream.table.validation
-import org.apache.flink.api.scala._
import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
-import org.apache.flink.table.planner.runtime.utils.TestData
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, TestData}
import org.apache.flink.table.planner.utils.TableTestUtil
import org.apache.flink.test.junit5.MiniClusterExtension
@@ -36,8 +35,8 @@ class UnsupportedOpsValidationTest {
def testJoin(): Unit = {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
- val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
+ val t1 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
+ val t2 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
assertThatThrownBy(() => t1.join(t2)).isInstanceOf(classOf[ValidationException])
}
@@ -46,8 +45,8 @@ class UnsupportedOpsValidationTest {
def testUnion(): Unit = {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
- val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
+ val t1 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
+ val t2 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
assertThatThrownBy(() => t1.union(t2)).isInstanceOf(classOf[ValidationException])
}
@@ -56,8 +55,8 @@ class UnsupportedOpsValidationTest {
def testIntersect(): Unit = {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
- val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
+ val t1 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
+ val t2 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
assertThatThrownBy(() => t1.intersect(t2)).isInstanceOf(classOf[ValidationException])
}
@@ -66,8 +65,8 @@ class UnsupportedOpsValidationTest {
def testIntersectAll(): Unit = {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
- val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
+ val t1 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
+ val t2 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
assertThatThrownBy(() => t1.intersectAll(t2)).isInstanceOf(classOf[ValidationException])
}
@@ -76,8 +75,8 @@ class UnsupportedOpsValidationTest {
def testMinus(): Unit = {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
- val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
+ val t1 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
+ val t2 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
assertThatThrownBy(() => t1.minus(t2)).isInstanceOf(classOf[ValidationException])
}
@@ -86,8 +85,8 @@ class UnsupportedOpsValidationTest {
def testMinusAll(): Unit = {
val env = StreamExecutionEnvironment.getExecutionEnvironment
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t1 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
- val t2 = env.fromCollection(TestData.smallTupleData3).toTable(tEnv)
+ val t1 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
+ val t2 = StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3).toTable(tEnv)
assertThatThrownBy(() => t1.minusAll(t2)).isInstanceOf(classOf[ValidationException])
}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/utils/FlinkRelOptUtilTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/utils/FlinkRelOptUtilTest.scala
index ab6cc27e061..ee91f0d79cf 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/utils/FlinkRelOptUtilTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/plan/utils/FlinkRelOptUtilTest.scala
@@ -19,14 +19,13 @@ package org.apache.flink.table.planner.plan.utils
import org.apache.flink.api.common.typeinfo.BasicTypeInfo.{DOUBLE_TYPE_INFO, INT_TYPE_INFO, STRING_TYPE_INFO}
import org.apache.flink.api.java.typeutils.RowTypeInfo
-import org.apache.flink.api.scala._
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api.{EnvironmentSettings, TableEnvironment, _}
import org.apache.flink.table.api.bridge.scala.{StreamTableEnvironment, _}
import org.apache.flink.table.api.internal.TableEnvironmentImpl
import org.apache.flink.table.planner.delegation.PlannerBase
import org.apache.flink.table.planner.plan.`trait`.{MiniBatchInterval, MiniBatchMode}
-import org.apache.flink.table.planner.runtime.utils.BatchTableEnvUtil
+import org.apache.flink.table.planner.runtime.utils.{BatchTableEnvUtil, StreamingEnvUtil}
import org.apache.flink.table.planner.runtime.utils.BatchTestBase.row
import org.apache.flink.table.planner.utils.TableTestUtil
@@ -57,7 +56,8 @@ class FlinkRelOptUtilTest {
val env = StreamExecutionEnvironment.createLocalEnvironment()
val tableEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val table = env.fromElements[(Int, Long, String)]().toTable(tableEnv, 'a, 'b, 'c)
+ val table =
+ StreamingEnvUtil.fromElements[(Int, Long, String)](env).toTable(tableEnv, 'a, 'b, 'c)
tableEnv.createTemporaryView("MyTable", table)
val sqlQuery =
@@ -109,7 +109,8 @@ class FlinkRelOptUtilTest {
val env = StreamExecutionEnvironment.createLocalEnvironment()
val tableEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val table = env.fromElements[(Int, Long, String)]().toTable(tableEnv, 'a, 'b, 'c)
+ val table =
+ StreamingEnvUtil.fromElements[(Int, Long, String)](env).toTable(tableEnv, 'a, 'b, 'c)
tableEnv.createTemporaryView("MyTable", table)
val sqlQuery =
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/CalcITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/CalcITCase.scala
index 011475eb268..b2e13cb81f7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/CalcITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/CalcITCase.scala
@@ -24,8 +24,7 @@ import org.apache.flink.api.common.typeinfo.SqlTimeTypeInfo.{DATE, TIME, TIMESTA
import org.apache.flink.api.common.typeinfo.Types
import org.apache.flink.api.common.typeinfo.Types.INSTANT
import org.apache.flink.api.java.typeutils._
-import org.apache.flink.api.scala._
-import org.apache.flink.table.api.{DataTypes, TableSchema, ValidationException}
+import org.apache.flink.table.api.{createTypeInformation, DataTypes, TableSchema, ValidationException}
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.api.config.ExecutionConfigOptions.LegacyCastBehaviour
import org.apache.flink.table.catalog.CatalogDatabaseImpl
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/MiscITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/MiscITCase.scala
index 0f043a307b1..4460d05485c 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/MiscITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/MiscITCase.scala
@@ -19,8 +19,7 @@ package org.apache.flink.table.planner.runtime.batch.sql
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.RowTypeInfo
-import org.apache.flink.api.scala._
-import org.apache.flink.table.api.ValidationException
+import org.apache.flink.table.api.{createTypeInformation, ValidationException}
import org.apache.flink.table.api.config.ExecutionConfigOptions.TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM
import org.apache.flink.table.planner.runtime.batch.sql.join.JoinITCaseHelper
import org.apache.flink.table.planner.runtime.batch.sql.join.JoinType.SortMergeJoin
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/SetOperatorsITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/SetOperatorsITCase.scala
index a0d951fc49b..b3b68888d59 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/SetOperatorsITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/SetOperatorsITCase.scala
@@ -19,7 +19,7 @@ package org.apache.flink.table.planner.runtime.batch.sql
import org.apache.flink.api.common.typeinfo.BasicTypeInfo.{INT_TYPE_INFO, LONG_TYPE_INFO, STRING_TYPE_INFO}
import org.apache.flink.api.java.typeutils.RowTypeInfo
-import org.apache.flink.api.scala._
+import org.apache.flink.table.api.createTypeInformation
import org.apache.flink.table.planner.runtime.batch.sql.join.JoinITCaseHelper
import org.apache.flink.table.planner.runtime.batch.sql.join.JoinType._
import org.apache.flink.table.planner.runtime.utils.{BatchTableEnvUtil, BatchTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/agg/AggregateITCaseBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/agg/AggregateITCaseBase.scala
index ad1e56c7f9f..7a497653569 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/agg/AggregateITCaseBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/agg/AggregateITCaseBase.scala
@@ -21,10 +21,9 @@ import org.apache.flink.api.common.BatchShuffleMode
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.tuple.{Tuple2 => JTuple2}
import org.apache.flink.api.java.typeutils.{RowTypeInfo, TupleTypeInfoBase}
-import org.apache.flink.api.scala._
import org.apache.flink.configuration.{ExecutionOptions, JobManagerOptions}
import org.apache.flink.configuration.JobManagerOptions.SchedulerType
-import org.apache.flink.table.api.{DataTypes, TableException, Types}
+import org.apache.flink.table.api._
import org.apache.flink.table.data.DecimalDataUtils
import org.apache.flink.table.planner.factories.TestValuesTableFactory
import org.apache.flink.table.planner.runtime.utils.BatchTestBase
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/agg/HashAggITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/agg/HashAggITCase.scala
index e1424f7ccf5..dca4d0fbbf0 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/agg/HashAggITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/agg/HashAggITCase.scala
@@ -17,8 +17,7 @@
*/
package org.apache.flink.table.planner.runtime.batch.sql.agg
-import org.apache.flink.api.scala._
-import org.apache.flink.table.api.DataTypes
+import org.apache.flink.table.api.{DataTypes, _}
import org.apache.flink.table.api.config.{AggregatePhaseStrategy, ExecutionConfigOptions, OptimizerConfigOptions}
import org.apache.flink.table.planner.plan.stats.FlinkStatistic
import org.apache.flink.table.planner.runtime.utils.BatchTestBase.row
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/AggregationITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/AggregationITCase.scala
index 65fa74b8d83..fc4c10948f2 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/AggregationITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/AggregationITCase.scala
@@ -19,7 +19,6 @@ package org.apache.flink.table.planner.runtime.batch.table
import org.apache.flink.api.java.tuple.{Tuple2 => JTuple2}
import org.apache.flink.api.java.typeutils.{ObjectArrayTypeInfo, TupleTypeInfo}
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.functions.AggregateFunction
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/CalcITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/CalcITCase.scala
index 4973e727deb..a198c6fab62 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/CalcITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/CalcITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.catalog.CatalogDatabaseImpl
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/CorrelateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/CorrelateITCase.scala
index 6fb6d8f7863..a97c34542fb 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/CorrelateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/CorrelateITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.planner.expressions.utils.{Func1, Func18, FuncWithOpen, RichFunc2}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/GroupWindowITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/GroupWindowITCase.scala
index 204ddcd7549..a623c11472b 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/GroupWindowITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/GroupWindowITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.{BatchTableEnvUtil, BatchTestBase}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/JoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/JoinITCase.scala
index 00c4bcffa75..d8603a82aa8 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/JoinITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/JoinITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.planner.expressions.utils.FuncWithOpen
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/SetOperatorsITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/SetOperatorsITCase.scala
index 0859680db18..53682d6c772 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/SetOperatorsITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/table/SetOperatorsITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.batch.table
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.planner.JBigDecimal
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/catalog/CatalogListenerTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/catalog/CatalogListenerTest.scala
index 5f194f0834a..0f39f17fe94 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/catalog/CatalogListenerTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/catalog/CatalogListenerTest.scala
@@ -18,7 +18,7 @@
package org.apache.flink.table.planner.runtime.catalog
import org.apache.flink.configuration.Configuration
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api.EnvironmentSettings
import org.apache.flink.table.api.bridge.scala.StreamTableEnvironment
import org.apache.flink.table.api.bridge.scala.internal.StreamTableEnvironmentImpl
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/GroupAggregateHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/GroupAggregateHarnessTest.scala
index 5b00bfd4391..9e4f83c1e5b 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/GroupAggregateHarnessTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/GroupAggregateHarnessTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.harness
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord
import org.apache.flink.streaming.util.{KeyedOneInputStreamOperatorTestHarness, OneInputStreamOperatorTestHarness}
import org.apache.flink.table.api.{EnvironmentSettings, _}
@@ -27,6 +26,7 @@ import org.apache.flink.table.api.config.AggregatePhaseStrategy
import org.apache.flink.table.api.config.ExecutionConfigOptions.{TABLE_EXEC_MINIBATCH_ALLOW_LATENCY, TABLE_EXEC_MINIBATCH_ENABLED, TABLE_EXEC_MINIBATCH_SIZE}
import org.apache.flink.table.api.config.OptimizerConfigOptions.TABLE_OPTIMIZER_AGG_PHASE_STRATEGY
import org.apache.flink.table.data.RowData
+import org.apache.flink.table.planner.runtime.utils.StreamingEnvUtil
import org.apache.flink.table.planner.runtime.utils.StreamingWithMiniBatchTestBase.{MiniBatchMode, MiniBatchOff, MiniBatchOn}
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.{HEAP_BACKEND, ROCKSDB_BACKEND, StateBackendMode}
import org.apache.flink.table.planner.runtime.utils.UserDefinedFunctionTestUtils.CountNullNonNull
@@ -312,7 +312,9 @@ class GroupAggregateHarnessTest(mode: StateBackendMode, miniBatch: MiniBatchMode
private def createAggregation()
: (KeyedOneInputStreamOperatorTestHarness[RowData, RowData, RowData], Array[LogicalType]) = {
val data = new mutable.MutableList[(String, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sql =
@@ -334,7 +336,9 @@ class GroupAggregateHarnessTest(mode: StateBackendMode, miniBatch: MiniBatchMode
tEnv.getConfig.set(TABLE_OPTIMIZER_AGG_PHASE_STRATEGY, AggregatePhaseStrategy.TWO_PHASE)
val data = new mutable.MutableList[(String, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sql =
@@ -358,7 +362,9 @@ class GroupAggregateHarnessTest(mode: StateBackendMode, miniBatch: MiniBatchMode
private def createAggregationWithDistinct()
: (KeyedOneInputStreamOperatorTestHarness[RowData, RowData, RowData], Array[LogicalType]) = {
val data = new mutable.MutableList[(String, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T", t)
tEnv.createTemporarySystemFunction("CntNullNonNull", new CountNullNonNull)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/HarnessTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/HarnessTestBase.scala
index ef8cd4f2e14..60debe8139f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/HarnessTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/HarnessTestBase.scala
@@ -24,8 +24,8 @@ import org.apache.flink.configuration.Configuration
import org.apache.flink.contrib.streaming.state.RocksDBStateBackend
import org.apache.flink.runtime.state.StateBackend
import org.apache.flink.runtime.state.memory.MemoryStateBackend
+import org.apache.flink.streaming.api.datastream.DataStream
import org.apache.flink.streaming.api.operators.OneInputStreamOperator
-import org.apache.flink.streaming.api.scala.DataStream
import org.apache.flink.streaming.api.transformations.{OneInputTransformation, PartitionTransformation}
import org.apache.flink.streaming.api.watermark.Watermark
import org.apache.flink.streaming.util.{KeyedOneInputStreamOperatorTestHarness, OneInputStreamOperatorTestHarness}
@@ -69,7 +69,7 @@ class HarnessTestBase(mode: StateBackendMode) extends StreamingTestBase {
: KeyedOneInputStreamOperatorTestHarness[RowData, RowData, RowData] = {
val transformation =
- extractExpectedTransformation(ds.javaStream.getTransformation, operatorNameIdentifier)
+ extractExpectedTransformation(ds.getTransformation, operatorNameIdentifier)
val processOperator = transformation.getOperator
.asInstanceOf[OneInputStreamOperator[Any, Any]]
val keySelector = transformation.getStateKeySelector.asInstanceOf[KeySelector[Any, Any]]
@@ -83,7 +83,7 @@ class HarnessTestBase(mode: StateBackendMode) extends StreamingTestBase {
ds: DataStream[_],
operatorNameIdentifier: String): OneInputStreamOperatorTestHarness[RowData, RowData] = {
val transformation =
- extractExpectedTransformation(ds.javaStream.getTransformation, operatorNameIdentifier)
+ extractExpectedTransformation(ds.getTransformation, operatorNameIdentifier)
val processOperator = transformation.getOperator
.asInstanceOf[OneInputStreamOperator[Any, Any]]
new OneInputStreamOperatorTestHarness(processOperator)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/OverAggregateHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/OverAggregateHarnessTest.scala
index ffb519be2cf..f3268670140 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/OverAggregateHarnessTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/OverAggregateHarnessTest.scala
@@ -17,20 +17,19 @@
*/
package org.apache.flink.table.planner.runtime.harness
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord
import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.bridge.scala.internal.StreamTableEnvironmentImpl
import org.apache.flink.table.data.RowData
+import org.apache.flink.table.planner.runtime.utils.StreamingEnvUtil
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.table.runtime.typeutils.RowDataSerializer
import org.apache.flink.table.runtime.util.RowDataHarnessAssertor
import org.apache.flink.table.runtime.util.StreamRecordUtils.{binaryrow, row}
import org.apache.flink.table.types.logical.LogicalType
import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension
-import org.apache.flink.types.Row
import org.junit.jupiter.api.{BeforeEach, TestTemplate}
import org.junit.jupiter.api.extension.ExtendWith
@@ -125,7 +124,9 @@ class OverAggregateHarnessTest(mode: StateBackendMode) extends HarnessTestBase(m
private def createProcTimeBoundedRowsOver()
: (KeyedOneInputStreamOperatorTestHarness[RowData, RowData, RowData], Array[LogicalType]) = {
val data = new mutable.MutableList[(Long, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'currtime, 'b, 'c, 'proctime.proctime)
+ val t = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'currtime, 'b, 'c, 'proctime.proctime)
tEnv.createTemporaryView("T", t)
val sql =
@@ -158,7 +159,9 @@ class OverAggregateHarnessTest(mode: StateBackendMode) extends HarnessTestBase(m
def testProcTimeBoundedRangeOver(): Unit = {
val data = new mutable.MutableList[(Long, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'currtime, 'b, 'c, 'proctime.proctime)
+ val t = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'currtime, 'b, 'c, 'proctime.proctime)
tEnv.createTemporaryView("T", t)
val sql =
@@ -262,7 +265,9 @@ class OverAggregateHarnessTest(mode: StateBackendMode) extends HarnessTestBase(m
def testProcTimeUnboundedOver(): Unit = {
val data = new mutable.MutableList[(Long, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'currtime, 'b, 'c, 'proctime.proctime)
+ val t = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'currtime, 'b, 'c, 'proctime.proctime)
tEnv.createTemporaryView("T", t)
val sql =
@@ -351,7 +356,7 @@ class OverAggregateHarnessTest(mode: StateBackendMode) extends HarnessTestBase(m
def testRowTimeBoundedRangeOver(): Unit = {
val data = new mutable.MutableList[(Long, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'rowtime.rowtime, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'rowtime.rowtime, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sql =
@@ -448,7 +453,7 @@ class OverAggregateHarnessTest(mode: StateBackendMode) extends HarnessTestBase(m
def testRowTimeBoundedRowsOver(): Unit = {
val data = new mutable.MutableList[(Long, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'rowtime.rowtime, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'rowtime.rowtime, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sql =
@@ -575,7 +580,7 @@ class OverAggregateHarnessTest(mode: StateBackendMode) extends HarnessTestBase(m
def testRowTimeUnboundedRangeOver(): Unit = {
val data = new mutable.MutableList[(Long, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'rowtime.rowtime, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'rowtime.rowtime, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sql =
@@ -697,7 +702,7 @@ class OverAggregateHarnessTest(mode: StateBackendMode) extends HarnessTestBase(m
def testRowTimeUnboundedRowsOver(): Unit = {
val data = new mutable.MutableList[(Long, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'rowtime.rowtime, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'rowtime.rowtime, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sql =
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/RankHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/RankHarnessTest.scala
index 0921cf5c2b5..d511076fbb0 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/RankHarnessTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/RankHarnessTest.scala
@@ -17,14 +17,13 @@
*/
package org.apache.flink.table.planner.runtime.harness
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.bridge.scala.internal.StreamTableEnvironmentImpl
import org.apache.flink.table.data.RowData
import org.apache.flink.table.planner.JInt
-import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedTableFunctions
+import org.apache.flink.table.planner.runtime.utils.{JavaUserDefinedTableFunctions, StreamingEnvUtil}
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.table.runtime.util.RowDataHarnessAssertor
import org.apache.flink.table.runtime.util.StreamRecordUtils.binaryRecord
@@ -54,7 +53,7 @@ class RankHarnessTest(mode: StateBackendMode) extends HarnessTestBase(mode) {
@TestTemplate
def testRetractRankWithRowNumber(): Unit = {
val data = new mutable.MutableList[(String, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T", t)
tEnv.createTemporarySystemFunction(
"STRING_SPLIT",
@@ -150,7 +149,7 @@ class RankHarnessTest(mode: StateBackendMode) extends HarnessTestBase(mode) {
@TestTemplate
def testRetractRankWithoutRowNumber(): Unit = {
val data = new mutable.MutableList[(String, String, Long)]
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T", t)
tEnv.createTemporarySystemFunction(
"STRING_SPLIT",
@@ -228,7 +227,7 @@ class RankHarnessTest(mode: StateBackendMode) extends HarnessTestBase(mode) {
def prepareUpdateRankWithRowNumberTester()
: (KeyedOneInputStreamOperatorTestHarness[RowData, RowData, RowData], RowDataHarnessAssertor) = {
val data = new mutable.MutableList[(String, Int, Int)]
- val t = env.fromCollection(data).toTable(tEnv, 'word, 'cnt, 'type)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'word, 'cnt, 'type)
tEnv.createTemporaryView("T", t)
val sql =
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/TableAggregateHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/TableAggregateHarnessTest.scala
index 3d4ff727976..14f16d3f832 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/TableAggregateHarnessTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/TableAggregateHarnessTest.scala
@@ -17,12 +17,12 @@
*/
package org.apache.flink.table.planner.runtime.harness
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness
import org.apache.flink.table.api.{EnvironmentSettings, _}
-import org.apache.flink.table.api.bridge.scala._
+import org.apache.flink.table.api.bridge.scala.{dataStreamConversions, tableConversions}
import org.apache.flink.table.api.bridge.scala.internal.StreamTableEnvironmentImpl
import org.apache.flink.table.data.RowData
+import org.apache.flink.table.planner.runtime.utils.StreamingEnvUtil
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.table.planner.utils.{Top3WithMapView, Top3WithRetractInput}
import org.apache.flink.table.runtime.typeutils.RowDataSerializer
@@ -57,7 +57,7 @@ class TableAggregateHarnessTest(mode: StateBackendMode) extends HarnessTestBase(
def testTableAggregate(): Unit = {
val top3 = new Top3WithMapView
tEnv.createTemporarySystemFunction("top3", top3)
- val source = env.fromCollection(data).toTable(tEnv, 'a, 'b)
+ val source = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b)
val resultTable = source
.groupBy('a)
.flatAggregate(top3('b).as('b1, 'b2))
@@ -162,7 +162,7 @@ class TableAggregateHarnessTest(mode: StateBackendMode) extends HarnessTestBase(
: (KeyedOneInputStreamOperatorTestHarness[RowData, RowData, RowData], Array[LogicalType]) = {
val top3 = new Top3WithRetractInput
tEnv.createTemporarySystemFunction("top3", top3)
- val source = env.fromCollection(data).toTable(tEnv, 'a, 'b)
+ val source = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b)
val resultTable = source
.groupBy('a)
.select('b.sum.as('b))
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowAggregateHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowAggregateHarnessTest.scala
index 5c5b7100132..bf6af9e20a7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowAggregateHarnessTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowAggregateHarnessTest.scala
@@ -17,7 +17,7 @@
*/
package org.apache.flink.table.planner.runtime.harness
-import org.apache.flink.streaming.api.scala.DataStream
+import org.apache.flink.streaming.api.datastream.DataStream
import org.apache.flink.streaming.api.watermark.Watermark
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord
import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowAggregateUseDaylightTimeHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowAggregateUseDaylightTimeHarnessTest.scala
index 17d8a512a4a..217c73fb4ce 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowAggregateUseDaylightTimeHarnessTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowAggregateUseDaylightTimeHarnessTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.harness
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord
import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness
import org.apache.flink.table.api._
@@ -29,7 +28,6 @@ import org.apache.flink.table.planner.runtime.utils.TestData
import org.apache.flink.table.runtime.util.RowDataHarnessAssertor
import org.apache.flink.table.runtime.util.StreamRecordUtils.binaryRecord
import org.apache.flink.testutils.junit.extensions.parameterized.{ParameterizedTestExtension, Parameters}
-import org.apache.flink.types.Row
import org.apache.flink.types.RowKind.INSERT
import org.junit.jupiter.api.{BeforeEach, TestTemplate}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowTableFunctionHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowTableFunctionHarnessTest.scala
index d1a4f11c122..44ce28a72cd 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowTableFunctionHarnessTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/harness/WindowTableFunctionHarnessTest.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.harness
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord
import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness
import org.apache.flink.table.api._
@@ -30,7 +29,6 @@ import org.apache.flink.table.runtime.util.RowDataHarnessAssertor
import org.apache.flink.table.runtime.util.StreamRecordUtils.binaryRecord
import org.apache.flink.table.runtime.util.TimeWindowUtil.toUtcTimestampMills
import org.apache.flink.testutils.junit.extensions.parameterized.{ParameterizedTestExtension, Parameters}
-import org.apache.flink.types.Row
import org.apache.flink.types.RowKind.INSERT
import org.junit.jupiter.api.{BeforeEach, TestTemplate}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/FsStreamingSinkITCaseBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/FsStreamingSinkITCaseBase.scala
index 0c07a076636..c60ac35259a 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/FsStreamingSinkITCaseBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/FsStreamingSinkITCaseBase.scala
@@ -22,8 +22,8 @@ import org.apache.flink.api.common.typeinfo.Types
import org.apache.flink.api.java.typeutils.RowTypeInfo
import org.apache.flink.connector.file.table.FileSystemConnectorOptions._
import org.apache.flink.core.execution.CheckpointingMode
+import org.apache.flink.streaming.api.datastream.DataStream
import org.apache.flink.streaming.api.functions.source.SourceFunction
-import org.apache.flink.streaming.api.scala.DataStream
import org.apache.flink.streaming.api.watermark.Watermark
import org.apache.flink.table.data.TimestampData
import org.apache.flink.table.planner.runtime.utils.{StreamingTestBase, TestSinkUtil}
@@ -102,11 +102,10 @@ abstract class FsStreamingSinkITCaseBase extends StreamingTestBase {
" You can only configure 'metastore' partition commit policy for a hive table.")
}
- def getDataStream2(fun: Row => Long) = {
- new DataStream(
- env.getJavaEnv.addSource(
- new FiniteTestSource(getData2, fun),
- new RowTypeInfo(Types.INT, Types.STRING, Types.STRING, Types.STRING, Types.STRING)))
+ def getDataStream2(fun: Row => Long): DataStream[Row] = {
+ env.addSource(
+ new FiniteTestSource(getData2, fun),
+ new RowTypeInfo(Types.INT, Types.STRING, Types.STRING, Types.STRING, Types.STRING))
}
@Test
@@ -131,10 +130,9 @@ abstract class FsStreamingSinkITCaseBase extends StreamingTestBase {
}
def getDataStream(fun: Row => Long): DataStream[Row] = {
- new DataStream(
- env.getJavaEnv.addSource(
- new FiniteTestSource(getData, fun),
- new RowTypeInfo(Types.INT, Types.STRING, Types.STRING, Types.STRING, Types.STRING)))
+ env.addSource(
+ new FiniteTestSource(getData, fun),
+ new RowTypeInfo(Types.INT, Types.STRING, Types.STRING, Types.STRING, Types.STRING))
}
def testPartitionCustomFormatDate(partition: Boolean, policy: String = "success-file"): Unit = {
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AggregateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AggregateITCase.scala
index 647ca88f9ce..c4506e2b064 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AggregateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AggregateITCase.scala
@@ -19,9 +19,8 @@ package org.apache.flink.table.planner.runtime.stream.sql
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.RowTypeInfo
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.api.TimeCharacteristic
-import org.apache.flink.streaming.api.scala.DataStream
+import org.apache.flink.streaming.api.datastream.DataStream
import org.apache.flink.table.api.{Types, _}
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.internal.TableEnvironmentInternal
@@ -1418,7 +1417,11 @@ class AggregateITCase(aggMode: AggMode, miniBatch: MiniBatchMode, backend: State
(4, 3, (14, "45.2136")),
(5, 3, (18, "42.6"))
)
- tEnv.createTemporaryView("src", env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c))
+ tEnv.createTemporaryView(
+ "src",
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c))
val sql = "SELECT a, b, COLLECT(c) as `set` FROM src GROUP BY a, b"
val view1 = tEnv.sqlQuery(sql)
@@ -1710,8 +1713,8 @@ class AggregateITCase(aggMode: AggMode, miniBatch: MiniBatchMode, backend: State
@TestTemplate
def testAggregationCodeSplit(): Unit = {
- val t = env
- .fromCollection(TestData.smallTupleData3)
+ val t = StreamingEnvUtil
+ .fromCollection(env, TestData.smallTupleData3)
.toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("MyTable", t)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AggregateRemoveITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AggregateRemoveITCase.scala
index ec81bc23121..01007463b45 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AggregateRemoveITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AggregateRemoveITCase.scala
@@ -17,12 +17,11 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.plan.stats.FlinkStatistic
-import org.apache.flink.table.planner.runtime.utils.{StreamingWithAggTestBase, TestData, TestingRetractSink}
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, StreamingWithAggTestBase, TestData, TestingRetractSink}
import org.apache.flink.table.planner.runtime.utils.BatchTestBase.row
import org.apache.flink.table.planner.runtime.utils.StreamingWithAggTestBase.AggMode
import org.apache.flink.table.planner.runtime.utils.StreamingWithMiniBatchTestBase.MiniBatchMode
@@ -297,7 +296,8 @@ class AggregateRemoveITCase(aggMode: AggMode, minibatch: MiniBatchMode, backend:
private def checkResult(str: String, rows: Seq[Row]): Unit = {
super.before()
- val ds1 = env.fromCollection(
+ val ds1 = StreamingEnvUtil.fromCollection(
+ env,
Seq[(Int, Int, String, String)](
(2, 1, "A", null),
(3, 2, "A", "Hi"),
@@ -306,7 +306,7 @@ class AggregateRemoveITCase(aggMode: AggMode, minibatch: MiniBatchMode, backend:
TableTestUtil.createTemporaryView[(Int, Int, String, String)](
tEnv,
"T",
- ds1.javaStream,
+ ds1,
Some(Array($"a", $"b", $"c", $"d")),
Some(Array(true, true, true, true)),
Some(FlinkStatistic.builder().uniqueKeys(Set(Set("a").asJava).asJava).build())
@@ -315,7 +315,7 @@ class AggregateRemoveITCase(aggMode: AggMode, minibatch: MiniBatchMode, backend:
TableTestUtil.createTemporaryView[(Int, Long, String)](
tEnv,
"MyTable",
- env.fromCollection(TestData.smallTupleData3).javaStream,
+ StreamingEnvUtil.fromCollection(env, TestData.smallTupleData3),
Some(Array($"a", $"b", $"c")),
Some(Array(true, true, true)),
Some(FlinkStatistic.builder().uniqueKeys(Set(Set("a").asJava).asJava).build())
@@ -324,7 +324,7 @@ class AggregateRemoveITCase(aggMode: AggMode, minibatch: MiniBatchMode, backend:
TableTestUtil.createTemporaryView[(Int, Long, Int, String, Long)](
tEnv,
"MyTable2",
- env.fromCollection(TestData.smallTupleData5).javaStream,
+ StreamingEnvUtil.fromCollection(env, TestData.smallTupleData5),
Some(Array($"a", $"b", $"c", $"d", $"e")),
Some(Array(true, true, true, true, true)),
Some(FlinkStatistic.builder().uniqueKeys(Set(Set("b").asJava).asJava).build())
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AsyncLookupJoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AsyncLookupJoinITCase.scala
index 9e7d00cbe3d..e94b06daf02 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AsyncLookupJoinITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/AsyncLookupJoinITCase.scala
@@ -17,9 +17,8 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.FlinkAssertions.anyCauseMatches
-import org.apache.flink.table.api.{TableException, TableSchema, Types}
+import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.config.{ExecutionConfigOptions, OptimizerConfigOptions}
import org.apache.flink.table.api.config.ExecutionConfigOptions.AsyncOutputMode
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/CalcITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/CalcITCase.scala
index 076b00411cb..fbcd046dcd5 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/CalcITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/CalcITCase.scala
@@ -19,14 +19,13 @@ package org.apache.flink.table.planner.runtime.stream.sql
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.RowTypeInfo
-import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.typeutils.Types
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api.{TableDescriptor, _}
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.api.config.ExecutionConfigOptions.LegacyCastBehaviour
import org.apache.flink.table.api.internal.TableEnvironmentInternal
+import org.apache.flink.table.api.typeutils.Types
import org.apache.flink.table.catalog.CatalogDatabaseImpl
import org.apache.flink.table.data.{GenericRowData, MapData}
import org.apache.flink.table.planner.factories.TestValuesTableFactory
@@ -94,7 +93,7 @@ class CalcITCase extends StreamingTestBase {
.ofFields(new IntType(), new BooleanType())
.asInstanceOf[TypeInformation[GenericRowData]]
- val ds = env.fromCollection(data)
+ val ds = StreamingEnvUtil.fromCollection(env, data)
val t = ds.toTable(tEnv, 'a, 'b)
tEnv.createTemporaryView("MyTableRow", t)
@@ -129,7 +128,7 @@ class CalcITCase extends StreamingTestBase {
.ofFields(new IntType(), new IntType(), new BigIntType())
.asInstanceOf[TypeInformation[GenericRowData]]
- val ds = env.fromCollection(data)
+ val ds = StreamingEnvUtil.fromCollection(env, data)
val t = ds.toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("MyTableRow", t)
@@ -156,7 +155,7 @@ class CalcITCase extends StreamingTestBase {
implicit val tpe: TypeInformation[Row] = new RowTypeInfo(Types.STRING, Types.STRING, Types.INT)
- val ds = env.fromCollection(data)
+ val ds = StreamingEnvUtil.fromCollection(env, data)
val t = ds.toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("MyTableRow", t)
@@ -189,7 +188,7 @@ class CalcITCase extends StreamingTestBase {
.ofFields(new IntType(), new IntType(), new BigIntType())
.asInstanceOf[TypeInformation[GenericRowData]]
- val ds = env.fromCollection(data)
+ val ds = StreamingEnvUtil.fromCollection(env, data)
val t = ds.toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("MyTableRow", t)
@@ -214,7 +213,7 @@ class CalcITCase extends StreamingTestBase {
implicit val tpe: TypeInformation[Row] = new RowTypeInfo(Types.STRING, Types.STRING, Types.INT)
- val ds = env.fromCollection(data)
+ val ds = StreamingEnvUtil.fromCollection(env, data)
val t = ds.toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("MyTableRow", t)
@@ -232,8 +231,8 @@ class CalcITCase extends StreamingTestBase {
def testPrimitiveMapType(): Unit = {
val sqlQuery = "SELECT MAP[b, 30, 10, a] FROM MyTableRow"
- val t = env
- .fromCollection(TestData.smallTupleData3)
+ val t = StreamingEnvUtil
+ .fromCollection(env, TestData.smallTupleData3)
.toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("MyTableRow", t)
@@ -250,8 +249,8 @@ class CalcITCase extends StreamingTestBase {
def testNonPrimitiveMapType(): Unit = {
val sqlQuery = "SELECT MAP[a, c] FROM MyTableRow"
- val t = env
- .fromCollection(TestData.smallTupleData3)
+ val t = StreamingEnvUtil
+ .fromCollection(env, TestData.smallTupleData3)
.toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("MyTableRow", t)
@@ -269,7 +268,8 @@ class CalcITCase extends StreamingTestBase {
val sqlQuery = "SELECT * FROM MyTable"
val table = tEnv.fromDataStream(
- env.fromCollection(
+ StreamingEnvUtil.fromCollection(
+ env,
Seq(
((0, 0), "0"),
((1, 1), "1"),
@@ -292,8 +292,8 @@ class CalcITCase extends StreamingTestBase {
def testIn(): Unit = {
val sqlQuery = "SELECT * FROM MyTable WHERE b in (1,3,4,5,6)"
- val t = env
- .fromCollection(TestData.tupleData3)
+ val t = StreamingEnvUtil
+ .fromCollection(env, TestData.tupleData3)
.toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("MyTable", t)
@@ -330,8 +330,8 @@ class CalcITCase extends StreamingTestBase {
def testNotIn(): Unit = {
val sqlQuery = "SELECT * FROM MyTable WHERE b not in (1,3,4,5,6)"
- val t = env
- .fromCollection(TestData.tupleData3)
+ val t = StreamingEnvUtil
+ .fromCollection(env, TestData.tupleData3)
.toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("MyTable", t)
@@ -347,8 +347,8 @@ class CalcITCase extends StreamingTestBase {
@Test
def testLongProjectionList(): Unit = {
- val t = env
- .fromCollection(TestData.smallTupleData3)
+ val t = StreamingEnvUtil
+ .fromCollection(env, TestData.smallTupleData3)
.toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("MyTable", t)
@@ -789,8 +789,8 @@ class CalcITCase extends StreamingTestBase {
@Test
def testNonMergeableRandCall(): Unit = {
- val t = env
- .fromCollection(TestData.smallTupleData3)
+ val t = StreamingEnvUtil
+ .fromCollection(env, TestData.smallTupleData3)
.toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("SimpleTable", t)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/ChangelogSourceITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/ChangelogSourceITCase.scala
index 479ef635a25..4ac4e6ba424 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/ChangelogSourceITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/ChangelogSourceITCase.scala
@@ -17,8 +17,8 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
+import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.planner.JBigDecimal
@@ -78,7 +78,7 @@ class ChangelogSourceITCase(
def testToRetractStream(): Unit = {
val result = tEnv.sqlQuery(s"SELECT * FROM users").toRetractStream[Row]
val sink = new TestingRetractSink()
- result.addSink(sink).setParallelism(result.parallelism)
+ result.addSink(sink).setParallelism(result.getParallelism)
env.execute()
val expected = Seq(
@@ -139,7 +139,7 @@ class ChangelogSourceITCase(
val result = tEnv.sqlQuery(query).toRetractStream[Row]
val sink = new TestingRetractSink()
- result.addSink(sink).setParallelism(result.parallelism)
+ result.addSink(sink).setParallelism(result.getParallelism)
env.execute()
val expected = Seq("3,29.39,tom123@gmail.com")
@@ -249,7 +249,7 @@ class ChangelogSourceITCase(
val sink = new TestingRetractSink
val result = tEnv.sqlQuery(sql).toRetractStream[Row]
- result.addSink(sink).setParallelism(result.parallelism)
+ result.addSink(sink).setParallelism(result.getParallelism)
env.execute()
val expected =
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/CorrelateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/CorrelateITCase.scala
index e325e8dbb72..cf986e900f4 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/CorrelateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/CorrelateITCase.scala
@@ -17,11 +17,10 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.internal.TableEnvironmentInternal
-import org.apache.flink.table.planner.runtime.utils.{StreamingTestBase, TestingAppendSink, TestingAppendTableSink, TestSinkUtil}
+import org.apache.flink.table.planner.runtime.utils._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedScalarFunctions.UdfWithOpen
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedTableFunctions.{NonDeterministicTableFunc, StringSplit}
import org.apache.flink.table.planner.utils.{RF, TableFunc7}
@@ -50,10 +49,14 @@ class CorrelateITCase extends StreamingTestBase {
val data2 = List((1, "abc-bcd"), (1, "hhh"), (1, "xxx"))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
- val t2 = env.fromCollection(data2).toTable(tEnv, 'a, 'c)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
+ .toTable(tEnv, 'a, 'c)
tEnv.createTemporaryView("T2", t2)
val query1 = "SELECT a, v FROM T1, lateral table(STRING_SPLIT(c, '-')) as T(v)"
@@ -105,7 +108,9 @@ class CorrelateITCase extends StreamingTestBase {
def testConstantTableFunc3(): Unit = {
val data = List((1, 2, "abc-bcd"), (1, 2, "hhh"), (1, 2, "xxx"))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
tEnv.createTemporarySystemFunction("str_split", new StringSplit())
@@ -141,7 +146,9 @@ class CorrelateITCase extends StreamingTestBase {
def testConstantNonDeterministicTableFunc2(): Unit = {
val data = List((1, 2, "abc-bcd"), (1, 2, "hhh"), (1, 2, "xxx"))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
tEnv.createTemporarySystemFunction("str_split", new NonDeterministicTableFunc())
@@ -158,7 +165,9 @@ class CorrelateITCase extends StreamingTestBase {
def testUdfIsOpenedAfterUdtf(): Unit = {
val data = List((1, 2, "abc-bcd"), (1, 2, "hhh"), (1, 2, "xxx"))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
// UdfWithOpen checks open method is opened, and add a '$' prefix to the given string
@@ -185,7 +194,9 @@ class CorrelateITCase extends StreamingTestBase {
data.+=(("1", "1,L", "A,B"))
data.+=(("2", "2,L", "B,C"))
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t)
tEnv.createTemporarySystemFunction("str_split", new StringSplit())
val sink1 = new TestingAppendSink
@@ -221,7 +232,7 @@ class CorrelateITCase extends StreamingTestBase {
)
val rowType = Types.ROW(Types.INT, Types.BOOLEAN, Types.ROW(Types.INT, Types.INT, Types.INT))
- val in = env.fromElements(row, row)(rowType).toTable(tEnv, 'a, 'b, 'c)
+ val in = env.fromData(rowType, row, row).toTable(tEnv, 'a, 'b, 'c)
val sink = new TestingAppendSink
@@ -242,7 +253,9 @@ class CorrelateITCase extends StreamingTestBase {
def testReUsePerRecord(): Unit = {
val data = List((1, 2, "3018-06-10|2018-06-03"), (1, 2, "2018-06-01"), (1, 2, "2018-06-02"))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
val query1 = "SELECT a, v FROM T1, lateral table(STRING_SPLIT(c, '|')) as T(v)"
@@ -266,7 +279,9 @@ class CorrelateITCase extends StreamingTestBase {
def testLeftJoinWithEmptyOutput(): Unit = {
val data = List((1, 2, ""), (1, 3, ""))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
val sql = "SELECT * FROM T1 left join lateral table(STRING_SPLIT(c, '|')) as T(v) on true"
@@ -284,7 +299,9 @@ class CorrelateITCase extends StreamingTestBase {
def testProjectCorrelateInput(): Unit = {
val data = List((1, 2, "3018-06-10|2018-06-03"), (1, 2, "2018-06-01"), (1, 2, "2018-06-02"))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
val sql = "SELECT v FROM T1, lateral table(STRING_SPLIT(c, '|')) as T(v)"
@@ -302,7 +319,9 @@ class CorrelateITCase extends StreamingTestBase {
def testPartialProjectCorrelate(): Unit = {
val data = List((1, 2, "3018-06-10|2018-06-03"), (1, 2, "2018-06-01"), (1, 2, "2018-06-02"))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
val sql = "SELECT a, v FROM T1, lateral table(STRING_SPLIT(c, '|')) as T(v)"
@@ -320,7 +339,9 @@ class CorrelateITCase extends StreamingTestBase {
def testProjectCorrelateInputWithEmptyOutput(): Unit = {
val data = List((1, 2, "a"), (1, 3, ""))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
val sql = "SELECT v FROM T1, lateral table(STRING_SPLIT(c, '|')) as T(v)"
@@ -338,7 +359,9 @@ class CorrelateITCase extends StreamingTestBase {
def testLeftJoinProjectCorrelateInputWithEmptyOutput(): Unit = {
val data = List((1, 2, ""), (1, 3, ""))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
val sql = "SELECT v FROM T1 left join lateral table(STRING_SPLIT(c, '|')) as T(v) on true"
@@ -357,7 +380,9 @@ class CorrelateITCase extends StreamingTestBase {
def testPartialProjectWithEmptyOutput(): Unit = {
val data = List((1, 2, "a"), (1, 3, ""))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
val sql = "SELECT a, v FROM T1, lateral table(STRING_SPLIT(c, '|')) as T(v)"
@@ -375,7 +400,9 @@ class CorrelateITCase extends StreamingTestBase {
def testLeftJoinPartialProjectWithEmptyOutput(): Unit = {
val data = List((1, 2, ""), (1, 3, ""))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
val sql = "SELECT b, v FROM T1 left join lateral table(STRING_SPLIT(c, '|')) as T(v) on true"
@@ -393,7 +420,9 @@ class CorrelateITCase extends StreamingTestBase {
def testLateralCrossJoin(): Unit = {
val data = List((1, 2, "x|y"))
- val t1 = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T1", t1)
val sql =
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/DataStreamScalaITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/DataStreamScalaITCase.scala
index ebdb4646b95..191da66be1c 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/DataStreamScalaITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/DataStreamScalaITCase.scala
@@ -17,16 +17,17 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration
-import org.apache.flink.streaming.api.scala.{CloseableIterator, DataStream, StreamExecutionEnvironment}
-import org.apache.flink.table.api.{DataTypes, Table, TableResult}
+import org.apache.flink.streaming.api.datastream.DataStream
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
+import org.apache.flink.table.api.{createTypeInformation, DataTypes, Table, TableResult}
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.catalog.{Column, ResolvedSchema}
import org.apache.flink.table.planner.runtime.stream.sql.DataStreamScalaITCase.{ComplexCaseClass, ImmutableCaseClass}
+import org.apache.flink.table.planner.runtime.utils.StreamingEnvUtil
import org.apache.flink.test.junit5.MiniClusterExtension
import org.apache.flink.types.Row
-import org.apache.flink.util.CollectionUtil
+import org.apache.flink.util.{CloseableIterator, CollectionUtil}
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.containsInAnyOrder
@@ -36,6 +37,7 @@ import org.junit.jupiter.api.extension.RegisterExtension
import java.util
+import scala.collection.JavaConversions.asScalaIterator
import scala.collection.JavaConverters._
/** Tests for connecting to the Scala [[DataStream]] API. */
@@ -58,7 +60,7 @@ class DataStreamScalaITCase {
ComplexCaseClass(42, "hello", ImmutableCaseClass(42.0, b = true)),
ComplexCaseClass(42, null, ImmutableCaseClass(42.0, b = false)))
- val dataStream = env.fromElements(caseClasses: _*)
+ val dataStream = StreamingEnvUtil.fromElements(env, caseClasses: _*)
val table = tableEnv.fromDataStream(dataStream)
@@ -91,7 +93,7 @@ class DataStreamScalaITCase {
@Test
def testImplicitConversions(): Unit = {
// DataStream to Table implicit
- val table = env.fromElements((42, "hello")).toTable(tableEnv)
+ val table = StreamingEnvUtil.fromElements(env, (42, "hello")).toTable(tableEnv)
// Table to DataStream implicit
assertEquals(List(Row.of(Int.box(42), "hello")), table.executeAndCollect().toList)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/DeduplicateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/DeduplicateITCase.scala
index b49920b4e46..dccaf33bcb1 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/DeduplicateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/DeduplicateITCase.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.runtime.stream.sql
import org.apache.flink.api.common.eventtime.{AscendingTimestampsWatermarks, TimestampAssigner, TimestampAssignerSupplier, WatermarkGenerator, WatermarkGeneratorSupplier, WatermarkStrategy}
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
@@ -180,8 +179,8 @@ class DeduplicateITCase(miniBatch: MiniBatchMode, mode: StateBackendMode)
@TestTemplate
def testFirstRowOnRowtime(): Unit = {
- val t = env
- .fromCollection(rowtimeTestData)
+ val t = StreamingEnvUtil
+ .fromCollection(env, rowtimeTestData)
.assignTimestampsAndWatermarks(new RowtimeExtractor)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime())
tEnv.createTemporaryView("T", t)
@@ -219,8 +218,8 @@ class DeduplicateITCase(miniBatch: MiniBatchMode, mode: StateBackendMode)
tEnv.getConfig.set(
ExecutionConfigOptions.TABLE_EXEC_DEDUPLICATE_MINIBATCH_COMPACT_CHANGES_ENABLED,
Boolean.box(true))
- val t = env
- .fromCollection(rowtimeTestData)
+ val t = StreamingEnvUtil
+ .fromCollection(env, rowtimeTestData)
.assignTimestampsAndWatermarks(new RowtimeExtractor)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime())
tEnv.createTemporaryView("T", t)
@@ -252,8 +251,8 @@ class DeduplicateITCase(miniBatch: MiniBatchMode, mode: StateBackendMode)
@TestTemplate
def testFirstRowOnRowTimeFollowedByUnboundedAgg(): Unit = {
- val t = env
- .fromCollection(rowtimeTestData)
+ val t = StreamingEnvUtil
+ .fromCollection(env, rowtimeTestData)
.assignTimestampsAndWatermarks(new RowtimeExtractor)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime())
tEnv.createTemporaryView("T", t)
@@ -288,8 +287,8 @@ class DeduplicateITCase(miniBatch: MiniBatchMode, mode: StateBackendMode)
@TestTemplate
def testLastRowOnRowtime(): Unit = {
- val t = env
- .fromCollection(rowtimeTestData)
+ val t = StreamingEnvUtil
+ .fromCollection(env, rowtimeTestData)
.assignTimestampsAndWatermarks(new RowtimeExtractor)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime())
tEnv.createTemporaryView("T", t)
@@ -331,8 +330,8 @@ class DeduplicateITCase(miniBatch: MiniBatchMode, mode: StateBackendMode)
tEnv.getConfig.set(
ExecutionConfigOptions.TABLE_EXEC_DEDUPLICATE_MINIBATCH_COMPACT_CHANGES_ENABLED,
Boolean.box(true))
- val t = env
- .fromCollection(rowtimeTestData)
+ val t = StreamingEnvUtil
+ .fromCollection(env, rowtimeTestData)
.assignTimestampsAndWatermarks(new RowtimeExtractor)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime())
tEnv.createTemporaryView("T", t)
@@ -366,8 +365,8 @@ class DeduplicateITCase(miniBatch: MiniBatchMode, mode: StateBackendMode)
@TestTemplate
def testLastRowOnRowTimeFollowedByUnboundedAgg(): Unit = {
- val t = env
- .fromCollection(rowtimeTestData)
+ val t = StreamingEnvUtil
+ .fromCollection(env, rowtimeTestData)
.assignTimestampsAndWatermarks(new RowtimeExtractor)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime())
tEnv.createTemporaryView("T", t)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/FilterableSourceITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/FilterableSourceITCase.scala
index 15916986e15..42dea12ceaa 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/FilterableSourceITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/FilterableSourceITCase.scala
@@ -17,14 +17,12 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala.createTypeInformation
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api.bridge.scala.tableConversions
import org.apache.flink.table.planner.factories.TestValuesTableFactory
import org.apache.flink.table.planner.runtime.utils.{StreamingTestBase, TestingAppendSink}
import org.apache.flink.table.planner.runtime.utils.BatchTestBase.row
import org.apache.flink.table.utils.LegacyRowExtension
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/GroupWindowITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/GroupWindowITCase.scala
index c6b2174820c..13b359c171d 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/GroupWindowITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/GroupWindowITCase.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.runtime.stream.sql
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.internal.TableEnvironmentInternal
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/IntervalJoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/IntervalJoinITCase.scala
index dee9540f871..3b637c34ce4 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/IntervalJoinITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/IntervalJoinITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.api.functions.AssignerWithPunctuatedWatermarks
import org.apache.flink.streaming.api.watermark.Watermark
import org.apache.flink.table.api._
@@ -63,13 +62,17 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=((1, 1L, "HiHi"))
data2.+=((2, 2L, "HeHe"))
- val tmp1 = env.fromCollection(data1).toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
+ val tmp1 = StreamingEnvUtil
+ .fromCollection(env, data1)
+ .toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
tEnv.createTemporaryView("TmpT1", tmp1)
val subquery1 = "SELECT IF(a = 1, CAST(NULL AS INT), a) as a, b, c, proctime FROM TmpT1"
val t1 = tEnv.sqlQuery(subquery1)
tEnv.createTemporaryView("T1", t1)
- val tmp2 = env.fromCollection(data2).toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
+ val tmp2 = StreamingEnvUtil
+ .fromCollection(env, data2)
+ .toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
tEnv.createTemporaryView("TmpT2", tmp2)
val subquery2 = "SELECT IF(a = 1, CAST(NULL AS INT), a) as a, b, c, proctime FROM TmpT2"
val t2 = tEnv.sqlQuery(subquery2)
@@ -106,13 +109,17 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=((1, 1L, "HiHi"))
data2.+=((2, 2L, "HeHe"))
- val tmp1 = env.fromCollection(data1).toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
+ val tmp1 = StreamingEnvUtil
+ .fromCollection(env, data1)
+ .toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
tEnv.createTemporaryView("TmpT1", tmp1)
val subquery1 = "SELECT IF(a = 1, CAST(NULL AS INT), a) as a, b, c, proctime FROM TmpT1"
val t1 = tEnv.sqlQuery(subquery1)
tEnv.createTemporaryView("T1", t1)
- val tmp2 = env.fromCollection(data2).toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
+ val tmp2 = StreamingEnvUtil
+ .fromCollection(env, data2)
+ .toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
tEnv.createTemporaryView("TmpT2", tmp2)
val subquery2 = "SELECT IF(a = 1, CAST(NULL AS INT), a) as a, b, c, proctime FROM TmpT2"
val t2 = tEnv.sqlQuery(subquery2)
@@ -155,8 +162,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data1.+=((null.asInstanceOf[String], 20L, "leftNull"))
data2.+=((null.asInstanceOf[String], 20L, "rightNull"))
- val t1 = env.fromCollection(data1).toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
- val t2 = env.fromCollection(data2).toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
+ .toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
+ .toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
tEnv.createTemporaryView("T1", t1)
tEnv.createTemporaryView("T2", t2)
@@ -200,12 +211,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
// test null key
data2.+=((null.asInstanceOf[String], "RIGHT10", 10000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
@@ -255,12 +266,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
// test null key
data2.+=((null.asInstanceOf[String], "RIGHT10", 10000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
@@ -310,12 +321,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
// test null key
data2.+=((null.asInstanceOf[String], "RIGHT10", 10000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
@@ -378,12 +389,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
// test null key
data2.+=((null.asInstanceOf[String], "RIGHT10", 10000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
@@ -439,9 +450,9 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
.watermark("rowtime", "rowtime - INTERVAL '1' SECOND")
.build()
- val t1 = tEnv.fromDataStream(env.fromCollection(data1), schema)
+ val t1 = tEnv.fromDataStream(StreamingEnvUtil.fromCollection(env, data1), schema)
- val t2 = tEnv.fromDataStream(env.fromCollection(data2), schema)
+ val t2 = tEnv.fromDataStream(StreamingEnvUtil.fromCollection(env, data2), schema)
tEnv.createTemporaryView("T1", t1)
tEnv.createTemporaryView("T2", t2)
@@ -503,12 +514,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=((2, 14L, "RIGHT7", 7000L))
data2.+=((1, 4L, "RIGHT8", 8000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row4WatermarkExtractor)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row4WatermarkExtractor)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
@@ -555,12 +566,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=((2, 8, "RIGHT7", 7000L))
data2.+=((1, 4L, "RIGHT8", 8000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row4WatermarkExtractor)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row4WatermarkExtractor)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
@@ -606,12 +617,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=(("A", "R-3", 8000L)) // 3 joining records
data2.+=(("D", "R-2", 8000L)) // no joining record
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
@@ -660,12 +671,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=(("A", "R-3", 8000L)) // 3 joining records
data2.+=(("D", "R-2", 8000L)) // no joining record
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
@@ -707,11 +718,11 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=((1, 1L, "HiHi"))
data2.+=((2, 2L, "HeHe"))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
tEnv.createTemporaryView("T1", t1)
@@ -755,13 +766,13 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=(("D", "R-8", 8000L))
data2.+=(("A", "R-11", 11000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
@@ -812,12 +823,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=(("B", "R-7", 7000L))
data2.+=(("D", "R-8", 8000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
@@ -861,8 +872,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=((1, 1L, "HiHi"))
data2.+=((2, 2L, "HeHe"))
- val t1 = env.fromCollection(data1).toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
- val t2 = env.fromCollection(data2).toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
+ .toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
+ .toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
tEnv.createTemporaryView("T1", t1)
tEnv.createTemporaryView("T2", t2)
@@ -903,12 +918,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=(("D", "R-8", 8000L))
data2.+=(("A", "R-20", 20000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
@@ -956,12 +971,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=(("B", "R-7", 7000L))
data2.+=(("D", "R-8", 8000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
@@ -1005,8 +1020,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=((1, 1L, "HiHi"))
data2.+=((2, 2L, "HeHe"))
- val t1 = env.fromCollection(data1).toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
- val t2 = env.fromCollection(data2).toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
+ .toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
+ .toTable(tEnv, 'a, 'b, 'c, 'proctime.proctime)
tEnv.createTemporaryView("T1", t1)
tEnv.createTemporaryView("T2", t2)
@@ -1047,12 +1066,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=(("B", "R-7", 7000L))
data2.+=(("D", "R-8", 8000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
@@ -1102,12 +1121,12 @@ class IntervalJoinITCase(mode: StateBackendMode) extends StreamingWithStateTestB
data2.+=(("B", "R-7", 7000L))
data2.+=(("D", "R-8", 8000L))
- val t1 = env
- .fromCollection(data1)
+ val t1 = StreamingEnvUtil
+ .fromCollection(env, data1)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
- val t2 = env
- .fromCollection(data2)
+ val t2 = StreamingEnvUtil
+ .fromCollection(env, data2)
.assignTimestampsAndWatermarks(new Row3WatermarkExtractor2)
.toTable(tEnv, 'key, 'id, 'rowtime.rowtime)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/JoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/JoinITCase.scala
index 91434e41241..1a775b511bd 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/JoinITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/JoinITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.api.TimeCharacteristic
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/Limit0RemoveITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/Limit0RemoveITCase.scala
index 24adf60304d..7532d0881a6 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/Limit0RemoveITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/Limit0RemoveITCase.scala
@@ -17,11 +17,10 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.internal.TableEnvironmentInternal
-import org.apache.flink.table.planner.runtime.utils.{StreamingTestBase, TestingAppendTableSink, TestingRetractTableSink, TestSinkUtil}
+import org.apache.flink.table.planner.runtime.utils._
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
@@ -30,7 +29,7 @@ class Limit0RemoveITCase extends StreamingTestBase() {
@Test
def testSimpleLimitRemove(): Unit = {
- val ds = env.fromCollection(Seq(1, 2, 3, 4, 5, 6))
+ val ds = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3, 4, 5, 6))
val table = ds.toTable(tEnv, 'a)
tEnv.createTemporaryView("MyTable", table)
@@ -46,7 +45,7 @@ class Limit0RemoveITCase extends StreamingTestBase() {
@Test
def testLimitRemoveWithOrderBy(): Unit = {
- val ds = env.fromCollection(Seq(1, 2, 3, 4, 5, 6))
+ val ds = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3, 4, 5, 6))
val table = ds.toTable(tEnv, 'a)
tEnv.createTemporaryView("MyTable", table)
@@ -62,7 +61,7 @@ class Limit0RemoveITCase extends StreamingTestBase() {
@Test
def testLimitRemoveWithSelect(): Unit = {
- val ds = env.fromCollection(Seq(1, 2, 3, 4, 5, 6))
+ val ds = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3, 4, 5, 6))
val table = ds.toTable(tEnv, 'a)
tEnv.createTemporaryView("MyTable", table)
@@ -78,11 +77,11 @@ class Limit0RemoveITCase extends StreamingTestBase() {
@Test
def testLimitRemoveWithIn(): Unit = {
- val ds1 = env.fromCollection(Seq(1, 2, 3, 4, 5, 6))
+ val ds1 = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3, 4, 5, 6))
val table1 = ds1.toTable(tEnv, 'a)
tEnv.createTemporaryView("MyTable1", table1)
- val ds2 = env.fromCollection(Seq(1, 2, 3))
+ val ds2 = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3))
val table2 = ds2.toTable(tEnv, 'a)
tEnv.createTemporaryView("MyTable2", table2)
@@ -98,11 +97,11 @@ class Limit0RemoveITCase extends StreamingTestBase() {
@Test
def testLimitRemoveWithNotIn(): Unit = {
- val ds1 = env.fromCollection(Seq(1, 2, 3, 4, 5, 6))
+ val ds1 = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3, 4, 5, 6))
val table1 = ds1.toTable(tEnv, 'a)
tEnv.createTemporaryView("MyTable1", table1)
- val ds2 = env.fromCollection(Seq(1, 2, 3))
+ val ds2 = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3))
val table2 = ds2.toTable(tEnv, 'a)
tEnv.createTemporaryView("MyTable2", table2)
@@ -119,11 +118,11 @@ class Limit0RemoveITCase extends StreamingTestBase() {
@Test
def testLimitRemoveWithExists(): Unit = {
- val ds1 = env.fromCollection(Seq(1, 2, 3, 4, 5, 6))
+ val ds1 = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3, 4, 5, 6))
val table1 = ds1.toTable(tEnv, 'a)
tEnv.createTemporaryView("MyTable1", table1)
- val ds2 = env.fromCollection(Seq(1, 2, 3))
+ val ds2 = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3))
val table2 = ds2.toTable(tEnv, 'a)
tEnv.createTemporaryView("MyTable2", table2)
@@ -139,11 +138,11 @@ class Limit0RemoveITCase extends StreamingTestBase() {
@Test
def testLimitRemoveWithNotExists(): Unit = {
- val ds1 = env.fromCollection(Seq(1, 2, 3, 4, 5, 6))
+ val ds1 = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3, 4, 5, 6))
val table1 = ds1.toTable(tEnv, 'a)
tEnv.createTemporaryView("MyTable1", table1)
- val ds2 = env.fromCollection(Seq(1, 2, 3))
+ val ds2 = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3))
val table2 = ds2.toTable(tEnv, 'a)
tEnv.createTemporaryView("MyTable2", table2)
@@ -160,11 +159,11 @@ class Limit0RemoveITCase extends StreamingTestBase() {
@Test
def testLimitRemoveWithJoin(): Unit = {
- val ds1 = env.fromCollection(Seq(1, 2, 3, 4, 5, 6))
+ val ds1 = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3, 4, 5, 6))
val table1 = ds1.toTable(tEnv, 'a1)
tEnv.createTemporaryView("MyTable1", table1)
- val ds2 = env.fromCollection(Seq(1, 2, 3))
+ val ds2 = StreamingEnvUtil.fromCollection(env, Seq(1, 2, 3))
val table2 = ds2.toTable(tEnv, 'a2)
tEnv.createTemporaryView("MyTable2", table2)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LimitITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LimitITCase.scala
index d28af199d01..af0adb0ac14 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LimitITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LimitITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api.{TableException, _}
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.runtime.utils._
@@ -89,7 +88,7 @@ class LimitITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mod
("fruit", 3, 44),
("fruit", 5, 22))
- val t = env.fromCollection(data).toTable(tEnv, 'category, 'shopId, 'num)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'category, 'shopId, 'num)
tEnv.createTemporaryView("T", t)
val sql = "SELECT * FROM T OFFSET 2"
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LimitableSourceITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LimitableSourceITCase.scala
index 1d8afbf4fe3..c02957245e6 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LimitableSourceITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LimitableSourceITCase.scala
@@ -17,7 +17,7 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
+import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.factories.TestValuesTableFactory
import org.apache.flink.table.planner.plan.rules.logical.PushLimitIntoTableSourceScanRule
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LookupJoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LookupJoinITCase.scala
index 2816e04e4ca..9ca49e2ad9f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LookupJoinITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/LookupJoinITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.config.OptimizerConfigOptions
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/MatchRecognizeITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/MatchRecognizeITCase.scala
index d1812f4a74d..6caf6e146ff 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/MatchRecognizeITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/MatchRecognizeITCase.scala
@@ -17,16 +17,16 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.common.typeinfo.BasicTypeInfo
-import org.apache.flink.api.scala._
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
+import org.apache.flink.api.common.eventtime._
+import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation}
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.catalog.DataTypeFactory
import org.apache.flink.table.functions.{AggregateFunction, FunctionContext, ScalarFunction}
import org.apache.flink.table.planner.factories.TestValuesTableFactory
import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.WeightedAvg
-import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestingAppendSink, UserDefinedFunctionTestUtils}
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, StreamingWithStateTestBase, TestingAppendSink, UserDefinedFunctionTestUtils}
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.table.planner.runtime.utils.TimeTestUtil.EventTimeSourceFunction
import org.apache.flink.table.planner.utils.TableTestUtil
@@ -39,8 +39,7 @@ import org.junit.jupiter.api.TestTemplate
import org.junit.jupiter.api.extension.ExtendWith
import java.sql.Timestamp
-import java.time.{Instant, ZoneId}
-import java.time.Duration
+import java.time.{Duration, Instant, ZoneId}
import java.util.TimeZone
import scala.collection.mutable
@@ -64,7 +63,10 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=((8, "c"))
data.+=((9, "h"))
- val t = env.fromCollection(data).toTable(tEnv, 'id, 'name, 'proctime.proctime)
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'id, 'name, 'proctime.proctime)
tEnv.createTemporaryView("MyTable", t)
val sqlQuery =
@@ -110,7 +112,10 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=((8, "c", null))
data.+=((9, null, null))
- val t = env.fromCollection(data).toTable(tEnv, 'id, 'name, 'nullField, 'proctime.proctime)
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'id, 'name, 'nullField, 'proctime.proctime)
tEnv.createTemporaryView("MyTable", t)
val sqlQuery =
@@ -160,9 +165,10 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=((8, "c", "key2", "second_key4"))
data.+=((9, "f", "key", "second_key"))
- val t = env
- .fromCollection(data)
- .toTable(tEnv, 'id, 'name, 'key1, 'key2, 'proctime.proctime)
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'id, 'name, 'key1, 'key2, 'proctime.proctime)
tEnv.createTemporaryView("MyTable", t)
val sqlQuery =
@@ -222,7 +228,9 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
)
val t = env
- .addSource(new EventTimeSourceFunction[(Int, Int, String, Int)](data))
+ .addSource(
+ new EventTimeSourceFunction[(Int, Int, String, Int)](data),
+ implicitly[TypeInformation[(Int, Int, String, Int)]])
.toTable(tEnv, 'secondaryOrder, 'ternaryOrder, 'name, 'id, 'rowtime.rowtime)
tEnv.createTemporaryView("MyTable", t)
@@ -276,10 +284,22 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=(("ACME1", Duration.ofSeconds(1).toMillis, 25, 3))
data.+=(("ACME1", Duration.ofSeconds(1).toMillis, 19, 8))
- val t = env
- .fromCollection(data)
- .assignAscendingTimestamps(e => e._2)
- .toTable(tEnv, 'symbol, 'rowtime.rowtime, 'price, 'tax)
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(String, Long, Int, Int)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(String, Long, Int, Int)] = {
+ new AscendingTimestampsWatermarks[(String, Long, Int, Int)]
+ }
+
+ override def createTimestampAssigner(context: TimestampAssignerSupplier.Context)
+ : TimestampAssigner[(String, Long, Int, Int)] = {
+ (e: (String, Long, Int, Int), _: Long) => e._2
+ }
+ })
+ .toTable(tEnv, 'symbol, 'rowtime.rowtime, 'price, 'tax)
tEnv.createTemporaryView("Ticker", t)
val sqlQuery =
@@ -329,10 +349,22 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=(("ACME", Duration.ofSeconds(4).toMillis, 1, 4))
data.+=(("ACME", Duration.ofSeconds(5).toMillis, 1, 3))
- val tickerEvents = env
- .fromCollection(data)
- .assignAscendingTimestamps(tickerEvent => tickerEvent._2)
- .toTable(tEnv, 'symbol, 'rowtime.rowtime, 'price, 'tax)
+ val tickerEvents =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(String, Long, Int, Int)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(String, Long, Int, Int)] = {
+ new AscendingTimestampsWatermarks[(String, Long, Int, Int)]
+ }
+
+ override def createTimestampAssigner(context: TimestampAssignerSupplier.Context)
+ : TimestampAssigner[(String, Long, Int, Int)] = {
+ (e: (String, Long, Int, Int), _: Long) => e._2
+ }
+ })
+ .toTable(tEnv, 'symbol, 'rowtime.rowtime, 'price, 'tax)
tEnv.createTemporaryView("Ticker", tickerEvents)
@@ -449,9 +481,10 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=(("ACME", 7L, 20, 7))
data.+=(("ACME", 8L, 25, 8))
- val t = env
- .fromCollection(data)
- .toTable(tEnv, 'symbol, 'tstamp, 'price, 'tax, 'proctime.proctime)
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'symbol, 'tstamp, 'price, 'tax, 'proctime.proctime)
tEnv.createTemporaryView("Ticker", t)
val sqlQuery =
@@ -495,11 +528,23 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=(("ACME", 3L, 13, 3))
data.+=(("ACME", 4L, 20, 4))
- val t = env
- .fromCollection(data)
- .assignAscendingTimestamps(tickerEvent => tickerEvent._2)
- .setParallelism(env.getParallelism)
- .toTable(tEnv, 'symbol, 'rowtime.rowtime, 'price, 'tax)
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(String, Long, Int, Int)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(String, Long, Int, Int)] = {
+ new AscendingTimestampsWatermarks[(String, Long, Int, Int)]
+ }
+
+ override def createTimestampAssigner(context: TimestampAssignerSupplier.Context)
+ : TimestampAssigner[(String, Long, Int, Int)] = {
+ (e: (String, Long, Int, Int), _: Long) => e._2
+ }
+ })
+ .setParallelism(env.getParallelism)
+ .toTable(tEnv, 'symbol, 'rowtime.rowtime, 'price, 'tax)
tEnv.createTemporaryView("Ticker", t)
val sqlQuery =
@@ -545,9 +590,10 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=((7, "ACME", 7L, 14))
data.+=((8, "ACME", 8L, 20))
- val t = env
- .fromCollection(data)
- .toTable(tEnv, 'id, 'symbol, 'tstamp, 'price, 'proctime.proctime)
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'id, 'symbol, 'tstamp, 'price, 'proctime.proctime)
tEnv.createTemporaryView("Ticker", t)
val sqlQuery =
@@ -602,9 +648,10 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=(("ACME", 3L, 13, 3))
data.+=(("ACME", 4L, 20, 4))
- val t = env
- .fromCollection(data)
- .toTable(tEnv, 'symbol, 'tstamp, 'price, 'tax, 'proctime.proctime)
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'symbol, 'tstamp, 'price, 'tax, 'proctime.proctime)
tEnv.createTemporaryView("Ticker", t)
val sqlQuery =
@@ -662,9 +709,10 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=((11, "h", 2, 0.8, 3))
data.+=((12, "h", 2, 0.8, 3))
- val t = env
- .fromCollection(data)
- .toTable(tEnv, 'id, 'name, 'price, 'rate, 'weight, 'proctime.proctime)
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'id, 'name, 'price, 'rate, 'weight, 'proctime.proctime)
tEnv.createTemporaryView("MyTable", t)
tEnv.createTemporarySystemFunction("weightedAvg", classOf[WeightedAvg])
@@ -721,13 +769,15 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=(Row.of(Int.box(8), "c", Int.box(3)))
data.+=(Row.of(Int.box(9), "c", Int.box(2)))
- val t = env
- .fromCollection(data)(
- Types.ROW(
- BasicTypeInfo.INT_TYPE_INFO,
- BasicTypeInfo.STRING_TYPE_INFO,
- BasicTypeInfo.INT_TYPE_INFO))
- .toTable(tEnv, 'id, 'name, 'price, 'proctime.proctime)
+ implicit val tpe: TypeInformation[Row] = Types.ROW(
+ BasicTypeInfo.INT_TYPE_INFO,
+ BasicTypeInfo.STRING_TYPE_INFO,
+ BasicTypeInfo.INT_TYPE_INFO)
+
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'id, 'name, 'price, 'proctime.proctime)
tEnv.createTemporaryView("MyTable", t)
tEnv.createTemporarySystemFunction("weightedAvg", classOf[WeightedAvg])
@@ -769,7 +819,10 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
val data = new mutable.MutableList[(Int, String)]
data.+=((1, "a"))
- val t = env.fromCollection(data).toTable(tEnv, 'id, 'name, 'proctime.proctime)
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'id, 'name, 'proctime.proctime)
tEnv.createTemporaryView("MyTable", t)
val sqlQuery =
@@ -817,9 +870,10 @@ class MatchRecognizeITCase(backend: StateBackendMode) extends StreamingWithState
data.+=((8, "a", 1))
data.+=((9, "f", 1))
- val t = env
- .fromCollection(data)
- .toTable(tEnv, 'id, 'name, 'price, 'proctime.proctime)
+ val t =
+ StreamingEnvUtil
+ .fromCollection(env, data)
+ .toTable(tEnv, 'id, 'name, 'price, 'proctime.proctime)
tEnv.createTemporaryView("MyTable", t)
tEnv.createTemporarySystemFunction("prefix", classOf[PrefixingScalarFunc])
tEnv.createTemporarySystemFunction("countFrom", classOf[RichAggFunc])
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/OverAggregateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/OverAggregateITCase.scala
index cd33a7d203a..eef53e61c85 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/OverAggregateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/OverAggregateITCase.scala
@@ -17,12 +17,12 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
+import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.RowTypeInfo
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.factories.TestValuesTableFactory
-import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestData, TestingAppendSink}
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, StreamingWithStateTestBase, TestData, TestingAppendSink}
import org.apache.flink.table.planner.runtime.utils.BatchTestBase.row
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.table.planner.runtime.utils.TimeTestUtil.EventTimeProcessOperator
@@ -84,8 +84,12 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val t1 = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)]
+ )
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
tEnv.createTemporaryView("T1", t1)
@@ -124,8 +128,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
)
val source = failingDataSource(data)
val t1 = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
tEnv.createTemporaryView("T1", t1)
val sink = new TestingAppendSink
@@ -541,8 +548,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val t1 = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Long, Int, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Long, Int, String)]],
+ new EventTimeProcessOperator[(Long, Int, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
tEnv.createTemporaryView("T1", t1)
@@ -613,8 +623,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val t1 = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Long, Int, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Long, Int, String)]],
+ new EventTimeProcessOperator[(Long, Int, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
tEnv.createTemporaryView("T1", t1)
@@ -691,9 +704,13 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
)
val source = failingDataSource(data)
+
val t1 = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Long, Int, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Long, Int, String)]],
+ new EventTimeProcessOperator[(Long, Int, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
tEnv.createTemporaryView("T1", t1)
@@ -761,8 +778,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val t1 = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Long, Int, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Long, Int, String)]],
+ new EventTimeProcessOperator[(Long, Int, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
tEnv.createTemporaryView("T1", t1)
@@ -834,8 +854,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val t1 = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
tEnv.createTemporaryView("T1", t1)
@@ -902,8 +925,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val t1 = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
tEnv.createTemporaryView("T1", t1)
@@ -962,8 +988,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val t1 = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
tEnv.createTemporaryView("T1", t1)
@@ -1019,8 +1048,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val t1 = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
tEnv.createTemporaryView("T1", t1)
@@ -1088,8 +1120,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val t1 = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
tEnv.createTemporaryView("T1", t1)
@@ -1342,7 +1377,7 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
env.setParallelism(1)
- val table = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'proctime.proctime)
+ val table = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b, 'proctime.proctime)
tEnv.createTemporaryView("MyTable", table)
tEnv.createTemporarySystemFunction("PairCount", classOf[CountPairs])
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/PartitionableSourceITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/PartitionableSourceITCase.scala
index 79dd7619bbc..4197fdf9c81 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/PartitionableSourceITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/PartitionableSourceITCase.scala
@@ -17,14 +17,12 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.catalog.{CatalogPartitionImpl, CatalogPartitionSpec, ObjectPath}
import org.apache.flink.table.planner.factories.{TestValuesCatalog, TestValuesTableFactory}
import org.apache.flink.table.planner.runtime.utils.{StreamingTestBase, TestingAppendSink}
import org.apache.flink.table.planner.runtime.utils.BatchTestBase.row
import org.apache.flink.testutils.junit.extensions.parameterized.{ParameterizedTestExtension, Parameters}
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.{BeforeEach, TestTemplate}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/PruneAggregateCallITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/PruneAggregateCallITCase.scala
index 94525a8f1e9..a6913a1e049 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/PruneAggregateCallITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/PruneAggregateCallITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
@@ -108,7 +107,7 @@ class PruneAggregateCallITCase(
TableTestUtil.createTemporaryView[(Int, Long, String)](
tEnv,
"MyTable",
- failingDataSource(TestData.smallTupleData3).javaStream,
+ failingDataSource(TestData.smallTupleData3),
Some(Array($"a", $"b", $"c")),
Some(Array(true, true, true)),
Some(FlinkStatistic.UNKNOWN)
@@ -117,7 +116,7 @@ class PruneAggregateCallITCase(
TableTestUtil.createTemporaryView[(Int, Long, Int, String, Long)](
tEnv,
"MyTable2",
- failingDataSource(TestData.smallTupleData5).javaStream,
+ failingDataSource(TestData.smallTupleData5),
Some(Array($"a", $"b", $"c", $"d", $"e")),
Some(Array(true, true, true, true, true)),
Some(FlinkStatistic.builder().uniqueKeys(Set(Set("b").asJava).asJava).build())
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/RankITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/RankITCase.scala
index e7769c242fb..e5262db4272 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/RankITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/RankITCase.scala
@@ -19,7 +19,6 @@ package org.apache.flink.table.planner.runtime.stream.sql
import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation}
import org.apache.flink.api.java.typeutils.RowTypeInfo
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.internal.TableEnvironmentInternal
@@ -319,7 +318,7 @@ class RankITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
BasicTypeInfo.DOUBLE_TYPE_INFO
) // tpe is automatically
- val ds = env.fromCollection(data)
+ val ds = StreamingEnvUtil.fromCollection(env, data)
val t = ds.toTable(tEnv, 'category, 'shopId, 'num)
tEnv.createTemporaryView("T", t)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SemiAntiJoinStreamITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SemiAntiJoinStreamITCase.scala
index 505a6988528..ca2d79b3000 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SemiAntiJoinStreamITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SemiAntiJoinStreamITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestData, TestingRetractSink}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SetOperatorsITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SetOperatorsITCase.scala
index 0774bd073e5..7354b742ab4 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SetOperatorsITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SetOperatorsITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestData, TestingRetractSink}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SortITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SortITCase.scala
index d3882d6b0e7..6e3f09f0ff1 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SortITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SortITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.runtime.utils._
@@ -44,7 +43,7 @@ class SortITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
data.+=(("1", "2"))
data.+=(("5", "1"))
- val da = env.fromCollection(data).toTable(tEnv, 'a1, 'a2)
+ val da = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a1, 'a2)
tEnv.createTemporaryView("a", da)
assertThatThrownBy(() => tEnv.sqlQuery(sqlQuery).toRetractStream[Row])
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SortLimitITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SortLimitITCase.scala
index 6298b7c455c..46a04017474 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SortLimitITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SortLimitITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.runtime.utils._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SourceWatermarkITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SourceWatermarkITCase.scala
index 1fe864ea7c8..1b901412947 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SourceWatermarkITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SourceWatermarkITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.data.TimestampData
@@ -26,7 +25,6 @@ import org.apache.flink.table.planner.runtime.utils.{StreamingTestBase, TestingA
import org.apache.flink.table.planner.runtime.utils.BatchTestBase.row
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedScalarFunctions.JavaFunc5
import org.apache.flink.table.utils.LegacyRowExtension
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SplitAggregateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SplitAggregateITCase.scala
index ff308e530c5..6720f2a0896 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SplitAggregateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/SplitAggregateITCase.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.runtime.stream.sql
import org.apache.flink.api.java.typeutils.RowTypeInfo
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.config.OptimizerConfigOptions
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/StreamFileSystemITCaseBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/StreamFileSystemITCaseBase.scala
index 930bf6f1f96..7d7ddaf7ae8 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/StreamFileSystemITCaseBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/StreamFileSystemITCaseBase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.api.functions.sink.SinkFunction
import org.apache.flink.table.api.TableEnvironment
import org.apache.flink.table.api.bridge.scala._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/StreamTableEnvironmentITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/StreamTableEnvironmentITCase.scala
index f4fad4d0238..e0284888acf 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/StreamTableEnvironmentITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/StreamTableEnvironmentITCase.scala
@@ -17,16 +17,15 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.configuration.Configuration
+import org.apache.flink.streaming.api.datastream.DataStream
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
-import org.apache.flink.streaming.api.scala.DataStream
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.java.StreamTableEnvironment
import org.apache.flink.table.api.bridge.scala
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.config.TableConfigOptions
-import org.apache.flink.table.planner.runtime.utils.{StreamingTestBase, StringSink}
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, StreamingTestBase, StringSink}
import org.apache.flink.table.planner.runtime.utils.JavaPojos.{Device, Order, Person, ProductItem}
import org.assertj.core.api.Assertions.assertThat
@@ -50,13 +49,15 @@ class StreamTableEnvironmentITCase extends StreamingTestBase {
DataTypes.FIELD("name", DataTypes.STRING())))
.column("amount", DataTypes.INT())
.build()
- val orderA = env.fromCollection(
+ val orderA = StreamingEnvUtil.fromCollection(
+ env,
Seq(
new Order(1L, new ProductItem("beer", 10L), 3),
new Order(1L, new ProductItem("diaper", 11L), 4),
new Order(3L, new ProductItem("rubber", 12L), 2)))
- val orderB: DataStream[Order] = env.fromCollection(
+ val orderB: DataStream[Order] = StreamingEnvUtil.fromCollection(
+ env,
Seq(
new Order(2L, new ProductItem("pen", 13L), 3),
new Order(2L, new ProductItem("rubber", 12L), 3),
@@ -102,12 +103,14 @@ class StreamTableEnvironmentITCase extends StreamingTestBase {
@Test
def testToAppendStreamWithRawType(): Unit = {
- val devices = env.fromCollection(
+ val devices = StreamingEnvUtil.fromCollection(
+ env,
Seq(
new Device(1L, "device1", Collections.singletonMap("A", 10)),
new Device(2L, "device2", Collections.emptyMap()),
new Device(3L, "device3", Collections.singletonMap("B", 20))
- ))
+ )
+ )
// register DataStream as Table
tEnv.createTemporaryView(
@@ -143,7 +146,8 @@ class StreamTableEnvironmentITCase extends StreamingTestBase {
@Test
def testToRetractStreamWithPojoType(): Unit = {
- val persons = env.fromCollection(
+ val persons = StreamingEnvUtil.fromCollection(
+ env,
Seq(
new Person("bob", 1),
new Person("Liz", 2),
@@ -165,7 +169,8 @@ class StreamTableEnvironmentITCase extends StreamingTestBase {
@Test
def testRetractMsgWithPojoType(): Unit = {
- val orders = env.fromCollection(
+ val orders = StreamingEnvUtil.fromCollection(
+ env,
Seq(
new Order(1L, new ProductItem("beer", 10L), 1),
new Order(1L, new ProductItem("beer", 10L), 2)
@@ -199,10 +204,9 @@ class StreamTableEnvironmentITCase extends StreamingTestBase {
val tEnv = StreamTableEnvironment.create(env)
assertThat(tEnv.getConfig.get(TableConfigOptions.TABLE_CATALOG_NAME)).isEqualTo("myCatalog")
- val scalaEnv =
- org.apache.flink.streaming.api.scala.StreamExecutionEnvironment.getExecutionEnvironment
+ val env2 = StreamExecutionEnvironment.getExecutionEnvironment
val scalaTEnv = scala.StreamTableEnvironment.create(
- scalaEnv,
+ env2,
EnvironmentSettings.newInstance.withConfiguration(config).build)
assertThat(scalaTEnv.getConfig.get(TableConfigOptions.TABLE_CATALOG_NAME))
.isEqualTo("myCatalog")
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TableScanITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TableScanITCase.scala
index 7e653ca27e5..ec3ccd66098 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TableScanITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TableScanITCase.scala
@@ -19,7 +19,6 @@ package org.apache.flink.table.planner.runtime.stream.sql
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.RowTypeInfo
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.api.functions.ProcessFunction
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TableSourceITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TableSourceITCase.scala
index a2089ee404e..0d96c0137ff 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TableSourceITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TableSourceITCase.scala
@@ -17,10 +17,9 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
-import org.apache.flink.core.testutils.{EachCallbackWrapper, FlinkAssertions}
-import org.apache.flink.core.testutils.FlinkAssertions.{anyCauseMatches, assertThatChainOfCauses}
-import org.apache.flink.table.api.{DataTypes, TableException}
+import org.apache.flink.core.testutils.EachCallbackWrapper
+import org.apache.flink.core.testutils.FlinkAssertions.anyCauseMatches
+import org.apache.flink.table.api.{createTypeInformation, TableException}
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.factories.TestValuesTableFactory
import org.apache.flink.table.planner.runtime.utils.{StreamingTestBase, TestData, TestingAppendSink, TestingRetractSink}
@@ -129,7 +128,7 @@ class TableSourceITCase extends StreamingTestBase {
def testProjectWithoutInputRef(): Unit = {
val result = tEnv.sqlQuery("SELECT COUNT(*) FROM MyTable").toRetractStream[Row]
val sink = new TestingRetractSink()
- result.addSink(sink).setParallelism(result.parallelism)
+ result.addSink(sink).setParallelism(result.getParallelism)
env.execute()
assertThat(sink.getRetractResults.sorted).isEqualTo(Seq("3"))
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TemporalSortITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TemporalSortITCase.scala
index 8d7b76a095b..606c8db7abe 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TemporalSortITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TemporalSortITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.factories.TestValuesTableFactory
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TemporalTableFunctionJoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TemporalTableFunctionJoinITCase.scala
index 3259a9be56d..519346c4583 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TemporalTableFunctionJoinITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TemporalTableFunctionJoinITCase.scala
@@ -17,18 +17,16 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.streaming.api.TimeCharacteristic
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.streaming.api.functions.timestamps.BoundedOutOfOrdernessTimestampExtractor
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
import org.apache.flink.streaming.api.windowing.time.Time
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
-import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestingAppendSink}
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, StreamingWithStateTestBase, TestingAppendSink}
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.table.planner.utils.TableTestUtil
import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.TestTemplate
@@ -78,11 +76,11 @@ class TemporalTableFunctionJoinITCase(state: StateBackendMode)
ratesHistoryData.+=(("Euro", 116L))
ratesHistoryData.+=(("Euro", 119L))
- val orders = env
- .fromCollection(ordersData)
+ val orders = StreamingEnvUtil
+ .fromCollection(env, ordersData)
.toTable(tEnv, 'amount, 'currency, 'proctime.proctime)
- val ratesHistory = env
- .fromCollection(ratesHistoryData)
+ val ratesHistory = StreamingEnvUtil
+ .fromCollection(env, ratesHistoryData)
.toTable(tEnv, 'currency, 'rate, 'proctime.proctime)
tEnv.createTemporaryView("Orders", orders)
@@ -142,14 +140,14 @@ class TemporalTableFunctionJoinITCase(state: StateBackendMode)
ratesHistoryData.+=(("Euro", 116L))
ratesHistoryData.+=(("Euro", 119L))
- val orders1 = env
- .fromCollection(ordersData)
+ val orders1 = StreamingEnvUtil
+ .fromCollection(env, ordersData)
.toTable(tEnv, 'amount, 'currency, 'proctime.proctime)
- val orders2 = env
- .fromCollection(ordersData)
+ val orders2 = StreamingEnvUtil
+ .fromCollection(env, ordersData)
.toTable(tEnv, 'amount, 'currency, 'proctime.proctime)
- val ratesHistory = env
- .fromCollection(ratesHistoryData)
+ val ratesHistory = StreamingEnvUtil
+ .fromCollection(env, ratesHistoryData)
.toTable(tEnv, 'currency, 'rate, 'proctime.proctime)
tEnv.createTemporaryView("Orders1", orders1)
@@ -201,12 +199,12 @@ class TemporalTableFunctionJoinITCase(state: StateBackendMode)
expectedOutput += (2 * 114).toString
expectedOutput += (3 * 116).toString
- val orders = env
- .fromCollection(ordersData)
+ val orders = StreamingEnvUtil
+ .fromCollection(env, ordersData)
.assignTimestampsAndWatermarks(new TimestampExtractor[(Long, String, Timestamp)]())
.toTable(tEnv, 'amount, 'currency, 'rowtime.rowtime)
- val ratesHistory = env
- .fromCollection(ratesHistoryData)
+ val ratesHistory = StreamingEnvUtil
+ .fromCollection(env, ratesHistoryData)
.assignTimestampsAndWatermarks(new TimestampExtractor[(String, Long, Timestamp)]())
.toTable(tEnv, 'currency, 'rate, 'rowtime.rowtime)
@@ -257,8 +255,8 @@ class TemporalTableFunctionJoinITCase(state: StateBackendMode)
ordersData.+=((2L, "A2", 1L, new Timestamp(3L)))
ordersData.+=((3L, "A4", 50L, new Timestamp(4L)))
ordersData.+=((4L, "A1", 3L, new Timestamp(5L)))
- val orders = env
- .fromCollection(ordersData)
+ val orders = StreamingEnvUtil
+ .fromCollection(env, ordersData)
.assignTimestampsAndWatermarks(new TimestampExtractor[(Long, String, Long, Timestamp)]())
.toTable(tEnv, 'orderId, 'productId, 'amount, 'rowtime.rowtime)
@@ -268,8 +266,8 @@ class TemporalTableFunctionJoinITCase(state: StateBackendMode)
ratesHistoryData.+=(("Yen", 1L, new Timestamp(1L)))
ratesHistoryData.+=(("Euro", 116L, new Timestamp(5L)))
ratesHistoryData.+=(("Euro", 119L, new Timestamp(7L)))
- val ratesHistory = env
- .fromCollection(ratesHistoryData)
+ val ratesHistory = StreamingEnvUtil
+ .fromCollection(env, ratesHistoryData)
.assignTimestampsAndWatermarks(new TimestampExtractor[(String, Long, Timestamp)]())
.toTable(tEnv, 'currency, 'rate, 'rowtime.rowtime)
@@ -279,8 +277,8 @@ class TemporalTableFunctionJoinITCase(state: StateBackendMode)
pricesHistoryData.+=(("A4", "Yen", 1d, new Timestamp(1L)))
pricesHistoryData.+=(("A1", "Euro", 11.6d, new Timestamp(5L)))
pricesHistoryData.+=(("A1", "Euro", 11.9d, new Timestamp(7L)))
- val pricesHistory = env
- .fromCollection(pricesHistoryData)
+ val pricesHistory = StreamingEnvUtil
+ .fromCollection(env, pricesHistoryData)
.assignTimestampsAndWatermarks(new TimestampExtractor[(String, String, Double, Timestamp)]())
.toTable(tEnv, 'productId, 'currency, 'price, 'rowtime.rowtime)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TimeAttributeITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TimeAttributeITCase.scala
index 53b3c71f0f8..dab2948eb4c 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TimeAttributeITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TimeAttributeITCase.scala
@@ -17,12 +17,10 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.factories.TestValuesTableFactory
import org.apache.flink.table.planner.runtime.utils.{StreamingTestBase, TestingAppendSink}
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedScalarFunctions.JavaFunc5
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TimestampITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TimestampITCase.scala
index 1dedef84a4c..be2aa1e8e65 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TimestampITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/TimestampITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.runtime.utils.{StreamingTestBase, TestingRetractSink}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/UnnestITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/UnnestITCase.scala
index dac5cd816ea..925c801e093 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/UnnestITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/UnnestITCase.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.runtime.stream.sql
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
@@ -47,7 +46,7 @@ class UnnestITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mo
(2, Array(41, 5), Array(Array(18), Array(87))),
(3, Array(18, 42), Array(Array(1), Array(45)))
)
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sqlQuery = "SELECT a, b, s FROM T, UNNEST(T.b) AS A (s)"
@@ -73,7 +72,7 @@ class UnnestITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mo
(2, Array(41, 5), Array(Array(18), Array(87))),
(3, Array(18, 42), Array(Array(1), Array(45)))
)
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sqlQuery = "SELECT a, s FROM T, UNNEST(T.c) AS A (s)"
@@ -93,7 +92,7 @@ class UnnestITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mo
(2, Array((13, "41.6"), (14, "45.2136"))),
(3, Array((18, "42.6")))
)
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b)
tEnv.createTemporaryView("T", t)
val sqlQuery = "SELECT a, b, s, t FROM T, UNNEST(T.b) AS A (s, t) WHERE s > 13"
@@ -114,7 +113,7 @@ class UnnestITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mo
(3, 2, (13, "41.6")),
(4, 3, (14, "45.2136")),
(5, 3, (18, "42.6")))
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sqlQuery =
@@ -146,7 +145,7 @@ class UnnestITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mo
(7, "8", "Hello World")
)
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sqlQuery =
@@ -206,7 +205,7 @@ class UnnestITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mo
(3, 2L, Array("Hello world", "x"))
)
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sqlQuery = "SELECT a, s FROM T, UNNEST(T.c) as A (s)"
@@ -251,7 +250,7 @@ class UnnestITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mo
Array("a", "b", "c"),
Array[TypeInformation[_]](Types.INT, Types.LONG, Types.MAP(Types.STRING, Types.STRING))
)
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b, 'c)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b, 'c)
tEnv.createTemporaryView("T", t)
val sqlQuery = "SELECT a, b, v FROM T CROSS JOIN UNNEST(c) as f (k, v)"
@@ -274,7 +273,7 @@ class UnnestITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mo
(3, Array((18, "42.6")))
)
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b)
tEnv.createTemporaryView("T", t)
val sqlQuery = "SELECT a, b, x, y " +
@@ -301,7 +300,7 @@ class UnnestITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mo
(2, Array((13, "41.6"), (14, "45.2136"))),
(3, Array((18, "42.6")))
)
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b)
tEnv.createTemporaryView("T", t)
val sqlQuery = "SELECT a, b, A._1, A._2 FROM T, UNNEST(T.b) AS A where A._1 > 13"
@@ -321,7 +320,7 @@ class UnnestITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mo
(2, Array((13, "41.6"), (14, "45.2136"))),
(3, Array((18, "42.6")))
)
- val t = env.fromCollection(data).toTable(tEnv, 'a, 'b)
+ val t = StreamingEnvUtil.fromCollection(env, data).toTable(tEnv, 'a, 'b)
tEnv.createTemporaryView("MyTable", t)
val sqlQuery =
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/WindowAggregateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/WindowAggregateITCase.scala
index e8ce8256e67..0986d390a22 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/WindowAggregateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/sql/WindowAggregateITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.sql
-import org.apache.flink.api.scala._
import org.apache.flink.configuration.{Configuration, RestartStrategyOptions}
import org.apache.flink.core.execution.CheckpointingMode
import org.apache.flink.table.api._
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/AggregateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/AggregateITCase.scala
index 3148ccce07b..198b3abf9f4 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/AggregateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/AggregateITCase.scala
@@ -18,12 +18,11 @@
package org.apache.flink.table.planner.runtime.stream.table
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.DataTypes.DECIMAL
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.internal.TableEnvironmentInternal
-import org.apache.flink.table.planner.runtime.utils.{JavaUserDefinedAggFunctions, StreamingWithStateTestBase, TestingRetractSink, TestingUpsertTableSink}
+import org.apache.flink.table.planner.runtime.utils._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.{CountDistinct, DataViewTestAgg, WeightedAvg}
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.table.planner.runtime.utils.TestData._
@@ -364,8 +363,8 @@ class AggregateITCase(mode: StateBackendMode) extends StreamingWithStateTestBase
data.+=((12, 5L, "B"))
val distinct = new CountDistinct
- val t = env
- .fromCollection(data)
+ val t = StreamingEnvUtil
+ .fromCollection(env, data)
.toTable(tEnv, 'a, 'b, 'c)
.groupBy('b)
.select('b, distinct('c), call(classOf[DataViewTestAgg], 'c, 'b))
@@ -390,8 +389,8 @@ class AggregateITCase(mode: StateBackendMode) extends StreamingWithStateTestBase
data.+=((4, 3L, "C"))
data.+=((5, 3L, "C"))
- val t = env
- .fromCollection(data)
+ val t = StreamingEnvUtil
+ .fromCollection(env, data)
.toTable(tEnv, 'a, 'b, 'c)
.groupBy('c)
.select('c, 'b.max)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/CalcITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/CalcITCase.scala
index 2e64ab3c022..8742e704be9 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/CalcITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/CalcITCase.scala
@@ -17,7 +17,6 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.annotation.{DataTypeHint, InputGroup}
import org.apache.flink.table.api._
@@ -25,14 +24,14 @@ import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.catalog.CatalogDatabaseImpl
import org.apache.flink.table.functions.ScalarFunction
import org.apache.flink.table.planner.expressions.utils._
-import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestingAppendSink, TestingRetractSink, UserDefinedFunctionTestUtils}
+import org.apache.flink.table.planner.runtime.utils._
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.table.planner.runtime.utils.TestData._
import org.apache.flink.table.utils.LegacyRowExtension
import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension
import org.apache.flink.types.Row
-import org.assertj.core.api.Assertions.{assertThat, assertThatExceptionOfType, assertThatThrownBy}
+import org.assertj.core.api.Assertions.{assertThat, assertThatExceptionOfType}
import org.junit.jupiter.api.{Disabled, TestTemplate}
import org.junit.jupiter.api.extension.{ExtendWith, RegisterExtension}
@@ -55,8 +54,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
tEnv.createTemporarySystemFunction("RichFunc2", new RichFunc2)
UserDefinedFunctionTestUtils.setJobParameters(env, Map("string.value" -> "Abc"))
- val result = env
- .fromCollection(tupleData3)
+ val result = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
.toTable(tEnv, 'a, 'b, 'c)
.where(call("RichFunc2", $"c") === "Abc#Hello" || call("RichFunc1", $"a") === 3 && $"b" === 2)
.select('c, udfLen('c).as('len))
@@ -71,7 +70,9 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@TestTemplate
def testSimpleSelectAll(): Unit = {
- val ds = env.fromCollection(smallTupleData3).toTable(tEnv)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv)
val sink = new TestingAppendSink
ds.toDataStream.addSink(sink)
@@ -83,8 +84,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@TestTemplate
def testSimpleSelectEmpty(): Unit = {
- val ds = env
- .fromCollection(smallTupleData3)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
.toTable(tEnv)
.select()
.select(lit("1").count())
@@ -99,7 +100,10 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@TestTemplate
def testSelectStar(): Unit = {
- val ds = env.fromCollection(smallNestedTupleData).toTable(tEnv, '_1, '_2).select('*)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallNestedTupleData)
+ .toTable(tEnv, '_1, '_2)
+ .select('*)
val sink = new TestingAppendSink
ds.toDataStream(
@@ -113,7 +117,10 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@TestTemplate
def testSelectFirst(): Unit = {
- val ds = env.fromCollection(smallTupleData3).toTable(tEnv).select('_1)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv)
+ .select('_1)
val sink = new TestingAppendSink
ds.toDataStream.addSink(sink)
@@ -127,8 +134,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
def testSimpleSelectWithNaming(): Unit = {
// verify ProjectMergeRule.
- val ds = env
- .fromCollection(tupleData3)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
.toTable(tEnv)
.select('_1.as('a), '_2.as('b), '_1.as('c))
.select('a, 'b)
@@ -164,8 +171,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@TestTemplate
def testSimpleSelectAllWithAs(): Unit = {
- val ds = env
- .fromCollection(smallTupleData3)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
.toTable(tEnv, 'a, 'b, 'c)
.select('a, 'b, 'c)
@@ -182,7 +189,9 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
/*
* Test simple filter
*/
- val ds = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
val sink = new TestingAppendSink
ds.filter('a === 3).toDataStream.addSink(sink)
@@ -197,7 +206,9 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
/*
* Test all-rejecting filter
*/
- val ds = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
val filterDs = ds.filter(false)
val sink = new TestingAppendSink
@@ -212,7 +223,9 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
/*
* Test all-passing filter
*/
- val ds = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
val sink = new TestingAppendSink
ds.filter(true).toDataStream.addSink(sink)
env.execute()
@@ -226,7 +239,9 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
/*
* Test filter on Integer tuple field.
*/
- val ds = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
val filterDs = ds
.filter('a % 2 === 0)
@@ -250,7 +265,9 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
/*
* Test filter on Integer tuple field.
*/
- val ds = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
val filterDs = ds
.filter('a % 2 !== 0)
@@ -274,8 +291,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
def testUserDefinedFunctionWithParameter(): Unit = {
tEnv.createTemporarySystemFunction("RichFunc2", new RichFunc2)
UserDefinedFunctionTestUtils.setJobParameters(env, Map("string.value" -> "ABC"))
- val ds = env
- .fromCollection(tupleData3)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
.toTable(tEnv, 'a, 'b, 'c)
.where(call("RichFunc2", $"c") === "ABC#Hello")
.select('c)
@@ -294,8 +311,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
tEnv.createTemporarySystemFunction("RichFunc2", new RichFunc2)
UserDefinedFunctionTestUtils.setJobParameters(env, Map("string.value" -> "Abc"))
- val result = env
- .fromCollection(tupleData3)
+ val result = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
.toTable(tEnv, 'a, 'b, 'c)
.where(
call("RichFunc2", $"c") === "Abc#Hello" ||
@@ -319,7 +336,10 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
testData.+=((3, 2L, "Anna#44"))
testData.+=((4, 3L, "nosharp"))
- val t = env.fromCollection(testData).toTable(tEnv).as("a", "b", "c")
+ val t = StreamingEnvUtil
+ .fromCollection(env, testData)
+ .toTable(tEnv)
+ .as("a", "b", "c")
val func0 = new Func13("default")
val func1 = new Func13("Sunny")
val func2 = new Func13("kevin2")
@@ -420,7 +440,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
def testCallFunctionWithStarArgument(): Unit = {
val table = tEnv
.fromDataStream(
- env.fromCollection(
+ StreamingEnvUtil.fromCollection(
+ env,
Seq(
("Foo", 0, 3),
("Bar", 1, 4),
@@ -486,7 +507,10 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@TestTemplate
def testMapType(): Unit = {
- val ds = env.fromCollection(tupleData3).toTable(tEnv).select(map('_1, '_3))
+ val ds = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv)
+ .select(map('_1, '_3))
val sink = new TestingAppendSink
ds.toDataStream.addSink(sink)
@@ -524,7 +548,10 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
testData.+=((1, 1L, "Kevin"))
testData.+=((2, 2L, "Sunny"))
- val t = env.fromCollection(testData).toTable(tEnv).as("a", "b", "c")
+ val t = StreamingEnvUtil
+ .fromCollection(env, testData)
+ .toTable(tEnv)
+ .as("a", "b", "c")
val result = t
// Adds simple column
@@ -559,8 +586,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@TestTemplate
def testMap(): Unit = {
- val ds = env
- .fromCollection(smallTupleData3)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
.toTable(tEnv, 'a, 'b, 'c)
.map(Func23('a, 'b, 'c))
.as("a", "b", "c", "d")
@@ -578,8 +605,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@TestTemplate
def testMapWithStarArgument(): Unit = {
- val ds = env
- .fromCollection(smallTupleData3)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
.toTable(tEnv, 'a, 'b, 'c)
.map(Func23('*))
.as("a", "b", "c", "d")
@@ -598,8 +625,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@Disabled("Will be open when FLINK-10834 has been fixed.")
@TestTemplate
def testNonDeterministic(): Unit = {
- val ds = env
- .fromCollection(smallTupleData3)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
.toTable(tEnv, 'a, 'b, 'c)
.map(Func25('a))
@@ -616,8 +643,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@TestTemplate
def testPrimitiveMapType(): Unit = {
- val ds = env
- .fromCollection(smallTupleData3)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
.toTable(tEnv)
.select(map('_2, 30, 10L, '_1))
@@ -632,8 +659,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@TestTemplate
def testNonPrimitiveType(): Unit = {
- val ds = env
- .fromCollection(smallTupleData3)
+ val ds = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
.toTable(tEnv)
.select(map('_1, '_3))
@@ -650,7 +677,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
def testSelectStarFromNestedTable(): Unit = {
val table = tEnv
.fromDataStream(
- env.fromCollection(
+ StreamingEnvUtil.fromCollection(
+ env,
Seq(
((0, 0), "0"),
((1, 1), "1"),
@@ -674,8 +702,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
@TestTemplate
def testCurrentDatabase(): Unit = {
val result1 =
- env
- .fromCollection(tupleData3)
+ StreamingEnvUtil
+ .fromCollection(env, tupleData3)
.toTable(tEnv)
.limit(1)
.select(currentDatabase())
@@ -693,8 +721,8 @@ class CalcITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(mode
new CatalogDatabaseImpl(new util.HashMap[String, String](), "db1"),
false)
tEnv.useDatabase("db1")
- val result2 = env
- .fromCollection(tupleData3)
+ val result2 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
.toTable(tEnv)
.limit(1)
.select(currentDatabase())
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/CorrelateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/CorrelateITCase.scala
index bd5c3ecee08..f8638e2d165 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/CorrelateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/CorrelateITCase.scala
@@ -17,9 +17,9 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
-import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment}
+import org.apache.flink.streaming.api.datastream.DataStream
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.expressions.utils.{Func18, FuncWithOpen, RichFunc2}
@@ -278,7 +278,7 @@ class CorrelateITCase(mode: StateBackendMode) extends StreamingWithStateTestBase
)
val rowType = Types.ROW(Types.INT, Types.BOOLEAN, Types.ROW(Types.INT, Types.INT, Types.INT))
- val in = env.fromElements(row, row)(rowType).toTable(tEnv).as("a", "b", "c")
+ val in = StreamingEnvUtil.fromElements(env, row, row)(rowType).toTable(tEnv).as("a", "b", "c")
val tableFunc = new TableFunc6()
val result = in
@@ -369,7 +369,7 @@ class CorrelateITCase(mode: StateBackendMode) extends StreamingWithStateTestBase
)
val rowType = Types.ROW(Types.INT, Types.BOOLEAN, Types.ROW(Types.INT, Types.INT, Types.INT))
- val in = env.fromElements(row, row)(rowType).toTable(tEnv).as("a", "b", "c")
+ val in = StreamingEnvUtil.fromElements(env, row, row)(rowType).toTable(tEnv).as("a", "b", "c")
val result = in.select(rf('a).as('d)).joinLateral(call(tf, 'd).as('e))
val sink = new TestingAppendSink
@@ -385,6 +385,6 @@ class CorrelateITCase(mode: StateBackendMode) extends StreamingWithStateTestBase
data.+=((2, 2L, "John#19"))
data.+=((3, 2L, "Anna#44"))
data.+=((4, 3L, "nosharp"))
- env.fromCollection(data)
+ StreamingEnvUtil.fromCollection(env, data)
}
}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/GroupWindowITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/GroupWindowITCase.scala
index 2a149997b9f..f5fad8b2791 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/GroupWindowITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/GroupWindowITCase.scala
@@ -17,7 +17,7 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
-import org.apache.flink.api.scala._
+import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestingAppendSink}
@@ -26,7 +26,6 @@ import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.S
import org.apache.flink.table.planner.runtime.utils.TimeTestUtil.TimestampAndWatermarkWithOffset
import org.apache.flink.table.planner.utils.CountAggFunction
import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.TestTemplate
@@ -296,6 +295,7 @@ class GroupWindowITCase(mode: StateBackendMode) extends StreamingWithStateTestBa
.assignTimestampsAndWatermarks(
new TimestampAndWatermarkWithOffset[(Long, Int, Double, Float, BigDecimal, String)](0L))
.map(t => (t._2, t._6))
+ .returns(implicitly[TypeInformation[(Int, String)]])
val table = stream.toTable(tEnv, 'int, 'string, 'rowtime.rowtime)
val windowedTable = table
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/GroupWindowTableAggregateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/GroupWindowTableAggregateITCase.scala
index 854620caa64..f36eecfba36 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/GroupWindowTableAggregateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/GroupWindowTableAggregateITCase.scala
@@ -17,7 +17,7 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
-import org.apache.flink.api.scala._
+import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestingAppendSink}
@@ -26,7 +26,6 @@ import org.apache.flink.table.planner.runtime.utils.TestData._
import org.apache.flink.table.planner.runtime.utils.TimeTestUtil.TimestampAndWatermarkWithOffset
import org.apache.flink.table.planner.utils.Top3
import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.TestTemplate
@@ -337,6 +336,8 @@ class GroupWindowTableAggregateITCase(mode: StateBackendMode)
.assignTimestampsAndWatermarks(
new TimestampAndWatermarkWithOffset[(Long, Int, Double, Float, BigDecimal, String)](0L))
.map(t => (t._2, t._6))
+ .returns(implicitly[TypeInformation[(Int, String)]])
+
val table = stream.toTable(tEnv, 'int, 'string, 'rowtime.rowtime)
val top3 = new Top3
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/JoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/JoinITCase.scala
index b0561dcb016..e31bee4ef53 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/JoinITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/JoinITCase.scala
@@ -18,7 +18,6 @@
package org.apache.flink.table.planner.runtime.stream.table
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.config.ExecutionConfigOptions
@@ -232,8 +231,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
(8L, null)
)
- val leftTable = env.fromCollection(data1).toTable(tEnv, 'a, 'b)
- val rightTable = env.fromCollection(data2).toTable(tEnv, 'bb, 'c)
+ val leftTable = StreamingEnvUtil
+ .fromCollection(env, data1)
+ .toTable(tEnv, 'a, 'b)
+ val rightTable = StreamingEnvUtil
+ .fromCollection(env, data2)
+ .toTable(tEnv, 'bb, 'c)
val leftTableWithPk = leftTable
.groupBy('a)
@@ -286,8 +289,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
(6, 6, 6)
)
- val leftTable = env.fromCollection(data1).toTable(tEnv, 'a, 'b)
- val rightTable = env.fromCollection(data2).toTable(tEnv, 'bb, 'c, 'd)
+ val leftTable = StreamingEnvUtil
+ .fromCollection(env, data1)
+ .toTable(tEnv, 'a, 'b)
+ val rightTable = StreamingEnvUtil
+ .fromCollection(env, data2)
+ .toTable(tEnv, 'bb, 'c, 'd)
val sink = new TestingRetractTableSink().configure(
Array[String]("a", "b", "c", "d"),
@@ -325,10 +332,8 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
(8L, 3, "RIGHT:Hello world"),
(16L, 3, "RIGHT:Hello world"))
- val stream1 = env
- .fromCollection(data1)
- val stream2 = env
- .fromCollection(data2)
+ val stream1 = StreamingEnvUtil.fromCollection(env, data1)
+ val stream2 = StreamingEnvUtil.fromCollection(env, data2)
val table1 = stream1.toTable(tEnv, 'long_l, 'int_l, 'string_l, 'proctime.proctime)
val table2 = stream2.toTable(tEnv, 'long_r, 'int_r, 'string_r)
@@ -366,8 +371,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testInnerJoin(): Unit = {
- val ds1 = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val testOpenCall = new FuncWithOpen
@@ -386,8 +395,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testInnerJoinWithFilter(): Unit = {
- val ds1 = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.join(ds2).where('b === 'e && 'b < 2).select('c, 'g)
@@ -400,8 +413,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testInnerJoinWithJoinFilter(): Unit = {
- val ds1 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.join(ds2).where('b === 'e && 'a < 6).select('c, 'g)
@@ -420,8 +437,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testInnerJoinWithNonEquiJoinPredicate(): Unit = {
- val ds1 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.join(ds2).where('b === 'e && 'a < 6 && 'h < 'b).select('c, 'g)
@@ -435,8 +456,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testInnerJoinWithMultipleKeys(): Unit = {
- val ds1 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.join(ds2).filter('a === 'd && 'b === 'h).select('c, 'g)
@@ -456,8 +481,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testInnerJoinWithAggregation(): Unit = {
- val ds1 = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.join(ds2).where('a === 'd).select('g.count)
@@ -471,8 +500,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testInnerJoinWithGroupedAggregation(): Unit = {
- val ds1 = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1
.join(ds2)
@@ -490,9 +523,15 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testInnerJoinPushThroughJoin(): Unit = {
- val ds1 = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
- val ds3 = env.fromCollection(smallTupleData3).toTable(tEnv, 'j, 'k, 'l)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds3 = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv, 'j, 'k, 'l)
val joinT = ds1
.join(ds2)
@@ -511,8 +550,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testInnerJoinWithDisjunctivePred(): Unit = {
- val ds1 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.join(ds2).filter('a === 'd && ('b === 'e || 'b === 'e - 10)).select('c, 'g)
@@ -526,8 +569,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testInnerJoinWithExpressionPreds(): Unit = {
- val ds1 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.join(ds2).filter('b === 'h + 1 && 'a - 1 === 'd + 2).select('c, 'g)
@@ -546,12 +593,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testLeftJoinWithMultipleKeys(): Unit = {
- val ds1 = env
- .fromCollection(tupleData3)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
.toTable(tEnv, 'a, 'b, 'c)
.select((('a === 21) ? (nullOf(Types.INT), 'a)).as('a), 'b, 'c)
- val ds2 = env
- .fromCollection(tupleData5)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
.toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
.select((('e === 15) ? (nullOf(Types.INT), 'd)).as('d), 'e, 'f, 'g, 'h)
@@ -591,8 +638,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testLeftJoinWithNonEquiJoinPred(): Unit = {
- val ds1 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.leftOuterJoin(ds2, 'a === 'd && 'b <= 'h).select('c, 'g)
@@ -631,8 +682,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testLeftJoinWithLeftLocalPred(): Unit = {
- val ds1 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.leftOuterJoin(ds2, 'a === 'd && 'b === 2).select('c, 'g)
@@ -671,8 +726,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testLeftJoinWithRetractionInput(): Unit = {
- val ds1 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
- val ds2 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
val leftT = ds1.groupBy('e).select('e, 'd.count.as('d))
val rightT = ds2.groupBy('b).select('b, 'a.count.as('a))
@@ -703,8 +762,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testRightJoinWithMultipleKeys(): Unit = {
- val ds1 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.rightOuterJoin(ds2, 'a === 'd && 'b === 'h).select('c, 'g)
@@ -734,8 +797,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testRightJoinWithNonEquiJoinPred(): Unit = {
- val ds2 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds1 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.rightOuterJoin(ds2, 'a === 'd && 'b <= 'h).select('c, 'g)
@@ -774,8 +841,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testRightJoinWithLeftLocalPred(): Unit = {
- val ds2 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds1 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.rightOuterJoin(ds2, 'a === 'd && 'b === 2).select('c, 'g)
@@ -814,8 +885,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testFullOuterJoinWithMultipleKeys(): Unit = {
- val ds1 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.fullOuterJoin(ds2, 'a === 'd && 'b === 'h).select('c, 'g)
@@ -862,8 +937,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testFullJoinWithNonEquiJoinPred(): Unit = {
- val ds1 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.fullOuterJoin(ds2, 'a === 'd && 'b <= 'h).select('c, 'g)
@@ -912,8 +991,12 @@ class JoinITCase(miniBatch: MiniBatchMode, mode: StateBackendMode, enableAsyncSt
@TestTemplate
def testFullJoinWithLeftLocalPred(): Unit = {
- val ds1 = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val joinT = ds1.fullOuterJoin(ds2, 'a === 'd && 'b >= 2 && 'h === 1).select('c, 'g)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/LegacyTableSinkITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/LegacyTableSinkITCase.scala
index be3bb424cbb..ef0738be7e3 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/LegacyTableSinkITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/LegacyTableSinkITCase.scala
@@ -17,15 +17,15 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
+import org.apache.flink.api.common.eventtime._
import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.api.internal.TableEnvironmentInternal
-import org.apache.flink.table.planner.runtime.utils.{TestingAppendTableSink, TestingRetractTableSink, TestingUpsertTableSink}
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, TestingAppendTableSink, TestingRetractTableSink, TestingUpsertTableSink}
import org.apache.flink.table.planner.runtime.utils.TestData.{smallTupleData3, tupleData3, tupleData5}
import org.apache.flink.table.planner.utils.{MemoryTableSourceSinkUtil, TableTestUtil}
import org.apache.flink.table.sinks._
@@ -71,10 +71,22 @@ class LegacyTableSinkITCase {
Array[String]("nullableCol", "c", "b"),
Array[TypeInformation[_]](Types.INT, Types.STRING, Types.SQL_TIMESTAMP)))
- val input = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._2)
+ val input = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._2
+ }
+ })
.map(x => x)
+ .returns(implicitly[TypeInformation[(Int, Long, String)]])
.setParallelism(4) // increase DOP to 4
val table = input
@@ -103,9 +115,20 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
val sink = new TestingAppendTableSink(TimeZone.getDefault)
@@ -140,8 +163,8 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(smallTupleData3)
+ val t = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
.toTable(tEnv, 'id, 'num, 'text)
tEnv.createTemporaryView("src", t)
@@ -167,8 +190,12 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val ds1 = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
+ .toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil
+ .fromCollection(env, tupleData5)
+ .toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
val sink = new TestingAppendTableSink
tEnv
@@ -196,9 +223,20 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text)
val sink = new TestingRetractTableSink()
@@ -236,9 +274,20 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
val sink = new TestingRetractTableSink(TimeZone.getDefault)
@@ -278,9 +327,20 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text)
val sink = new TestingUpsertTableSink(Array(0, 2), TimeZone.getDefault).configure(
@@ -318,9 +378,20 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
val sink = new TestingUpsertTableSink(Array(0, 1, 2), TimeZone.getDefault).configure(
@@ -363,9 +434,20 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
val sink = new TestingUpsertTableSink(Array(0, 1, 2), TimeZone.getDefault)
@@ -416,9 +498,20 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
val sink = new TestingUpsertTableSink(Array(0), TimeZone.getDefault)
@@ -463,9 +556,20 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
val sink = new TestingUpsertTableSink(Array(0), TimeZone.getDefault)
@@ -511,9 +615,20 @@ class LegacyTableSinkITCase {
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
env.setParallelism(4)
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text)
val sink = new TestingUpsertTableSink(Array(0))
@@ -550,9 +665,20 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
val r = t
@@ -570,9 +696,20 @@ class LegacyTableSinkITCase {
env.getConfig.enableObjectReuse()
val tEnv = StreamTableEnvironment.create(env, TableTestUtil.STREAM_SETTING)
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
val r = t
@@ -600,8 +737,8 @@ class LegacyTableSinkITCase {
MemoryTableSourceSinkUtil.createDataTypeAppendStreamTable(tEnv, schema, "testSink")
- val table = env
- .fromCollection(tupleData3)
+ val table = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
.toTable(tEnv, 'a, 'b, 'c)
.where('a > 20)
.select("12345", 55.cast(DataTypes.DECIMAL(10, 0)), "12345".cast(DataTypes.CHAR(5)))
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/OverAggregateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/OverAggregateITCase.scala
index f294e141a1e..be55b4add39 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/OverAggregateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/OverAggregateITCase.scala
@@ -17,7 +17,7 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
-import org.apache.flink.api.scala._
+import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.table.api._
import org.apache.flink.table.api.Expressions.$
import org.apache.flink.table.api.bridge.scala._
@@ -28,7 +28,6 @@ import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.S
import org.apache.flink.table.planner.runtime.utils.TimeTestUtil.EventTimeProcessOperator
import org.apache.flink.table.planner.utils.CountAggFunction
import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension
-import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.{BeforeEach, TestTemplate}
@@ -162,8 +161,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val table = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
val countFun = new CountAggFunction
val weightAvgFun = new WeightedAvg
@@ -241,8 +243,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val table = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
val windowedTable = table
@@ -302,8 +307,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val table = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
val windowedTable = table
@@ -358,8 +366,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val table = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
val windowedTable = table
@@ -414,8 +425,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val table = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Int, Long, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Int, Long, String)]],
+ new EventTimeProcessOperator[(Int, Long, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
val windowedTable = table
@@ -597,8 +611,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val countDist = new CountDistinctWithRetractAndReset
val source = failingDataSource(data)
val table = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Long, Int, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Long, Int, String)]],
+ new EventTimeProcessOperator[(Long, Int, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
val windowedTable = table
@@ -670,8 +687,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val countDist = new CountDistinctWithRetractAndReset
val source = failingDataSource(data)
val table = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Long, Int, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Long, Int, String)]],
+ new EventTimeProcessOperator[(Long, Int, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
val windowedTable = table
@@ -722,8 +742,11 @@ class OverAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTest
val source = failingDataSource(data)
val table = source
- .transform("TimeAssigner", new EventTimeProcessOperator[(Long, Int, String)])
- .setParallelism(source.parallelism)
+ .transform(
+ "TimeAssigner",
+ implicitly[TypeInformation[(Long, Int, String)]],
+ new EventTimeProcessOperator[(Long, Int, String)])
+ .setParallelism(source.getParallelism)
.toTable(tEnv, 'a, 'b, 'c, 'rowtime.rowtime)
val windowedTable = table
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/RetractionITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/RetractionITCase.scala
index 3416d5baff6..fa410b19bd7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/RetractionITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/RetractionITCase.scala
@@ -17,10 +17,10 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
-import org.apache.flink.table.api.bridge.scala._
-import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestingRetractSink}
+import org.apache.flink.table.api.bridge.scala.{dataStreamConversions, tableConversions}
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, StreamingWithStateTestBase, TestingRetractSink}
+import org.apache.flink.table.planner.runtime.utils.StreamingEnvUtil.fromCollection
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.table.planner.utils.TableFunc0
import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension
@@ -50,7 +50,7 @@ class RetractionITCase(mode: StateBackendMode) extends StreamingWithStateTestBas
// keyed groupby + keyed groupby
@TestTemplate
def testWordCount(): Unit = {
- val stream = env.fromCollection(data)
+ val stream = StreamingEnvUtil.fromCollection(env, data)
val table = stream.toTable(tEnv, 'word, 'num)
val resultTable = table
.groupBy('word)
@@ -69,7 +69,7 @@ class RetractionITCase(mode: StateBackendMode) extends StreamingWithStateTestBas
// keyed groupby + non-keyed groupby
@TestTemplate
def testGroupByAndNonKeyedGroupBy(): Unit = {
- val stream = env.fromCollection(data)
+ val stream = StreamingEnvUtil.fromCollection(env, data)
val table = stream.toTable(tEnv, 'word, 'num)
val resultTable = table
.groupBy('word)
@@ -87,7 +87,7 @@ class RetractionITCase(mode: StateBackendMode) extends StreamingWithStateTestBas
// non-keyed groupby + keyed groupby
@TestTemplate
def testNonKeyedGroupByAndGroupBy(): Unit = {
- val stream = env.fromCollection(data)
+ val stream = StreamingEnvUtil.fromCollection(env, data)
val table = stream.toTable(tEnv, 'word, 'num)
val resultTable = table
.select('num.sum.as('count))
@@ -123,7 +123,7 @@ class RetractionITCase(mode: StateBackendMode) extends StreamingWithStateTestBas
(7, 8L)
)
- val stream = env.fromCollection(data)
+ val stream = StreamingEnvUtil.fromCollection(env, data)
val table = stream.toTable(tEnv, 'pk, 'value)
val resultTable = table
.groupBy('pk)
@@ -162,7 +162,7 @@ class RetractionITCase(mode: StateBackendMode) extends StreamingWithStateTestBas
def testCorrelate(): Unit = {
val func0 = new TableFunc0
- val stream = env.fromCollection(data)
+ val stream = fromCollection(env, data)
val table = stream.toTable(tEnv, 'word, 'num)
val resultTable = table
.groupBy('word)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/SetOperatorsITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/SetOperatorsITCase.scala
index f29732d1a2e..a649658b1f5 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/SetOperatorsITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/SetOperatorsITCase.scala
@@ -17,12 +17,11 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.plan.utils.NonPojo
-import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestingAppendSink, TestingRetractSink}
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, StreamingWithStateTestBase, TestingAppendSink, TestingRetractSink}
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.table.planner.runtime.utils.TestData._
import org.apache.flink.table.utils.LegacyRowExtension
@@ -43,8 +42,8 @@ class SetOperatorsITCase(mode: StateBackendMode) extends StreamingWithStateTestB
@TestTemplate
def testUnion(): Unit = {
- val ds1 = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(smallTupleData3).toTable(tEnv, 'd, 'e, 'f)
+ val ds1 = StreamingEnvUtil.fromCollection(env, smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil.fromCollection(env, smallTupleData3).toTable(tEnv, 'd, 'e, 'f)
val unionDs = ds1.unionAll(ds2).select('c)
@@ -58,8 +57,8 @@ class SetOperatorsITCase(mode: StateBackendMode) extends StreamingWithStateTestB
@TestTemplate
def testUnionWithFilter(): Unit = {
- val ds1 = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'a, 'b, 'd, 'c, 'e)
+ val ds1 = StreamingEnvUtil.fromCollection(env, smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil.fromCollection(env, tupleData5).toTable(tEnv, 'a, 'b, 'd, 'c, 'e)
val unionDs = ds1.unionAll(ds2.select('a, 'b, 'c)).filter('b < 2).select('c)
@@ -82,8 +81,10 @@ class SetOperatorsITCase(mode: StateBackendMode) extends StreamingWithStateTestB
classOf[NonPojo],
DataTypes.FIELD("x", DataTypes.MAP(DataTypes.STRING(), DataTypes.STRING()))))
.build()
- val s1 = env.fromElements((1, new NonPojo), (2, new NonPojo)).toTable(tEnv, schema)
- val s2 = env.fromElements((3, new NonPojo), (4, new NonPojo)).toTable(tEnv, schema)
+ val s1 =
+ StreamingEnvUtil.fromElements(env, (1, new NonPojo), (2, new NonPojo)).toTable(tEnv, schema)
+ val s2 =
+ StreamingEnvUtil.fromElements(env, (3, new NonPojo), (4, new NonPojo)).toTable(tEnv, schema)
val sink = new TestingAppendSink
s1.unionAll(s2)
@@ -102,11 +103,11 @@ class SetOperatorsITCase(mode: StateBackendMode) extends StreamingWithStateTestB
@TestTemplate
def testUnionWithCompositeType(): Unit = {
- val s1 = env
- .fromElements((1, (1, "a")), (2, (2, "b")))
+ val s1 = StreamingEnvUtil
+ .fromElements(env, (1, (1, "a")), (2, (2, "b")))
.toTable(tEnv, 'a, 'b)
- val s2 = env
- .fromElements(((3, "c"), 3), ((4, "d"), 4))
+ val s2 = StreamingEnvUtil
+ .fromElements(env, ((3, "c"), 3), ((4, "d"), 4))
.toTable(tEnv, 'a, 'b)
val sink = new TestingAppendSink
@@ -136,9 +137,9 @@ class SetOperatorsITCase(mode: StateBackendMode) extends StreamingWithStateTestB
(4, "hello")
)
- val tableA = env.fromCollection(dataA).toTable(tEnv, 'a, 'b, 'c)
+ val tableA = StreamingEnvUtil.fromCollection(env, dataA).toTable(tEnv, 'a, 'b, 'c)
- val tableB = env.fromCollection(dataB).toTable(tEnv, 'x, 'y)
+ val tableB = StreamingEnvUtil.fromCollection(env, dataB).toTable(tEnv, 'x, 'y)
val sink = new TestingRetractSink
tableA.where('a.in(tableB.select('x))).toRetractStream[Row].addSink(sink)
@@ -171,9 +172,9 @@ class SetOperatorsITCase(mode: StateBackendMode) extends StreamingWithStateTestB
(-1, "Hanoi-1")
)
- val tableA = env.fromCollection(dataA).toTable(tEnv, 'a, 'b, 'c)
+ val tableA = StreamingEnvUtil.fromCollection(env, dataA).toTable(tEnv, 'a, 'b, 'c)
- val tableB = env.fromCollection(dataB).toTable(tEnv, 'x, 'y)
+ val tableB = StreamingEnvUtil.fromCollection(env, dataB).toTable(tEnv, 'x, 'y)
val sink = new TestingRetractSink
@@ -212,11 +213,11 @@ class SetOperatorsITCase(mode: StateBackendMode) extends StreamingWithStateTestB
(2L, "Cool")
)
- val tableA = env.fromCollection(dataA).toTable(tEnv, 'a, 'b, 'c)
+ val tableA = StreamingEnvUtil.fromCollection(env, dataA).toTable(tEnv, 'a, 'b, 'c)
- val tableB = env.fromCollection(dataB).toTable(tEnv, 'x, 'y)
+ val tableB = StreamingEnvUtil.fromCollection(env, dataB).toTable(tEnv, 'x, 'y)
- val tableC = env.fromCollection(dataC).toTable(tEnv, 'w, 'z)
+ val tableC = StreamingEnvUtil.fromCollection(env, dataC).toTable(tEnv, 'w, 'z)
val sink = new TestingRetractSink
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/SubQueryITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/SubQueryITCase.scala
index 7bf264c92fc..fb4c31085ce 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/SubQueryITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/SubQueryITCase.scala
@@ -17,10 +17,9 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
-import org.apache.flink.table.api.bridge.scala._
-import org.apache.flink.table.planner.runtime.utils.{StreamingWithStateTestBase, TestingRetractSink}
+import org.apache.flink.table.api.bridge.scala.{dataStreamConversions, tableConversions}
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, StreamingWithStateTestBase, TestingRetractSink}
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension
import org.apache.flink.types.Row
@@ -47,9 +46,9 @@ class SubQueryITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(
(4, "hello")
)
- val tableA = env.fromCollection(dataA).toTable(tEnv, 'a, 'b, 'c)
+ val tableA = StreamingEnvUtil.fromCollection(env, dataA).toTable(tEnv, 'a, 'b, 'c)
- val tableB = env.fromCollection(dataB).toTable(tEnv, 'x, 'y)
+ val tableB = StreamingEnvUtil.fromCollection(env, dataB).toTable(tEnv, 'x, 'y)
val result = tableA.where('a.in(tableB.select('x)))
@@ -85,9 +84,9 @@ class SubQueryITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(
(-1, "Hanoi-1")
)
- val tableA = env.fromCollection(dataA).toTable(tEnv, 'a, 'b, 'c)
+ val tableA = StreamingEnvUtil.fromCollection(env, dataA).toTable(tEnv, 'a, 'b, 'c)
- val tableB = env.fromCollection(dataB).toTable(tEnv, 'x, 'y)
+ val tableB = StreamingEnvUtil.fromCollection(env, dataB).toTable(tEnv, 'x, 'y)
val result = tableA
.where('a.in(tableB.where('y.like("%Hanoi%")).groupBy('y).select('x.sum)))
@@ -126,11 +125,11 @@ class SubQueryITCase(mode: StateBackendMode) extends StreamingWithStateTestBase(
(2L, "Cool")
)
- val tableA = env.fromCollection(dataA).toTable(tEnv, 'a, 'b, 'c)
+ val tableA = StreamingEnvUtil.fromCollection(env, dataA).toTable(tEnv, 'a, 'b, 'c)
- val tableB = env.fromCollection(dataB).toTable(tEnv, 'x, 'y)
+ val tableB = StreamingEnvUtil.fromCollection(env, dataB).toTable(tEnv, 'x, 'y)
- val tableC = env.fromCollection(dataC).toTable(tEnv, 'w, 'z)
+ val tableC = StreamingEnvUtil.fromCollection(env, dataC).toTable(tEnv, 'w, 'z)
val result = tableA
.where('a.in(tableB.select('x)) && 'b.in(tableC.select('w)))
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableAggregateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableAggregateITCase.scala
index 77a16173552..ff2c41702c6 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableAggregateITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableAggregateITCase.scala
@@ -17,15 +17,14 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
-import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.factories.TestValuesTableFactory
-import org.apache.flink.table.planner.runtime.utils.{JavaUserDefinedTableAggFunctions, StreamingWithStateTestBase, TestData, TestingRetractSink}
+import org.apache.flink.table.planner.runtime.utils._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.OverloadedDoubleMaxFunction
import org.apache.flink.table.planner.runtime.utils.StreamingWithStateTestBase.StateBackendMode
import org.apache.flink.table.planner.runtime.utils.TestData.tupleData3
-import org.apache.flink.table.planner.utils.{TableAggSum, Top3, Top3Accum, Top3WithMapView, Top3WithRetractInput}
+import org.apache.flink.table.planner.utils._
import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension
import org.apache.flink.types.Row
@@ -300,7 +299,7 @@ class TableAggregateITCase(mode: StateBackendMode) extends StreamingWithStateTes
@TestTemplate
def testTableAggFunctionWithoutRetractionMethod(): Unit = {
val top3 = new Top3
- val source = env.fromCollection(tupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val source = StreamingEnvUtil.fromCollection(env, tupleData3).toTable(tEnv, 'a, 'b, 'c)
assertThatThrownBy(
() => {
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableSinkITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableSinkITCase.scala
index 735d09f4c21..75e4388e3a7 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableSinkITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableSinkITCase.scala
@@ -17,7 +17,7 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
-import org.apache.flink.api.scala._
+import org.apache.flink.api.common.eventtime._
import org.apache.flink.core.testutils.EachCallbackWrapper
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
@@ -25,8 +25,8 @@ import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.api.config.ExecutionConfigOptions.RowtimeInserter
import org.apache.flink.table.planner.factories.TestValuesTableFactory
import org.apache.flink.table.planner.factories.TestValuesTableFactory.changelogRow
+import org.apache.flink.table.planner.runtime.utils.{StreamingEnvUtil, StreamingTestBase}
import org.apache.flink.table.planner.runtime.utils.BatchTestBase.row
-import org.apache.flink.table.planner.runtime.utils.StreamingTestBase
import org.apache.flink.table.planner.runtime.utils.TestData._
import org.apache.flink.table.utils.LegacyRowExtension
@@ -47,9 +47,20 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testAppendSinkOnAppendTable(): Unit = {
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
tEnv.executeSql(s"""
@@ -82,8 +93,8 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testInsertWithTargetColumnsAndSqlHint(): Unit = {
- val t = env
- .fromCollection(smallTupleData3)
+ val t = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
.toTable(tEnv, 'id, 'num, 'text)
tEnv.createTemporaryView("src", t)
@@ -109,8 +120,8 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testAppendSinkWithNestedRow(): Unit = {
- val t = env
- .fromCollection(smallTupleData3)
+ val t = StreamingEnvUtil
+ .fromCollection(env, smallTupleData3)
.toTable(tEnv, 'id, 'num, 'text)
tEnv.createTemporaryView("src", t)
@@ -132,8 +143,8 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testAppendSinkOnAppendTableForInnerJoin(): Unit = {
- val ds1 = env.fromCollection(smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
- val ds2 = env.fromCollection(tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
+ val ds1 = StreamingEnvUtil.fromCollection(env, smallTupleData3).toTable(tEnv, 'a, 'b, 'c)
+ val ds2 = StreamingEnvUtil.fromCollection(env, tupleData5).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
tEnv.executeSql(s"""
|CREATE TABLE appendSink (
@@ -158,9 +169,20 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testRetractSinkOnUpdatingTable(): Unit = {
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text)
tEnv.executeSql(s"""
@@ -187,9 +209,20 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testRetractSinkOnAppendTable(): Unit = {
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
tEnv.executeSql(s"""
@@ -225,9 +258,20 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testUpsertSinkOnNestedAggregation(): Unit = {
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text)
tEnv.executeSql(s"""
@@ -261,9 +305,20 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testUpsertSinkOnAppendingTable(): Unit = {
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
tEnv.executeSql(s"""
@@ -306,9 +361,20 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testUpsertSinkOnAppendingTableWithoutFullKey1(): Unit = {
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
tEnv.executeSql(s"""
@@ -348,9 +414,20 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testUpsertSinkOnAppendingTableWithoutFullKey2(): Unit = {
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
tEnv.executeSql(s"""
@@ -389,9 +466,20 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testUpsertSinkWithFilter(): Unit = {
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text)
tEnv.executeSql(s"""
@@ -426,9 +514,20 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testMultiRowtimeWithRowtimeInserter(): Unit = {
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
tEnv.executeSql(s"""
@@ -456,9 +555,20 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testMultiRowtimeWithoutTimestampInserter(): Unit = {
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
// disable inserter
@@ -506,8 +616,8 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val table = env
- .fromCollection(tupleData3)
+ val table = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
.toTable(tEnv, 'a, 'b, 'c)
.where('a > 20)
.select("12345", 55.cast(DataTypes.DECIMAL(10, 0)), "12345".cast(DataTypes.CHAR(5)))
@@ -532,8 +642,8 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val table = env
- .fromCollection(tupleData3)
+ val table = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
.toTable(tEnv, 'a, 'b, 'c)
.where('a > 20)
.select("12345", 55.cast(DataTypes.DECIMAL(10, 0)), "12345".cast(DataTypes.CHAR(5)))
@@ -770,7 +880,7 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val t = env.fromCollection(tupleData2).toTable(tEnv, 'x, 'y)
+ val t = StreamingEnvUtil.fromCollection(env, tupleData2).toTable(tEnv, 'x, 'y)
tEnv.createTemporaryView("MyTable", t)
tEnv
@@ -801,7 +911,7 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val t = env.fromCollection(tupleData2).toTable(tEnv, 'x, 'y)
+ val t = StreamingEnvUtil.fromCollection(env, tupleData2).toTable(tEnv, 'x, 'y)
tEnv.createTemporaryView("MyTable", t)
tEnv
@@ -837,7 +947,7 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val t = env.fromCollection(tupleData2).toTable(tEnv, 'x, 'y)
+ val t = StreamingEnvUtil.fromCollection(env, tupleData2).toTable(tEnv, 'x, 'y)
tEnv.createTemporaryView("MyTable", t)
tEnv
@@ -869,7 +979,7 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val t = env.fromCollection(tupleData2).toTable(tEnv, 'x, 'y)
+ val t = StreamingEnvUtil.fromCollection(env, tupleData2).toTable(tEnv, 'x, 'y)
tEnv.createTemporaryView("MyTable", t)
tEnv
@@ -908,7 +1018,7 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val t = env.fromCollection(tupleData2).toTable(tEnv, 'x, 'y)
+ val t = StreamingEnvUtil.fromCollection(env, tupleData2).toTable(tEnv, 'x, 'y)
tEnv.createTemporaryView("MyTable", t)
tEnv
@@ -945,7 +1055,7 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val t = env.fromCollection(tupleData2).toTable(tEnv, 'x, 'y)
+ val t = StreamingEnvUtil.fromCollection(env, tupleData2).toTable(tEnv, 'x, 'y)
tEnv.createTemporaryView("MyTable", t)
tEnv
@@ -981,7 +1091,7 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val t = env.fromCollection(tupleData2).toTable(tEnv, 'x, 'y)
+ val t = StreamingEnvUtil.fromCollection(env, tupleData2).toTable(tEnv, 'x, 'y)
tEnv.createTemporaryView("MyTable", t)
tEnv
@@ -1017,7 +1127,7 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val t = env.fromCollection(tupleData2).toTable(tEnv, 'x, 'y)
+ val t = StreamingEnvUtil.fromCollection(env, tupleData2).toTable(tEnv, 'x, 'y)
tEnv.createTemporaryView("MyTable", t)
tEnv
@@ -1054,7 +1164,7 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val t = env.fromCollection(tupleData2).toTable(tEnv, 'x, 'y)
+ val t = StreamingEnvUtil.fromCollection(env, tupleData2).toTable(tEnv, 'x, 'y)
tEnv.createTemporaryView("MyTable", t)
tEnv
@@ -1090,7 +1200,7 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val t = env.fromCollection(tupleData2).toTable(tEnv, 'x, 'y)
+ val t = StreamingEnvUtil.fromCollection(env, tupleData2).toTable(tEnv, 'x, 'y)
tEnv.createTemporaryView("MyTable", t)
tEnv
@@ -1126,7 +1236,7 @@ class TableSinkITCase extends StreamingTestBase {
|)
|""".stripMargin)
- val t = env.fromCollection(tupleData2).toTable(tEnv, 'x, 'y)
+ val t = StreamingEnvUtil.fromCollection(env, tupleData2).toTable(tEnv, 'x, 'y)
tEnv.createTemporaryView("MyTable", t)
assertThatThrownBy(
@@ -1315,9 +1425,20 @@ class TableSinkITCase extends StreamingTestBase {
@Test
def testAppendStreamToSinkWithoutPkForceKeyBy(): Unit = {
- val t = env
- .fromCollection(tupleData3)
- .assignAscendingTimestamps(_._1.toLong)
+ val t = StreamingEnvUtil
+ .fromCollection(env, tupleData3)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Int, Long, String)]() {
+
+ override def createWatermarkGenerator(context: WatermarkGeneratorSupplier.Context)
+ : WatermarkGenerator[(Int, Long, String)] = {
+ new AscendingTimestampsWatermarks[(Int, Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Int, Long, String)] = {
+ (e: (Int, Long, String), _: Long) => e._1.toLong
+ }
+ })
.toTable(tEnv, 'id, 'num, 'text, 'rowtime.rowtime)
tEnv.getConfig.set(
ExecutionConfigOptions.TABLE_EXEC_SINK_KEYED_SHUFFLE,
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableToDataStreamITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableToDataStreamITCase.scala
index 9ede1a24178..6f20d288369 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableToDataStreamITCase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/stream/table/TableToDataStreamITCase.scala
@@ -17,14 +17,13 @@
*/
package org.apache.flink.table.planner.runtime.stream.table
-import org.apache.flink.api.scala._
+import org.apache.flink.api.common.eventtime._
import org.apache.flink.streaming.api.functions.sink.SinkFunction
-import org.apache.flink.streaming.api.scala.DataStream
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.scala._
import org.apache.flink.table.planner.factories.TestValuesTableFactory
import org.apache.flink.table.planner.factories.TestValuesTableFactory.TestSinkContextTableSink
-import org.apache.flink.table.planner.runtime.utils.{AbstractExactlyOnceSink, StreamingTestBase, TestingRetractSink, TestSinkUtil}
+import org.apache.flink.table.planner.runtime.utils._
import org.apache.flink.types.Row
import org.assertj.core.api.Assertions.assertThat
@@ -143,10 +142,22 @@ final class TableToDataStreamITCase extends StreamingTestBase {
def testHasRowtimeFromDataStreamToTableBackDataStream(): Unit = {
val data = Seq((1L, "A"), (2L, "B"), (3L, "C"), (4L, "D"), (7L, "E"))
- val ds1 = env
- .fromCollection(data)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, data)
// second to millisecond
- .assignAscendingTimestamps(_._1 * 1000L)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Long, String)]() {
+
+ override def createWatermarkGenerator(
+ context: WatermarkGeneratorSupplier.Context): WatermarkGenerator[(Long, String)] = {
+ new AscendingTimestampsWatermarks[(Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Long, String)] = {
+ (e: (Long, String), _: Long) => e._1 * 1000L
+ }
+ })
+
val table = ds1.toTable(tEnv, 'ts, 'a, 'rowtime.rowtime)
tEnv.createTemporaryView("t1", table)
@@ -282,17 +293,28 @@ final class TableToDataStreamITCase extends StreamingTestBase {
val expected =
"ROW<`a` STRING, `ts` TIMESTAMP(3), `proctime` TIMESTAMP_LTZ(3) NOT NULL> NOT NULL(org.apache.flink.types.Row, org.apache.flink.table.runtime.typeutils.ExternalSerializer)"
- assertThat(dataStream.dataType.toString).isEqualTo(expected)
+ assertThat(dataStream.getType.toString).isEqualTo(expected)
}
@Test
def testHasFromDataStreamToTableBackDataStreamWithProctime(): Unit = {
val data = Seq((1L, "A"))
- val ds1 = env
- .fromCollection(data)
+ val ds1 = StreamingEnvUtil
+ .fromCollection(env, data)
// second to millisecond
- .assignAscendingTimestamps(_._1 * 1000L)
+ .assignTimestampsAndWatermarks(new WatermarkStrategy[(Long, String)]() {
+
+ override def createWatermarkGenerator(
+ context: WatermarkGeneratorSupplier.Context): WatermarkGenerator[(Long, String)] = {
+ new AscendingTimestampsWatermarks[(Long, String)]
+ }
+
+ override def createTimestampAssigner(
+ context: TimestampAssignerSupplier.Context): TimestampAssigner[(Long, String)] = {
+ (e: (Long, String), _: Long) => e._1 * 1000L
+ }
+ })
val table = ds1.toTable(tEnv, 'ts, 'a, 'proctime.proctime())
tEnv.createTemporaryView("t1", table)
@@ -307,7 +329,7 @@ final class TableToDataStreamITCase extends StreamingTestBase {
val expected =
"ROW<`EXPR$0` STRING, `ts` BIGINT, `proctime` TIMESTAMP_LTZ(3)> NOT NULL(org.apache.flink.types.Row, org.apache.flink.table.runtime.typeutils.ExternalSerializer)"
- assertThat(ds2.dataType.toString).isEqualTo(expected)
+ assertThat(ds2.getType.toString).isEqualTo(expected)
}
private def localDateTime(epochSecond: Long): LocalDateTime = {
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/CollectionBatchExecTable.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/CollectionBatchExecTable.scala
index 0a0b4c0bda5..9dcd5af7d58 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/CollectionBatchExecTable.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/CollectionBatchExecTable.scala
@@ -17,8 +17,7 @@
*/
package org.apache.flink.table.planner.runtime.utils
-import org.apache.flink.api.scala._
-import org.apache.flink.table.api.{Table, TableEnvironment}
+import org.apache.flink.table.api._
import scala.collection.mutable
import scala.util.Random
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamingEnvUtil.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamingEnvUtil.scala
new file mode 100644
index 00000000000..5638f0fda48
--- /dev/null
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamingEnvUtil.scala
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.flink.table.planner.runtime.utils
+
+import org.apache.flink.api.common.typeinfo.TypeInformation
+import org.apache.flink.streaming.api.datastream.DataStreamSource
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
+
+import scala.collection.JavaConverters._
+
+object StreamingEnvUtil {
+
+ /** Create a [[DataStreamSource]] from a sequence of elements. */
+ def fromElements[T: TypeInformation](
+ env: StreamExecutionEnvironment,
+ data: T*): DataStreamSource[T] = {
+ fromCollection(env, data.toSeq)
+ }
+
+ /** Create a [[DataStreamSource]] from a sequence of elements. */
+ def fromCollection[T: TypeInformation](
+ env: StreamExecutionEnvironment,
+ data: Seq[T]): DataStreamSource[T] = {
+ val typeInfo = implicitly[TypeInformation[T]]
+ env.fromCollection(data.asJava, typeInfo)
+ }
+}
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamingTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamingTestBase.scala
index aeea77068a6..dc6e058e233 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamingTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamingTestBase.scala
@@ -17,7 +17,7 @@
*/
package org.apache.flink.table.planner.runtime.utils
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api.{EnvironmentSettings, ImplicitExpressionConversions}
import org.apache.flink.table.api.bridge.scala.StreamTableEnvironment
import org.apache.flink.table.planner.factories.TestValuesTableFactory
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamingWithStateTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamingWithStateTestBase.scala
index 68225dee784..0b5c8c76bb9 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamingWithStateTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamingWithStateTestBase.scala
@@ -21,8 +21,8 @@ import org.apache.flink.api.common.typeinfo.{TypeInformation, Types}
import org.apache.flink.api.common.typeutils.CompositeType
import org.apache.flink.configuration.{CheckpointingOptions, Configuration, RestartStrategyOptions, StateBackendOptions}
import org.apache.flink.core.execution.CheckpointingMode
+import org.apache.flink.streaming.api.datastream.DataStream
import org.apache.flink.streaming.api.functions.source.FromElementsFunction
-import org.apache.flink.streaming.api.scala.DataStream
import org.apache.flink.table.api.bridge.scala.StreamTableEnvironment
import org.apache.flink.table.data.{RowData, StringData}
import org.apache.flink.table.data.binary.BinaryRowData
@@ -137,7 +137,7 @@ class StreamingWithStateTestBase(state: StateBackendMode) extends StreamingTestB
data.length / 2
) // fail after half elements
- env.addSource(function)(typeInfo).setMaxParallelism(1)
+ env.addSource(function, typeInfo).setMaxParallelism(1)
}
private def mapStrEquals(str1: String, str2: String): Boolean = {
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/UserDefinedFunctionTestUtils.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/UserDefinedFunctionTestUtils.scala
index 96e49926ff4..ebb6c66f736 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/UserDefinedFunctionTestUtils.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/UserDefinedFunctionTestUtils.scala
@@ -18,14 +18,14 @@
package org.apache.flink.table.planner.runtime.utils
import org.apache.flink.api.common.typeinfo.TypeInformation
+import org.apache.flink.api.java.ExecutionEnvironment
import org.apache.flink.api.java.tuple.{Tuple1, Tuple2}
import org.apache.flink.api.java.typeutils._
-import org.apache.flink.api.scala.ExecutionEnvironment
-import org.apache.flink.api.scala.typeutils.Types
import org.apache.flink.configuration.Configuration
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.annotation.{DataTypeHint, FunctionHint, InputGroup}
import org.apache.flink.table.api.DataTypes
+import org.apache.flink.table.api.typeutils.Types
import org.apache.flink.table.catalog.DataTypeFactory
import org.apache.flink.table.data.{RowData, StringData}
import org.apache.flink.table.functions.{AggregateFunction, FunctionContext, ScalarFunction}
@@ -500,14 +500,6 @@ object UserDefinedFunctionTestUtils {
env.getConfig.setGlobalJobParameters(conf)
}
- def setJobParameters(
- env: org.apache.flink.streaming.api.environment.StreamExecutionEnvironment,
- parameters: Map[String, String]): Unit = {
- val conf = new Configuration()
- parameters.foreach { case (k, v) => conf.setString(k, v) }
- env.getConfig.setGlobalJobParameters(conf)
- }
-
def writeCacheFile(fileName: String, contents: String): String = {
val tempFile = File.createTempFile(this.getClass.getName + "-" + fileName, "tmp")
tempFile.deleteOnExit()
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/TableTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/TableTestBase.scala
index a04695d072e..a9833f7c2b6 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/TableTestBase.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/TableTestBase.scala
@@ -21,21 +21,19 @@ import org.apache.flink.FlinkVersion
import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation}
import org.apache.flink.api.dag.Transformation
import org.apache.flink.api.java.typeutils.{PojoTypeInfo, RowTypeInfo, TupleTypeInfo}
-import org.apache.flink.api.scala.typeutils.CaseClassTypeInfo
import org.apache.flink.configuration.BatchExecutionOptions
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParseException
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode
import org.apache.flink.streaming.api.{environment, TimeCharacteristic}
import org.apache.flink.streaming.api.datastream.DataStream
import org.apache.flink.streaming.api.environment.{LocalStreamEnvironment, StreamExecutionEnvironment}
-import org.apache.flink.streaming.api.graph.StreamGraph
-import org.apache.flink.streaming.api.scala.{StreamExecutionEnvironment => ScalaStreamExecEnv}
import org.apache.flink.table.api._
import org.apache.flink.table.api.bridge.java.{StreamTableEnvironment => JavaStreamTableEnv}
import org.apache.flink.table.api.bridge.scala.{StreamTableEnvironment => ScalaStreamTableEnv}
import org.apache.flink.table.api.config.ExecutionConfigOptions
import org.apache.flink.table.api.internal.{StatementSetImpl, TableEnvironmentImpl, TableEnvironmentInternal, TableImpl}
-import org.apache.flink.table.catalog.{CatalogManager, CatalogStoreHolder, FunctionCatalog, GenericInMemoryCatalog, GenericInMemoryCatalogStore, ObjectIdentifier}
+import org.apache.flink.table.api.typeutils.CaseClassTypeInfo
+import org.apache.flink.table.catalog._
import org.apache.flink.table.data.RowData
import org.apache.flink.table.delegation.{Executor, ExecutorFactory}
import org.apache.flink.table.descriptors.ConnectorDescriptorValidator.CONNECTOR_TYPE
@@ -79,9 +77,7 @@ import _root_.scala.collection.JavaConversions._
import _root_.scala.io.Source
import org.apache.calcite.avatica.util.TimeUnit
import org.apache.calcite.rel.RelNode
-import org.apache.calcite.rel.rel2sql.RelToSqlConverter
import org.apache.calcite.sql.{SqlExplainLevel, SqlIntervalQualifier}
-import org.apache.calcite.sql.dialect.AnsiSqlDialect
import org.apache.calcite.sql.parser.SqlParserPos
import org.assertj.core.api.Assertions.{assertThat, assertThatExceptionOfType, fail}
import org.junit.jupiter.api.Assertions.{assertEquals, assertTrue}
@@ -204,8 +200,9 @@ abstract class TableTestUtilBase(test: TableTestBase, isStreamingMode: Boolean)
* returns the registered [[Table]].
*/
def addDataStream[T: TypeInformation](name: String, fields: Expression*): Table = {
- val env = new ScalaStreamExecEnv(new LocalStreamEnvironment())
- val dataStream = env.fromElements[T]().javaStream
+ val env = new LocalStreamEnvironment()
+ val typeInfo = implicitly[TypeInformation[T]]
+ val dataStream = env.fromCollection[T](Collections.emptyList[T](), typeInfo)
val tableEnv = getTableEnv
TableTestUtil.createTemporaryView(tableEnv, name, dataStream, Some(fields.toArray))
tableEnv.from(name)
@@ -1263,8 +1260,8 @@ abstract class TableTestUtil(
abstract class ScalaTableTestUtil(test: TableTestBase, isStreamingMode: Boolean)
extends TableTestUtilBase(test, isStreamingMode) {
- // scala env
- val env = new ScalaStreamExecEnv(new LocalStreamEnvironment())
+ // env
+ val env = new LocalStreamEnvironment()
// scala tableEnv
val tableEnv: ScalaStreamTableEnv = ScalaStreamTableEnv.create(env, setting)
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/UserDefinedTableFunctions.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/UserDefinedTableFunctions.scala
index 86be0ff857e..ac7ab7afd3f 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/UserDefinedTableFunctions.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/UserDefinedTableFunctions.scala
@@ -20,9 +20,9 @@ package org.apache.flink.table.planner.utils
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.tuple.Tuple3
import org.apache.flink.api.java.typeutils.RowTypeInfo
-import org.apache.flink.api.scala.typeutils.Types
import org.apache.flink.table.annotation.DataTypeHint
import org.apache.flink.table.api.{DataTypes, ValidationException}
+import org.apache.flink.table.api.typeutils.Types
import org.apache.flink.table.catalog.DataTypeFactory
import org.apache.flink.table.functions.{FunctionContext, ScalarFunction, TableFunction}
import org.apache.flink.table.functions.python.{PythonEnv, PythonFunction}
diff --git a/pom.xml b/pom.xml
index 8504dc9a234..1a5999e964b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2404,6 +2404,8 @@ under the License.
<exclude>org.apache.flink.api.java.hadoop.mapreduce.HadoopInputFormat</exclude>
<exclude>org.apache.flink.api.java.hadoop.mapreduce.HadoopOutputFormat</exclude>
<exclude>org.apache.flink.api.java.typeutils.WritableTypeInfo</exclude>
+ <!-- FLINK-36327 Remove dependency about flink-scala and flink-streaming-scala in table module in flink-2.0 -->
+ <exclude>org.apache.flink.table.api.typeutils.*</exclude>
<!-- MARKER: end exclusions -->
</excludes>
<accessModifier>public</accessModifier>