You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2019/01/31 09:08:57 UTC
[flink] branch master updated: [FLINK-11064] [table] Setup a new
flink-table module structure
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 0ab1549 [FLINK-11064] [table] Setup a new flink-table module structure
0ab1549 is described below
commit 0ab1549f52f1f544e8492757c6b0d562bf50a061
Author: Timo Walther <tw...@apache.org>
AuthorDate: Mon Jan 28 07:48:59 2019 +0100
[FLINK-11064] [table] Setup a new flink-table module structure
This commit splits the flink-table module into multiple submodules in
accordance with FLIP-32 (step 1).
The new module structure looks as follows:
flink-table-common
^
|
flink-table-api-java <------- flink-table-api-scala
^ ^
| |
flink-table-api-java-bridge flink-table-api-scala-bridge
^
|
flink-table-planner
The module structure assumes that the type system has been reworked such
that only one table environment exists for both Java and Scala users.
The module `flink-table-planner` contains the content of the old
`flink-table` module. From there we can distribute ported classes to
their final module without breaking backwards compatibility or
force users to update their dependencies again.
For example, if a user wants to implement a pure table program in Scala,
`flink-table-api-scala` and `flink-table-planner` need to be
added to the project.
Until we support pure table programs, `flink-table-api-scala/java-bridge`
and `flink-table-planner` need to be added to the project.
This closes #7587.
---
docs/dev/table/index.md | 63 ++++++++++---
flink-connectors/flink-connector-cassandra/pom.xml | 26 ++++--
.../flink-connector-elasticsearch-base/pom.xml | 16 +++-
.../flink-connector-elasticsearch6/pom.xml | 16 +++-
.../flink-connector-kafka-0.10/pom.xml | 15 ++-
.../flink-connector-kafka-0.11/pom.xml | 15 ++-
flink-connectors/flink-connector-kafka-0.8/pom.xml | 15 ++-
flink-connectors/flink-connector-kafka-0.9/pom.xml | 15 ++-
.../flink-connector-kafka-base/pom.xml | 15 ++-
flink-connectors/flink-connector-kafka/pom.xml | 15 ++-
flink-connectors/flink-hbase/pom.xml | 16 +++-
flink-connectors/flink-jdbc/pom.xml | 14 ++-
flink-connectors/flink-orc/pom.xml | 13 ++-
flink-dist/pom.xml | 2 +-
flink-dist/src/main/assemblies/bin.xml | 4 +-
flink-dist/src/main/assemblies/opt.xml | 6 +-
.../flink-stream-sql-test/pom.xml | 10 +-
flink-examples/flink-examples-table/pom.xml | 13 ++-
flink-formats/flink-avro/pom.xml | 10 +-
flink-formats/flink-json/pom.xml | 2 +-
flink-libraries/pom.xml | 3 -
flink-scala-shell/pom.xml | 9 +-
.../flink-sql-client/bin/sql-client.sh | 0
.../flink-sql-client/conf/sql-client-defaults.yaml | 0
.../flink-sql-client/pom.xml | 23 +++--
.../org/apache/flink/table/client/SqlClient.java | 0
.../flink/table/client/SqlClientException.java | 0
.../table/client/cli/CliChangelogResultView.java | 0
.../apache/flink/table/client/cli/CliClient.java | 0
.../flink/table/client/cli/CliInputView.java | 0
.../apache/flink/table/client/cli/CliOptions.java | 0
.../flink/table/client/cli/CliOptionsParser.java | 0
.../flink/table/client/cli/CliResultView.java | 0
.../apache/flink/table/client/cli/CliRowView.java | 0
.../apache/flink/table/client/cli/CliStrings.java | 0
.../flink/table/client/cli/CliTableResultView.java | 0
.../apache/flink/table/client/cli/CliUtils.java | 0
.../org/apache/flink/table/client/cli/CliView.java | 0
.../flink/table/client/cli/SqlCommandParser.java | 0
.../flink/table/client/cli/SqlCompleter.java | 0
.../flink/table/client/cli/SqlMultiLineParser.java | 0
.../flink/table/client/config/ConfigUtil.java | 0
.../flink/table/client/config/Environment.java | 0
.../table/client/config/entries/ConfigEntry.java | 0
.../client/config/entries/DeploymentEntry.java | 0
.../client/config/entries/ExecutionEntry.java | 0
.../table/client/config/entries/FunctionEntry.java | 0
.../client/config/entries/SinkTableEntry.java | 0
.../config/entries/SourceSinkTableEntry.java | 0
.../client/config/entries/SourceTableEntry.java | 0
.../table/client/config/entries/TableEntry.java | 0
.../client/config/entries/TemporalTableEntry.java | 0
.../table/client/config/entries/ViewEntry.java | 0
.../flink/table/client/gateway/Executor.java | 0
.../client/gateway/ProgramTargetDescriptor.java | 0
.../table/client/gateway/ResultDescriptor.java | 0
.../flink/table/client/gateway/SessionContext.java | 0
.../client/gateway/SqlExecutionException.java | 0
.../flink/table/client/gateway/TypedResult.java | 0
.../gateway/local/CollectBatchTableSink.java | 0
.../gateway/local/CollectStreamTableSink.java | 0
.../client/gateway/local/ExecutionContext.java | 0
.../table/client/gateway/local/LocalExecutor.java | 0
.../client/gateway/local/ProgramDeployer.java | 0
.../table/client/gateway/local/ResultStore.java | 0
.../client/gateway/local/result/BasicResult.java | 0
.../local/result/ChangelogCollectStreamResult.java | 0
.../gateway/local/result/ChangelogResult.java | 0
.../gateway/local/result/CollectStreamResult.java | 0
.../client/gateway/local/result/DynamicResult.java | 0
.../result/MaterializedCollectBatchResult.java | 0
.../result/MaterializedCollectStreamResult.java | 0
.../gateway/local/result/MaterializedResult.java | 0
.../table/client/gateway/local/result/Result.java | 0
.../src/main/resources/META-INF/NOTICE | 0
.../main/resources/META-INF/licenses/LICENSE.jline | 0
.../src/test/assembly/test-table-factories.xml | 0
.../flink/table/client/cli/CliClientTest.java | 0
.../table/client/cli/SqlCommandParserTest.java | 0
.../table/client/gateway/local/DependencyTest.java | 0
.../client/gateway/local/EnvironmentTest.java | 0
.../client/gateway/local/ExecutionContextTest.java | 0
.../client/gateway/local/LocalExecutorITCase.java | 0
.../MaterializedCollectStreamResultTest.java | 0
.../gateway/utils/DummyTableSinkFactory.java | 0
.../gateway/utils/DummyTableSourceFactory.java | 0
.../client/gateway/utils/EnvironmentFileUtil.java | 0
.../gateway/utils/TestTableSinkFactoryBase.java | 0
.../gateway/utils/TestTableSourceFactoryBase.java | 0
.../client/gateway/utils/UserDefinedFunctions.java | 0
.../org.apache.flink.table.factories.TableFactory | 0
.../src/test/resources/log4j-test.properties | 0
.../src/test/resources/test-data.csv | 0
.../src/test/resources/test-factory-services-file | 0
.../test/resources/test-sql-client-defaults.yaml | 0
.../test/resources/test-sql-client-factory.yaml | 0
.../test/resources/test-sql-client-streaming.yaml | 0
.../flink-table-api-java-bridge}/pom.xml | 31 +++----
.../flink-table-api-java}/pom.xml | 30 ++----
.../flink-table-api-scala-bridge}/pom.xml | 31 +++----
.../flink-table-api-scala}/pom.xml | 30 ++----
.../flink-table-common/pom.xml | 9 +-
.../org/apache/flink/table/api/TableException.java | 0
.../org/apache/flink/table/api/TableSchema.java | 0
.../flink/table/api/ValidationException.java | 0
.../table/descriptors/ConnectorDescriptor.java | 0
.../descriptors/ConnectorDescriptorValidator.java | 0
.../apache/flink/table/descriptors/Descriptor.java | 0
.../flink/table/descriptors/DescriptorBase.java | 0
.../table/descriptors/DescriptorProperties.java | 0
.../table/descriptors/DescriptorValidator.java | 0
.../flink/table/descriptors/FormatDescriptor.java | 0
.../descriptors/FormatDescriptorValidator.java | 0
.../factories/DeserializationSchemaFactory.java | 0
.../factories/SerializationSchemaFactory.java | 0
.../apache/flink/table/factories/TableFactory.java | 0
.../flink/table/factories/TableFormatFactory.java | 0
.../table/factories/TableFormatFactoryBase.java | 0
.../flink/table/functions/AggregateFunction.java | 0
.../flink/table/functions/FunctionContext.java | 0
.../flink/table/functions/ScalarFunction.java | 0
.../flink/table/functions/TableFunction.java | 0
.../flink/table/functions/UserDefinedFunction.java | 0
.../apache/flink/table/utils/EncodingUtils.java | 0
.../apache/flink/table/utils/TypeStringUtils.java | 0
.../table/descriptors/DescriptorTestBase.java | 0
.../factories/TableFormatFactoryBaseTest.java | 0
.../flink/table/utils/EncodingUtilsTest.java | 0
.../flink/table/utils/TypeStringUtilsTest.java | 0
.../flink-table-planner}/pom.xml | 31 +++++--
.../apache/calcite/avatica/util/DateTimeUtils.java | 0
.../calcite/sql/validate/SqlValidatorImpl.java | 0
.../apache/calcite/sql2rel/AuxiliaryConverter.java | 0
.../apache/flink/table/api/java/package-info.java | 0
.../table/dataview/ListViewSerializerSnapshot.java | 0
.../table/dataview/MapViewSerializerSnapshot.java | 0
.../java/org/apache/flink/table/explain/Node.java | 0
.../apache/flink/table/explain/PlanJsonParser.java | 0
.../runtime/types/CRowSerializerSnapshot.java | 0
.../src/main/resources/META-INF/NOTICE | 2 +-
.../resources/META-INF/licenses/LICENSE.janino | 0
.../org.apache.flink.table.factories.TableFactory | 0
.../flink/table/api/BatchTableEnvironment.scala | 0
.../flink/table/api/StreamTableEnvironment.scala | 0
.../org/apache/flink/table/api/TableConfig.scala | 0
.../apache/flink/table/api/TableEnvironment.scala | 0
.../scala/org/apache/flink/table/api/Types.scala | 0
.../apache/flink/table/api/dataview/DataView.scala | 0
.../flink/table/api/dataview/DataViewSpec.scala | 0
.../apache/flink/table/api/dataview/ListView.scala | 0
.../apache/flink/table/api/dataview/MapView.scala | 0
.../org/apache/flink/table/api/exceptions.scala | 0
.../table/api/java/BatchTableEnvironment.scala | 0
.../table/api/java/StreamTableEnvironment.scala | 0
.../org/apache/flink/table/api/java/windows.scala | 0
.../scala/org/apache/flink/table/api/package.scala | 0
.../org/apache/flink/table/api/queryConfig.scala | 0
.../table/api/scala/BatchTableEnvironment.scala | 0
.../flink/table/api/scala/DataSetConversions.scala | 0
.../table/api/scala/DataStreamConversions.scala | 0
.../table/api/scala/StreamTableEnvironment.scala | 0
.../flink/table/api/scala/TableConversions.scala | 0
.../table/api/scala/TableFunctionConversions.scala | 0
.../flink/table/api/scala/expressionDsl.scala | 0
.../org/apache/flink/table/api/scala/package.scala | 0
.../org/apache/flink/table/api/scala/windows.scala | 0
.../scala/org/apache/flink/table/api/table.scala | 0
.../scala/org/apache/flink/table/api/windows.scala | 0
.../apache/flink/table/calcite/CalciteConfig.scala | 0
.../table/calcite/FlinkCalciteSqlValidator.scala | 0
.../flink/table/calcite/FlinkPlannerImpl.scala | 0
.../flink/table/calcite/FlinkRelBuilder.scala | 0
.../table/calcite/FlinkRelOptClusterFactory.scala | 0
.../flink/table/calcite/FlinkTypeFactory.scala | 0
.../flink/table/calcite/FlinkTypeSystem.scala | 0
.../table/calcite/RelTimeIndicatorConverter.scala | 0
.../flink/table/catalog/CrudExternalCatalog.scala | 0
.../flink/table/catalog/ExternalCatalog.scala | 0
.../table/catalog/ExternalCatalogSchema.scala | 0
.../flink/table/catalog/ExternalCatalogTable.scala | 0
.../flink/table/catalog/ExternalTableUtil.scala | 0
.../table/catalog/InMemoryExternalCatalog.scala | 0
.../table/codegen/AggregationCodeGenerator.scala | 0
.../flink/table/codegen/CodeGenException.scala | 0
.../apache/flink/table/codegen/CodeGenUtils.scala | 0
.../apache/flink/table/codegen/CodeGenerator.scala | 0
.../table/codegen/CollectorCodeGenerator.scala | 0
.../org/apache/flink/table/codegen/Compiler.scala | 0
.../flink/table/codegen/ExpressionReducer.scala | 0
.../table/codegen/FunctionCodeGenerator.scala | 0
.../org/apache/flink/table/codegen/Indenter.scala | 0
.../table/codegen/InputFormatCodeGenerator.scala | 0
.../flink/table/codegen/MatchCodeGenerator.scala | 0
.../flink/table/codegen/calls/BuiltInMethods.scala | 0
.../flink/table/codegen/calls/CallGenerator.scala | 0
.../table/codegen/calls/ConstantCallGen.scala | 0
.../codegen/calls/CurrentTimePointCallGen.scala | 0
.../table/codegen/calls/DateFormatCallGen.scala | 0
.../flink/table/codegen/calls/ExtractCallGen.scala | 0
.../table/codegen/calls/FloorCeilCallGen.scala | 0
.../table/codegen/calls/FunctionGenerator.scala | 0
.../table/codegen/calls/HashCalcCallGen.scala | 0
.../flink/table/codegen/calls/MethodCallGen.scala | 0
.../codegen/calls/MultiTypeMethodCallGen.scala | 0
.../table/codegen/calls/NotCallGenerator.scala | 0
.../flink/table/codegen/calls/RandCallGen.scala | 0
.../codegen/calls/ScalarFunctionCallGen.scala | 0
.../table/codegen/calls/ScalarOperators.scala | 0
.../table/codegen/calls/TableFunctionCallGen.scala | 0
.../table/codegen/calls/TimestampDiffCallGen.scala | 0
.../flink/table/codegen/calls/TrimCallGen.scala | 0
.../org/apache/flink/table/codegen/generated.scala | 0
.../org/apache/flink/table/codegen/package.scala | 0
.../flink/table/dataview/ListViewSerializer.scala | 0
.../flink/table/dataview/ListViewTypeInfo.scala | 0
.../table/dataview/ListViewTypeInfoFactory.scala | 0
.../flink/table/dataview/MapViewSerializer.scala | 0
.../flink/table/dataview/MapViewTypeInfo.scala | 0
.../table/dataview/MapViewTypeInfoFactory.scala | 0
.../flink/table/dataview/StateListView.scala | 0
.../apache/flink/table/dataview/StateMapView.scala | 0
.../table/descriptors/BatchTableDescriptor.scala | 0
.../flink/table/descriptors/ClassInstance.scala | 0
.../table/descriptors/ClassInstanceValidator.scala | 0
.../table/descriptors/ConnectTableDescriptor.scala | 0
.../org/apache/flink/table/descriptors/Csv.scala | 0
.../flink/table/descriptors/CsvValidator.scala | 0
.../flink/table/descriptors/FileSystem.scala | 0
.../table/descriptors/FileSystemValidator.scala | 0
.../table/descriptors/FunctionDescriptor.scala | 0
.../descriptors/FunctionDescriptorValidator.scala | 0
.../table/descriptors/HierarchyDescriptor.scala | 0
.../descriptors/HierarchyDescriptorValidator.scala | 0
.../flink/table/descriptors/LiteralValue.scala | 0
.../table/descriptors/LiteralValueValidator.scala | 0
.../apache/flink/table/descriptors/Metadata.scala | 0
.../table/descriptors/MetadataValidator.scala | 0
.../table/descriptors/RegistrableDescriptor.scala | 0
.../apache/flink/table/descriptors/Rowtime.scala | 0
.../flink/table/descriptors/RowtimeValidator.scala | 0
.../apache/flink/table/descriptors/Schema.scala | 0
.../flink/table/descriptors/SchemaValidator.scala | 0
.../table/descriptors/SchematicDescriptor.scala | 0
.../flink/table/descriptors/Statistics.scala | 0
.../table/descriptors/StatisticsValidator.scala | 0
.../table/descriptors/StreamTableDescriptor.scala | 0
.../StreamTableDescriptorValidator.scala | 0
.../table/descriptors/StreamableDescriptor.scala | 0
.../flink/table/descriptors/TableDescriptor.scala | 0
.../flink/table/expressions/Expression.scala | 0
.../flink/table/expressions/ExpressionParser.scala | 0
.../flink/table/expressions/ExpressionUtils.scala | 0
.../flink/table/expressions/InputTypeSpec.scala | 0
.../flink/table/expressions/UDAGGExpression.scala | 0
.../flink/table/expressions/aggregations.scala | 0
.../flink/table/expressions/arithmetic.scala | 0
.../org/apache/flink/table/expressions/call.scala | 0
.../org/apache/flink/table/expressions/cast.scala | 0
.../flink/table/expressions/collection.scala | 0
.../flink/table/expressions/comparison.scala | 0
.../apache/flink/table/expressions/composite.scala | 0
.../flink/table/expressions/fieldExpression.scala | 0
.../flink/table/expressions/hashExpressions.scala | 0
.../apache/flink/table/expressions/literals.scala | 0
.../org/apache/flink/table/expressions/logic.scala | 0
.../flink/table/expressions/mathExpressions.scala | 0
.../apache/flink/table/expressions/ordering.scala | 0
.../apache/flink/table/expressions/package.scala | 0
.../table/expressions/stringExpressions.scala | 0
.../apache/flink/table/expressions/subquery.scala | 0
.../apache/flink/table/expressions/symbols.scala | 0
.../org/apache/flink/table/expressions/time.scala | 0
.../flink/table/expressions/windowProperties.scala | 0
.../table/factories/BatchTableSinkFactory.scala | 0
.../table/factories/BatchTableSourceFactory.scala | 0
.../table/factories/StreamTableSinkFactory.scala | 0
.../table/factories/StreamTableSourceFactory.scala | 0
.../table/factories/TableFactoryService.scala | 0
.../flink/table/factories/TableFactoryUtil.scala | 0
.../functions/DistinctAggregateFunction.scala | 0
.../flink/table/functions/FunctionService.scala | 0
.../table/functions/TemporalTableFunction.scala | 0
.../functions/aggfunctions/AvgAggFunction.scala | 0
.../aggfunctions/CollectAggFunction.scala | 0
.../functions/aggfunctions/CountAggFunction.scala | 0
.../aggfunctions/DistinctAccumulator.scala | 0
.../functions/aggfunctions/MaxAggFunction.scala | 0
.../aggfunctions/MaxAggFunctionWithRetract.scala | 0
.../functions/aggfunctions/MinAggFunction.scala | 0
.../aggfunctions/MinAggFunctionWithRetract.scala | 0
.../table/functions/aggfunctions/Ordering.scala | 0
.../functions/aggfunctions/Sum0AggFunction.scala | 0
.../aggfunctions/Sum0WithRetractAggFunction.scala | 0
.../functions/aggfunctions/SumAggFunction.scala | 0
.../aggfunctions/SumWithRetractAggFunction.scala | 0
.../table/functions/sql/ProctimeSqlFunction.scala | 0
.../table/functions/sql/ScalarSqlFunctions.scala | 0
.../sql/StreamRecordTimestampSqlFunction.scala | 0
.../table/functions/utils/AggSqlFunction.scala | 0
.../table/functions/utils/ScalarSqlFunction.scala | 0
.../table/functions/utils/TableSqlFunction.scala | 0
.../functions/utils/UserDefinedFunctionUtils.scala | 0
.../flink/table/plan/ProjectionTranslator.scala | 0
.../org/apache/flink/table/plan/TreeNode.scala | 0
.../apache/flink/table/plan/cost/DataSetCost.scala | 0
.../flink/table/plan/cost/DataSetCostFactory.scala | 0
.../cost/FlinkDefaultRelMetadataProvider.scala | 0
.../flink/table/plan/cost/FlinkRelMdRowCount.scala | 0
.../flink/table/plan/logical/LogicalNode.scala | 0
.../flink/table/plan/logical/LogicalWindow.scala | 0
.../flink/table/plan/logical/MatchRecognize.scala | 0
.../flink/table/plan/logical/Resolvable.scala | 0
.../flink/table/plan/logical/groupWindows.scala | 0
.../flink/table/plan/logical/operators.scala | 0
.../logical/rel/LogicalTemporalTableJoin.scala | 0
.../plan/logical/rel/LogicalWindowAggregate.scala | 0
.../flink/table/plan/nodes/CommonAggregate.scala | 0
.../apache/flink/table/plan/nodes/CommonCalc.scala | 0
.../flink/table/plan/nodes/CommonCorrelate.scala | 0
.../apache/flink/table/plan/nodes/CommonJoin.scala | 0
.../table/plan/nodes/CommonMatchRecognize.scala | 0
.../apache/flink/table/plan/nodes/CommonScan.scala | 0
.../apache/flink/table/plan/nodes/CommonSort.scala | 0
.../flink/table/plan/nodes/FlinkConventions.scala | 0
.../flink/table/plan/nodes/FlinkRelNode.scala | 0
.../flink/table/plan/nodes/OverAggregate.scala | 0
.../table/plan/nodes/PhysicalTableSourceScan.scala | 0
.../flink/table/plan/nodes/dataset/BatchScan.scala | 0
.../plan/nodes/dataset/BatchTableSourceScan.scala | 0
.../plan/nodes/dataset/DataSetAggregate.scala | 0
.../table/plan/nodes/dataset/DataSetCalc.scala | 0
.../plan/nodes/dataset/DataSetCorrelate.scala | 0
.../table/plan/nodes/dataset/DataSetDistinct.scala | 0
.../plan/nodes/dataset/DataSetIntersect.scala | 0
.../table/plan/nodes/dataset/DataSetJoin.scala | 0
.../table/plan/nodes/dataset/DataSetMinus.scala | 0
.../table/plan/nodes/dataset/DataSetRel.scala | 0
.../table/plan/nodes/dataset/DataSetScan.scala | 0
.../plan/nodes/dataset/DataSetSingleRowJoin.scala | 0
.../table/plan/nodes/dataset/DataSetSort.scala | 0
.../table/plan/nodes/dataset/DataSetUnion.scala | 0
.../table/plan/nodes/dataset/DataSetValues.scala | 0
.../nodes/dataset/DataSetWindowAggregate.scala | 0
.../plan/nodes/datastream/DataStreamCalc.scala | 0
.../nodes/datastream/DataStreamCorrelate.scala | 0
.../datastream/DataStreamGroupAggregate.scala | 0
.../DataStreamGroupWindowAggregate.scala | 0
.../plan/nodes/datastream/DataStreamJoin.scala | 0
.../DataStreamJoinToCoProcessTranslator.scala | 0
.../plan/nodes/datastream/DataStreamMatch.scala | 0
.../nodes/datastream/DataStreamOverAggregate.scala | 0
.../plan/nodes/datastream/DataStreamRel.scala | 0
.../plan/nodes/datastream/DataStreamScan.scala | 0
.../plan/nodes/datastream/DataStreamSort.scala | 0
...taStreamTemporalJoinToCoProcessTranslator.scala | 0
.../datastream/DataStreamTemporalTableJoin.scala | 0
.../plan/nodes/datastream/DataStreamUnion.scala | 0
.../plan/nodes/datastream/DataStreamValues.scala | 0
.../nodes/datastream/DataStreamWindowJoin.scala | 0
.../table/plan/nodes/datastream/StreamScan.scala | 0
.../nodes/datastream/StreamTableSourceScan.scala | 0
.../nodes/datastream/retractionTraitDefs.scala | 0
.../plan/nodes/datastream/retractionTraits.scala | 0
.../plan/nodes/logical/FlinkLogicalAggregate.scala | 0
.../plan/nodes/logical/FlinkLogicalCalc.scala | 0
.../plan/nodes/logical/FlinkLogicalCorrelate.scala | 0
.../plan/nodes/logical/FlinkLogicalIntersect.scala | 0
.../plan/nodes/logical/FlinkLogicalJoin.scala | 0
.../plan/nodes/logical/FlinkLogicalJoinBase.scala | 0
.../plan/nodes/logical/FlinkLogicalMatch.scala | 0
.../plan/nodes/logical/FlinkLogicalMinus.scala | 0
.../logical/FlinkLogicalNativeTableScan.scala | 0
.../nodes/logical/FlinkLogicalOverWindow.scala | 0
.../table/plan/nodes/logical/FlinkLogicalRel.scala | 0
.../plan/nodes/logical/FlinkLogicalSort.scala | 0
.../logical/FlinkLogicalTableFunctionScan.scala | 0
.../logical/FlinkLogicalTableSourceScan.scala | 0
.../logical/FlinkLogicalTemporalTableJoin.scala | 0
.../plan/nodes/logical/FlinkLogicalUnion.scala | 0
.../plan/nodes/logical/FlinkLogicalValues.scala | 0
.../logical/FlinkLogicalWindowAggregate.scala | 0
.../flink/table/plan/rules/FlinkRuleSets.scala | 0
.../plan/rules/common/ConvertToNotInOrInRule.scala | 0
.../rules/common/LogicalWindowAggregateRule.scala | 0
.../WindowAggregateReduceFunctionsRule.scala | 0
.../plan/rules/common/WindowPropertiesRule.scala | 0
.../rules/dataSet/BatchTableSourceScanRule.scala | 0
.../plan/rules/dataSet/DataSetAggregateRule.scala | 0
.../table/plan/rules/dataSet/DataSetCalcRule.scala | 0
.../plan/rules/dataSet/DataSetCorrelateRule.scala | 0
.../plan/rules/dataSet/DataSetDistinctRule.scala | 0
.../plan/rules/dataSet/DataSetIntersectRule.scala | 0
.../table/plan/rules/dataSet/DataSetJoinRule.scala | 0
.../DataSetLogicalWindowAggregateRule.scala | 0
.../plan/rules/dataSet/DataSetMinusRule.scala | 0
.../table/plan/rules/dataSet/DataSetScanRule.scala | 0
.../rules/dataSet/DataSetSingleRowJoinRule.scala | 0
.../table/plan/rules/dataSet/DataSetSortRule.scala | 0
.../plan/rules/dataSet/DataSetUnionRule.scala | 0
.../plan/rules/dataSet/DataSetValuesRule.scala | 0
.../rules/dataSet/DataSetWindowAggregateRule.scala | 0
.../plan/rules/datastream/DataStreamCalcRule.scala | 0
.../rules/datastream/DataStreamCorrelateRule.scala | 0
.../datastream/DataStreamGroupAggregateRule.scala | 0
.../DataStreamGroupWindowAggregateRule.scala | 0
.../plan/rules/datastream/DataStreamJoinRule.scala | 0
.../DataStreamLogicalWindowAggregateRule.scala | 0
.../rules/datastream/DataStreamMatchRule.scala | 0
.../datastream/DataStreamOverAggregateRule.scala | 0
.../datastream/DataStreamRetractionRules.scala | 0
.../plan/rules/datastream/DataStreamScanRule.scala | 0
.../plan/rules/datastream/DataStreamSortRule.scala | 0
.../DataStreamTemporalTableJoinRule.scala | 0
.../rules/datastream/DataStreamUnionRule.scala | 0
.../rules/datastream/DataStreamValuesRule.scala | 0
.../datastream/DataStreamWindowJoinRule.scala | 0
.../datastream/StreamTableSourceScanRule.scala | 0
.../rules/logical/DecomposeGroupingSetRule.scala | 0
.../logical/EnumerableToLogicalTableScan.scala | 0
.../LogicalCorrelateToTemporalTableJoinRule.scala | 0
.../plan/rules/logical/LogicalUnnestRule.scala | 0
.../PushFilterIntoTableSourceScanRule.scala | 0
.../PushProjectIntoTableSourceScanRule.scala | 0
.../flink/table/plan/schema/ArrayRelDataType.scala | 0
.../table/plan/schema/BatchTableSourceTable.scala | 0
.../table/plan/schema/CompositeRelDataType.scala | 0
.../flink/table/plan/schema/DataSetTable.scala | 0
.../flink/table/plan/schema/DataStreamTable.scala | 0
.../table/plan/schema/FlinkTableFunctionImpl.scala | 0
.../table/plan/schema/GenericRelDataType.scala | 0
.../flink/table/plan/schema/InlineTable.scala | 0
.../flink/table/plan/schema/MapRelDataType.scala | 0
.../table/plan/schema/MultisetRelDataType.scala | 0
.../apache/flink/table/plan/schema/RelTable.scala | 0
.../apache/flink/table/plan/schema/RowSchema.scala | 0
.../table/plan/schema/StreamTableSourceTable.scala | 0
.../flink/table/plan/schema/TableSinkTable.scala | 0
.../table/plan/schema/TableSourceSinkTable.scala | 0
.../flink/table/plan/schema/TableSourceTable.scala | 0
.../plan/schema/TimeIndicatorRelDataType.scala | 0
.../flink/table/plan/stats/ColumnStats.scala | 0
.../flink/table/plan/stats/FlinkStatistic.scala | 0
.../apache/flink/table/plan/stats/TableStats.scala | 0
.../flink/table/plan/util/CorrelateUtil.scala | 0
.../table/plan/util/ExplodeFunctionUtil.scala | 0
.../flink/table/plan/util/RexDefaultVisitor.scala | 0
.../table/plan/util/RexProgramExtractor.scala | 0
.../flink/table/plan/util/RexProgramRewriter.scala | 0
.../table/plan/util/UpdatingPlanChecker.scala | 0
.../table/runtime/CRowCorrelateProcessRunner.scala | 0
.../flink/table/runtime/CRowKeySelector.scala | 0
.../apache/flink/table/runtime/CRowMapRunner.scala | 0
.../table/runtime/CRowOutputProcessRunner.scala | 0
.../flink/table/runtime/CRowProcessRunner.scala | 0
.../table/runtime/CRowWrappingCollector.scala | 0
.../table/runtime/CorrelateFlatMapRunner.scala | 0
.../table/runtime/CountPartitionFunction.scala | 0
.../flink/table/runtime/FlatJoinRunner.scala | 0
.../apache/flink/table/runtime/FlatMapRunner.scala | 0
.../table/runtime/IntersectCoGroupFunction.scala | 0
.../flink/table/runtime/LimitFilterFunction.scala | 0
.../flink/table/runtime/MapJoinLeftRunner.scala | 0
.../flink/table/runtime/MapJoinRightRunner.scala | 0
.../org/apache/flink/table/runtime/MapRunner.scala | 0
.../flink/table/runtime/MapSideJoinRunner.scala | 0
.../flink/table/runtime/MinusCoGroupFunction.scala | 0
.../runtime/OutputRowtimeProcessFunction.scala | 0
.../flink/table/runtime/RowKeySelector.scala | 0
.../table/runtime/RowtimeProcessFunction.scala | 0
.../table/runtime/TableFunctionCollector.scala | 0
.../runtime/aggregate/AggregateAggFunction.scala | 0
.../table/runtime/aggregate/AggregateUtil.scala | 0
.../table/runtime/aggregate/CleanupState.scala | 0
.../CoProcessFunctionWithCleanupState.scala | 0
.../runtime/aggregate/DataSetAggFunction.scala | 0
.../aggregate/DataSetFinalAggFunction.scala | 0
.../runtime/aggregate/DataSetPreAggFunction.scala | 0
...ataSetSessionWindowAggReduceGroupFunction.scala | 0
...DataSetSessionWindowAggregatePreProcessor.scala | 0
.../DataSetSlideTimeWindowAggFlatMapFunction.scala | 0
...aSetSlideTimeWindowAggReduceGroupFunction.scala | 0
...ataSetSlideWindowAggReduceCombineFunction.scala | 0
.../DataSetSlideWindowAggReduceGroupFunction.scala | 0
...etTumbleCountWindowAggReduceGroupFunction.scala | 0
...tTumbleTimeWindowAggReduceCombineFunction.scala | 0
...SetTumbleTimeWindowAggReduceGroupFunction.scala | 0
.../aggregate/DataSetWindowAggMapFunction.scala | 0
.../table/runtime/aggregate/DistinctReduce.scala | 0
.../runtime/aggregate/GeneratedAggregations.scala | 0
.../aggregate/GroupAggProcessFunction.scala | 0
...IncrementalAggregateAllTimeWindowFunction.scala | 0
.../IncrementalAggregateAllWindowFunction.scala | 0
.../IncrementalAggregateTimeWindowFunction.scala | 0
.../IncrementalAggregateWindowFunction.scala | 0
.../KeyedProcessFunctionWithCleanupState.scala | 0
.../aggregate/ProcTimeBoundedRangeOver.scala | 0
.../aggregate/ProcTimeBoundedRowsOver.scala | 0
.../aggregate/ProcTimeSortProcessFunction.scala | 0
.../runtime/aggregate/ProcTimeUnboundedOver.scala | 0
.../ProcessFunctionWithCleanupState.scala | 0
.../aggregate/RowTimeBoundedRangeOver.scala | 0
.../runtime/aggregate/RowTimeBoundedRowsOver.scala | 0
.../aggregate/RowTimeSortProcessFunction.scala | 0
.../runtime/aggregate/RowTimeUnboundedOver.scala | 0
.../flink/table/runtime/aggregate/SortUtil.scala | 0
.../aggregate/TimeWindowPropertyCollector.scala | 0
.../conversion/CRowToJavaTupleMapFunction.scala | 0
.../conversion/CRowToJavaTupleMapRunner.scala | 0
.../runtime/conversion/CRowToRowMapFunction.scala | 0
.../conversion/CRowToScalaTupleMapFunction.scala | 0
.../conversion/CRowToScalaTupleMapRunner.scala | 0
.../runtime/functions/DateTimeFunctions.scala | 0
.../table/runtime/functions/ScalarFunctions.scala | 0
.../table/runtime/functions/ThreadLocalCache.scala | 0
.../table/runtime/io/CRowValuesInputFormat.scala | 0
.../flink/table/runtime/io/ValuesInputFormat.scala | 0
...eTwoInputStreamOperatorWithStateRetention.scala | 0
.../join/CRowWrappingMultiOutputCollector.scala | 0
.../table/runtime/join/CountingCollector.scala | 0
.../table/runtime/join/EmitAwareCollector.scala | 0
.../table/runtime/join/NonWindowFullJoin.scala | 0
.../NonWindowFullJoinWithNonEquiPredicates.scala | 0
.../table/runtime/join/NonWindowInnerJoin.scala | 0
.../flink/table/runtime/join/NonWindowJoin.scala | 0
.../runtime/join/NonWindowLeftRightJoin.scala | 0
...nWindowLeftRightJoinWithNonEquiPredicates.scala | 0
.../table/runtime/join/NonWindowOuterJoin.scala | 0
.../NonWindowOuterJoinWithNonEquiPredicates.scala | 0
.../table/runtime/join/OuterJoinPaddingUtil.scala | 0
.../runtime/join/ProcTimeBoundedStreamJoin.scala | 0
.../runtime/join/RowTimeBoundedStreamJoin.scala | 0
.../runtime/join/TemporalProcessTimeJoin.scala | 0
.../table/runtime/join/TemporalRowtimeJoin.scala | 0
.../table/runtime/join/TimeBoundedStreamJoin.scala | 0
.../flink/table/runtime/join/WindowJoinUtil.scala | 0
.../table/runtime/match/EventRowComparator.scala | 0
.../runtime/match/IterativeConditionRunner.scala | 0
.../match/PatternProcessFunctionRunner.scala | 0
.../KeyedCoProcessOperatorWithWatermarkDelay.scala | 0
.../KeyedProcessOperatorWithWatermarkDelay.scala | 0
.../runtime/outerJoinGroupReduceRunners.scala | 0
.../flink/table/runtime/outerJoinRunners.scala | 0
.../triggers/StateCleaningCountTrigger.scala | 0
.../apache/flink/table/runtime/types/CRow.scala | 0
.../flink/table/runtime/types/CRowComparator.scala | 0
.../flink/table/runtime/types/CRowSerializer.scala | 0
.../flink/table/runtime/types/CRowTypeInfo.scala | 0
.../flink/table/sinks/AppendStreamTableSink.scala | 0
.../apache/flink/table/sinks/BatchTableSink.scala | 0
.../table/sinks/CsvAppendTableSinkFactory.scala | 0
.../table/sinks/CsvBatchTableSinkFactory.scala | 0
.../apache/flink/table/sinks/CsvTableSink.scala | 0
.../table/sinks/CsvTableSinkFactoryBase.scala | 0
.../flink/table/sinks/RetractStreamTableSink.scala | 0
.../apache/flink/table/sinks/StreamTableSink.scala | 0
.../org/apache/flink/table/sinks/TableSink.scala | 0
.../apache/flink/table/sinks/TableSinkBase.scala | 0
.../flink/table/sinks/UpsertStreamTableSink.scala | 0
.../flink/table/sources/BatchTableSource.scala | 0
.../sources/CsvAppendTableSourceFactory.scala | 0
.../table/sources/CsvBatchTableSourceFactory.scala | 0
.../flink/table/sources/CsvTableSource.scala | 0
.../table/sources/CsvTableSourceFactoryBase.scala | 0
.../flink/table/sources/DefinedFieldMapping.scala | 0
.../apache/flink/table/sources/FieldComputer.scala | 0
.../table/sources/FilterableTableSource.scala | 0
.../NestedFieldsProjectableTableSource.scala | 0
.../table/sources/ProjectableTableSource.scala | 0
.../flink/table/sources/StreamTableSource.scala | 0
.../apache/flink/table/sources/TableSource.scala | 0
.../flink/table/sources/TableSourceUtil.scala | 0
.../table/sources/definedTimeAttributes.scala | 0
.../table/sources/tsextractors/ExistingField.scala | 0
.../tsextractors/StreamRecordTimestamp.scala | 0
.../sources/tsextractors/TimestampExtractor.scala | 0
.../sources/wmstrategies/AscendingTimestamps.scala | 0
.../wmstrategies/BoundedOutOfOrderTimestamps.scala | 0
.../sources/wmstrategies/watermarkStrategies.scala | 0
.../flink/table/typeutils/InternalTypeInfo.scala | 0
.../table/typeutils/RowIntervalTypeInfo.scala | 0
.../table/typeutils/TimeIndicatorTypeInfo.scala | 0
.../table/typeutils/TimeIntervalTypeInfo.scala | 0
.../flink/table/typeutils/TypeCheckUtils.scala | 0
.../flink/table/typeutils/TypeCoercion.scala | 0
.../flink/table/util/JavaScalaConversionUtil.scala | 0
.../org/apache/flink/table/util/Logging.scala | 0
.../org/apache/flink/table/util/MatchUtil.scala | 0
.../flink/table/util/TableConnectorUtil.scala | 0
.../flink/table/validate/FunctionCatalog.scala | 0
.../flink/table/validate/ValidationResult.scala | 0
.../ListViewSerializerSnapshotMigrationTest.java | 0
.../MapViewSerializerSnapshotMigrationTest.java | 0
.../table/runtime/batch/JavaTableSourceITCase.java | 0
.../runtime/batch/sql/GroupingSetsITCase.java | 0
.../table/runtime/batch/sql/JavaSqlITCase.java | 0
.../batch/table/JavaTableEnvironmentITCase.java | 0
.../table/runtime/stream/sql/JavaSqlITCase.java | 0
.../flink/table/runtime/utils/JavaPojos.java | 0
.../table/runtime/utils/JavaStreamTestData.java | 0
.../runtime/utils/JavaUserDefinedAggFunctions.java | 0
.../utils/JavaUserDefinedScalarFunctions.java | 0
.../utils/JavaUserDefinedTableFunctions.java | 0
.../org.apache.flink.table.factories.TableFactory | 0
.../resources/flink-1.6-list-view-serializer-data | Bin
.../flink-1.6-list-view-serializer-snapshot | Bin
.../resources/flink-1.6-map-view-serializer-data | Bin
.../flink-1.6-map-view-serializer-snapshot | Bin
.../resources/flink-1.7-list-view-serializer-data | Bin
.../flink-1.7-list-view-serializer-snapshot | Bin
.../resources/flink-1.7-map-view-serializer-data | Bin
.../flink-1.7-map-view-serializer-snapshot | Bin
.../src/test/resources/log4j-test.properties | 0
.../src/test/resources/logback-test.xml | 0
.../table/api/ExternalCatalogInsertTest.scala | 0
.../flink/table/api/ExternalCatalogTest.scala | 0
.../apache/flink/table/api/QueryConfigTest.scala | 0
.../flink/table/api/TableEnvironmentTest.scala | 0
.../apache/flink/table/api/TableSchemaTest.scala | 0
.../apache/flink/table/api/TableSourceTest.scala | 0
.../api/batch/BatchTableEnvironmentTest.scala | 0
.../apache/flink/table/api/batch/ExplainTest.scala | 0
.../flink/table/api/batch/sql/AggregateTest.scala | 0
.../flink/table/api/batch/sql/CalcTest.scala | 0
.../flink/table/api/batch/sql/CorrelateTest.scala | 0
.../api/batch/sql/DistinctAggregateTest.scala | 0
.../table/api/batch/sql/GroupWindowTest.scala | 0
.../table/api/batch/sql/GroupingSetsTest.scala | 0
.../flink/table/api/batch/sql/JoinTest.scala | 0
.../table/api/batch/sql/SetOperatorsTest.scala | 0
.../table/api/batch/sql/SingleRowJoinTest.scala | 0
.../api/batch/sql/TemporalTableJoinTest.scala | 0
.../batch/sql/validation/CalcValidationTest.scala | 0
.../sql/validation/CorrelateValidationTest.scala | 0
.../sql/validation/GroupWindowValidationTest.scala | 0
.../sql/validation/InsertIntoValidationTest.scala | 0
.../batch/sql/validation/JoinValidationTest.scala | 0
.../sql/validation/OverWindowValidationTest.scala | 0
.../batch/sql/validation/SortValidationTest.scala | 0
.../table/api/batch/table/AggregateTest.scala | 0
.../flink/table/api/batch/table/CalcTest.scala | 0
.../table/api/batch/table/CorrelateTest.scala | 0
.../table/api/batch/table/GroupWindowTest.scala | 0
.../flink/table/api/batch/table/JoinTest.scala | 0
.../table/api/batch/table/SetOperatorsTest.scala | 0
.../api/batch/table/TemporalTableJoinTest.scala | 0
.../stringexpr/AggregateStringExpressionTest.scala | 0
.../stringexpr/CalcStringExpressionTest.scala | 0
.../stringexpr/CorrelateStringExpressionTest.scala | 0
.../stringexpr/JoinStringExpressionTest.scala | 0
.../batch/table/stringexpr/SetOperatorsTest.scala | 0
.../stringexpr/SortStringExpressionTest.scala | 0
.../table/validation/AggregateValidationTest.scala | 0
.../table/validation/CalcValidationTest.scala | 0
.../table/validation/CorrelateValidationTest.scala | 0
.../validation/GroupWindowValidationTest.scala | 0
.../validation/InsertIntoValidationTest.scala | 0
.../table/validation/JoinValidationTest.scala | 0
.../validation/OverWindowValidationTest.scala | 0
.../validation/SetOperatorsValidationTest.scala | 0
.../table/validation/SortValidationTest.scala | 0
.../flink/table/api/stream/ExplainTest.scala | 0
.../api/stream/StreamTableEnvironmentTest.scala | 0
.../StreamTableEnvironmentValidationTest.scala | 0
.../flink/table/api/stream/sql/AggregateTest.scala | 0
.../flink/table/api/stream/sql/CorrelateTest.scala | 0
.../api/stream/sql/DistinctAggregateTest.scala | 0
.../table/api/stream/sql/GroupWindowTest.scala | 0
.../flink/table/api/stream/sql/JoinTest.scala | 0
.../table/api/stream/sql/MatchRecognizeTest.scala | 0
.../table/api/stream/sql/OverWindowTest.scala | 0
.../table/api/stream/sql/SetOperatorsTest.scala | 0
.../flink/table/api/stream/sql/SortTest.scala | 0
.../api/stream/sql/TemporalTableJoinTest.scala | 0
.../flink/table/api/stream/sql/UnionTest.scala | 0
.../sql/validation/CorrelateValidationTest.scala | 0
.../sql/validation/InsertIntoValidationTest.scala | 0
.../stream/sql/validation/JoinValidationTest.scala | 0
.../validation/MatchRecognizeValidationTest.scala | 0
.../sql/validation/OverWindowValidationTest.scala | 0
.../stream/sql/validation/SortValidationTest.scala | 0
.../validation/WindowAggregateValidationTest.scala | 0
.../table/api/stream/table/AggregateTest.scala | 0
.../flink/table/api/stream/table/CalcTest.scala | 0
.../table/api/stream/table/CorrelateTest.scala | 0
.../table/api/stream/table/GroupWindowTest.scala | 0
.../flink/table/api/stream/table/JoinTest.scala | 0
.../table/api/stream/table/OverWindowTest.scala | 0
.../table/api/stream/table/SetOperatorsTest.scala | 0
.../table/api/stream/table/TableSourceTest.scala | 0
.../api/stream/table/TemporalTableJoinTest.scala | 0
.../stringexpr/AggregateStringExpressionTest.scala | 0
.../stringexpr/CalcStringExpressionTest.scala | 0
.../stringexpr/CorrelateStringExpressionTest.scala | 0
.../GroupWindowStringExpressionTest.scala | 0
.../OverWindowStringExpressionTest.scala | 0
.../SetOperatorsStringExpressionTest.scala | 0
.../table/validation/AggregateValidationTest.scala | 0
.../table/validation/CalcValidationTest.scala | 0
.../table/validation/CorrelateValidationTest.scala | 0
.../validation/GroupWindowValidationTest.scala | 0
.../validation/InsertIntoValidationTest.scala | 0
.../table/validation/JoinValidationTest.scala | 0
.../validation/OverWindowValidationTest.scala | 0
.../validation/SetOperatorsValidationTest.scala | 0
.../table/validation/TableSinkValidationTest.scala | 0
.../TemporalTableJoinValidationTest.scala | 0
.../validation/UnsupportedOpsValidationTest.scala | 0
.../api/validation/InlineTableValidationTest.scala | 0
.../TableEnvironmentValidationTest.scala | 0
.../api/validation/TableSchemaValidationTest.scala | 0
.../api/validation/TableSinksValidationTest.scala | 0
.../api/validation/TableSourceValidationTest.scala | 0
.../UserDefinedFunctionValidationTest.scala | 0
.../table/calcite/CalciteConfigBuilderTest.scala | 0
.../table/catalog/ExternalCatalogSchemaTest.scala | 0
.../catalog/InMemoryExternalCatalogTest.scala | 0
.../table/dataview/ListViewSerializerTest.scala | 0
.../table/dataview/MapViewSerializerTest.scala | 0
.../table/descriptors/ClassInstanceTest.scala | 0
.../apache/flink/table/descriptors/CsvTest.scala | 0
.../descriptors/DescriptorPropertiesTest.scala | 0
.../flink/table/descriptors/FileSystemTest.scala | 0
.../table/descriptors/FunctionDescriptorTest.scala | 0
.../flink/table/descriptors/LiteralValueTest.scala | 0
.../flink/table/descriptors/MetadataTest.scala | 0
.../flink/table/descriptors/RowtimeTest.scala | 0
.../flink/table/descriptors/SchemaTest.scala | 0
.../table/descriptors/SchemaValidatorTest.scala | 0
.../flink/table/descriptors/StatisticsTest.scala | 0
.../table/descriptors/TableDescriptorTest.scala | 0
.../table/descriptors/TestTableDescriptor.scala | 0
.../flink/table/expressions/ArrayTypeTest.scala | 0
.../table/expressions/CompositeAccessTest.scala | 0
.../table/expressions/DateTimeFunctionTest.scala | 0
.../flink/table/expressions/DecimalTypeTest.scala | 0
.../flink/table/expressions/KeywordParseTest.scala | 0
.../flink/table/expressions/LiteralTest.scala | 0
.../flink/table/expressions/MapTypeTest.scala | 0
.../table/expressions/NonDeterministicTests.scala | 0
.../flink/table/expressions/RowTypeTest.scala | 0
.../table/expressions/ScalarFunctionsTest.scala | 0
.../table/expressions/ScalarOperatorsTest.scala | 0
.../table/expressions/SqlExpressionTest.scala | 0
.../table/expressions/TemporalTypesTest.scala | 0
.../UserDefinedScalarFunctionTest.scala | 0
.../expressions/utils/ArrayTypeTestBase.scala | 0
.../expressions/utils/CompositeTypeTestBase.scala | 0
.../expressions/utils/ExpressionTestBase.scala | 0
.../table/expressions/utils/MapTypeTestBase.scala | 0
.../table/expressions/utils/RowTypeTestBase.scala | 0
.../utils/ScalarOperatorsTestBase.scala | 0
.../expressions/utils/ScalarTypesTestBase.scala | 0
.../utils/userDefinedScalarFunctions.scala | 0
.../validation/ArrayTypeValidationTest.scala | 0
.../validation/CompositeAccessValidationTest.scala | 0
.../validation/MapTypeValidationTest.scala | 0
.../validation/RowTypeValidationTest.scala | 0
.../validation/ScalarFunctionsValidationTest.scala | 0
.../validation/ScalarOperatorsValidationTest.scala | 0
.../factories/TableFormatFactoryServiceTest.scala | 0
.../factories/TableSinkFactoryServiceTest.scala | 0
.../factories/TableSourceFactoryServiceTest.scala | 0
.../utils/TestAmbiguousTableFormatFactory.scala | 0
.../utils/TestDeserializationSchema.scala | 0
.../utils/TestFixedFormatTableFactory.scala | 0
.../factories/utils/TestSerializationSchema.scala | 0
.../table/factories/utils/TestTableFormat.scala | 0
.../factories/utils/TestTableFormatFactory.scala | 0
.../factories/utils/TestTableSinkFactory.scala | 0
.../factories/utils/TestTableSourceFactory.scala | 0
.../TestWildcardFormatTableSourceFactory.scala | 0
.../table/functions/FunctionServiceTest.scala | 0
.../table/match/MatchRecognizeValidationTest.scala | 0
.../flink/table/match/PatternTranslatorTest.scala | 0
.../table/match/PatternTranslatorTestBase.scala | 0
.../table/plan/ExpressionReductionRulesTest.scala | 0
.../flink/table/plan/NormalizationRulesTest.scala | 0
.../flink/table/plan/QueryDecorrelationTest.scala | 0
.../flink/table/plan/RetractionRulesTest.scala | 0
.../flink/table/plan/RexProgramExtractorTest.scala | 0
.../flink/table/plan/RexProgramRewriterTest.scala | 0
.../flink/table/plan/RexProgramTestBase.scala | 0
.../table/plan/TimeIndicatorConversionTest.scala | 0
.../flink/table/plan/UpdatingPlanCheckerTest.scala | 0
.../runtime/aggfunctions/AggFunctionTestBase.scala | 0
.../runtime/aggfunctions/AvgFunctionTest.scala | 0
.../aggfunctions/CollectAggFunctionTest.scala | 0
.../aggfunctions/CountAggFunctionTest.scala | 0
.../CountAggFunctionWithNonParamTest.scala | 0
.../runtime/aggfunctions/MaxAggFunctionTest.scala | 0
.../MaxWithRetractAggFunctionTest.scala | 0
.../runtime/aggfunctions/MinAggFunctionTest.scala | 0
.../MinWithRetractAggFunctionTest.scala | 0
.../runtime/aggfunctions/Sum0AggFunctionTest.scala | 0
.../Sum0WithRetractAggFunctionTest.scala | 0
.../runtime/aggfunctions/SumAggFunctionTest.scala | 0
.../SumWithRetractAggFunctionTest.scala | 0
.../table/runtime/batch/sql/AggregateITCase.scala | 0
.../flink/table/runtime/batch/sql/CalcITCase.scala | 0
.../flink/table/runtime/batch/sql/JoinITCase.scala | 0
.../runtime/batch/sql/SetOperatorsITCase.scala | 0
.../flink/table/runtime/batch/sql/SortITCase.scala | 0
.../runtime/batch/sql/TableEnvironmentITCase.scala | 0
.../runtime/batch/sql/TableSourceITCase.scala | 0
.../runtime/batch/table/AggregateITCase.scala | 0
.../table/runtime/batch/table/CalcITCase.scala | 0
.../runtime/batch/table/CorrelateITCase.scala | 0
.../runtime/batch/table/GroupWindowITCase.scala | 0
.../table/runtime/batch/table/JoinITCase.scala | 0
.../runtime/batch/table/SetOperatorsITCase.scala | 0
.../table/runtime/batch/table/SortITCase.scala | 0
.../batch/table/TableEnvironmentITCase.scala | 0
.../runtime/batch/table/TableSinkITCase.scala | 0
.../runtime/batch/table/TableSourceITCase.scala | 0
...AbstractTwoInputStreamOperatorWithTTLTest.scala | 0
.../runtime/harness/AggFunctionHarnessTest.scala | 0
.../harness/GroupAggregateHarnessTest.scala | 0
.../table/runtime/harness/HarnessTestBase.scala | 0
.../table/runtime/harness/JoinHarnessTest.scala | 0
.../table/runtime/harness/MatchHarnessTest.scala | 0
.../runtime/harness/OverWindowHarnessTest.scala | 0
.../harness/SortProcessFunctionHarnessTest.scala | 0
.../StateCleaningCountTriggerHarnessTest.scala | 0
.../runtime/harness/TemporalJoinHarnessTest.scala | 0
...edCoProcessOperatorWithWatermarkDelayTest.scala | 0
.../KeyedProcessFunctionWithCleanupStateTest.scala | 0
...eyedProcessOperatorWithWatermarkDelayTest.scala | 0
.../ProcessFunctionWithCleanupStateTest.scala | 0
.../runtime/stream/TimeAttributesITCase.scala | 0
.../runtime/stream/sql/InsertIntoITCase.scala | 0
.../table/runtime/stream/sql/JoinITCase.scala | 0
.../runtime/stream/sql/MatchRecognizeITCase.scala | 0
.../runtime/stream/sql/OverWindowITCase.scala | 0
.../runtime/stream/sql/SetOperatorsITCase.scala | 0
.../table/runtime/stream/sql/SortITCase.scala | 0
.../flink/table/runtime/stream/sql/SqlITCase.scala | 0
.../runtime/stream/sql/TableSourceITCase.scala | 0
.../runtime/stream/sql/TemporalJoinITCase.scala | 0
.../runtime/stream/table/AggregateITCase.scala | 0
.../table/runtime/stream/table/CalcITCase.scala | 0
.../runtime/stream/table/CorrelateITCase.scala | 0
.../runtime/stream/table/GroupWindowITCase.scala | 0
.../table/runtime/stream/table/JoinITCase.scala | 0
.../runtime/stream/table/OverWindowITCase.scala | 0
.../runtime/stream/table/RetractionITCase.scala | 0
.../runtime/stream/table/SetOperatorsITCase.scala | 0
.../runtime/stream/table/TableSinkITCase.scala | 0
.../runtime/stream/table/TableSourceITCase.scala | 0
.../table/runtime/types/CRowComparatorTest.scala | 0
.../table/runtime/types/CRowSerializerTest.scala | 0
.../flink/table/runtime/utils/CommonTestData.scala | 0
.../flink/table/runtime/utils/SortTestUtils.scala | 0
.../flink/table/runtime/utils/StreamITCase.scala | 0
.../flink/table/runtime/utils/StreamTestData.scala | 0
.../runtime/utils/StreamingWithStateTestBase.scala | 0
.../utils/TableProgramsClusterTestBase.scala | 0
.../utils/TableProgramsCollectionTestBase.scala | 0
.../runtime/utils/TableProgramsTestBase.scala | 0
.../flink/table/runtime/utils/TimeTestUtil.scala | 0
.../utils/UserDefinedFunctionTestUtils.scala | 0
.../flink/table/typeutils/TypeCheckUtilsTest.scala | 0
.../flink/table/utils/InMemoryTableFactory.scala | 0
.../flink/table/utils/InputTypeBuilder.scala | 0
.../flink/table/utils/LogicalPlanFormatUtils.scala | 0
.../table/utils/MemoryTableSourceSinkUtil.scala | 0
.../flink/table/utils/MockTableEnvironment.scala | 0
.../apache/flink/table/utils/TableTestBase.scala | 0
.../table/utils/TestFilterableTableSource.scala | 0
.../table/utils/UserDefinedAggFunctions.scala | 0
.../table/utils/UserDefinedTableFunctions.scala | 0
.../flink/table/utils/testTableSources.scala | 0
.../src/test/scala/resources/testFilter0.out | 0
.../src/test/scala/resources/testFilter1.out | 0
.../src/test/scala/resources/testFilterStream0.out | 0
.../src/test/scala/resources/testJoin0.out | 0
.../src/test/scala/resources/testJoin1.out | 0
.../src/test/scala/resources/testUnion0.out | 0
.../src/test/scala/resources/testUnion1.out | 0
.../src/test/scala/resources/testUnionStream0.out | 0
flink-table/flink-table-uber/pom.xml | 103 +++++++++++++++++++++
.../flink-table-common => flink-table}/pom.xml | 41 +++-----
pom.xml | 3 +-
tools/travis/stage.sh | 8 +-
883 files changed, 460 insertions(+), 195 deletions(-)
diff --git a/docs/dev/table/index.md b/docs/dev/table/index.md
index 0b80801..b23619a 100644
--- a/docs/dev/table/index.md
+++ b/docs/dev/table/index.md
@@ -31,41 +31,78 @@ The Table API and the SQL interfaces are tightly integrated with each other as w
**Please note that the Table API and SQL are not yet feature complete and are being actively developed. Not all operations are supported by every combination of \[Table API, SQL\] and \[stream, batch\] input.**
-Setup
------
+Dependency Structure
+--------------------
-The Table API and SQL are bundled in the `flink-table` Maven artifact.
-The following dependency must be added to your project in order to use the Table API and SQL:
+All Table API and SQL components are bundled in the `flink-table` Maven artifact.
+
+The following dependencies are relevant for most projects:
+
+* `flink-table-common`: A common module for extending the table ecosystem by custom functions, formats, etc.
+* `flink-table-api-java`: The Table & SQL API for pure table programs using the Java programming language (in early development stage, not recommended!).
+* `flink-table-api-scala`: The Table & SQL API for pure table programs using the Scala programming language (in early development stage, not recommended!).
+* `flink-table-api-java-bridge`: The Table & SQL API with DataStream/DataSet API support using the Java programming language.
+* `flink-table-api-scala-bridge`: The Table & SQL API with DataStream/DataSet API support using the Scala programming language.
+* `flink-table-planner`: The table program planner and runtime.
+* `flink-table-uber`: Packages the modules above into a distribution for most Table & SQL API use cases. The uber JAR file `flink-table*.jar` is located in the `/opt` directory of a Flink release and can be moved to `/lib` if desired.
+
+### Table Program Dependencies
+
+The following dependencies must be added to a project in order to use the Table API & SQL for defining pipelines:
{% highlight xml %}
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table{{ site.scala_version_suffix }}</artifactId>
- <version>{{site.version }}</version>
+ <artifactId>flink-table-planner{{ site.scala_version_suffix }}</artifactId>
+ <version>{{site.version}}</version>
</dependency>
{% endhighlight %}
-In addition, you need to add a dependency for either Flink's Scala batch or streaming API. For a batch query you need to add:
+Additionally, depending on the target programming language, you need to add the Java or Scala API.
{% highlight xml %}
+<!-- Either... -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala{{ site.scala_version_suffix }}</artifactId>
- <version>{{site.version }}</version>
+ <artifactId>flink-table-api-java-bridge{{ site.scala_version_suffix }}</artifactId>
+ <version>{{site.version}}</version>
+</dependency>
+<!-- or... -->
+<dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-scala-bridge{{ site.scala_version_suffix }}</artifactId>
+ <version>{{site.version}}</version>
</dependency>
{% endhighlight %}
-For a streaming query you need to add:
+Internally, parts of the table ecosystem are implemented in Scala. Therefore, please make sure to add the following dependency for both batch and streaming applications:
{% highlight xml %}
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala{{ site.scala_version_suffix }}</artifactId>
- <version>{{site.version }}</version>
+ <version>{{site.version}}</version>
+</dependency>
+{% endhighlight %}
+
+### Extension Dependencies
+
+If you want to implement a [custom format](({{ site.baseurl }}/dev/table/sourceSinks.html#define-a-tablefactory)) for interacting with Kafka or a set of [user-defined functions]({{ site.baseurl }}/dev/table/functions.html), the following dependency is sufficient and can be used for JAR files for the SQL Client:
+
+{% highlight xml %}
+<dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-common</artifactId>
+ <version>{{site.version}}</version>
</dependency>
{% endhighlight %}
-**Note:** Due to an issue in Apache Calcite, which prevents the user classloaders from being garbage-collected, we do *not* recommend building a fat-jar that includes the `flink-table` dependency. Instead, we recommend configuring Flink to include the `flink-table` dependency in the system classloader. This can be done by copying the `flink-table.jar` file from the `./opt` folder to the `./lib` folder. See [these instructions]({{ site.baseurl }}/dev/linking.html) for further details.
+Currently, the module includes extension points for:
+- `SerializationSchemaFactory`
+- `DeserializationSchemaFactory`
+- `ScalarFunction`
+- `TableFunction`
+- `AggregateFunction`
{% top %}
@@ -80,4 +117,4 @@ Where to go next?
* [Built-in Functions]({{ site.baseurl }}/dev/table/functions.html): Supported functions in Table API and SQL.
* [SQL Client]({{ site.baseurl }}/dev/table/sqlClient.html): Play around with Flink SQL and submit a table program to a cluster without programming knowledge.
-{% top %}
+{% top %}
\ No newline at end of file
diff --git a/flink-connectors/flink-connector-cassandra/pom.xml b/flink-connectors/flink-connector-cassandra/pom.xml
index a3b27da..882e662 100644
--- a/flink-connectors/flink-connector-cassandra/pom.xml
+++ b/flink-connectors/flink-connector-cassandra/pom.xml
@@ -154,6 +154,26 @@ under the License.
<version>${guava.version}</version>
</dependency>
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- Test dependencies -->
+
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_${scala.binary.version}</artifactId>
@@ -196,11 +216,5 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
diff --git a/flink-connectors/flink-connector-elasticsearch-base/pom.xml b/flink-connectors/flink-connector-elasticsearch-base/pom.xml
index b70c0bc..ebd722a 100644
--- a/flink-connectors/flink-connector-elasticsearch-base/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch-base/pom.xml
@@ -70,13 +70,21 @@ under the License.
</exclusions>
</dependency>
- <!-- Used for the Elasticsearch table sink. -->
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <!-- Projects depending on this project, won't depend on flink-table. -->
<optional>true</optional>
</dependency>
@@ -108,7 +116,7 @@ under the License.
<!-- Elasticsearch table descriptor testing -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-elasticsearch6/pom.xml b/flink-connectors/flink-connector-elasticsearch6/pom.xml
index 4c79e89..b2a9886 100644
--- a/flink-connectors/flink-connector-elasticsearch6/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch6/pom.xml
@@ -84,13 +84,21 @@ under the License.
<version>2.9.1</version>
</dependency>
- <!-- Used for the Elasticsearch table sink. -->
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <!-- Projects depending on this project, won't depend on flink-table. -->
<optional>true</optional>
</dependency>
@@ -158,7 +166,7 @@ under the License.
<!-- Elasticsearch table descriptor testing -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kafka-0.10/pom.xml b/flink-connectors/flink-connector-kafka-0.10/pom.xml
index 8871d79..0336b31 100644
--- a/flink-connectors/flink-connector-kafka-0.10/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.10/pom.xml
@@ -77,12 +77,21 @@ under the License.
<version>${kafka.version}</version>
</dependency>
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <!-- Projects depending on this project, won't depend on flink-table. -->
<optional>true</optional>
</dependency>
@@ -166,7 +175,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kafka-0.11/pom.xml b/flink-connectors/flink-connector-kafka-0.11/pom.xml
index d44ab8d..70ff20a 100644
--- a/flink-connectors/flink-connector-kafka-0.11/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.11/pom.xml
@@ -77,12 +77,21 @@ under the License.
<version>${kafka.version}</version>
</dependency>
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <!-- Projects depending on this project, won't depend on flink-table. -->
<optional>true</optional>
</dependency>
@@ -174,7 +183,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kafka-0.8/pom.xml b/flink-connectors/flink-connector-kafka-0.8/pom.xml
index 7b36068..4bd9893 100644
--- a/flink-connectors/flink-connector-kafka-0.8/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.8/pom.xml
@@ -72,12 +72,21 @@ under the License.
</exclusions>
</dependency>
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <!-- Projects depending on this project, won't depend on flink-table. -->
<optional>true</optional>
</dependency>
@@ -182,7 +191,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kafka-0.9/pom.xml b/flink-connectors/flink-connector-kafka-0.9/pom.xml
index 3ac8554..840aa9a 100644
--- a/flink-connectors/flink-connector-kafka-0.9/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.9/pom.xml
@@ -67,12 +67,21 @@ under the License.
</exclusions>
</dependency>
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <!-- Projects depending on this project, won't depend on flink-table. -->
<optional>true</optional>
</dependency>
@@ -139,7 +148,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kafka-base/pom.xml b/flink-connectors/flink-connector-kafka-base/pom.xml
index 29d5d2e..4610376 100644
--- a/flink-connectors/flink-connector-kafka-base/pom.xml
+++ b/flink-connectors/flink-connector-kafka-base/pom.xml
@@ -57,12 +57,21 @@ under the License.
<scope>provided</scope>
</dependency>
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <!-- Projects depending on this project, won't depend on flink-table. -->
<optional>true</optional>
</dependency>
@@ -183,7 +192,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kafka/pom.xml b/flink-connectors/flink-connector-kafka/pom.xml
index 30f6a5f..09bb450 100644
--- a/flink-connectors/flink-connector-kafka/pom.xml
+++ b/flink-connectors/flink-connector-kafka/pom.xml
@@ -76,12 +76,21 @@ under the License.
<version>${kafka.version}</version>
</dependency>
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <!-- Projects depending on this project, won't depend on flink-table. -->
<optional>true</optional>
</dependency>
@@ -157,7 +166,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml
index 2692dc7..4505607 100644
--- a/flink-connectors/flink-hbase/pom.xml
+++ b/flink-connectors/flink-hbase/pom.xml
@@ -90,15 +90,21 @@ under the License.
<scope>provided</scope>
</dependency>
- <!-- table dependencies -->
-
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <!-- Projects depending on this project,
- won't depend on flink-table. -->
<optional>true</optional>
</dependency>
diff --git a/flink-connectors/flink-jdbc/pom.xml b/flink-connectors/flink-jdbc/pom.xml
index 4c53310..ae3db43 100644
--- a/flink-connectors/flink-jdbc/pom.xml
+++ b/flink-connectors/flink-jdbc/pom.xml
@@ -36,13 +36,21 @@ under the License.
<packaging>jar</packaging>
<dependencies>
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <!-- Projects depending on this project,
- won't depend on flink-table. -->
<optional>true</optional>
</dependency>
diff --git a/flink-connectors/flink-orc/pom.xml b/flink-connectors/flink-orc/pom.xml
index 4fcfe60..97da72c 100644
--- a/flink-connectors/flink-orc/pom.xml
+++ b/flink-connectors/flink-orc/pom.xml
@@ -45,12 +45,21 @@ under the License.
<scope>provided</scope>
</dependency>
+ <!-- Table ecosystem -->
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- A planner dependency won't be necessary once FLIP-32 has been completed. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <!-- Projects depending on this project, won't depend on flink-table. -->
<optional>true</optional>
</dependency>
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index c459928..6e59965 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -308,7 +308,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-uber_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
index 438321c..7dc73b4 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -95,14 +95,14 @@ under the License.
<!-- copy SQL client -->
<fileSet>
- <directory>../flink-libraries/flink-sql-client/bin/</directory>
+ <directory>../flink-table/flink-sql-client/bin/</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
<!-- copy SQL client configuration files -->
<fileSet>
- <directory>../flink-libraries/flink-sql-client/conf/</directory>
+ <directory>../flink-table/flink-sql-client/conf/</directory>
<outputDirectory>conf</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index aa18ef3..a877fd1 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -59,9 +59,9 @@
<fileMode>0644</fileMode>
</file>
- <!-- Table API-->
+ <!-- Table/SQL Uber JAR -->
<file>
- <source>../flink-libraries/flink-table/target/flink-table_${scala.binary.version}-${project.version}.jar</source>
+ <source>../flink-table/flink-table-uber/target/flink-table-uber_${scala.binary.version}-${project.version}.jar</source>
<outputDirectory>opt/</outputDirectory>
<destName>flink-table_${scala.binary.version}-${project.version}.jar</destName>
<fileMode>0644</fileMode>
@@ -69,7 +69,7 @@
<!-- SQL Client -->
<file>
- <source>../flink-libraries/flink-sql-client/target/flink-sql-client_${scala.binary.version}-${project.version}.jar</source>
+ <source>../flink-table/flink-sql-client/target/flink-sql-client_${scala.binary.version}-${project.version}.jar</source>
<outputDirectory>opt/</outputDirectory>
<destName>flink-sql-client_${scala.binary.version}-${project.version}.jar</destName>
<fileMode>0644</fileMode>
diff --git a/flink-end-to-end-tests/flink-stream-sql-test/pom.xml b/flink-end-to-end-tests/flink-stream-sql-test/pom.xml
index f7fc631..e153841 100644
--- a/flink-end-to-end-tests/flink-stream-sql-test/pom.xml
+++ b/flink-end-to-end-tests/flink-stream-sql-test/pom.xml
@@ -41,9 +41,17 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- Table ecosystem -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-examples/flink-examples-table/pom.xml b/flink-examples/flink-examples-table/pom.xml
index c01d464..8812eb1 100644
--- a/flink-examples/flink-examples-table/pom.xml
+++ b/flink-examples/flink-examples-table/pom.xml
@@ -35,9 +35,20 @@ under the License.
<dependencies>
+ <!-- Table ecosystem -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-scala-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/flink-formats/flink-avro/pom.xml b/flink-formats/flink-avro/pom.xml
index 34b6b7d..6217b4a 100644
--- a/flink-formats/flink-avro/pom.xml
+++ b/flink-formats/flink-avro/pom.xml
@@ -82,7 +82,13 @@ under the License.
<!-- TODO This could be dropped if we move the Table Avro IT Case -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -90,7 +96,7 @@ under the License.
<!-- TODO This could be dropped if we move the Table Avro IT Case -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
diff --git a/flink-formats/flink-json/pom.xml b/flink-formats/flink-json/pom.xml
index 43af92c..dd52836 100644
--- a/flink-formats/flink-json/pom.xml
+++ b/flink-formats/flink-json/pom.xml
@@ -77,7 +77,7 @@ under the License.
<!-- TODO This could be dropped if we change JsonRowFormatFactoryTest -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-libraries/pom.xml b/flink-libraries/pom.xml
index 3014aaf..88550d6 100644
--- a/flink-libraries/pom.xml
+++ b/flink-libraries/pom.xml
@@ -38,9 +38,6 @@ under the License.
<module>flink-gelly-scala</module>
<module>flink-gelly-examples</module>
<module>flink-python</module>
- <module>flink-table</module>
- <module>flink-table-common</module>
- <module>flink-sql-client</module>
<module>flink-ml</module>
<module>flink-cep</module>
<module>flink-cep-scala</module>
diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
index e7d3135..e3530f6 100644
--- a/flink-scala-shell/pom.xml
+++ b/flink-scala-shell/pom.xml
@@ -78,9 +78,16 @@ under the License.
<version>${scala.version}</version>
</dependency>
+ <!-- Table ecosystem -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-scala-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-libraries/flink-sql-client/bin/sql-client.sh b/flink-table/flink-sql-client/bin/sql-client.sh
similarity index 100%
rename from flink-libraries/flink-sql-client/bin/sql-client.sh
rename to flink-table/flink-sql-client/bin/sql-client.sh
diff --git a/flink-libraries/flink-sql-client/conf/sql-client-defaults.yaml b/flink-table/flink-sql-client/conf/sql-client-defaults.yaml
similarity index 100%
rename from flink-libraries/flink-sql-client/conf/sql-client-defaults.yaml
rename to flink-table/flink-sql-client/conf/sql-client-defaults.yaml
diff --git a/flink-libraries/flink-sql-client/pom.xml b/flink-table/flink-sql-client/pom.xml
similarity index 87%
rename from flink-libraries/flink-sql-client/pom.xml
rename to flink-table/flink-sql-client/pom.xml
index c47f702..28acd69 100644
--- a/flink-libraries/flink-sql-client/pom.xml
+++ b/flink-table/flink-sql-client/pom.xml
@@ -22,13 +22,17 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-libraries</artifactId>
+ <artifactId>flink-table</artifactId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-sql-client_${scala.binary.version}</artifactId>
<name>flink-sql-client</name>
+ <description>
+ This module contains the SQL Client for exploring and
+ submitting SQL programs to Flink.
+ </description>
<packaging>jar</packaging>
@@ -57,13 +61,19 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-cep_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- Table ecosystem -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-cep_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
@@ -140,9 +150,8 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.1</version>
<executions>
- <!-- Exclude all flink-dist files and only include flink-table and flink-sql-client -->
+ <!-- Exclude all flink-dist files -->
<execution>
<id>shade-flink</id>
<phase>package</phase>
@@ -152,7 +161,9 @@ under the License.
<configuration>
<artifactSet>
<includes combine.children="append">
- <include>org.apache.flink:flink-table_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-table-common</include>
+ <include>org.apache.flink:flink-table-api-java-bridge_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-table-planner_${scala.binary.version}</include>
<include>org.apache.flink:flink-cep_${scala.binary.version}</include>
<include>org.jline:*</include>
</includes>
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/SqlClient.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/SqlClient.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/SqlClient.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/SqlClient.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/SqlClientException.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/SqlClientException.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/SqlClientException.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/SqlClientException.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliChangelogResultView.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliChangelogResultView.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliChangelogResultView.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliChangelogResultView.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliClient.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliClient.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliClient.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliClient.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliInputView.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliInputView.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliInputView.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliInputView.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliOptions.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliOptions.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliOptions.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliOptions.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliOptionsParser.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliOptionsParser.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliOptionsParser.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliOptionsParser.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliResultView.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliResultView.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliResultView.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliResultView.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliRowView.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliRowView.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliRowView.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliRowView.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliTableResultView.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliTableResultView.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliTableResultView.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliTableResultView.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliUtils.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliUtils.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliUtils.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliUtils.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliView.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliView.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliView.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliView.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCommandParser.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCommandParser.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCommandParser.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCommandParser.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCompleter.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCompleter.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCompleter.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlCompleter.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlMultiLineParser.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlMultiLineParser.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlMultiLineParser.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/SqlMultiLineParser.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/ConfigUtil.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/ConfigUtil.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/ConfigUtil.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/ConfigUtil.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/Environment.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/Environment.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/Environment.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/Environment.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ConfigEntry.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ConfigEntry.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ConfigEntry.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ConfigEntry.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/DeploymentEntry.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/DeploymentEntry.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/DeploymentEntry.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/DeploymentEntry.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ExecutionEntry.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ExecutionEntry.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ExecutionEntry.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ExecutionEntry.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/FunctionEntry.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/FunctionEntry.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/FunctionEntry.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/FunctionEntry.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SinkTableEntry.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SinkTableEntry.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SinkTableEntry.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SinkTableEntry.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SourceSinkTableEntry.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SourceSinkTableEntry.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SourceSinkTableEntry.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SourceSinkTableEntry.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SourceTableEntry.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SourceTableEntry.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SourceTableEntry.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/SourceTableEntry.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/TableEntry.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/TableEntry.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/TableEntry.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/TableEntry.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/TemporalTableEntry.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/TemporalTableEntry.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/TemporalTableEntry.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/TemporalTableEntry.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ViewEntry.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ViewEntry.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ViewEntry.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/config/entries/ViewEntry.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/Executor.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/Executor.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/Executor.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/Executor.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/ProgramTargetDescriptor.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/ProgramTargetDescriptor.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/ProgramTargetDescriptor.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/ProgramTargetDescriptor.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/ResultDescriptor.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/ResultDescriptor.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/ResultDescriptor.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/ResultDescriptor.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/SessionContext.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/SessionContext.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/SessionContext.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/SessionContext.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/SqlExecutionException.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/SqlExecutionException.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/SqlExecutionException.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/SqlExecutionException.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/TypedResult.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/TypedResult.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/TypedResult.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/TypedResult.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/CollectBatchTableSink.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/CollectBatchTableSink.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/CollectBatchTableSink.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/CollectBatchTableSink.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/CollectStreamTableSink.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/CollectStreamTableSink.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/CollectStreamTableSink.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/CollectStreamTableSink.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/LocalExecutor.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/LocalExecutor.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/LocalExecutor.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/LocalExecutor.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ProgramDeployer.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ProgramDeployer.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ProgramDeployer.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ProgramDeployer.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ResultStore.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ResultStore.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ResultStore.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/ResultStore.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/BasicResult.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/BasicResult.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/BasicResult.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/BasicResult.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/ChangelogCollectStreamResult.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/ChangelogCollectStreamResult.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/ChangelogCollectStreamResult.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/ChangelogCollectStreamResult.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/ChangelogResult.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/ChangelogResult.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/ChangelogResult.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/ChangelogResult.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/CollectStreamResult.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/CollectStreamResult.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/CollectStreamResult.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/CollectStreamResult.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/DynamicResult.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/DynamicResult.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/DynamicResult.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/DynamicResult.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectBatchResult.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectBatchResult.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectBatchResult.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectBatchResult.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectStreamResult.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectStreamResult.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectStreamResult.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectStreamResult.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedResult.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedResult.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedResult.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/MaterializedResult.java
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/Result.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/Result.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/Result.java
rename to flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/gateway/local/result/Result.java
diff --git a/flink-libraries/flink-sql-client/src/main/resources/META-INF/NOTICE b/flink-table/flink-sql-client/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/resources/META-INF/NOTICE
rename to flink-table/flink-sql-client/src/main/resources/META-INF/NOTICE
diff --git a/flink-libraries/flink-sql-client/src/main/resources/META-INF/licenses/LICENSE.jline b/flink-table/flink-sql-client/src/main/resources/META-INF/licenses/LICENSE.jline
similarity index 100%
rename from flink-libraries/flink-sql-client/src/main/resources/META-INF/licenses/LICENSE.jline
rename to flink-table/flink-sql-client/src/main/resources/META-INF/licenses/LICENSE.jline
diff --git a/flink-libraries/flink-sql-client/src/test/assembly/test-table-factories.xml b/flink-table/flink-sql-client/src/test/assembly/test-table-factories.xml
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/assembly/test-table-factories.xml
rename to flink-table/flink-sql-client/src/test/assembly/test-table-factories.xml
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientTest.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientTest.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientTest.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientTest.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/SqlCommandParserTest.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/SqlCommandParserTest.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/SqlCommandParserTest.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/SqlCommandParserTest.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/DependencyTest.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/DependencyTest.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/DependencyTest.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/DependencyTest.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/EnvironmentTest.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/EnvironmentTest.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/EnvironmentTest.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/EnvironmentTest.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/ExecutionContextTest.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/ExecutionContextTest.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/ExecutionContextTest.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/ExecutionContextTest.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/LocalExecutorITCase.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectStreamResultTest.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectStreamResultTest.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectStreamResultTest.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/local/result/MaterializedCollectStreamResultTest.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/DummyTableSinkFactory.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/DummyTableSinkFactory.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/DummyTableSinkFactory.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/DummyTableSinkFactory.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/DummyTableSourceFactory.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/DummyTableSourceFactory.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/DummyTableSourceFactory.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/DummyTableSourceFactory.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/EnvironmentFileUtil.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/EnvironmentFileUtil.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/EnvironmentFileUtil.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/EnvironmentFileUtil.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/TestTableSinkFactoryBase.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/TestTableSinkFactoryBase.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/TestTableSinkFactoryBase.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/TestTableSinkFactoryBase.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/TestTableSourceFactoryBase.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/TestTableSourceFactoryBase.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/TestTableSourceFactoryBase.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/TestTableSourceFactoryBase.java
diff --git a/flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/UserDefinedFunctions.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/UserDefinedFunctions.java
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/UserDefinedFunctions.java
rename to flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/gateway/utils/UserDefinedFunctions.java
diff --git a/flink-libraries/flink-sql-client/src/test/resources/META-INF/services/org.apache.flink.table.factories.TableFactory b/flink-table/flink-sql-client/src/test/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
rename to flink-table/flink-sql-client/src/test/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
diff --git a/flink-libraries/flink-table/src/test/resources/log4j-test.properties b/flink-table/flink-sql-client/src/test/resources/log4j-test.properties
similarity index 100%
rename from flink-libraries/flink-table/src/test/resources/log4j-test.properties
rename to flink-table/flink-sql-client/src/test/resources/log4j-test.properties
diff --git a/flink-libraries/flink-sql-client/src/test/resources/test-data.csv b/flink-table/flink-sql-client/src/test/resources/test-data.csv
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/resources/test-data.csv
rename to flink-table/flink-sql-client/src/test/resources/test-data.csv
diff --git a/flink-libraries/flink-sql-client/src/test/resources/test-factory-services-file b/flink-table/flink-sql-client/src/test/resources/test-factory-services-file
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/resources/test-factory-services-file
rename to flink-table/flink-sql-client/src/test/resources/test-factory-services-file
diff --git a/flink-libraries/flink-sql-client/src/test/resources/test-sql-client-defaults.yaml b/flink-table/flink-sql-client/src/test/resources/test-sql-client-defaults.yaml
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/resources/test-sql-client-defaults.yaml
rename to flink-table/flink-sql-client/src/test/resources/test-sql-client-defaults.yaml
diff --git a/flink-libraries/flink-sql-client/src/test/resources/test-sql-client-factory.yaml b/flink-table/flink-sql-client/src/test/resources/test-sql-client-factory.yaml
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/resources/test-sql-client-factory.yaml
rename to flink-table/flink-sql-client/src/test/resources/test-sql-client-factory.yaml
diff --git a/flink-libraries/flink-sql-client/src/test/resources/test-sql-client-streaming.yaml b/flink-table/flink-sql-client/src/test/resources/test-sql-client-streaming.yaml
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/resources/test-sql-client-streaming.yaml
rename to flink-table/flink-sql-client/src/test/resources/test-sql-client-streaming.yaml
diff --git a/flink-connectors/flink-jdbc/pom.xml b/flink-table/flink-table-api-java-bridge/pom.xml
similarity index 75%
copy from flink-connectors/flink-jdbc/pom.xml
copy to flink-table/flink-table-api-java-bridge/pom.xml
index 4c53310..0353a8e 100644
--- a/flink-connectors/flink-jdbc/pom.xml
+++ b/flink-table/flink-table-api-java-bridge/pom.xml
@@ -7,9 +7,7 @@ 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
@@ -18,46 +16,41 @@ specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connectors</artifactId>
+ <artifactId>flink-table</artifactId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-jdbc_${scala.binary.version}</artifactId>
- <name>flink-jdbc</name>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <name>flink-table-api-java-bridge</name>
+ <description>
+ This module contains the Table/SQL API for writing table programs
+ that interact with other Flink APIs using the Java programming language.
+ </description>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
- <!-- Projects depending on this project,
- won't depend on flink-table. -->
- <optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-java</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.14.2.0</version>
- <scope>test</scope>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/flink-libraries/flink-table-common/pom.xml b/flink-table/flink-table-api-java/pom.xml
similarity index 72%
copy from flink-libraries/flink-table-common/pom.xml
copy to flink-table/flink-table-api-java/pom.xml
index fac1745..4ae3b6f 100644
--- a/flink-libraries/flink-table-common/pom.xml
+++ b/flink-table/flink-table-api-java/pom.xml
@@ -22,37 +22,25 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-libraries</artifactId>
+ <artifactId>flink-table</artifactId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-table-common</artifactId>
- <name>flink-table-common</name>
+ <artifactId>flink-table-api-java</artifactId>
+ <name>flink-table-api-java</name>
+ <description>
+ This module contains the Table/SQL API for writing table programs
+ within the table ecosystem using the Java programming language.
+ </description>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <artifactId>flink-table-common</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/flink-connectors/flink-jdbc/pom.xml b/flink-table/flink-table-api-scala-bridge/pom.xml
similarity index 70%
copy from flink-connectors/flink-jdbc/pom.xml
copy to flink-table/flink-table-api-scala-bridge/pom.xml
index 4c53310..9a4a08e 100644
--- a/flink-connectors/flink-jdbc/pom.xml
+++ b/flink-table/flink-table-api-scala-bridge/pom.xml
@@ -7,9 +7,7 @@ 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
@@ -18,46 +16,41 @@ specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connectors</artifactId>
+ <artifactId>flink-table</artifactId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-jdbc_${scala.binary.version}</artifactId>
- <name>flink-jdbc</name>
+ <artifactId>flink-table-api-scala-bridge_${scala.binary.version}</artifactId>
+ <name>flink-table-api-scala-bridge</name>
+ <description>
+ This module contains the Table/SQL API for writing table programs
+ that interact with other Flink APIs using the Scala programming language.
+ </description>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-scala_${scala.binary.version}</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
- <!-- Projects depending on this project,
- won't depend on flink-table. -->
- <optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_${scala.binary.version}</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.14.2.0</version>
- <scope>test</scope>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/flink-connectors/flink-jdbc/pom.xml b/flink-table/flink-table-api-scala/pom.xml
similarity index 71%
copy from flink-connectors/flink-jdbc/pom.xml
copy to flink-table/flink-table-api-scala/pom.xml
index 4c53310..edac789 100644
--- a/flink-connectors/flink-jdbc/pom.xml
+++ b/flink-table/flink-table-api-scala/pom.xml
@@ -7,9 +7,7 @@ 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
@@ -18,46 +16,36 @@ specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-connectors</artifactId>
+ <artifactId>flink-table</artifactId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-jdbc_${scala.binary.version}</artifactId>
- <name>flink-jdbc</name>
+ <artifactId>flink-table-api-scala_${scala.binary.version}</artifactId>
+ <name>flink-table-api-scala</name>
+ <description>
+ This module contains the Table/SQL API for writing table programs
+ within the table ecosystem using the Scala programming language.
+ </description>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-common</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
- <!-- Projects depending on this project,
- won't depend on flink-table. -->
- <optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.14.2.0</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/flink-libraries/flink-table-common/pom.xml b/flink-table/flink-table-common/pom.xml
similarity index 86%
copy from flink-libraries/flink-table-common/pom.xml
copy to flink-table/flink-table-common/pom.xml
index fac1745..09672f6 100644
--- a/flink-libraries/flink-table-common/pom.xml
+++ b/flink-table/flink-table-common/pom.xml
@@ -22,13 +22,18 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-libraries</artifactId>
+ <artifactId>flink-table</artifactId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flink-table-common</artifactId>
<name>flink-table-common</name>
+ <description>
+ This module contains extension points of the Table/SQL API.
+ It allows for implementing user-defined functions, custom
+ formats, etc. with minimal dependencies.
+ </description>
<packaging>jar</packaging>
@@ -36,7 +41,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/api/TableException.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/TableException.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/api/TableException.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/TableException.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/api/TableSchema.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/TableSchema.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/api/TableSchema.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/TableSchema.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/api/ValidationException.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/ValidationException.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/api/ValidationException.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/ValidationException.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/ConnectorDescriptor.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/ConnectorDescriptor.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/ConnectorDescriptor.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/ConnectorDescriptor.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/ConnectorDescriptorValidator.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/ConnectorDescriptorValidator.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/ConnectorDescriptorValidator.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/ConnectorDescriptorValidator.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/Descriptor.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/Descriptor.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/Descriptor.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/Descriptor.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorBase.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorBase.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorBase.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorBase.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorProperties.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorProperties.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorProperties.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorProperties.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorValidator.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorValidator.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorValidator.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/DescriptorValidator.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/FormatDescriptor.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/FormatDescriptor.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/FormatDescriptor.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/FormatDescriptor.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/FormatDescriptorValidator.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/FormatDescriptorValidator.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/descriptors/FormatDescriptorValidator.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/descriptors/FormatDescriptorValidator.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/factories/DeserializationSchemaFactory.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/DeserializationSchemaFactory.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/factories/DeserializationSchemaFactory.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/DeserializationSchemaFactory.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/factories/SerializationSchemaFactory.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/SerializationSchemaFactory.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/factories/SerializationSchemaFactory.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/SerializationSchemaFactory.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFactory.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFactory.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFactory.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFactory.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFormatFactory.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFormatFactory.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFormatFactory.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFormatFactory.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFormatFactoryBase.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFormatFactoryBase.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFormatFactoryBase.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/TableFormatFactoryBase.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/functions/AggregateFunction.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/AggregateFunction.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/functions/AggregateFunction.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/AggregateFunction.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/functions/FunctionContext.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/FunctionContext.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/functions/FunctionContext.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/FunctionContext.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/functions/ScalarFunction.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/ScalarFunction.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/functions/ScalarFunction.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/ScalarFunction.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/functions/TableFunction.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/TableFunction.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/functions/TableFunction.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/TableFunction.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/functions/UserDefinedFunction.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/UserDefinedFunction.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/functions/UserDefinedFunction.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/UserDefinedFunction.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/utils/EncodingUtils.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/utils/EncodingUtils.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/utils/EncodingUtils.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/utils/EncodingUtils.java
diff --git a/flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/utils/TypeStringUtils.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/utils/TypeStringUtils.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/main/java/org/apache/flink/table/utils/TypeStringUtils.java
rename to flink-table/flink-table-common/src/main/java/org/apache/flink/table/utils/TypeStringUtils.java
diff --git a/flink-libraries/flink-table-common/src/test/java/org/apache/flink/table/descriptors/DescriptorTestBase.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/descriptors/DescriptorTestBase.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/test/java/org/apache/flink/table/descriptors/DescriptorTestBase.java
rename to flink-table/flink-table-common/src/test/java/org/apache/flink/table/descriptors/DescriptorTestBase.java
diff --git a/flink-libraries/flink-table-common/src/test/java/org/apache/flink/table/factories/TableFormatFactoryBaseTest.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/factories/TableFormatFactoryBaseTest.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/test/java/org/apache/flink/table/factories/TableFormatFactoryBaseTest.java
rename to flink-table/flink-table-common/src/test/java/org/apache/flink/table/factories/TableFormatFactoryBaseTest.java
diff --git a/flink-libraries/flink-table-common/src/test/java/org/apache/flink/table/utils/EncodingUtilsTest.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/utils/EncodingUtilsTest.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/test/java/org/apache/flink/table/utils/EncodingUtilsTest.java
rename to flink-table/flink-table-common/src/test/java/org/apache/flink/table/utils/EncodingUtilsTest.java
diff --git a/flink-libraries/flink-table-common/src/test/java/org/apache/flink/table/utils/TypeStringUtilsTest.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/utils/TypeStringUtilsTest.java
similarity index 100%
rename from flink-libraries/flink-table-common/src/test/java/org/apache/flink/table/utils/TypeStringUtilsTest.java
rename to flink-table/flink-table-common/src/test/java/org/apache/flink/table/utils/TypeStringUtilsTest.java
diff --git a/flink-libraries/flink-table/pom.xml b/flink-table/flink-table-planner/pom.xml
similarity index 92%
rename from flink-libraries/flink-table/pom.xml
rename to flink-table/flink-table-planner/pom.xml
index 1fe5a09..f9063bb 100644
--- a/flink-libraries/flink-table/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -22,13 +22,18 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-libraries</artifactId>
+ <artifactId>flink-table</artifactId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-table_${scala.binary.version}</artifactId>
- <name>flink-table</name>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <name>flink-table-planner</name>
+ <description>
+ This module bridges Table/SQL API and runtime. It contains
+ all resources that are required during pre-flight and runtime
+ phase.
+ </description>
<packaging>jar</packaging>
@@ -46,7 +51,7 @@ under the License.
<artifactId>commons-compiler</artifactId>
<version>3.0.7</version>
</dependency>
- <!-- Common dependency of calcite-core and flink-table -->
+ <!-- Common dependency of calcite-core and flink-table-planner -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
@@ -67,6 +72,19 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
@@ -238,7 +256,7 @@ under the License.
<filter>
<artifact>*:*</artifact>
<excludes>
- <!-- excluded all these files for a clean flink-table jar -->
+ <!-- excluded all these files for a clean flink-table-planner jar -->
<exclude>org-apache-calcite-jdbc.properties</exclude>
<exclude>common.proto</exclude>
<exclude>requests.proto</exclude>
@@ -268,8 +286,7 @@ under the License.
<include>net.hydromatic:*</include>
<include>com.esri.geometry:*</include>
- <!-- flink-table dependencies -->
- <include>org.apache.flink:flink-table-common</include>
+ <!-- flink-table-planner dependencies -->
<include>org.codehaus.janino:*</include>
<include>joda-time:*</include>
</includes>
diff --git a/flink-libraries/flink-table/src/main/java/org/apache/calcite/avatica/util/DateTimeUtils.java b/flink-table/flink-table-planner/src/main/java/org/apache/calcite/avatica/util/DateTimeUtils.java
similarity index 100%
rename from flink-libraries/flink-table/src/main/java/org/apache/calcite/avatica/util/DateTimeUtils.java
rename to flink-table/flink-table-planner/src/main/java/org/apache/calcite/avatica/util/DateTimeUtils.java
diff --git a/flink-libraries/flink-table/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java b/flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
similarity index 100%
rename from flink-libraries/flink-table/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
rename to flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
diff --git a/flink-libraries/flink-table/src/main/java/org/apache/calcite/sql2rel/AuxiliaryConverter.java b/flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql2rel/AuxiliaryConverter.java
similarity index 100%
rename from flink-libraries/flink-table/src/main/java/org/apache/calcite/sql2rel/AuxiliaryConverter.java
rename to flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql2rel/AuxiliaryConverter.java
diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/table/api/java/package-info.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/api/java/package-info.java
similarity index 100%
rename from flink-libraries/flink-table/src/main/java/org/apache/flink/table/api/java/package-info.java
rename to flink-table/flink-table-planner/src/main/java/org/apache/flink/table/api/java/package-info.java
diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/table/dataview/ListViewSerializerSnapshot.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/dataview/ListViewSerializerSnapshot.java
similarity index 100%
rename from flink-libraries/flink-table/src/main/java/org/apache/flink/table/dataview/ListViewSerializerSnapshot.java
rename to flink-table/flink-table-planner/src/main/java/org/apache/flink/table/dataview/ListViewSerializerSnapshot.java
diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/table/dataview/MapViewSerializerSnapshot.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/dataview/MapViewSerializerSnapshot.java
similarity index 100%
rename from flink-libraries/flink-table/src/main/java/org/apache/flink/table/dataview/MapViewSerializerSnapshot.java
rename to flink-table/flink-table-planner/src/main/java/org/apache/flink/table/dataview/MapViewSerializerSnapshot.java
diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/Node.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/explain/Node.java
similarity index 100%
rename from flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/Node.java
rename to flink-table/flink-table-planner/src/main/java/org/apache/flink/table/explain/Node.java
diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/PlanJsonParser.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/explain/PlanJsonParser.java
similarity index 100%
rename from flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/PlanJsonParser.java
rename to flink-table/flink-table-planner/src/main/java/org/apache/flink/table/explain/PlanJsonParser.java
diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/table/runtime/types/CRowSerializerSnapshot.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/runtime/types/CRowSerializerSnapshot.java
similarity index 100%
rename from flink-libraries/flink-table/src/main/java/org/apache/flink/table/runtime/types/CRowSerializerSnapshot.java
rename to flink-table/flink-table-planner/src/main/java/org/apache/flink/table/runtime/types/CRowSerializerSnapshot.java
diff --git a/flink-libraries/flink-table/src/main/resources/META-INF/NOTICE b/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
similarity index 97%
rename from flink-libraries/flink-table/src/main/resources/META-INF/NOTICE
rename to flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
index 54a2535..f661ee1 100644
--- a/flink-libraries/flink-table/src/main/resources/META-INF/NOTICE
+++ b/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-flink-table
+flink-table-planner
Copyright 2014-2018 The Apache Software Foundation
This product includes software developed at
diff --git a/flink-libraries/flink-table/src/main/resources/META-INF/licenses/LICENSE.janino b/flink-table/flink-table-planner/src/main/resources/META-INF/licenses/LICENSE.janino
similarity index 100%
rename from flink-libraries/flink-table/src/main/resources/META-INF/licenses/LICENSE.janino
rename to flink-table/flink-table-planner/src/main/resources/META-INF/licenses/LICENSE.janino
diff --git a/flink-libraries/flink-table/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory b/flink-table/flink-table-planner/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
similarity index 100%
rename from flink-libraries/flink-table/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
rename to flink-table/flink-table-planner/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/BatchTableEnvironment.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/BatchTableEnvironment.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/BatchTableEnvironment.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/BatchTableEnvironment.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/StreamTableEnvironment.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/StreamTableEnvironment.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/StreamTableEnvironment.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/StreamTableEnvironment.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/TableConfig.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/TableConfig.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/TableConfig.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/TableConfig.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/TableEnvironment.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/TableEnvironment.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/TableEnvironment.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/TableEnvironment.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/Types.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/Types.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/Types.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/Types.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/dataview/DataView.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/dataview/DataView.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/dataview/DataView.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/dataview/DataView.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/dataview/DataViewSpec.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/dataview/DataViewSpec.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/dataview/DataViewSpec.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/dataview/DataViewSpec.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/dataview/ListView.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/dataview/ListView.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/dataview/ListView.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/dataview/ListView.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/dataview/MapView.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/dataview/MapView.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/dataview/MapView.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/dataview/MapView.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/exceptions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/exceptions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/exceptions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/exceptions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/windows.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/java/windows.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/windows.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/java/windows.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/package.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/package.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/package.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/package.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/queryConfig.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/queryConfig.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/queryConfig.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/queryConfig.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataSetConversions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/DataSetConversions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataSetConversions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/DataSetConversions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/TableFunctionConversions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/TableFunctionConversions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/TableFunctionConversions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/TableFunctionConversions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/expressionDsl.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/expressionDsl.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/expressionDsl.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/expressionDsl.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/package.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/package.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/package.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/package.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/windows.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/windows.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/windows.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/scala/windows.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/table.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/table.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/table.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/table.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/windows.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/windows.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/windows.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/windows.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/CalciteConfig.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/CalciteConfig.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/CalciteConfig.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/CalciteConfig.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkCalciteSqlValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkCalciteSqlValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkCalciteSqlValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkCalciteSqlValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkPlannerImpl.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkPlannerImpl.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkPlannerImpl.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkPlannerImpl.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkRelBuilder.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkRelBuilder.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkRelBuilder.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkRelBuilder.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkRelOptClusterFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkRelOptClusterFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkRelOptClusterFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkRelOptClusterFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkTypeFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkTypeFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkTypeFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkTypeFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkTypeSystem.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkTypeSystem.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkTypeSystem.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/FlinkTypeSystem.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/RelTimeIndicatorConverter.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/RelTimeIndicatorConverter.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/RelTimeIndicatorConverter.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/calcite/RelTimeIndicatorConverter.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/CrudExternalCatalog.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/CrudExternalCatalog.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/CrudExternalCatalog.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/CrudExternalCatalog.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalCatalog.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/ExternalCatalog.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalCatalog.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/ExternalCatalog.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogSchema.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogSchema.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogSchema.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogSchema.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogTable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogTable.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogTable.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogTable.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalTableUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/ExternalTableUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalTableUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/ExternalTableUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/InMemoryExternalCatalog.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/InMemoryExternalCatalog.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/InMemoryExternalCatalog.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/catalog/InMemoryExternalCatalog.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/AggregationCodeGenerator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/AggregationCodeGenerator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/AggregationCodeGenerator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/AggregationCodeGenerator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenException.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/CodeGenException.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenException.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/CodeGenException.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenUtils.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/CodeGenUtils.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenUtils.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/CodeGenUtils.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CollectorCodeGenerator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/CollectorCodeGenerator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CollectorCodeGenerator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/CollectorCodeGenerator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/Compiler.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/Compiler.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/Compiler.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/Compiler.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/ExpressionReducer.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/ExpressionReducer.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/ExpressionReducer.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/ExpressionReducer.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/FunctionCodeGenerator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/FunctionCodeGenerator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/FunctionCodeGenerator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/FunctionCodeGenerator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/Indenter.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/Indenter.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/Indenter.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/Indenter.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/InputFormatCodeGenerator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/InputFormatCodeGenerator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/InputFormatCodeGenerator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/InputFormatCodeGenerator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/MatchCodeGenerator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/MatchCodeGenerator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/MatchCodeGenerator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/MatchCodeGenerator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/BuiltInMethods.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/BuiltInMethods.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/BuiltInMethods.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/BuiltInMethods.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/CallGenerator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/CallGenerator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/CallGenerator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/CallGenerator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ConstantCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ConstantCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ConstantCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ConstantCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/CurrentTimePointCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/CurrentTimePointCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/CurrentTimePointCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/CurrentTimePointCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/DateFormatCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/DateFormatCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/DateFormatCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/DateFormatCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ExtractCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ExtractCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ExtractCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ExtractCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FloorCeilCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/FloorCeilCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FloorCeilCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/FloorCeilCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FunctionGenerator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/FunctionGenerator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FunctionGenerator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/FunctionGenerator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/HashCalcCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/HashCalcCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/HashCalcCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/HashCalcCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/MethodCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/MethodCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/MethodCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/MethodCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/MultiTypeMethodCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/MultiTypeMethodCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/MultiTypeMethodCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/MultiTypeMethodCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/NotCallGenerator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/NotCallGenerator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/NotCallGenerator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/NotCallGenerator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/RandCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/RandCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/RandCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/RandCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarFunctionCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ScalarFunctionCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarFunctionCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ScalarFunctionCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TableFunctionCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/TableFunctionCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TableFunctionCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/TableFunctionCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TimestampDiffCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/TimestampDiffCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TimestampDiffCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/TimestampDiffCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TrimCallGen.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/TrimCallGen.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TrimCallGen.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/calls/TrimCallGen.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/generated.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/generated.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/generated.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/generated.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/package.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/package.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/package.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/codegen/package.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/ListViewSerializer.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/ListViewSerializer.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/ListViewSerializer.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/ListViewSerializer.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/ListViewTypeInfo.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/ListViewTypeInfo.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/ListViewTypeInfo.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/ListViewTypeInfo.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/ListViewTypeInfoFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/ListViewTypeInfoFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/ListViewTypeInfoFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/ListViewTypeInfoFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/MapViewSerializer.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/MapViewSerializer.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/MapViewSerializer.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/MapViewSerializer.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/MapViewTypeInfo.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/MapViewTypeInfo.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/MapViewTypeInfo.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/MapViewTypeInfo.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/MapViewTypeInfoFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/MapViewTypeInfoFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/MapViewTypeInfoFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/MapViewTypeInfoFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/StateListView.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/StateListView.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/StateListView.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/StateListView.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/StateMapView.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/StateMapView.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/dataview/StateMapView.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/dataview/StateMapView.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/BatchTableDescriptor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/BatchTableDescriptor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/BatchTableDescriptor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/BatchTableDescriptor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/ClassInstance.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/ClassInstance.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/ClassInstance.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/ClassInstance.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/ClassInstanceValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/ClassInstanceValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/ClassInstanceValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/ClassInstanceValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/ConnectTableDescriptor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/ConnectTableDescriptor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/ConnectTableDescriptor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/ConnectTableDescriptor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/Csv.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/Csv.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/Csv.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/Csv.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/CsvValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/CsvValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/CsvValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/CsvValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/FileSystem.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/FileSystem.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/FileSystem.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/FileSystem.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/FileSystemValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/FileSystemValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/FileSystemValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/FileSystemValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/FunctionDescriptor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/FunctionDescriptor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/FunctionDescriptor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/FunctionDescriptor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/FunctionDescriptorValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/FunctionDescriptorValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/FunctionDescriptorValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/FunctionDescriptorValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/HierarchyDescriptor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/HierarchyDescriptor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/HierarchyDescriptor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/HierarchyDescriptor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/HierarchyDescriptorValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/HierarchyDescriptorValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/HierarchyDescriptorValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/HierarchyDescriptorValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/LiteralValue.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/LiteralValue.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/LiteralValue.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/LiteralValue.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/LiteralValueValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/LiteralValueValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/LiteralValueValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/LiteralValueValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/Metadata.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/Metadata.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/Metadata.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/Metadata.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/MetadataValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/MetadataValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/MetadataValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/MetadataValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/RegistrableDescriptor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/RegistrableDescriptor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/RegistrableDescriptor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/RegistrableDescriptor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/Rowtime.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/Rowtime.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/Rowtime.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/Rowtime.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/RowtimeValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/RowtimeValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/RowtimeValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/RowtimeValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/Schema.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/Schema.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/Schema.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/Schema.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/SchemaValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/SchemaValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/SchemaValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/SchemaValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/SchematicDescriptor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/SchematicDescriptor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/SchematicDescriptor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/SchematicDescriptor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/Statistics.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/Statistics.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/Statistics.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/Statistics.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/StatisticsValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/StatisticsValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/StatisticsValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/StatisticsValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/StreamTableDescriptor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/StreamTableDescriptor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/StreamTableDescriptor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/StreamTableDescriptor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/StreamTableDescriptorValidator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/StreamTableDescriptorValidator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/StreamTableDescriptorValidator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/StreamTableDescriptorValidator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/StreamableDescriptor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/StreamableDescriptor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/StreamableDescriptor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/StreamableDescriptor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/TableDescriptor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/TableDescriptor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/descriptors/TableDescriptor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/descriptors/TableDescriptor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/Expression.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/Expression.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/Expression.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/Expression.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionParser.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/ExpressionParser.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionParser.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/ExpressionParser.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionUtils.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/ExpressionUtils.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionUtils.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/ExpressionUtils.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/InputTypeSpec.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/InputTypeSpec.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/InputTypeSpec.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/InputTypeSpec.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/UDAGGExpression.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/UDAGGExpression.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/UDAGGExpression.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/UDAGGExpression.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/aggregations.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/aggregations.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/aggregations.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/aggregations.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/arithmetic.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/arithmetic.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/arithmetic.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/arithmetic.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/call.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/call.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/cast.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/cast.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/cast.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/cast.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/collection.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/collection.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/collection.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/collection.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/comparison.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/comparison.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/comparison.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/comparison.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/composite.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/composite.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/composite.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/composite.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/fieldExpression.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/fieldExpression.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/fieldExpression.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/fieldExpression.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/hashExpressions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/hashExpressions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/hashExpressions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/hashExpressions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/literals.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/literals.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/literals.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/literals.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/logic.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/logic.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/logic.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/logic.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/mathExpressions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/mathExpressions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/mathExpressions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/mathExpressions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ordering.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/ordering.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ordering.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/ordering.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/package.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/package.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/package.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/package.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/stringExpressions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/stringExpressions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/stringExpressions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/stringExpressions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/subquery.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/subquery.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/subquery.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/subquery.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/symbols.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/symbols.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/symbols.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/symbols.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/time.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/time.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/time.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/time.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/windowProperties.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/windowProperties.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/windowProperties.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/windowProperties.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/BatchTableSinkFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/BatchTableSinkFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/BatchTableSinkFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/BatchTableSinkFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/BatchTableSourceFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/BatchTableSourceFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/BatchTableSourceFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/BatchTableSourceFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/StreamTableSinkFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/StreamTableSinkFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/StreamTableSinkFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/StreamTableSinkFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/StreamTableSourceFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/StreamTableSourceFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/StreamTableSourceFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/StreamTableSourceFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/TableFactoryService.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/TableFactoryService.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/TableFactoryService.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/TableFactoryService.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/TableFactoryUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/TableFactoryUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/TableFactoryUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/factories/TableFactoryUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/DistinctAggregateFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/DistinctAggregateFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/DistinctAggregateFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/DistinctAggregateFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/FunctionService.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/FunctionService.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/FunctionService.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/FunctionService.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/TemporalTableFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/TemporalTableFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/TemporalTableFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/TemporalTableFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/AvgAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/AvgAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/AvgAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/AvgAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/CollectAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/CollectAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/CollectAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/CollectAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/CountAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/CountAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/CountAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/CountAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/DistinctAccumulator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/DistinctAccumulator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/DistinctAccumulator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/DistinctAccumulator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/MaxAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/MaxAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/MaxAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/MaxAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/MaxAggFunctionWithRetract.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/MaxAggFunctionWithRetract.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/MaxAggFunctionWithRetract.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/MaxAggFunctionWithRetract.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/MinAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/MinAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/MinAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/MinAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/MinAggFunctionWithRetract.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/MinAggFunctionWithRetract.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/MinAggFunctionWithRetract.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/MinAggFunctionWithRetract.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/Ordering.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/Ordering.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/Ordering.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/Ordering.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/Sum0AggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/Sum0AggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/Sum0AggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/Sum0AggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/Sum0WithRetractAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/Sum0WithRetractAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/Sum0WithRetractAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/Sum0WithRetractAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/SumAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/SumAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/SumAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/SumAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/SumWithRetractAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/SumWithRetractAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/aggfunctions/SumWithRetractAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/aggfunctions/SumWithRetractAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/sql/ProctimeSqlFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/sql/ProctimeSqlFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/sql/ProctimeSqlFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/sql/ProctimeSqlFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/sql/ScalarSqlFunctions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/sql/ScalarSqlFunctions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/sql/ScalarSqlFunctions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/sql/ScalarSqlFunctions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/sql/StreamRecordTimestampSqlFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/sql/StreamRecordTimestampSqlFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/sql/StreamRecordTimestampSqlFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/sql/StreamRecordTimestampSqlFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/AggSqlFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/utils/AggSqlFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/AggSqlFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/utils/AggSqlFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/ScalarSqlFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/utils/ScalarSqlFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/ScalarSqlFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/utils/ScalarSqlFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/TableSqlFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/utils/TableSqlFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/TableSqlFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/utils/TableSqlFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/UserDefinedFunctionUtils.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/utils/UserDefinedFunctionUtils.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/UserDefinedFunctionUtils.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/functions/utils/UserDefinedFunctionUtils.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/ProjectionTranslator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/ProjectionTranslator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/ProjectionTranslator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/ProjectionTranslator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/TreeNode.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/TreeNode.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/TreeNode.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/TreeNode.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/DataSetCost.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/cost/DataSetCost.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/DataSetCost.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/cost/DataSetCost.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/DataSetCostFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/cost/DataSetCostFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/DataSetCostFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/cost/DataSetCostFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/FlinkDefaultRelMetadataProvider.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/cost/FlinkDefaultRelMetadataProvider.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/FlinkDefaultRelMetadataProvider.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/cost/FlinkDefaultRelMetadataProvider.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/FlinkRelMdRowCount.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/cost/FlinkRelMdRowCount.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/FlinkRelMdRowCount.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/cost/FlinkRelMdRowCount.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalNode.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/LogicalNode.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalNode.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/LogicalNode.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalWindow.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/LogicalWindow.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalWindow.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/LogicalWindow.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/MatchRecognize.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/MatchRecognize.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/MatchRecognize.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/MatchRecognize.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/Resolvable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/Resolvable.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/Resolvable.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/Resolvable.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/groupWindows.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/groupWindows.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/groupWindows.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/groupWindows.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/operators.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/operators.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/operators.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/operators.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalTemporalTableJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalTemporalTableJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalTemporalTableJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalTemporalTableJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalWindowAggregate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalWindowAggregate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalWindowAggregate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalWindowAggregate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonAggregate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonAggregate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonAggregate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonAggregate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonCalc.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonCalc.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonCalc.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonCalc.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonCorrelate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonCorrelate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonCorrelate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonCorrelate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonMatchRecognize.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonMatchRecognize.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonMatchRecognize.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonMatchRecognize.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonSort.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonSort.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonSort.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/CommonSort.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkConventions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/FlinkConventions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkConventions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/FlinkConventions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkRelNode.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/FlinkRelNode.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkRelNode.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/FlinkRelNode.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/OverAggregate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/OverAggregate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/OverAggregate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/OverAggregate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/PhysicalTableSourceScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/PhysicalTableSourceScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/PhysicalTableSourceScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/PhysicalTableSourceScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchTableSourceScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchTableSourceScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchTableSourceScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchTableSourceScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetAggregate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetAggregate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetAggregate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetAggregate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCalc.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCalc.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCalc.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCalc.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCorrelate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCorrelate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCorrelate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCorrelate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetDistinct.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetDistinct.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetDistinct.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetDistinct.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetIntersect.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetIntersect.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetIntersect.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetIntersect.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetMinus.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetMinus.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetMinus.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetMinus.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetRel.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetRel.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetRel.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetRel.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSingleRowJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSingleRowJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSingleRowJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSingleRowJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSort.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSort.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSort.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSort.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetUnion.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetUnion.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetUnion.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetUnion.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetValues.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetValues.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetValues.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetValues.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetWindowAggregate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetWindowAggregate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetWindowAggregate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetWindowAggregate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCalc.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCalc.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCalc.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCalc.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCorrelate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCorrelate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCorrelate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCorrelate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupAggregate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupAggregate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupAggregate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupAggregate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupWindowAggregate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupWindowAggregate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupWindowAggregate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamGroupWindowAggregate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamJoinToCoProcessTranslator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamJoinToCoProcessTranslator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamJoinToCoProcessTranslator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamJoinToCoProcessTranslator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamMatch.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamMatch.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamMatch.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamMatch.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamOverAggregate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamOverAggregate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamOverAggregate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamOverAggregate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamRel.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamRel.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamRel.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamRel.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamSort.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamSort.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamSort.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamSort.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamTemporalJoinToCoProcessTranslator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamTemporalJoinToCoProcessTranslator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamTemporalJoinToCoProcessTranslator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamTemporalJoinToCoProcessTranslator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamTemporalTableJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamTemporalTableJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamTemporalTableJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamTemporalTableJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamUnion.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamUnion.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamUnion.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamUnion.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamValues.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamValues.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamValues.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamValues.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamWindowJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamWindowJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamWindowJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamWindowJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamTableSourceScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamTableSourceScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamTableSourceScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamTableSourceScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/retractionTraitDefs.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/retractionTraitDefs.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/retractionTraitDefs.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/retractionTraitDefs.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/retractionTraits.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/retractionTraits.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/retractionTraits.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/datastream/retractionTraits.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalAggregate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalAggregate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalAggregate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalAggregate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalCalc.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalCalc.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalCalc.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalCalc.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalCorrelate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalCorrelate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalCorrelate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalCorrelate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalIntersect.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalIntersect.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalIntersect.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalIntersect.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalJoinBase.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalJoinBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalJoinBase.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalJoinBase.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalMatch.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalMatch.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalMatch.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalMatch.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalMinus.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalMinus.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalMinus.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalMinus.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalNativeTableScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalNativeTableScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalNativeTableScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalNativeTableScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalOverWindow.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalOverWindow.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalOverWindow.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalOverWindow.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalRel.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalRel.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalRel.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalRel.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalSort.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalSort.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalSort.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalSort.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableFunctionScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableFunctionScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableFunctionScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableFunctionScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableSourceScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableSourceScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableSourceScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableSourceScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTemporalTableJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTemporalTableJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTemporalTableJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTemporalTableJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalUnion.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalUnion.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalUnion.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalUnion.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalValues.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalValues.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalValues.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalValues.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalWindowAggregate.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalWindowAggregate.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalWindowAggregate.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalWindowAggregate.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/FlinkRuleSets.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/FlinkRuleSets.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/FlinkRuleSets.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/FlinkRuleSets.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/common/ConvertToNotInOrInRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/common/ConvertToNotInOrInRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/common/ConvertToNotInOrInRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/common/ConvertToNotInOrInRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/common/LogicalWindowAggregateRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/common/LogicalWindowAggregateRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/common/LogicalWindowAggregateRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/common/LogicalWindowAggregateRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/common/WindowAggregateReduceFunctionsRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/common/WindowAggregateReduceFunctionsRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/common/WindowAggregateReduceFunctionsRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/common/WindowAggregateReduceFunctionsRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/common/WindowPropertiesRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/common/WindowPropertiesRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/common/WindowPropertiesRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/common/WindowPropertiesRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/BatchTableSourceScanRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/BatchTableSourceScanRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/BatchTableSourceScanRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/BatchTableSourceScanRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetAggregateRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetAggregateRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetAggregateRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetAggregateRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCalcRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCalcRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCalcRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCalcRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCorrelateRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCorrelateRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCorrelateRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCorrelateRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetDistinctRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetDistinctRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetDistinctRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetDistinctRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetIntersectRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetIntersectRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetIntersectRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetIntersectRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetJoinRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetJoinRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetJoinRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetJoinRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetLogicalWindowAggregateRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetLogicalWindowAggregateRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetLogicalWindowAggregateRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetLogicalWindowAggregateRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetMinusRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetMinusRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetMinusRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetMinusRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetScanRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetScanRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetScanRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetScanRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSingleRowJoinRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSingleRowJoinRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSingleRowJoinRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSingleRowJoinRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSortRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSortRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSortRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSortRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetUnionRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetUnionRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetUnionRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetUnionRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetValuesRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetValuesRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetValuesRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetValuesRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetWindowAggregateRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetWindowAggregateRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetWindowAggregateRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetWindowAggregateRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCalcRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCalcRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCalcRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCalcRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCorrelateRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCorrelateRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCorrelateRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCorrelateRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupAggregateRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupAggregateRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupAggregateRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupAggregateRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupWindowAggregateRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupWindowAggregateRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupWindowAggregateRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamGroupWindowAggregateRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamJoinRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamJoinRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamJoinRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamJoinRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamLogicalWindowAggregateRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamLogicalWindowAggregateRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamLogicalWindowAggregateRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamLogicalWindowAggregateRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamMatchRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamMatchRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamMatchRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamMatchRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamOverAggregateRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamOverAggregateRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamOverAggregateRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamOverAggregateRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamRetractionRules.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamRetractionRules.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamRetractionRules.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamRetractionRules.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamScanRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamScanRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamScanRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamScanRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamSortRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamSortRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamSortRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamSortRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamTemporalTableJoinRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamTemporalTableJoinRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamTemporalTableJoinRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamTemporalTableJoinRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamUnionRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamUnionRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamUnionRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamUnionRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamValuesRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamValuesRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamValuesRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamValuesRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamWindowJoinRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamWindowJoinRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamWindowJoinRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamWindowJoinRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/StreamTableSourceScanRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/StreamTableSourceScanRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/StreamTableSourceScanRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/datastream/StreamTableSourceScanRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/DecomposeGroupingSetRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/DecomposeGroupingSetRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/DecomposeGroupingSetRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/DecomposeGroupingSetRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/EnumerableToLogicalTableScan.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/EnumerableToLogicalTableScan.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/EnumerableToLogicalTableScan.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/EnumerableToLogicalTableScan.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/LogicalCorrelateToTemporalTableJoinRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/LogicalCorrelateToTemporalTableJoinRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/LogicalCorrelateToTemporalTableJoinRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/LogicalCorrelateToTemporalTableJoinRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/LogicalUnnestRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/LogicalUnnestRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/LogicalUnnestRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/LogicalUnnestRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/PushFilterIntoTableSourceScanRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/PushFilterIntoTableSourceScanRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/PushFilterIntoTableSourceScanRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/PushFilterIntoTableSourceScanRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/PushProjectIntoTableSourceScanRule.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/PushProjectIntoTableSourceScanRule.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/logical/PushProjectIntoTableSourceScanRule.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/rules/logical/PushProjectIntoTableSourceScanRule.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/ArrayRelDataType.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/ArrayRelDataType.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/ArrayRelDataType.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/ArrayRelDataType.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/BatchTableSourceTable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/BatchTableSourceTable.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/BatchTableSourceTable.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/BatchTableSourceTable.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/CompositeRelDataType.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/CompositeRelDataType.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/CompositeRelDataType.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/CompositeRelDataType.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/DataSetTable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/DataSetTable.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/DataSetTable.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/DataSetTable.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/DataStreamTable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/DataStreamTable.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/DataStreamTable.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/DataStreamTable.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTableFunctionImpl.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/FlinkTableFunctionImpl.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTableFunctionImpl.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/FlinkTableFunctionImpl.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/GenericRelDataType.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/GenericRelDataType.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/GenericRelDataType.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/GenericRelDataType.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/InlineTable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/InlineTable.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/InlineTable.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/InlineTable.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/MapRelDataType.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/MapRelDataType.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/MapRelDataType.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/MapRelDataType.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/MultisetRelDataType.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/MultisetRelDataType.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/MultisetRelDataType.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/MultisetRelDataType.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/RelTable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/RelTable.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/RelTable.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/RelTable.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/RowSchema.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/RowSchema.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/RowSchema.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/RowSchema.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/StreamTableSourceTable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/StreamTableSourceTable.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/StreamTableSourceTable.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/StreamTableSourceTable.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/TableSinkTable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/TableSinkTable.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/TableSinkTable.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/TableSinkTable.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/TableSourceSinkTable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/TableSourceSinkTable.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/TableSourceSinkTable.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/TableSourceSinkTable.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/TableSourceTable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/TableSourceTable.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/TableSourceTable.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/TableSourceTable.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/TimeIndicatorRelDataType.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/TimeIndicatorRelDataType.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/TimeIndicatorRelDataType.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/schema/TimeIndicatorRelDataType.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/stats/ColumnStats.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/stats/ColumnStats.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/stats/ColumnStats.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/stats/ColumnStats.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/stats/FlinkStatistic.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/stats/FlinkStatistic.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/stats/FlinkStatistic.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/stats/FlinkStatistic.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/stats/TableStats.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/stats/TableStats.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/stats/TableStats.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/stats/TableStats.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/CorrelateUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/CorrelateUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/CorrelateUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/CorrelateUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/ExplodeFunctionUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/ExplodeFunctionUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/ExplodeFunctionUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/ExplodeFunctionUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/RexDefaultVisitor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/RexDefaultVisitor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/RexDefaultVisitor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/RexDefaultVisitor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/RexProgramExtractor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/RexProgramExtractor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/RexProgramExtractor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/RexProgramExtractor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/RexProgramRewriter.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/RexProgramRewriter.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/RexProgramRewriter.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/RexProgramRewriter.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/UpdatingPlanChecker.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/UpdatingPlanChecker.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/util/UpdatingPlanChecker.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/plan/util/UpdatingPlanChecker.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowCorrelateProcessRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowCorrelateProcessRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowCorrelateProcessRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowCorrelateProcessRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowKeySelector.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowKeySelector.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowKeySelector.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowKeySelector.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowMapRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowMapRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowMapRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowMapRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowOutputProcessRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowOutputProcessRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowOutputProcessRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowOutputProcessRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowProcessRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowProcessRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowProcessRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowProcessRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowWrappingCollector.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowWrappingCollector.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowWrappingCollector.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CRowWrappingCollector.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CorrelateFlatMapRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CorrelateFlatMapRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CorrelateFlatMapRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CorrelateFlatMapRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CountPartitionFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CountPartitionFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CountPartitionFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/CountPartitionFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatJoinRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/FlatJoinRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatJoinRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/FlatJoinRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatMapRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/FlatMapRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatMapRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/FlatMapRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/IntersectCoGroupFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/IntersectCoGroupFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/IntersectCoGroupFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/IntersectCoGroupFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/LimitFilterFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/LimitFilterFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/LimitFilterFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/LimitFilterFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapJoinLeftRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/MapJoinLeftRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapJoinLeftRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/MapJoinLeftRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapJoinRightRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/MapJoinRightRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapJoinRightRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/MapJoinRightRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/MapRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/MapRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapSideJoinRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/MapSideJoinRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapSideJoinRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/MapSideJoinRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MinusCoGroupFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/MinusCoGroupFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MinusCoGroupFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/MinusCoGroupFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/OutputRowtimeProcessFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/OutputRowtimeProcessFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/OutputRowtimeProcessFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/OutputRowtimeProcessFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/RowKeySelector.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/RowKeySelector.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/RowKeySelector.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/RowKeySelector.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/RowtimeProcessFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/RowtimeProcessFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/RowtimeProcessFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/RowtimeProcessFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/TableFunctionCollector.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/TableFunctionCollector.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/TableFunctionCollector.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/TableFunctionCollector.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/CleanupState.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/CleanupState.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/CleanupState.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/CleanupState.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/CoProcessFunctionWithCleanupState.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/CoProcessFunctionWithCleanupState.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/CoProcessFunctionWithCleanupState.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/CoProcessFunctionWithCleanupState.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetFinalAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetFinalAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetFinalAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetFinalAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetPreAggFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetPreAggFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetPreAggFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetPreAggFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSessionWindowAggReduceGroupFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSessionWindowAggReduceGroupFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSessionWindowAggReduceGroupFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSessionWindowAggReduceGroupFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSessionWindowAggregatePreProcessor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSessionWindowAggregatePreProcessor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSessionWindowAggregatePreProcessor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSessionWindowAggregatePreProcessor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggFlatMapFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggFlatMapFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggFlatMapFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggFlatMapFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggReduceGroupFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggReduceGroupFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggReduceGroupFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggReduceGroupFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideWindowAggReduceCombineFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideWindowAggReduceCombineFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideWindowAggReduceCombineFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideWindowAggReduceCombineFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideWindowAggReduceGroupFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideWindowAggReduceGroupFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideWindowAggReduceGroupFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideWindowAggReduceGroupFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleCountWindowAggReduceGroupFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleCountWindowAggReduceGroupFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleCountWindowAggReduceGroupFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleCountWindowAggReduceGroupFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleTimeWindowAggReduceCombineFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleTimeWindowAggReduceCombineFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleTimeWindowAggReduceCombineFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleTimeWindowAggReduceCombineFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleTimeWindowAggReduceGroupFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleTimeWindowAggReduceGroupFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleTimeWindowAggReduceGroupFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetTumbleTimeWindowAggReduceGroupFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetWindowAggMapFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetWindowAggMapFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetWindowAggMapFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetWindowAggMapFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DistinctReduce.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DistinctReduce.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DistinctReduce.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/DistinctReduce.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/GeneratedAggregations.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/GeneratedAggregations.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/GeneratedAggregations.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/GeneratedAggregations.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/GroupAggProcessFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/GroupAggProcessFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/GroupAggProcessFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/GroupAggProcessFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllTimeWindowFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllTimeWindowFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllTimeWindowFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllTimeWindowFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllWindowFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllWindowFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllWindowFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllWindowFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateTimeWindowFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateTimeWindowFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateTimeWindowFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateTimeWindowFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateWindowFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateWindowFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateWindowFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateWindowFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/KeyedProcessFunctionWithCleanupState.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/KeyedProcessFunctionWithCleanupState.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/KeyedProcessFunctionWithCleanupState.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/KeyedProcessFunctionWithCleanupState.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeSortProcessFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeSortProcessFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeSortProcessFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeSortProcessFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedOver.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedOver.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedOver.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedOver.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcessFunctionWithCleanupState.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcessFunctionWithCleanupState.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcessFunctionWithCleanupState.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcessFunctionWithCleanupState.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeSortProcessFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeSortProcessFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeSortProcessFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeSortProcessFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/SortUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/SortUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/SortUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/SortUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/TimeWindowPropertyCollector.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/TimeWindowPropertyCollector.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/TimeWindowPropertyCollector.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/aggregate/TimeWindowPropertyCollector.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToJavaTupleMapFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToJavaTupleMapFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToJavaTupleMapFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToJavaTupleMapFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToJavaTupleMapRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToJavaTupleMapRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToJavaTupleMapRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToJavaTupleMapRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToRowMapFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToRowMapFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToRowMapFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToRowMapFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToScalaTupleMapFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToScalaTupleMapFunction.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToScalaTupleMapFunction.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToScalaTupleMapFunction.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToScalaTupleMapRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToScalaTupleMapRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToScalaTupleMapRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/conversion/CRowToScalaTupleMapRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/functions/DateTimeFunctions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/functions/DateTimeFunctions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/functions/DateTimeFunctions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/functions/DateTimeFunctions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/functions/ScalarFunctions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/functions/ScalarFunctions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/functions/ScalarFunctions.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/functions/ScalarFunctions.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/functions/ThreadLocalCache.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/functions/ThreadLocalCache.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/functions/ThreadLocalCache.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/functions/ThreadLocalCache.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/io/CRowValuesInputFormat.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/io/CRowValuesInputFormat.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/io/CRowValuesInputFormat.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/io/CRowValuesInputFormat.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/io/ValuesInputFormat.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/io/ValuesInputFormat.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/io/ValuesInputFormat.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/io/ValuesInputFormat.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/BaseTwoInputStreamOperatorWithStateRetention.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/BaseTwoInputStreamOperatorWithStateRetention.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/BaseTwoInputStreamOperatorWithStateRetention.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/BaseTwoInputStreamOperatorWithStateRetention.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/CRowWrappingMultiOutputCollector.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/CRowWrappingMultiOutputCollector.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/CRowWrappingMultiOutputCollector.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/CRowWrappingMultiOutputCollector.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/CountingCollector.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/CountingCollector.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/CountingCollector.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/CountingCollector.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/EmitAwareCollector.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/EmitAwareCollector.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/EmitAwareCollector.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/EmitAwareCollector.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowFullJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowFullJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowFullJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowFullJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowFullJoinWithNonEquiPredicates.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowFullJoinWithNonEquiPredicates.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowFullJoinWithNonEquiPredicates.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowFullJoinWithNonEquiPredicates.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowInnerJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowInnerJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowInnerJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowInnerJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowLeftRightJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowLeftRightJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowLeftRightJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowLeftRightJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowLeftRightJoinWithNonEquiPredicates.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowLeftRightJoinWithNonEquiPredicates.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowLeftRightJoinWithNonEquiPredicates.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowLeftRightJoinWithNonEquiPredicates.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowOuterJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowOuterJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowOuterJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowOuterJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowOuterJoinWithNonEquiPredicates.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowOuterJoinWithNonEquiPredicates.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowOuterJoinWithNonEquiPredicates.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/NonWindowOuterJoinWithNonEquiPredicates.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/OuterJoinPaddingUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/OuterJoinPaddingUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/OuterJoinPaddingUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/OuterJoinPaddingUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/ProcTimeBoundedStreamJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/ProcTimeBoundedStreamJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/ProcTimeBoundedStreamJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/ProcTimeBoundedStreamJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/RowTimeBoundedStreamJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/RowTimeBoundedStreamJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/RowTimeBoundedStreamJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/RowTimeBoundedStreamJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalProcessTimeJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/TemporalProcessTimeJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalProcessTimeJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/TemporalProcessTimeJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalRowtimeJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/TemporalRowtimeJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalRowtimeJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/TemporalRowtimeJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TimeBoundedStreamJoin.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/TimeBoundedStreamJoin.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TimeBoundedStreamJoin.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/TimeBoundedStreamJoin.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/WindowJoinUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/WindowJoinUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/WindowJoinUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/join/WindowJoinUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/EventRowComparator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/match/EventRowComparator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/EventRowComparator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/match/EventRowComparator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/IterativeConditionRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/match/IterativeConditionRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/IterativeConditionRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/match/IterativeConditionRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/PatternProcessFunctionRunner.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/match/PatternProcessFunctionRunner.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/PatternProcessFunctionRunner.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/match/PatternProcessFunctionRunner.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/operators/KeyedCoProcessOperatorWithWatermarkDelay.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/operators/KeyedCoProcessOperatorWithWatermarkDelay.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/operators/KeyedCoProcessOperatorWithWatermarkDelay.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/operators/KeyedCoProcessOperatorWithWatermarkDelay.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/operators/KeyedProcessOperatorWithWatermarkDelay.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/operators/KeyedProcessOperatorWithWatermarkDelay.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/operators/KeyedProcessOperatorWithWatermarkDelay.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/operators/KeyedProcessOperatorWithWatermarkDelay.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinGroupReduceRunners.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/outerJoinGroupReduceRunners.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinGroupReduceRunners.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/outerJoinGroupReduceRunners.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinRunners.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/outerJoinRunners.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinRunners.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/outerJoinRunners.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/triggers/StateCleaningCountTrigger.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/triggers/StateCleaningCountTrigger.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/triggers/StateCleaningCountTrigger.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/triggers/StateCleaningCountTrigger.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/types/CRow.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/types/CRow.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/types/CRow.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/types/CRow.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/types/CRowComparator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/types/CRowComparator.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/types/CRowComparator.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/types/CRowComparator.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/types/CRowSerializer.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/types/CRowSerializer.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/types/CRowSerializer.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/types/CRowSerializer.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/types/CRowTypeInfo.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/types/CRowTypeInfo.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/types/CRowTypeInfo.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/runtime/types/CRowTypeInfo.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/AppendStreamTableSink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/AppendStreamTableSink.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/AppendStreamTableSink.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/AppendStreamTableSink.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/BatchTableSink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/BatchTableSink.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/BatchTableSink.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/BatchTableSink.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/CsvAppendTableSinkFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/CsvAppendTableSinkFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/CsvAppendTableSinkFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/CsvAppendTableSinkFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/CsvBatchTableSinkFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/CsvBatchTableSinkFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/CsvBatchTableSinkFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/CsvBatchTableSinkFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/CsvTableSink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/CsvTableSink.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/CsvTableSink.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/CsvTableSink.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/CsvTableSinkFactoryBase.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/CsvTableSinkFactoryBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/CsvTableSinkFactoryBase.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/CsvTableSinkFactoryBase.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/RetractStreamTableSink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/RetractStreamTableSink.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/RetractStreamTableSink.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/RetractStreamTableSink.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/StreamTableSink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/StreamTableSink.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/StreamTableSink.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/StreamTableSink.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/TableSink.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSink.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/TableSink.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSinkBase.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/TableSinkBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSinkBase.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/TableSinkBase.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/UpsertStreamTableSink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/UpsertStreamTableSink.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/UpsertStreamTableSink.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sinks/UpsertStreamTableSink.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/BatchTableSource.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/BatchTableSource.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/BatchTableSource.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/BatchTableSource.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/CsvAppendTableSourceFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/CsvAppendTableSourceFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/CsvAppendTableSourceFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/CsvAppendTableSourceFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/CsvBatchTableSourceFactory.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/CsvBatchTableSourceFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/CsvBatchTableSourceFactory.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/CsvBatchTableSourceFactory.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/CsvTableSource.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/CsvTableSource.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/CsvTableSource.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/CsvTableSource.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/CsvTableSourceFactoryBase.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/CsvTableSourceFactoryBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/CsvTableSourceFactoryBase.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/CsvTableSourceFactoryBase.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/DefinedFieldMapping.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/DefinedFieldMapping.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/DefinedFieldMapping.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/DefinedFieldMapping.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/FieldComputer.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/FieldComputer.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/FieldComputer.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/FieldComputer.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/FilterableTableSource.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/FilterableTableSource.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/FilterableTableSource.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/FilterableTableSource.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/NestedFieldsProjectableTableSource.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/NestedFieldsProjectableTableSource.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/NestedFieldsProjectableTableSource.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/NestedFieldsProjectableTableSource.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/ProjectableTableSource.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/ProjectableTableSource.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/ProjectableTableSource.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/ProjectableTableSource.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/StreamTableSource.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/StreamTableSource.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/StreamTableSource.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/StreamTableSource.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/TableSource.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/TableSource.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/TableSource.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/TableSource.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/TableSourceUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/TableSourceUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/TableSourceUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/TableSourceUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/definedTimeAttributes.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/definedTimeAttributes.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/definedTimeAttributes.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/definedTimeAttributes.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/tsextractors/ExistingField.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/tsextractors/ExistingField.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/tsextractors/ExistingField.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/tsextractors/ExistingField.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/tsextractors/StreamRecordTimestamp.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/tsextractors/StreamRecordTimestamp.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/tsextractors/StreamRecordTimestamp.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/tsextractors/StreamRecordTimestamp.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/tsextractors/TimestampExtractor.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/tsextractors/TimestampExtractor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/tsextractors/TimestampExtractor.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/tsextractors/TimestampExtractor.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/wmstrategies/AscendingTimestamps.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/wmstrategies/AscendingTimestamps.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/wmstrategies/AscendingTimestamps.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/wmstrategies/AscendingTimestamps.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/wmstrategies/BoundedOutOfOrderTimestamps.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/wmstrategies/BoundedOutOfOrderTimestamps.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/wmstrategies/BoundedOutOfOrderTimestamps.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/wmstrategies/BoundedOutOfOrderTimestamps.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/wmstrategies/watermarkStrategies.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/wmstrategies/watermarkStrategies.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/wmstrategies/watermarkStrategies.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/sources/wmstrategies/watermarkStrategies.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/InternalTypeInfo.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/InternalTypeInfo.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/InternalTypeInfo.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/InternalTypeInfo.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowIntervalTypeInfo.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/RowIntervalTypeInfo.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowIntervalTypeInfo.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/RowIntervalTypeInfo.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TimeIndicatorTypeInfo.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/TimeIndicatorTypeInfo.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TimeIndicatorTypeInfo.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/TimeIndicatorTypeInfo.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TimeIntervalTypeInfo.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/TimeIntervalTypeInfo.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TimeIntervalTypeInfo.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/TimeIntervalTypeInfo.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeCheckUtils.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/TypeCheckUtils.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeCheckUtils.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/TypeCheckUtils.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeCoercion.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/TypeCoercion.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeCoercion.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/typeutils/TypeCoercion.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/util/JavaScalaConversionUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/JavaScalaConversionUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/util/JavaScalaConversionUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/JavaScalaConversionUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/util/Logging.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/Logging.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/util/Logging.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/Logging.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/util/MatchUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/MatchUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/util/MatchUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/MatchUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/util/TableConnectorUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/TableConnectorUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/util/TableConnectorUtil.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/TableConnectorUtil.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/FunctionCatalog.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/validate/FunctionCatalog.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/FunctionCatalog.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/validate/FunctionCatalog.scala
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/ValidationResult.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/validate/ValidationResult.scala
similarity index 100%
rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/ValidationResult.scala
rename to flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/validate/ValidationResult.scala
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/dataview/ListViewSerializerSnapshotMigrationTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/dataview/ListViewSerializerSnapshotMigrationTest.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/dataview/ListViewSerializerSnapshotMigrationTest.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/dataview/ListViewSerializerSnapshotMigrationTest.java
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/dataview/MapViewSerializerSnapshotMigrationTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/dataview/MapViewSerializerSnapshotMigrationTest.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/dataview/MapViewSerializerSnapshotMigrationTest.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/dataview/MapViewSerializerSnapshotMigrationTest.java
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/batch/JavaTableSourceITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/JavaTableSourceITCase.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/batch/JavaTableSourceITCase.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/JavaTableSourceITCase.java
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/batch/sql/GroupingSetsITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/sql/GroupingSetsITCase.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/batch/sql/GroupingSetsITCase.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/sql/GroupingSetsITCase.java
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/batch/sql/JavaSqlITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/sql/JavaSqlITCase.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/batch/sql/JavaSqlITCase.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/sql/JavaSqlITCase.java
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/stream/sql/JavaSqlITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/stream/sql/JavaSqlITCase.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/stream/sql/JavaSqlITCase.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/stream/sql/JavaSqlITCase.java
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/utils/JavaPojos.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/utils/JavaPojos.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/utils/JavaPojos.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/utils/JavaPojos.java
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/utils/JavaStreamTestData.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/utils/JavaStreamTestData.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/utils/JavaStreamTestData.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/utils/JavaStreamTestData.java
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedAggFunctions.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedAggFunctions.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedAggFunctions.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedAggFunctions.java
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedScalarFunctions.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedScalarFunctions.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedScalarFunctions.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedScalarFunctions.java
diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedTableFunctions.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedTableFunctions.java
similarity index 100%
rename from flink-libraries/flink-table/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedTableFunctions.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/utils/JavaUserDefinedTableFunctions.java
diff --git a/flink-libraries/flink-table/src/test/resources/META-INF/services/org.apache.flink.table.factories.TableFactory b/flink-table/flink-table-planner/src/test/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
similarity index 100%
rename from flink-libraries/flink-table/src/test/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
rename to flink-table/flink-table-planner/src/test/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
diff --git a/flink-libraries/flink-table/src/test/resources/flink-1.6-list-view-serializer-data b/flink-table/flink-table-planner/src/test/resources/flink-1.6-list-view-serializer-data
similarity index 100%
rename from flink-libraries/flink-table/src/test/resources/flink-1.6-list-view-serializer-data
rename to flink-table/flink-table-planner/src/test/resources/flink-1.6-list-view-serializer-data
diff --git a/flink-libraries/flink-table/src/test/resources/flink-1.6-list-view-serializer-snapshot b/flink-table/flink-table-planner/src/test/resources/flink-1.6-list-view-serializer-snapshot
similarity index 100%
rename from flink-libraries/flink-table/src/test/resources/flink-1.6-list-view-serializer-snapshot
rename to flink-table/flink-table-planner/src/test/resources/flink-1.6-list-view-serializer-snapshot
diff --git a/flink-libraries/flink-table/src/test/resources/flink-1.6-map-view-serializer-data b/flink-table/flink-table-planner/src/test/resources/flink-1.6-map-view-serializer-data
similarity index 100%
rename from flink-libraries/flink-table/src/test/resources/flink-1.6-map-view-serializer-data
rename to flink-table/flink-table-planner/src/test/resources/flink-1.6-map-view-serializer-data
diff --git a/flink-libraries/flink-table/src/test/resources/flink-1.6-map-view-serializer-snapshot b/flink-table/flink-table-planner/src/test/resources/flink-1.6-map-view-serializer-snapshot
similarity index 100%
rename from flink-libraries/flink-table/src/test/resources/flink-1.6-map-view-serializer-snapshot
rename to flink-table/flink-table-planner/src/test/resources/flink-1.6-map-view-serializer-snapshot
diff --git a/flink-libraries/flink-table/src/test/resources/flink-1.7-list-view-serializer-data b/flink-table/flink-table-planner/src/test/resources/flink-1.7-list-view-serializer-data
similarity index 100%
rename from flink-libraries/flink-table/src/test/resources/flink-1.7-list-view-serializer-data
rename to flink-table/flink-table-planner/src/test/resources/flink-1.7-list-view-serializer-data
diff --git a/flink-libraries/flink-table/src/test/resources/flink-1.7-list-view-serializer-snapshot b/flink-table/flink-table-planner/src/test/resources/flink-1.7-list-view-serializer-snapshot
similarity index 100%
rename from flink-libraries/flink-table/src/test/resources/flink-1.7-list-view-serializer-snapshot
rename to flink-table/flink-table-planner/src/test/resources/flink-1.7-list-view-serializer-snapshot
diff --git a/flink-libraries/flink-table/src/test/resources/flink-1.7-map-view-serializer-data b/flink-table/flink-table-planner/src/test/resources/flink-1.7-map-view-serializer-data
similarity index 100%
rename from flink-libraries/flink-table/src/test/resources/flink-1.7-map-view-serializer-data
rename to flink-table/flink-table-planner/src/test/resources/flink-1.7-map-view-serializer-data
diff --git a/flink-libraries/flink-table/src/test/resources/flink-1.7-map-view-serializer-snapshot b/flink-table/flink-table-planner/src/test/resources/flink-1.7-map-view-serializer-snapshot
similarity index 100%
rename from flink-libraries/flink-table/src/test/resources/flink-1.7-map-view-serializer-snapshot
rename to flink-table/flink-table-planner/src/test/resources/flink-1.7-map-view-serializer-snapshot
diff --git a/flink-libraries/flink-sql-client/src/test/resources/log4j-test.properties b/flink-table/flink-table-planner/src/test/resources/log4j-test.properties
similarity index 100%
rename from flink-libraries/flink-sql-client/src/test/resources/log4j-test.properties
rename to flink-table/flink-table-planner/src/test/resources/log4j-test.properties
diff --git a/flink-libraries/flink-table/src/test/resources/logback-test.xml b/flink-table/flink-table-planner/src/test/resources/logback-test.xml
similarity index 100%
rename from flink-libraries/flink-table/src/test/resources/logback-test.xml
rename to flink-table/flink-table-planner/src/test/resources/logback-test.xml
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/ExternalCatalogInsertTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/ExternalCatalogInsertTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/ExternalCatalogInsertTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/ExternalCatalogInsertTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/ExternalCatalogTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/ExternalCatalogTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/ExternalCatalogTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/ExternalCatalogTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/QueryConfigTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/QueryConfigTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/QueryConfigTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/QueryConfigTest.scala
diff --git a/flink-libraries/flink-table/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
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/TableSchemaTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableSchemaTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/TableSchemaTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableSchemaTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/TableSourceTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableSourceTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/TableSourceTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableSourceTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/BatchTableEnvironmentTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/BatchTableEnvironmentTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/BatchTableEnvironmentTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/BatchTableEnvironmentTest.scala
diff --git a/flink-libraries/flink-table/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
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/ExplainTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/ExplainTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/AggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/AggregateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/AggregateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/AggregateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/CalcTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/CalcTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/CalcTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/CalcTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/CorrelateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/CorrelateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/CorrelateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/CorrelateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/DistinctAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/DistinctAggregateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/DistinctAggregateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/DistinctAggregateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/GroupWindowTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/GroupWindowTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/GroupWindowTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/GroupWindowTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/GroupingSetsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/GroupingSetsTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/GroupingSetsTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/GroupingSetsTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/JoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/JoinTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/JoinTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/JoinTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/SetOperatorsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/SetOperatorsTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/SetOperatorsTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/SetOperatorsTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/SingleRowJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/SingleRowJoinTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/SingleRowJoinTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/SingleRowJoinTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/TemporalTableJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/TemporalTableJoinTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/TemporalTableJoinTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/TemporalTableJoinTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/CalcValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/CalcValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/CalcValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/CalcValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/CorrelateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/CorrelateValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/CorrelateValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/CorrelateValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/GroupWindowValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/GroupWindowValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/GroupWindowValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/GroupWindowValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/InsertIntoValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/InsertIntoValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/InsertIntoValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/InsertIntoValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/JoinValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/JoinValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/JoinValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/JoinValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/OverWindowValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/OverWindowValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/OverWindowValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/OverWindowValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/SortValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/SortValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/sql/validation/SortValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/sql/validation/SortValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/AggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/AggregateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/AggregateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/AggregateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/CalcTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CalcTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/CalcTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CalcTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/CorrelateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CorrelateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/CorrelateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CorrelateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/GroupWindowTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/GroupWindowTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/GroupWindowTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/GroupWindowTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/JoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/JoinTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/JoinTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/JoinTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/SetOperatorsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/SetOperatorsTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/SetOperatorsTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/SetOperatorsTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/TemporalTableJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/TemporalTableJoinTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/TemporalTableJoinTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/TemporalTableJoinTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/AggregateStringExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/AggregateStringExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/AggregateStringExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/AggregateStringExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/CalcStringExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/CalcStringExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/CalcStringExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/CalcStringExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/CorrelateStringExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/CorrelateStringExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/CorrelateStringExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/CorrelateStringExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/JoinStringExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/JoinStringExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/JoinStringExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/JoinStringExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/SetOperatorsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/SetOperatorsTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/SetOperatorsTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/SetOperatorsTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/SortStringExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/SortStringExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/SortStringExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/stringexpr/SortStringExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/AggregateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/AggregateValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/AggregateValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/AggregateValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/CalcValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/CalcValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/CalcValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/CalcValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/CorrelateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/CorrelateValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/CorrelateValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/CorrelateValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/GroupWindowValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/GroupWindowValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/GroupWindowValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/GroupWindowValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/InsertIntoValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/InsertIntoValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/InsertIntoValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/InsertIntoValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/JoinValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/JoinValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/JoinValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/JoinValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/OverWindowValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/OverWindowValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/OverWindowValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/OverWindowValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/SetOperatorsValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/SetOperatorsValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/SetOperatorsValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/SetOperatorsValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/SortValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/SortValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/batch/table/validation/SortValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/validation/SortValidationTest.scala
diff --git a/flink-libraries/flink-table/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
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/ExplainTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/ExplainTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/StreamTableEnvironmentTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/StreamTableEnvironmentTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/StreamTableEnvironmentTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/StreamTableEnvironmentTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/StreamTableEnvironmentValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/StreamTableEnvironmentValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/StreamTableEnvironmentValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/StreamTableEnvironmentValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/AggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/AggregateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/AggregateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/AggregateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/CorrelateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/CorrelateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/CorrelateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/CorrelateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/DistinctAggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/DistinctAggregateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/DistinctAggregateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/DistinctAggregateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/GroupWindowTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/GroupWindowTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/GroupWindowTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/GroupWindowTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/JoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/JoinTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/JoinTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/JoinTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/MatchRecognizeTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/MatchRecognizeTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/MatchRecognizeTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/MatchRecognizeTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/OverWindowTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/OverWindowTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/OverWindowTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/OverWindowTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/SetOperatorsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/SetOperatorsTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/SetOperatorsTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/SetOperatorsTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/SortTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/SortTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/SortTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/SortTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/TemporalTableJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/TemporalTableJoinTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/TemporalTableJoinTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/TemporalTableJoinTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/UnionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/UnionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/UnionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/UnionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/CorrelateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/CorrelateValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/CorrelateValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/CorrelateValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/InsertIntoValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/InsertIntoValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/InsertIntoValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/InsertIntoValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/JoinValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/JoinValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/JoinValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/JoinValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/MatchRecognizeValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/MatchRecognizeValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/MatchRecognizeValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/MatchRecognizeValidationTest.scala
diff --git a/flink-libraries/flink-table/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
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/OverWindowValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/OverWindowValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/SortValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/SortValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/SortValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/SortValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/WindowAggregateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/WindowAggregateValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/WindowAggregateValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/sql/validation/WindowAggregateValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/AggregateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/AggregateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/AggregateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/AggregateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/CalcTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CalcTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/CalcTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CalcTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/CorrelateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CorrelateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/CorrelateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CorrelateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/GroupWindowTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/GroupWindowTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/GroupWindowTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/GroupWindowTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/JoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/JoinTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/JoinTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/JoinTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/OverWindowTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/OverWindowTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/OverWindowTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/OverWindowTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/SetOperatorsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/SetOperatorsTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/SetOperatorsTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/SetOperatorsTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/TableSourceTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/TableSourceTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/TableSourceTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/TableSourceTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/TemporalTableJoinTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/TemporalTableJoinTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/TemporalTableJoinTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/TemporalTableJoinTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/AggregateStringExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/AggregateStringExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/AggregateStringExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/AggregateStringExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/CalcStringExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/CalcStringExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/CalcStringExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/CalcStringExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/CorrelateStringExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/CorrelateStringExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/CorrelateStringExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/CorrelateStringExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/GroupWindowStringExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/GroupWindowStringExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/GroupWindowStringExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/GroupWindowStringExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/OverWindowStringExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/OverWindowStringExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/OverWindowStringExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/OverWindowStringExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/SetOperatorsStringExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/SetOperatorsStringExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/SetOperatorsStringExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/stringexpr/SetOperatorsStringExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/AggregateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/AggregateValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/AggregateValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/AggregateValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/CalcValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/CalcValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/CalcValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/CalcValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/CorrelateValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/CorrelateValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/CorrelateValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/CorrelateValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/GroupWindowValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/GroupWindowValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/GroupWindowValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/GroupWindowValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/InsertIntoValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/InsertIntoValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/InsertIntoValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/InsertIntoValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/JoinValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/JoinValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/JoinValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/JoinValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/OverWindowValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/OverWindowValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/OverWindowValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/OverWindowValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/SetOperatorsValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/SetOperatorsValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/SetOperatorsValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/SetOperatorsValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/TableSinkValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/TableSinkValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/TableSinkValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/TableSinkValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/TemporalTableJoinValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/TemporalTableJoinValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/TemporalTableJoinValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/TemporalTableJoinValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/UnsupportedOpsValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/UnsupportedOpsValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/table/validation/UnsupportedOpsValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/validation/UnsupportedOpsValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/InlineTableValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/InlineTableValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/InlineTableValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/InlineTableValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/TableEnvironmentValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/TableEnvironmentValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/TableEnvironmentValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/TableEnvironmentValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/TableSchemaValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/TableSchemaValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/TableSchemaValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/TableSchemaValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/TableSinksValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/TableSinksValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/TableSinksValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/TableSinksValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/TableSourceValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/TableSourceValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/TableSourceValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/TableSourceValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/UserDefinedFunctionValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/UserDefinedFunctionValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/validation/UserDefinedFunctionValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/validation/UserDefinedFunctionValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/calcite/CalciteConfigBuilderTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/calcite/CalciteConfigBuilderTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/calcite/CalciteConfigBuilderTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/calcite/CalciteConfigBuilderTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/catalog/ExternalCatalogSchemaTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/catalog/ExternalCatalogSchemaTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/catalog/ExternalCatalogSchemaTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/catalog/ExternalCatalogSchemaTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/catalog/InMemoryExternalCatalogTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/catalog/InMemoryExternalCatalogTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/catalog/InMemoryExternalCatalogTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/catalog/InMemoryExternalCatalogTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/dataview/ListViewSerializerTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/dataview/ListViewSerializerTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/dataview/ListViewSerializerTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/dataview/ListViewSerializerTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/dataview/MapViewSerializerTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/dataview/MapViewSerializerTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/dataview/MapViewSerializerTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/dataview/MapViewSerializerTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/ClassInstanceTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/ClassInstanceTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/ClassInstanceTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/ClassInstanceTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/CsvTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/CsvTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/CsvTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/CsvTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/DescriptorPropertiesTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/DescriptorPropertiesTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/DescriptorPropertiesTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/DescriptorPropertiesTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/FileSystemTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/FileSystemTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/FileSystemTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/FileSystemTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/FunctionDescriptorTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/FunctionDescriptorTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/FunctionDescriptorTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/FunctionDescriptorTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/LiteralValueTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/LiteralValueTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/LiteralValueTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/LiteralValueTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/MetadataTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/MetadataTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/MetadataTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/MetadataTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/RowtimeTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/RowtimeTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/RowtimeTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/RowtimeTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/SchemaTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/SchemaTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/SchemaTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/SchemaTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/SchemaValidatorTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/SchemaValidatorTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/SchemaValidatorTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/SchemaValidatorTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/StatisticsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/StatisticsTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/StatisticsTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/StatisticsTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/TableDescriptorTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/TableDescriptorTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/TableDescriptorTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/TableDescriptorTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/TestTableDescriptor.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/TestTableDescriptor.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/descriptors/TestTableDescriptor.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/descriptors/TestTableDescriptor.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ArrayTypeTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/ArrayTypeTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ArrayTypeTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/ArrayTypeTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/CompositeAccessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/CompositeAccessTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/CompositeAccessTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/CompositeAccessTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/DateTimeFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/DateTimeFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/DateTimeFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/DateTimeFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/DecimalTypeTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/DecimalTypeTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/DecimalTypeTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/DecimalTypeTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/KeywordParseTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/KeywordParseTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/KeywordParseTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/KeywordParseTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/LiteralTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/LiteralTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/LiteralTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/LiteralTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/MapTypeTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/MapTypeTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/MapTypeTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/MapTypeTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/NonDeterministicTests.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/NonDeterministicTests.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/NonDeterministicTests.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/NonDeterministicTests.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/RowTypeTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/RowTypeTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/RowTypeTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/RowTypeTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/SqlExpressionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/SqlExpressionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/SqlExpressionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/SqlExpressionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/TemporalTypesTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/TemporalTypesTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/TemporalTypesTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/TemporalTypesTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ArrayTypeTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/ArrayTypeTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ArrayTypeTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/ArrayTypeTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/CompositeTypeTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/CompositeTypeTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/CompositeTypeTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/CompositeTypeTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/MapTypeTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/MapTypeTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/MapTypeTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/MapTypeTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/RowTypeTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/RowTypeTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/RowTypeTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/RowTypeTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ScalarOperatorsTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/ScalarOperatorsTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ScalarOperatorsTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/ScalarOperatorsTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ScalarTypesTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/ScalarTypesTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ScalarTypesTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/ScalarTypesTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/userDefinedScalarFunctions.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/userDefinedScalarFunctions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/userDefinedScalarFunctions.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/utils/userDefinedScalarFunctions.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/ArrayTypeValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/ArrayTypeValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/ArrayTypeValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/ArrayTypeValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/CompositeAccessValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/CompositeAccessValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/CompositeAccessValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/CompositeAccessValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/MapTypeValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/MapTypeValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/MapTypeValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/MapTypeValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/RowTypeValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/RowTypeValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/RowTypeValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/RowTypeValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/ScalarFunctionsValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/ScalarFunctionsValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/ScalarFunctionsValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/ScalarFunctionsValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/ScalarOperatorsValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/ScalarOperatorsValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/validation/ScalarOperatorsValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/expressions/validation/ScalarOperatorsValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/TableFormatFactoryServiceTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/TableFormatFactoryServiceTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/TableFormatFactoryServiceTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/TableFormatFactoryServiceTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/TableSinkFactoryServiceTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/TableSinkFactoryServiceTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/TableSinkFactoryServiceTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/TableSinkFactoryServiceTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/TableSourceFactoryServiceTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/TableSourceFactoryServiceTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/TableSourceFactoryServiceTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/TableSourceFactoryServiceTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestAmbiguousTableFormatFactory.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestAmbiguousTableFormatFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestAmbiguousTableFormatFactory.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestAmbiguousTableFormatFactory.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestDeserializationSchema.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestDeserializationSchema.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestDeserializationSchema.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestDeserializationSchema.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestFixedFormatTableFactory.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestFixedFormatTableFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestFixedFormatTableFactory.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestFixedFormatTableFactory.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestSerializationSchema.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestSerializationSchema.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestSerializationSchema.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestSerializationSchema.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestTableFormat.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestTableFormat.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestTableFormat.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestTableFormat.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestTableFormatFactory.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestTableFormatFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestTableFormatFactory.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestTableFormatFactory.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestTableSinkFactory.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestTableSinkFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestTableSinkFactory.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestTableSinkFactory.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestTableSourceFactory.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestTableSourceFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestTableSourceFactory.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestTableSourceFactory.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestWildcardFormatTableSourceFactory.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestWildcardFormatTableSourceFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/factories/utils/TestWildcardFormatTableSourceFactory.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/factories/utils/TestWildcardFormatTableSourceFactory.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/functions/FunctionServiceTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/functions/FunctionServiceTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/functions/FunctionServiceTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/functions/FunctionServiceTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/match/MatchRecognizeValidationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/match/MatchRecognizeValidationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/match/MatchRecognizeValidationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/match/MatchRecognizeValidationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/match/PatternTranslatorTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/match/PatternTranslatorTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/match/PatternTranslatorTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/match/PatternTranslatorTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/match/PatternTranslatorTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/match/PatternTranslatorTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/match/PatternTranslatorTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/match/PatternTranslatorTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/ExpressionReductionRulesTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/ExpressionReductionRulesTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/ExpressionReductionRulesTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/ExpressionReductionRulesTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/NormalizationRulesTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/NormalizationRulesTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/NormalizationRulesTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/NormalizationRulesTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/QueryDecorrelationTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/QueryDecorrelationTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/QueryDecorrelationTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/QueryDecorrelationTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/RetractionRulesTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/RetractionRulesTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/RetractionRulesTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/RetractionRulesTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/RexProgramExtractorTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/RexProgramExtractorTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/RexProgramExtractorTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/RexProgramExtractorTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/RexProgramRewriterTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/RexProgramRewriterTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/RexProgramRewriterTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/RexProgramRewriterTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/RexProgramTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/RexProgramTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/RexProgramTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/RexProgramTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/TimeIndicatorConversionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/TimeIndicatorConversionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/TimeIndicatorConversionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/TimeIndicatorConversionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/UpdatingPlanCheckerTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/UpdatingPlanCheckerTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/UpdatingPlanCheckerTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/plan/UpdatingPlanCheckerTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/AggFunctionTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/AggFunctionTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/AggFunctionTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/AggFunctionTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/AvgFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/AvgFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/AvgFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/AvgFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CollectAggFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CollectAggFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CollectAggFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CollectAggFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CountAggFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CountAggFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CountAggFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CountAggFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CountAggFunctionWithNonParamTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CountAggFunctionWithNonParamTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CountAggFunctionWithNonParamTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/CountAggFunctionWithNonParamTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MaxAggFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MaxAggFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MaxAggFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MaxAggFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MaxWithRetractAggFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MaxWithRetractAggFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MaxWithRetractAggFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MaxWithRetractAggFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MinAggFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MinAggFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MinAggFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MinAggFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MinWithRetractAggFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MinWithRetractAggFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MinWithRetractAggFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/MinWithRetractAggFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/Sum0AggFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/Sum0AggFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/Sum0AggFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/Sum0AggFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/Sum0WithRetractAggFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/Sum0WithRetractAggFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/Sum0WithRetractAggFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/Sum0WithRetractAggFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/SumAggFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/SumAggFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/SumAggFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/SumAggFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/SumWithRetractAggFunctionTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/SumWithRetractAggFunctionTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggfunctions/SumWithRetractAggFunctionTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/aggfunctions/SumWithRetractAggFunctionTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/AggregateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/AggregateITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/AggregateITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/AggregateITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/CalcITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/CalcITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/CalcITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/CalcITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/JoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/JoinITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/JoinITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/JoinITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/SetOperatorsITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/SetOperatorsITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/SetOperatorsITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/SetOperatorsITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/SortITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/SortITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/SortITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/SortITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/TableEnvironmentITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/TableEnvironmentITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/TableEnvironmentITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/TableEnvironmentITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/TableSourceITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/TableSourceITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/sql/TableSourceITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/sql/TableSourceITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/AggregateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/AggregateITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/AggregateITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/AggregateITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/CalcITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/CalcITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/CalcITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/CalcITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/CorrelateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/CorrelateITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/CorrelateITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/CorrelateITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/GroupWindowITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/GroupWindowITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/GroupWindowITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/GroupWindowITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/JoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/JoinITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/JoinITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/JoinITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/SetOperatorsITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/SetOperatorsITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/SetOperatorsITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/SetOperatorsITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/SortITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/SortITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/SortITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/SortITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/TableEnvironmentITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/TableEnvironmentITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/TableEnvironmentITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/TableEnvironmentITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/TableSinkITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/TableSinkITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/TableSinkITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/TableSinkITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/TableSourceITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/TableSourceITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/TableSourceITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/batch/table/TableSourceITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/AbstractTwoInputStreamOperatorWithTTLTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/AbstractTwoInputStreamOperatorWithTTLTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/AbstractTwoInputStreamOperatorWithTTLTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/AbstractTwoInputStreamOperatorWithTTLTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/AggFunctionHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/AggFunctionHarnessTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/AggFunctionHarnessTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/AggFunctionHarnessTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/GroupAggregateHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/GroupAggregateHarnessTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/GroupAggregateHarnessTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/GroupAggregateHarnessTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/HarnessTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/HarnessTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/HarnessTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/HarnessTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/JoinHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/JoinHarnessTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/JoinHarnessTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/JoinHarnessTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/MatchHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/MatchHarnessTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/MatchHarnessTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/MatchHarnessTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/OverWindowHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/OverWindowHarnessTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/OverWindowHarnessTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/OverWindowHarnessTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/SortProcessFunctionHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/SortProcessFunctionHarnessTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/SortProcessFunctionHarnessTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/SortProcessFunctionHarnessTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/StateCleaningCountTriggerHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/StateCleaningCountTriggerHarnessTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/StateCleaningCountTriggerHarnessTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/StateCleaningCountTriggerHarnessTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/TemporalJoinHarnessTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/TemporalJoinHarnessTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/harness/TemporalJoinHarnessTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/harness/TemporalJoinHarnessTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/operators/KeyedCoProcessOperatorWithWatermarkDelayTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/operators/KeyedCoProcessOperatorWithWatermarkDelayTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/operators/KeyedCoProcessOperatorWithWatermarkDelayTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/operators/KeyedCoProcessOperatorWithWatermarkDelayTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/operators/KeyedProcessFunctionWithCleanupStateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/operators/KeyedProcessFunctionWithCleanupStateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/operators/KeyedProcessFunctionWithCleanupStateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/operators/KeyedProcessFunctionWithCleanupStateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/operators/KeyedProcessOperatorWithWatermarkDelayTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/operators/KeyedProcessOperatorWithWatermarkDelayTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/operators/KeyedProcessOperatorWithWatermarkDelayTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/operators/KeyedProcessOperatorWithWatermarkDelayTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/operators/ProcessFunctionWithCleanupStateTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/operators/ProcessFunctionWithCleanupStateTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/operators/ProcessFunctionWithCleanupStateTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/operators/ProcessFunctionWithCleanupStateTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/TimeAttributesITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/TimeAttributesITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/TimeAttributesITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/TimeAttributesITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/InsertIntoITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/InsertIntoITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/InsertIntoITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/InsertIntoITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/JoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/JoinITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/JoinITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/JoinITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/MatchRecognizeITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/MatchRecognizeITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/MatchRecognizeITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/MatchRecognizeITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/OverWindowITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/OverWindowITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/OverWindowITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/OverWindowITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/SetOperatorsITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/SetOperatorsITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/SetOperatorsITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/SetOperatorsITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/SortITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/SortITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/SortITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/SortITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/SqlITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/SqlITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/SqlITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/SqlITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/TableSourceITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/TableSourceITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/TableSourceITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/TableSourceITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/TemporalJoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/TemporalJoinITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/TemporalJoinITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/sql/TemporalJoinITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/AggregateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/AggregateITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/AggregateITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/AggregateITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/CalcITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/CalcITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/CalcITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/CalcITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/CorrelateITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/CorrelateITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/CorrelateITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/CorrelateITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/GroupWindowITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/GroupWindowITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/GroupWindowITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/GroupWindowITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/JoinITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/JoinITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/JoinITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/JoinITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/OverWindowITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/OverWindowITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/OverWindowITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/OverWindowITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/RetractionITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/RetractionITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/RetractionITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/RetractionITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/SetOperatorsITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/SetOperatorsITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/SetOperatorsITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/SetOperatorsITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/TableSinkITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/TableSinkITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/TableSinkITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/TableSinkITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/TableSourceITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/TableSourceITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/TableSourceITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/stream/table/TableSourceITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/types/CRowComparatorTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/types/CRowComparatorTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/types/CRowComparatorTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/types/CRowComparatorTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/types/CRowSerializerTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/types/CRowSerializerTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/types/CRowSerializerTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/types/CRowSerializerTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/CommonTestData.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/CommonTestData.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/CommonTestData.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/CommonTestData.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/SortTestUtils.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/SortTestUtils.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/SortTestUtils.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/SortTestUtils.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/StreamITCase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/StreamITCase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/StreamITCase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/StreamITCase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/StreamTestData.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/StreamTestData.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/StreamTestData.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/StreamTestData.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithStateTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithStateTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithStateTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/StreamingWithStateTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsClusterTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsClusterTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsClusterTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsClusterTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsCollectionTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsCollectionTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsCollectionTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsCollectionTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/TableProgramsTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/TimeTestUtil.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/TimeTestUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/TimeTestUtil.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/TimeTestUtil.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/UserDefinedFunctionTestUtils.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/UserDefinedFunctionTestUtils.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/UserDefinedFunctionTestUtils.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/runtime/utils/UserDefinedFunctionTestUtils.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/typeutils/TypeCheckUtilsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/typeutils/TypeCheckUtilsTest.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/typeutils/TypeCheckUtilsTest.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/typeutils/TypeCheckUtilsTest.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/InMemoryTableFactory.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/InMemoryTableFactory.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/InMemoryTableFactory.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/InMemoryTableFactory.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/InputTypeBuilder.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/InputTypeBuilder.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/InputTypeBuilder.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/InputTypeBuilder.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/LogicalPlanFormatUtils.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/LogicalPlanFormatUtils.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/LogicalPlanFormatUtils.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/LogicalPlanFormatUtils.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/MemoryTableSourceSinkUtil.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/MemoryTableSourceSinkUtil.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/MemoryTableSourceSinkUtil.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/MemoryTableSourceSinkUtil.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/MockTableEnvironment.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/MockTableEnvironment.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/MockTableEnvironment.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/MockTableEnvironment.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/TableTestBase.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/TableTestBase.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/TableTestBase.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/TableTestBase.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/TestFilterableTableSource.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/TestFilterableTableSource.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/TestFilterableTableSource.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/TestFilterableTableSource.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/UserDefinedAggFunctions.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/UserDefinedAggFunctions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/UserDefinedAggFunctions.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/UserDefinedAggFunctions.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/UserDefinedTableFunctions.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/UserDefinedTableFunctions.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/UserDefinedTableFunctions.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/UserDefinedTableFunctions.scala
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/testTableSources.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/testTableSources.scala
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/testTableSources.scala
rename to flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/utils/testTableSources.scala
diff --git a/flink-libraries/flink-table/src/test/scala/resources/testFilter0.out b/flink-table/flink-table-planner/src/test/scala/resources/testFilter0.out
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/resources/testFilter0.out
rename to flink-table/flink-table-planner/src/test/scala/resources/testFilter0.out
diff --git a/flink-libraries/flink-table/src/test/scala/resources/testFilter1.out b/flink-table/flink-table-planner/src/test/scala/resources/testFilter1.out
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/resources/testFilter1.out
rename to flink-table/flink-table-planner/src/test/scala/resources/testFilter1.out
diff --git a/flink-libraries/flink-table/src/test/scala/resources/testFilterStream0.out b/flink-table/flink-table-planner/src/test/scala/resources/testFilterStream0.out
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/resources/testFilterStream0.out
rename to flink-table/flink-table-planner/src/test/scala/resources/testFilterStream0.out
diff --git a/flink-libraries/flink-table/src/test/scala/resources/testJoin0.out b/flink-table/flink-table-planner/src/test/scala/resources/testJoin0.out
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/resources/testJoin0.out
rename to flink-table/flink-table-planner/src/test/scala/resources/testJoin0.out
diff --git a/flink-libraries/flink-table/src/test/scala/resources/testJoin1.out b/flink-table/flink-table-planner/src/test/scala/resources/testJoin1.out
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/resources/testJoin1.out
rename to flink-table/flink-table-planner/src/test/scala/resources/testJoin1.out
diff --git a/flink-libraries/flink-table/src/test/scala/resources/testUnion0.out b/flink-table/flink-table-planner/src/test/scala/resources/testUnion0.out
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/resources/testUnion0.out
rename to flink-table/flink-table-planner/src/test/scala/resources/testUnion0.out
diff --git a/flink-libraries/flink-table/src/test/scala/resources/testUnion1.out b/flink-table/flink-table-planner/src/test/scala/resources/testUnion1.out
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/resources/testUnion1.out
rename to flink-table/flink-table-planner/src/test/scala/resources/testUnion1.out
diff --git a/flink-libraries/flink-table/src/test/scala/resources/testUnionStream0.out b/flink-table/flink-table-planner/src/test/scala/resources/testUnionStream0.out
similarity index 100%
rename from flink-libraries/flink-table/src/test/scala/resources/testUnionStream0.out
rename to flink-table/flink-table-planner/src/test/scala/resources/testUnionStream0.out
diff --git a/flink-table/flink-table-uber/pom.xml b/flink-table/flink-table-uber/pom.xml
new file mode 100644
index 0000000..c9a73d3
--- /dev/null
+++ b/flink-table/flink-table-uber/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table</artifactId>
+ <version>1.8-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>flink-table-uber_${scala.binary.version}</artifactId>
+ <name>flink-table-uber</name>
+ <description>
+ This module contains the entire Table/SQL distribution for writing table programs
+ within the table ecosystem or between other Flink APIs. Users can either use the
+ Scala or Java programming language.
+ </description>
+
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-scala_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-scala-bridge_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <!-- Exclude all flink-dist files and only include flink-table-* -->
+ <execution>
+ <id>shade-flink</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes combine.children="append">
+ <include>org.apache.flink:flink-table-common</include>
+ <include>org.apache.flink:flink-table-api-java</include>
+ <include>org.apache.flink:flink-table-api-scala_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-table-api-java-bridge_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-table-api-scala-bridge_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-table-planner_${scala.binary.version}</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/flink-libraries/flink-table-common/pom.xml b/flink-table/pom.xml
similarity index 65%
rename from flink-libraries/flink-table-common/pom.xml
rename to flink-table/pom.xml
index fac1745..b101051 100644
--- a/flink-libraries/flink-table-common/pom.xml
+++ b/flink-table/pom.xml
@@ -22,37 +22,24 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-libraries</artifactId>
+ <artifactId>flink-parent</artifactId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-table-common</artifactId>
- <name>flink-table-common</name>
+ <artifactId>flink-table</artifactId>
+ <name>flink-table</name>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>1.8-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modules>
+ <module>flink-table-common</module>
+ <module>flink-table-api-java</module>
+ <module>flink-table-api-scala</module>
+ <module>flink-table-api-java-bridge</module>
+ <module>flink-table-api-scala-bridge</module>
+ <module>flink-table-planner</module>
+ <module>flink-table-uber</module>
+ <module>flink-sql-client</module>
+ </modules>
</project>
diff --git a/pom.xml b/pom.xml
index dc6bcad..fab2767 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@ under the License.
<module>flink-test-utils-parent</module>
<module>flink-state-backends</module>
<module>flink-libraries</module>
+ <module>flink-table</module>
<module>flink-quickstart</module>
<module>flink-contrib</module>
<module>flink-dist</module>
@@ -1310,7 +1311,7 @@ under the License.
<exclude>flink-core/src/test/resources/kryo-serializer-config-snapshot-v1</exclude>
<exclude>flink-formats/flink-avro/src/test/resources/avro/*.avsc</exclude>
<exclude>out/test/flink-avro/avro/user.avsc</exclude>
- <exclude>flink-libraries/flink-table/src/test/scala/resources/*.out</exclude>
+ <exclude>flink-table/flink-table-planner/src/test/scala/resources/*.out</exclude>
<exclude>flink-yarn/src/test/resources/krb5.keytab</exclude>
<exclude>flink-end-to-end-tests/test-scripts/test-data/*</exclude>
<exclude>flink-end-to-end-tests/test-scripts/docker-hadoop-secure-cluster/config/keystore.jks</exclude>
diff --git a/tools/travis/stage.sh b/tools/travis/stage.sh
index 1e43fe8..683dd13 100644
--- a/tools/travis/stage.sh
+++ b/tools/travis/stage.sh
@@ -47,7 +47,13 @@ flink-libraries/flink-gelly-examples,\
flink-libraries/flink-ml,\
flink-libraries/flink-python,\
flink-libraries/flink-streaming-python,\
-flink-libraries/flink-table,\
+flink-table/flink-table-common,\
+flink-table/flink-table-api-java,\
+flink-table/flink-table-api-scala,\
+flink-table/flink-table-api-java-bridge,\
+flink-table/flink-table-api-scala-bridge,\
+flink-table/flink-table-planner,\
+flink-table/flink-sql-client,\
flink-queryable-state/flink-queryable-state-runtime,\
flink-queryable-state/flink-queryable-state-client-java"