From 1a064e29f7ee20dd938e84785431a2cff05b89b1 Mon Sep 17 00:00:00 2001 From: Anton Mushin Date: Wed, 7 Dec 2016 16:42:42 +0400 Subject: [PATCH 1/3] [FLINK-4704] Move Table API to org.apache.flink.table move table api to org.apache.flink.table package --- docs/dev/table_api.md | 10 +- .../kafka/Kafka010JsonTableSource.java | 4 +- .../connectors/kafka/Kafka010TableSource.java | 4 +- .../kafka/Kafka08JsonTableSink.java | 2 +- .../kafka/Kafka08JsonTableSource.java | 4 +- .../connectors/kafka/Kafka08TableSource.java | 4 +- .../kafka/Kafka08JsonTableSinkTest.java | 2 +- .../kafka/Kafka08JsonTableSourceTest.java | 2 +- .../kafka/Kafka09JsonTableSink.java | 2 +- .../kafka/Kafka09JsonTableSource.java | 4 +- .../connectors/kafka/Kafka09TableSource.java | 4 +- .../kafka/Kafka09JsonTableSinkTest.java | 2 +- .../kafka/Kafka09JsonTableSourceTest.java | 2 +- .../connectors/kafka/KafkaJsonTableSink.java | 2 +- .../kafka/KafkaJsonTableSource.java | 2 +- .../connectors/kafka/KafkaTableSink.java | 6 +- .../connectors/kafka/KafkaTableSource.java | 6 +- .../JsonRowDeserializationSchema.java | 4 +- .../JsonRowSerializationSchema.java | 2 +- .../JsonRowDeserializationSchemaTest.java | 2 +- .../kafka/JsonRowSerializationSchemaTest.java | 2 +- .../kafka/KafkaTableSinkTestBase.java | 4 +- .../kafka/KafkaTableSourceTestBase.java | 2 +- .../api/java/io/jdbc/JDBCInputFormat.java | 4 +- .../api/java/io/jdbc/JDBCOutputFormat.java | 2 +- .../flink/api/java/io/jdbc/JDBCFullTest.java | 2 +- .../api/java/io/jdbc/JDBCInputFormatTest.java | 4 +- .../java/io/jdbc/JDBCOutputFormatTest.java | 2 +- .../flink/api/java/io/jdbc/JDBCTestBase.java | 2 +- .../flink/examples/java/WordCountSQL.java | 6 +- .../flink/examples/java/WordCountTable.java | 6 +- .../api/java}/package-info.java | 18 +- .../flink/{api => }/table/explain/Node.java | 2 +- .../table/explain/PlanJsonParser.java | 2 +- .../examples/scala/StreamSQLExample.scala | 4 +- .../examples/scala/StreamTableExample.scala | 4 +- .../examples/scala/TPCHQuery3Table.scala | 4 +- .../flink/examples/scala/WordCountSQL.scala | 4 +- .../flink/examples/scala/WordCountTable.scala | 4 +- .../table/BatchTableEnvironment.scala | 22 +- .../flink/{api => }/table/CalciteConfig.scala | 2 +- .../table/FlinkCalciteSqlValidator.scala | 2 +- .../{api => }/table/FlinkPlannerImpl.scala | 2 +- .../{api => }/table/FlinkRelBuilder.scala | 10 +- .../{api => }/table/FlinkTypeFactory.scala | 10 +- .../{api => }/table/FlinkTypeSystem.scala | 2 +- .../apache/flink/{api => }/table/Row.scala | 2 +- .../table/StreamTableEnvironment.scala | 21 +- .../flink/{api => }/table/TableConfig.scala | 2 +- .../{api => }/table/TableEnvironment.scala | 24 +- .../apache/flink/{api => }/table/Types.scala | 4 +- .../api/java}/BatchTableEnvironment.scala | 23 +- .../api/java}/StreamTableEnvironment.scala | 23 +- .../api/java}/groupWindows.scala | 4 +- .../api/scala}/BatchTableEnvironment.scala | 22 +- .../api/scala}/DataSetConversions.scala | 6 +- .../api/scala}/DataStreamConversions.scala | 6 +- .../api/scala}/StreamTableEnvironment.scala | 22 +- .../api/scala}/TableConversions.scala | 8 +- .../api/scala}/expressionDsl.scala | 10 +- .../api/scala}/groupWindows.scala | 6 +- .../table => table/api/scala}/package.scala | 17 +- .../table/codegen/CodeGenException.scala | 2 +- .../table/codegen/CodeGenUtils.scala | 4 +- .../table/codegen/CodeGenerator.scala | 20 +- .../{api => }/table/codegen/Compiler.scala | 2 +- .../table/codegen/ExpressionReducer.scala | 6 +- .../{api => }/table/codegen/Indenter.scala | 2 +- .../table/codegen/calls/BuiltInMethods.scala | 4 +- .../table/codegen/calls/CallGenerator.scala | 6 +- .../calls/CurrentTimePointCallGen.scala | 4 +- .../codegen/calls/FloorCeilCallGen.scala | 8 +- .../table/codegen/calls/MethodCallGen.scala | 8 +- .../calls/MultiTypeMethodCallGen.scala | 6 +- .../codegen/calls/NotCallGenerator.scala | 6 +- .../codegen/calls/ScalarFunctionCallGen.scala | 10 +- .../table/codegen/calls/ScalarFunctions.scala | 359 ++++++++++++++++++ .../table/codegen/calls/ScalarOperators.scala | 10 +- .../table/codegen/calls/TrimCallGen.scala | 8 +- .../{api => }/table/codegen/generated.scala | 2 +- .../{api => }/table/codegen/package.scala | 2 +- .../flink/{api => }/table/exceptions.scala | 2 +- .../table/expressions/Expression.scala | 6 +- .../table/expressions/ExpressionParser.scala | 18 +- .../table/expressions/ExpressionUtils.scala | 6 +- .../table/expressions/InputTypeSpec.scala | 4 +- .../table/expressions/aggregations.scala | 4 +- .../table/expressions/arithmetic.scala | 8 +- .../{api => }/table/expressions/call.scala | 12 +- .../{api => }/table/expressions/cast.scala | 8 +- .../table/expressions/comparison.scala | 6 +- .../table/expressions/composite.scala | 6 +- .../table/expressions/fieldExpression.scala | 6 +- .../table/expressions/literals.scala | 6 +- .../{api => }/table/expressions/logic.scala | 4 +- .../table/expressions/mathExpressions.scala | 6 +- .../table/expressions/ordering.scala | 4 +- .../{api => }/table/expressions/package.scala | 6 +- .../table/expressions/stringExpressions.scala | 6 +- .../{api => }/table/expressions/symbols.scala | 2 +- .../{api => }/table/expressions/time.scala | 14 +- .../table/expressions/windowProperties.scala | 6 +- .../table/functions/ScalarFunction.scala | 6 +- .../table/functions/UserDefinedFunction.scala | 2 +- .../table/functions/utils/MathFunctions.scala | 2 +- .../functions/utils/ScalarSqlFunction.scala | 10 +- .../utils/UserDefinedFunctionUtils.scala | 8 +- .../flink/{api => }/table/package.scala | 4 +- .../table/plan/ProjectionTranslator.scala | 8 +- .../table/plan/cost/DataSetCost.scala | 2 +- .../table/plan/cost/DataSetCostFactory.scala | 2 +- .../table/plan/logical/LogicalNode.scala | 12 +- .../table/plan/logical/LogicalWindow.scala | 8 +- .../table/plan/logical/Resolvable.scala | 4 +- .../table/plan/logical/groupWindows.scala | 10 +- .../table/plan/logical/operators.scala | 18 +- .../logical/rel/LogicalWindowAggregate.scala | 8 +- .../table/plan/nodes/FlinkAggregate.scala | 6 +- .../table/plan/nodes/FlinkCalc.scala | 10 +- .../{api => }/table/plan/nodes/FlinkRel.scala | 8 +- .../table/plan/nodes/dataset/BatchScan.scala | 8 +- .../nodes/dataset/BatchTableSourceScan.scala | 8 +- .../plan/nodes/dataset/DataSetAggregate.scala | 12 +- .../plan/nodes/dataset/DataSetCalc.scala | 10 +- .../nodes/dataset/DataSetConvention.scala | 2 +- .../plan/nodes/dataset/DataSetIntersect.scala | 8 +- .../plan/nodes/dataset/DataSetJoin.scala | 10 +- .../plan/nodes/dataset/DataSetMinus.scala | 8 +- .../table/plan/nodes/dataset/DataSetRel.scala | 12 +- .../plan/nodes/dataset/DataSetScan.scala | 6 +- .../nodes/dataset/DataSetSingleRowJoin.scala | 10 +- .../plan/nodes/dataset/DataSetSort.scala | 8 +- .../plan/nodes/dataset/DataSetUnion.scala | 4 +- .../plan/nodes/dataset/DataSetValues.scala | 10 +- .../datastream/DataStreamAggregate.scala | 22 +- .../nodes/datastream/DataStreamCalc.scala | 10 +- .../datastream/DataStreamConvention.scala | 2 +- .../plan/nodes/datastream/DataStreamRel.scala | 6 +- .../nodes/datastream/DataStreamScan.scala | 6 +- .../nodes/datastream/DataStreamUnion.scala | 4 +- .../nodes/datastream/DataStreamValues.scala | 10 +- .../plan/nodes/datastream/StreamScan.scala | 12 +- .../datastream/StreamTableSourceScan.scala | 8 +- .../rules/EnumerableToLogicalTableScan.scala | 2 +- .../table/plan/rules/FlinkRuleSets.scala | 8 +- .../dataSet/BatchTableSourceScanRule.scala | 8 +- .../rules/dataSet/DataSetAggregateRule.scala | 6 +- .../DataSetAggregateWithNullValuesRule.scala | 6 +- .../plan/rules/dataSet/DataSetCalcRule.scala | 4 +- .../rules/dataSet/DataSetIntersectRule.scala | 4 +- .../plan/rules/dataSet/DataSetJoinRule.scala | 4 +- .../plan/rules/dataSet/DataSetMinusRule.scala | 4 +- .../plan/rules/dataSet/DataSetScanRule.scala | 6 +- .../dataSet/DataSetSingleRowJoinRule.scala | 4 +- .../plan/rules/dataSet/DataSetSortRule.scala | 4 +- .../plan/rules/dataSet/DataSetUnionRule.scala | 4 +- .../rules/dataSet/DataSetValuesRule.scala | 4 +- .../datastream/DataStreamAggregateRule.scala | 10 +- .../rules/datastream/DataStreamCalcRule.scala | 6 +- .../rules/datastream/DataStreamScanRule.scala | 8 +- .../datastream/DataStreamUnionRule.scala | 6 +- .../datastream/DataStreamValuesRule.scala | 4 +- .../StreamTableSourceScanRule.scala | 8 +- .../plan/schema/CompositeRelDataType.scala | 6 +- .../table/plan/schema/DataSetTable.scala | 2 +- .../table/plan/schema/DataStreamTable.scala | 2 +- .../table/plan/schema/FlinkTable.scala | 4 +- .../plan/schema/GenericRelDataType.scala | 4 +- .../table/plan/schema/RelTable.scala | 2 +- .../table/plan/schema/TableSourceTable.scala | 8 +- .../runtime/CountPartitionFunction.scala | 2 +- .../table/runtime/FlatJoinRunner.scala | 4 +- .../table/runtime/FlatMapRunner.scala | 4 +- .../runtime/IntersectCoGroupFunction.scala | 2 +- .../table/runtime/LimitFilterFunction.scala | 2 +- .../table/runtime/MapJoinLeftRunner.scala | 2 +- .../table/runtime/MapJoinRightRunner.scala | 2 +- .../{api => }/table/runtime/MapRunner.scala | 4 +- .../table/runtime/MapSideJoinRunner.scala | 4 +- .../table/runtime/MinusCoGroupFunction.scala | 2 +- .../table/runtime/aggregate/Aggregate.scala | 4 +- .../AggregateAllTimeWindowFunction.scala | 4 +- .../AggregateAllWindowFunction.scala | 4 +- .../aggregate/AggregateMapFunction.scala | 4 +- .../AggregateReduceCombineFunction.scala | 4 +- .../AggregateReduceGroupFunction.scala | 4 +- .../AggregateTimeWindowFunction.scala | 4 +- .../runtime/aggregate/AggregateUtil.scala | 14 +- .../aggregate/AggregateWindowFunction.scala | 4 +- .../runtime/aggregate/AvgAggregate.scala | 4 +- .../runtime/aggregate/CountAggregate.scala | 4 +- ...mentalAggregateAllTimeWindowFunction.scala | 4 +- ...ncrementalAggregateAllWindowFunction.scala | 4 +- .../IncrementalAggregateReduceFunction.scala | 4 +- ...crementalAggregateTimeWindowFunction.scala | 4 +- .../IncrementalAggregateWindowFunction.scala | 4 +- .../runtime/aggregate/MaxAggregate.scala | 4 +- .../runtime/aggregate/MinAggregate.scala | 4 +- .../runtime/aggregate/SumAggregate.scala | 4 +- .../TimeWindowPropertyCollector.scala | 4 +- .../table/runtime/io/RowCsvInputFormat.scala | 8 +- .../table/runtime/io/ValuesInputFormat.scala | 4 +- .../table/sinks/BatchTableSink.scala | 4 +- .../{api => }/table/sinks/CsvTableSink.scala | 6 +- .../table/sinks/StreamTableSink.scala | 4 +- .../{api => }/table/sinks/TableSink.scala | 8 +- .../{api => }/table/sinks/TableSinkBase.scala | 10 +- .../table/sources/BatchTableSource.scala | 2 +- .../table/sources/CsvTableSource.scala | 8 +- .../table/sources/StreamTableSource.scala | 2 +- .../{api => }/table/sources/TableSource.scala | 2 +- .../apache/flink/{api => }/table/table.scala | 16 +- .../{api => }/table/trees/TreeNode.scala | 2 +- .../table/typeutils/InternalTypeInfo.scala | 2 +- .../table/typeutils/NullAwareComparator.scala | 2 +- .../table/typeutils/NullMaskUtils.scala | 4 +- .../table/typeutils/RowComparator.scala | 8 +- .../table/typeutils/RowIntervalTypeInfo.scala | 2 +- .../table/typeutils/RowSerializer.scala | 6 +- .../table/typeutils/RowTypeInfo.scala | 4 +- .../typeutils/TimeIntervalTypeInfo.scala | 4 +- .../table/typeutils/TypeCheckUtils.scala | 4 +- .../table/typeutils/TypeCoercion.scala | 2 +- .../table/typeutils/TypeConverter.scala | 4 +- .../table/validate/FunctionCatalog.scala | 10 +- .../table/validate/ValidationResult.scala | 2 +- .../flink/{api => }/table/windows.scala | 6 +- .../api/java/batch/ExplainTest.java | 8 +- .../java/batch/TableEnvironmentITCase.java | 19 +- .../api/java/batch/TableSourceITCase.java | 18 +- .../api/java/batch/sql/SqlITCase.java | 12 +- .../java/batch/table/AggregationsITCase.java | 14 +- .../api/java/batch/table/CalcITCase.java | 16 +- .../api/java/batch/table/CastingITCase.java | 12 +- .../api/java/batch/table/JoinITCase.java | 14 +- .../api/java/stream/sql/SqlITCase.java | 14 +- .../api/java/stream/utils/StreamTestData.java | 2 +- .../{api => }/table/AggregationTest.scala | 8 +- .../table/CalciteConfigBuilderTest.scala | 2 +- .../table/CompositeFlatteningTest.scala | 20 +- .../table/ExpressionReductionTest.scala | 8 +- .../table/TableEnvironmentTest.scala | 6 +- .../api/scala/batch/ExplainTest.scala | 6 +- .../scala/batch/TableEnvironmentITCase.scala | 10 +- .../api/scala/batch/TableSinkITCase.scala | 14 +- .../api/scala/batch/TableSourceITCase.scala | 17 +- .../scala/batch/sql/AggregationsITCase.scala | 8 +- .../api/scala/batch/sql/CalcITCase.scala | 16 +- .../api/scala/batch/sql/JoinITCase.scala | 10 +- .../scala/batch/sql/SetOperatorsITCase.scala | 10 +- .../scala/batch/sql/SetOperatorsTest.scala | 8 +- .../scala/batch/sql/SingleRowJoinTest.scala | 8 +- .../api/scala/batch/sql/SortITCase.scala | 12 +- .../scala/batch/sql/TableWithSQLITCase.scala | 10 +- .../batch/table/AggregationsITCase.scala | 10 +- .../api/scala/batch/table/CalcITCase.scala | 12 +- .../api/scala/batch/table/JoinITCase.scala | 12 +- .../batch/table/SetOperatorsITCase.scala | 10 +- .../api/scala/batch/table/SortITCase.scala | 12 +- .../api/scala/batch/utils/SortTestUtils.scala | 2 +- .../batch/utils/TableProgramsTestBase.scala | 6 +- .../api/scala/stream/ExplainStreamTest.scala | 6 +- .../api/scala/stream/TableSinkITCase.scala | 10 +- .../api/scala/stream/TableSourceITCase.scala | 12 +- .../api/scala/stream/sql/SqlITCase.scala | 8 +- .../stream/table/AggregationsITCase.scala | 10 +- .../api/scala/stream/table/CalcITCase.scala | 10 +- .../scala/stream/table/GroupWindowTest.scala | 14 +- .../api/scala/stream/table/UnionITCase.scala | 8 +- .../stream/table/UnsupportedOpsTest.scala | 8 +- .../api/scala/stream/utils/StreamITCase.scala | 4 +- .../scala/stream/utils/StreamTestData.scala | 2 +- .../expressions/CompositeAccessTest.scala | 12 +- .../table/expressions/DecimalTypeTest.scala | 10 +- .../expressions/NonDeterministicTests.scala | 10 +- .../expressions/ScalarFunctionsTest.scala | 10 +- .../expressions/ScalarOperatorsTest.scala | 10 +- .../table/expressions/SqlExpressionTest.scala | 8 +- .../table/expressions/TemporalTypesTest.scala | 10 +- .../UserDefinedScalarFunctionTest.scala | 12 +- .../utils/ExpressionTestBase.scala | 16 +- .../utils/UserDefinedScalarFunctions.scala | 6 +- .../runtime/aggregate/AggregateTestBase.scala | 4 +- .../runtime/aggregate/AvgAggregateTest.scala | 2 +- .../aggregate/CountAggregateTest.scala | 2 +- .../runtime/aggregate/MaxAggregateTest.scala | 2 +- .../runtime/aggregate/MinAggregateTest.scala | 2 +- .../runtime/aggregate/SumAggregateTest.scala | 2 +- .../runtime/io/RowCsvInputFormatTest.scala | 8 +- .../table/typeutils/RowComparatorTest.scala | 6 +- .../RowComparatorWithManyFieldsTest.scala | 4 +- .../table/typeutils/RowSerializerTest.scala | 6 +- .../{api => }/table/utils/TableTestBase.scala | 10 +- 293 files changed, 1346 insertions(+), 987 deletions(-) rename flink-libraries/flink-table/src/main/java/org/apache/flink/{api/java/table => table/api/java}/package-info.java (69%) rename flink-libraries/flink-table/src/main/java/org/apache/flink/{api => }/table/explain/Node.java (98%) rename flink-libraries/flink-table/src/main/java/org/apache/flink/{api => }/table/explain/PlanJsonParser.java (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/BatchTableEnvironment.scala (93%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/CalciteConfig.scala (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/FlinkCalciteSqlValidator.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/FlinkPlannerImpl.scala (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/FlinkRelBuilder.scala (91%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/FlinkTypeFactory.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/FlinkTypeSystem.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/Row.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/StreamTableEnvironment.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/TableConfig.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/TableEnvironment.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/Types.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api/java/table => table/api/java}/BatchTableEnvironment.scala (87%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api/java/table => table/api/java}/StreamTableEnvironment.scala (87%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api/java/table => table/api/java}/groupWindows.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api/scala/table => table/api/scala}/BatchTableEnvironment.scala (86%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api/scala/table => table/api/scala}/DataSetConversions.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api/scala/table => table/api/scala}/DataStreamConversions.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api/scala/table => table/api/scala}/StreamTableEnvironment.scala (87%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api/scala/table => table/api/scala}/TableConversions.scala (89%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api/scala/table => table/api/scala}/expressionDsl.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api/scala/table => table/api/scala}/groupWindows.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api/scala/table => table/api/scala}/package.scala (86%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/CodeGenException.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/CodeGenUtils.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/CodeGenerator.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/Compiler.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/ExpressionReducer.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/Indenter.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/BuiltInMethods.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/CallGenerator.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/CurrentTimePointCallGen.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/FloorCeilCallGen.scala (88%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/MethodCallGen.scala (83%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/MultiTypeMethodCallGen.scala (88%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/NotCallGenerator.scala (85%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/ScalarFunctionCallGen.scala (91%) create mode 100644 flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarFunctions.scala rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/ScalarOperators.scala (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/TrimCallGen.scala (88%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/generated.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/package.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/exceptions.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/Expression.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/ExpressionParser.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/ExpressionUtils.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/InputTypeSpec.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/aggregations.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/arithmetic.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/call.scala (91%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/cast.scala (90%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/comparison.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/composite.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/fieldExpression.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/literals.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/logic.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/mathExpressions.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/ordering.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/package.scala (88%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/stringExpressions.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/symbols.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/time.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/windowProperties.scala (90%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/functions/ScalarFunction.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/functions/UserDefinedFunction.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/functions/utils/MathFunctions.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/functions/utils/ScalarSqlFunction.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/functions/utils/UserDefinedFunctionUtils.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/package.scala (91%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/ProjectionTranslator.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/cost/DataSetCost.scala (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/cost/DataSetCostFactory.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/logical/LogicalNode.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/logical/LogicalWindow.scala (82%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/logical/Resolvable.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/logical/groupWindows.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/logical/operators.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/logical/rel/LogicalWindowAggregate.scala (93%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/FlinkAggregate.scala (91%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/FlinkCalc.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/FlinkRel.scala (93%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/BatchScan.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/BatchTableSourceScan.scala (90%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetAggregate.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetCalc.scala (93%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetConvention.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetIntersect.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetJoin.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetMinus.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetRel.scala (87%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetScan.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetSingleRowJoin.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetSort.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetUnion.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetValues.scala (91%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/datastream/DataStreamAggregate.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/datastream/DataStreamCalc.scala (91%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/datastream/DataStreamConvention.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/datastream/DataStreamRel.scala (90%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/datastream/DataStreamScan.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/datastream/DataStreamUnion.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/datastream/DataStreamValues.scala (90%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/datastream/StreamScan.scala (90%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/datastream/StreamTableSourceScan.scala (89%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/EnumerableToLogicalTableScan.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/FlinkRuleSets.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/BatchTableSourceScanRule.scala (89%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetAggregateRule.scala (93%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetAggregateWithNullValuesRule.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetCalcRule.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetIntersectRule.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetJoinRule.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetMinusRule.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetScanRule.scala (91%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetSingleRowJoinRule.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetSortRule.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetUnionRule.scala (93%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetValuesRule.scala (91%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/datastream/DataStreamAggregateRule.scala (88%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/datastream/DataStreamCalcRule.scala (89%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/datastream/DataStreamScanRule.scala (88%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/datastream/DataStreamUnionRule.scala (89%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/datastream/DataStreamValuesRule.scala (91%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/datastream/StreamTableSourceScanRule.scala (91%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/schema/CompositeRelDataType.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/schema/DataSetTable.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/schema/DataStreamTable.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/schema/FlinkTable.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/schema/GenericRelDataType.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/schema/RelTable.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/schema/TableSourceTable.scala (85%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/CountPartitionFunction.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/FlatJoinRunner.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/FlatMapRunner.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/IntersectCoGroupFunction.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/LimitFilterFunction.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/MapJoinLeftRunner.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/MapJoinRightRunner.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/MapRunner.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/MapSideJoinRunner.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/MinusCoGroupFunction.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/Aggregate.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/AggregateAllTimeWindowFunction.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/AggregateAllWindowFunction.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/AggregateMapFunction.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/AggregateReduceCombineFunction.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/AggregateReduceGroupFunction.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/AggregateTimeWindowFunction.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/AggregateUtil.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/AggregateWindowFunction.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/AvgAggregate.scala (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/CountAggregate.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/IncrementalAggregateAllTimeWindowFunction.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/IncrementalAggregateAllWindowFunction.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/IncrementalAggregateReduceFunction.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/IncrementalAggregateTimeWindowFunction.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/IncrementalAggregateWindowFunction.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/MaxAggregate.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/MinAggregate.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/SumAggregate.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/aggregate/TimeWindowPropertyCollector.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/io/RowCsvInputFormat.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/runtime/io/ValuesInputFormat.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/sinks/BatchTableSink.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/sinks/CsvTableSink.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/sinks/StreamTableSink.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/sinks/TableSink.scala (88%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/sinks/TableSinkBase.scala (87%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/sources/BatchTableSource.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/sources/CsvTableSource.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/sources/StreamTableSource.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/sources/TableSource.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/table.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/trees/TreeNode.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/typeutils/InternalTypeInfo.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/typeutils/NullAwareComparator.scala (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/typeutils/NullMaskUtils.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/typeutils/RowComparator.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/typeutils/RowIntervalTypeInfo.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/typeutils/RowSerializer.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/typeutils/RowTypeInfo.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/typeutils/TimeIntervalTypeInfo.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/typeutils/TypeCheckUtils.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/typeutils/TypeCoercion.scala (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/typeutils/TypeConverter.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/validate/FunctionCatalog.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/validate/ValidationResult.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/windows.scala (98%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/{ => table}/api/java/batch/ExplainTest.java (96%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/{ => table}/api/java/batch/TableEnvironmentITCase.java (97%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/{ => table}/api/java/batch/TableSourceITCase.java (88%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/{ => table}/api/java/batch/sql/SqlITCase.java (94%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/{ => table}/api/java/batch/table/AggregationsITCase.java (97%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/{ => table}/api/java/batch/table/CalcITCase.java (96%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/{ => table}/api/java/batch/table/CastingITCase.java (93%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/{ => table}/api/java/batch/table/JoinITCase.java (95%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/{ => table}/api/java/stream/sql/SqlITCase.java (91%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/{ => table}/api/java/stream/utils/StreamTestData.java (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/AggregationTest.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/CalciteConfigBuilderTest.scala (99%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/CompositeFlatteningTest.scala (83%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/ExpressionReductionTest.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/TableEnvironmentTest.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/ExplainTest.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/TableEnvironmentITCase.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/TableSinkITCase.scala (84%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/TableSourceITCase.scala (90%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/sql/AggregationsITCase.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/sql/CalcITCase.scala (95%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/sql/JoinITCase.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/sql/SetOperatorsITCase.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/sql/SetOperatorsTest.scala (92%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/sql/SingleRowJoinTest.scala (95%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/sql/SortITCase.scala (92%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/sql/TableWithSQLITCase.scala (92%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/table/AggregationsITCase.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/table/CalcITCase.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/table/JoinITCase.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/table/SetOperatorsITCase.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/table/SortITCase.scala (93%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/utils/SortTestUtils.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/utils/TableProgramsTestBase.scala (90%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/ExplainStreamTest.scala (94%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/TableSinkITCase.scala (88%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/TableSourceITCase.scala (94%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/sql/SqlITCase.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/table/AggregationsITCase.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/table/CalcITCase.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/table/GroupWindowTest.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/table/UnionITCase.scala (94%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/table/UnsupportedOpsTest.scala (94%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/utils/StreamITCase.scala (94%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/utils/StreamTestData.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/expressions/CompositeAccessTest.scala (92%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/expressions/DecimalTypeTest.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/expressions/NonDeterministicTests.scala (89%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/expressions/ScalarFunctionsTest.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/expressions/ScalarOperatorsTest.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/expressions/SqlExpressionTest.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/expressions/TemporalTypesTest.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/expressions/UserDefinedScalarFunctionTest.scala (94%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/expressions/utils/ExpressionTestBase.scala (93%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/expressions/utils/UserDefinedScalarFunctions.scala (94%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/runtime/aggregate/AggregateTestBase.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/runtime/aggregate/AvgAggregateTest.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/runtime/aggregate/CountAggregateTest.scala (95%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/runtime/aggregate/MaxAggregateTest.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/runtime/aggregate/MinAggregateTest.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/runtime/aggregate/SumAggregateTest.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/runtime/io/RowCsvInputFormatTest.scala (99%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/typeutils/RowComparatorTest.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/typeutils/RowComparatorWithManyFieldsTest.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/typeutils/RowSerializerTest.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/utils/TableTestBase.scala (95%) diff --git a/docs/dev/table_api.md b/docs/dev/table_api.md index 927180323034b..c7e84119d1ecd 100644 --- a/docs/dev/table_api.md +++ b/docs/dev/table_api.md @@ -398,7 +398,7 @@ Please refer to the Javadoc for a full list of supported operations and a descri
-The Table API is enabled by importing `org.apache.flink.api.scala.table._`. This enables +The Table API is enabled by importing `org.apache.flink.table.api.scala._`. This enables implicit conversions to convert a `DataSet` or `DataStream` to a Table. The following example shows: - how a `DataSet` is converted to a `Table`, @@ -407,7 +407,7 @@ implicit conversions to convert a `DataSet` or `DataStream` to a Table. The foll {% highlight scala %} import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala._ case class WC(word: String, count: Int) @@ -448,7 +448,7 @@ The following example shows how to convert a `DataStream` to a `Table` and filte {% highlight scala %} import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala._ val env = StreamExecutionEnvironment.getExecutionEnvironment val tEnv = TableEnvironment.getTableEnvironment(env) @@ -1451,7 +1451,7 @@ A, ABS, ABSOLUTE, ACTION, ADA, ADD, ADMIN, AFTER, ALL, ALLOCATE, ALLOW, ALTER, A Data Types ---------- -The Table API is built on top of Flink's DataSet and DataStream API. Internally, it also uses Flink's `TypeInformation` to distinguish between types. The Table API does not support all Flink types so far. All supported simple types are listed in `org.apache.flink.api.table.Types`. The following table summarizes the relation between Table API types, SQL types, and the resulting Java class. +The Table API is built on top of Flink's DataSet and DataStream API. Internally, it also uses Flink's `TypeInformation` to distinguish between types. The Table API does not support all Flink types so far. All supported simple types are listed in `org.apache.flink.table.Types`. The following table summarizes the relation between Table API types, SQL types, and the resulting Java class. | Table API | SQL | Java type | | :--------------------- | :-------------------------- | :--------------------- | @@ -3814,7 +3814,7 @@ ELEMENT(ARRAY) If a required scalar function is not contained in the built-in functions, it is possible to define custom, user-defined scalar functions for both the Table API and SQL. A user-defined scalar functions maps zero, one, or multiple scalar values to a new scalar value. -In order to define a scalar function one has to extend the base class `ScalarFunction` in `org.apache.flink.api.table.functions` and implement (one or more) evaluation methods. The behavior of a scalar function is determined by the evaluation method. An evaluation method must be declared publicly and named `eval`. The parameter types and return type of the evaluation method also determine the parameter and return types of the scalar function. Evaluation methods can also be overloaded by implementing multiple methods named `eval`. +In order to define a scalar function one has to extend the base class `ScalarFunction` in `org.apache.flink.table.functions` and implement (one or more) evaluation methods. The behavior of a scalar function is determined by the evaluation method. An evaluation method must be declared publicly and named `eval`. The parameter types and return type of the evaluation method also determine the parameter and return types of the scalar function. Evaluation methods can also be overloaded by implementing multiple methods named `eval`. The following example snippet shows how to define your own hash code function: diff --git a/flink-connectors/flink-connector-kafka-0.10/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka010JsonTableSource.java b/flink-connectors/flink-connector-kafka-0.10/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka010JsonTableSource.java index ddf1ad3b8166a..a43f2d2d91ef0 100644 --- a/flink-connectors/flink-connector-kafka-0.10/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka010JsonTableSource.java +++ b/flink-connectors/flink-connector-kafka-0.10/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka010JsonTableSource.java @@ -19,8 +19,8 @@ package org.apache.flink.streaming.connectors.kafka; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.sources.StreamTableSource; +import org.apache.flink.table.Row; +import org.apache.flink.table.sources.StreamTableSource; import org.apache.flink.streaming.util.serialization.DeserializationSchema; import java.util.Properties; diff --git a/flink-connectors/flink-connector-kafka-0.10/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka010TableSource.java b/flink-connectors/flink-connector-kafka-0.10/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka010TableSource.java index 732440b11a45f..c3710da044e36 100644 --- a/flink-connectors/flink-connector-kafka-0.10/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka010TableSource.java +++ b/flink-connectors/flink-connector-kafka-0.10/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka010TableSource.java @@ -19,8 +19,8 @@ package org.apache.flink.streaming.connectors.kafka; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.sources.StreamTableSource; +import org.apache.flink.table.Row; +import org.apache.flink.table.sources.StreamTableSource; import org.apache.flink.streaming.util.serialization.DeserializationSchema; import java.util.Properties; diff --git a/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSink.java b/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSink.java index b155576bce93b..b008416bf0b2f 100644 --- a/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSink.java +++ b/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSink.java @@ -17,7 +17,7 @@ */ package org.apache.flink.streaming.connectors.kafka; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.streaming.connectors.kafka.partitioner.KafkaPartitioner; import org.apache.flink.streaming.util.serialization.SerializationSchema; diff --git a/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSource.java b/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSource.java index 63bb57e121010..2a9780a0b1b44 100644 --- a/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSource.java +++ b/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSource.java @@ -19,8 +19,8 @@ package org.apache.flink.streaming.connectors.kafka; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.sources.StreamTableSource; +import org.apache.flink.table.Row; +import org.apache.flink.table.sources.StreamTableSource; import org.apache.flink.streaming.util.serialization.DeserializationSchema; import java.util.Properties; diff --git a/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08TableSource.java b/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08TableSource.java index 8f51237fbb680..56c69aced286f 100644 --- a/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08TableSource.java +++ b/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka08TableSource.java @@ -19,8 +19,8 @@ package org.apache.flink.streaming.connectors.kafka; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.sources.StreamTableSource; +import org.apache.flink.table.Row; +import org.apache.flink.table.sources.StreamTableSource; import org.apache.flink.streaming.util.serialization.DeserializationSchema; import java.util.Properties; diff --git a/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSinkTest.java b/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSinkTest.java index 6d0b1406ff20c..8e216bda9645a 100644 --- a/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSinkTest.java +++ b/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSinkTest.java @@ -17,7 +17,7 @@ */ package org.apache.flink.streaming.connectors.kafka; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.streaming.connectors.kafka.partitioner.KafkaPartitioner; import org.apache.flink.streaming.util.serialization.JsonRowSerializationSchema; import org.apache.flink.streaming.util.serialization.SerializationSchema; diff --git a/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSourceTest.java b/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSourceTest.java index a2d66ac2f6413..47216af6c3f53 100644 --- a/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSourceTest.java +++ b/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka08JsonTableSourceTest.java @@ -20,7 +20,7 @@ import java.util.Properties; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.streaming.util.serialization.DeserializationSchema; import org.apache.flink.streaming.util.serialization.JsonRowDeserializationSchema; diff --git a/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSink.java b/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSink.java index 38ea47c237d28..891e7cb30b764 100644 --- a/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSink.java +++ b/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSink.java @@ -17,7 +17,7 @@ */ package org.apache.flink.streaming.connectors.kafka; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.streaming.connectors.kafka.partitioner.KafkaPartitioner; import org.apache.flink.streaming.util.serialization.SerializationSchema; diff --git a/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSource.java b/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSource.java index 975ef5800a07f..e85870576e347 100644 --- a/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSource.java +++ b/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSource.java @@ -19,8 +19,8 @@ package org.apache.flink.streaming.connectors.kafka; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.sources.StreamTableSource; +import org.apache.flink.table.Row; +import org.apache.flink.table.sources.StreamTableSource; import org.apache.flink.streaming.util.serialization.DeserializationSchema; import java.util.Properties; diff --git a/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09TableSource.java b/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09TableSource.java index 03b504024645f..3a560783d4190 100644 --- a/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09TableSource.java +++ b/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/Kafka09TableSource.java @@ -19,8 +19,8 @@ package org.apache.flink.streaming.connectors.kafka; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.sources.StreamTableSource; +import org.apache.flink.table.Row; +import org.apache.flink.table.sources.StreamTableSource; import org.apache.flink.streaming.util.serialization.DeserializationSchema; import java.util.Properties; diff --git a/flink-connectors/flink-connector-kafka-0.9/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSinkTest.java b/flink-connectors/flink-connector-kafka-0.9/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSinkTest.java index 45f70acf8c6fb..0f512323665d1 100644 --- a/flink-connectors/flink-connector-kafka-0.9/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSinkTest.java +++ b/flink-connectors/flink-connector-kafka-0.9/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSinkTest.java @@ -17,7 +17,7 @@ */ package org.apache.flink.streaming.connectors.kafka; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.streaming.connectors.kafka.partitioner.KafkaPartitioner; import org.apache.flink.streaming.util.serialization.JsonRowSerializationSchema; import org.apache.flink.streaming.util.serialization.SerializationSchema; diff --git a/flink-connectors/flink-connector-kafka-0.9/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSourceTest.java b/flink-connectors/flink-connector-kafka-0.9/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSourceTest.java index 4a75f50740c94..9d1d679deb468 100644 --- a/flink-connectors/flink-connector-kafka-0.9/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSourceTest.java +++ b/flink-connectors/flink-connector-kafka-0.9/src/test/java/org/apache/flink/streaming/connectors/kafka/Kafka09JsonTableSourceTest.java @@ -20,7 +20,7 @@ import java.util.Properties; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.streaming.util.serialization.DeserializationSchema; import org.apache.flink.streaming.util.serialization.JsonRowDeserializationSchema; diff --git a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaJsonTableSink.java b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaJsonTableSink.java index ee987838c143e..e86dac6c96307 100644 --- a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaJsonTableSink.java +++ b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaJsonTableSink.java @@ -17,7 +17,7 @@ */ package org.apache.flink.streaming.connectors.kafka; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.streaming.connectors.kafka.partitioner.KafkaPartitioner; import org.apache.flink.streaming.util.serialization.JsonRowSerializationSchema; import org.apache.flink.streaming.util.serialization.SerializationSchema; diff --git a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaJsonTableSource.java b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaJsonTableSource.java index f145509bab2ff..3cdad0f3facd8 100644 --- a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaJsonTableSource.java +++ b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaJsonTableSource.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.connectors.kafka; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.sources.StreamTableSource; +import org.apache.flink.table.sources.StreamTableSource; import org.apache.flink.streaming.util.serialization.DeserializationSchema; import org.apache.flink.streaming.util.serialization.JsonRowDeserializationSchema; diff --git a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSink.java b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSink.java index 714d9cd9085ea..0b24472b41989 100644 --- a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSink.java +++ b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSink.java @@ -18,9 +18,9 @@ package org.apache.flink.streaming.connectors.kafka; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.sinks.StreamTableSink; -import org.apache.flink.api.table.typeutils.RowTypeInfo; +import org.apache.flink.table.Row; +import org.apache.flink.table.sinks.StreamTableSink; +import org.apache.flink.table.typeutils.RowTypeInfo; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.connectors.kafka.partitioner.KafkaPartitioner; import org.apache.flink.streaming.util.serialization.SerializationSchema; diff --git a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSource.java b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSource.java index fd423d7432b8f..da3a2feb7efbf 100644 --- a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSource.java +++ b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSource.java @@ -19,9 +19,9 @@ package org.apache.flink.streaming.connectors.kafka; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.sources.StreamTableSource; -import org.apache.flink.api.table.typeutils.RowTypeInfo; +import org.apache.flink.table.Row; +import org.apache.flink.table.sources.StreamTableSource; +import org.apache.flink.table.typeutils.RowTypeInfo; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.util.serialization.DeserializationSchema; diff --git a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/util/serialization/JsonRowDeserializationSchema.java b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/util/serialization/JsonRowDeserializationSchema.java index 434481095cc7c..d86d9bf0f9b8c 100644 --- a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/util/serialization/JsonRowDeserializationSchema.java +++ b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/util/serialization/JsonRowDeserializationSchema.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.typeutils.TypeExtractor; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.typeutils.RowTypeInfo; +import org.apache.flink.table.Row; +import org.apache.flink.table.typeutils.RowTypeInfo; import org.apache.flink.util.Preconditions; import java.io.IOException; diff --git a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/util/serialization/JsonRowSerializationSchema.java b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/util/serialization/JsonRowSerializationSchema.java index 077ff132642aa..06d0edf86d4cb 100644 --- a/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/util/serialization/JsonRowSerializationSchema.java +++ b/flink-connectors/flink-connector-kafka-base/src/main/java/org/apache/flink/streaming/util/serialization/JsonRowSerializationSchema.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.util.Preconditions; diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/JsonRowDeserializationSchemaTest.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/JsonRowDeserializationSchemaTest.java index 68225e2ae461f..634f2ff299e04 100644 --- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/JsonRowDeserializationSchemaTest.java +++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/JsonRowDeserializationSchemaTest.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.streaming.util.serialization.JsonRowDeserializationSchema; import org.junit.Test; diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/JsonRowSerializationSchemaTest.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/JsonRowSerializationSchemaTest.java index 92af15de2336c..3d9743ae7bc9b 100644 --- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/JsonRowSerializationSchemaTest.java +++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/JsonRowSerializationSchemaTest.java @@ -16,7 +16,7 @@ */ package org.apache.flink.streaming.connectors.kafka; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.streaming.util.serialization.JsonRowDeserializationSchema; import org.apache.flink.streaming.util.serialization.JsonRowSerializationSchema; import org.junit.Test; diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSinkTestBase.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSinkTestBase.java index ae0af527ebb78..ea49b0c399f3f 100644 --- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSinkTestBase.java +++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSinkTestBase.java @@ -18,8 +18,8 @@ package org.apache.flink.streaming.connectors.kafka; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.typeutils.RowTypeInfo; +import org.apache.flink.table.Row; +import org.apache.flink.table.typeutils.RowTypeInfo; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.connectors.kafka.internals.TypeUtil; import org.apache.flink.streaming.connectors.kafka.partitioner.KafkaPartitioner; diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSourceTestBase.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSourceTestBase.java index 2a281e8e40939..020fbb4ecdcce 100644 --- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSourceTestBase.java +++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSourceTestBase.java @@ -21,7 +21,7 @@ import java.util.Properties; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.util.serialization.DeserializationSchema; import org.junit.Test; diff --git a/flink-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java b/flink-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java index b4246f5a9c7bb..5f35dacbd8562 100644 --- a/flink-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java +++ b/flink-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java @@ -37,8 +37,8 @@ import org.apache.flink.api.common.io.statistics.BaseStatistics; import org.apache.flink.api.java.io.jdbc.split.ParameterValuesProvider; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.typeutils.RowTypeInfo; +import org.apache.flink.table.Row; +import org.apache.flink.table.typeutils.RowTypeInfo; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; diff --git a/flink-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java b/flink-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java index da4b1ade75005..9f6f2a5ee35ae 100644 --- a/flink-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java +++ b/flink-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.io.RichOutputFormat; import org.apache.flink.api.java.tuple.Tuple; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.configuration.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCFullTest.java b/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCFullTest.java index da9469b2f6541..b3455d7f0962e 100644 --- a/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCFullTest.java +++ b/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCFullTest.java @@ -29,7 +29,7 @@ import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.io.jdbc.JDBCInputFormat.JDBCInputFormatBuilder; import org.apache.flink.api.java.io.jdbc.split.NumericBetweenParametersProvider; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.junit.Assert; import org.junit.Test; diff --git a/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java b/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java index efae076c3d2a0..ce0e43089c7b0 100644 --- a/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java +++ b/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java @@ -25,7 +25,7 @@ import org.apache.flink.api.java.io.jdbc.split.GenericParameterValuesProvider; import org.apache.flink.api.java.io.jdbc.split.NumericBetweenParametersProvider; import org.apache.flink.api.java.io.jdbc.split.ParameterValuesProvider; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.apache.flink.core.io.InputSplit; import org.junit.After; import org.junit.Assert; @@ -244,4 +244,4 @@ public void testEmptyResults() throws IOException, InstantiationException, Illeg Assert.assertEquals(0, recordsCnt); } -} \ No newline at end of file +} diff --git a/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java b/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java index 086a84cfba20a..154972a85689c 100644 --- a/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java +++ b/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java @@ -26,7 +26,7 @@ import java.sql.SQLException; import org.apache.flink.api.java.tuple.Tuple5; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.Row; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCTestBase.java b/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCTestBase.java index 69ad69350cc2c..9237a54fbe539 100644 --- a/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCTestBase.java +++ b/flink-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCTestBase.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.table.typeutils.RowTypeInfo; +import org.apache.flink.table.typeutils.RowTypeInfo; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountSQL.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountSQL.java index c9043d1a5c4be..d1f748eb74986 100644 --- a/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountSQL.java +++ b/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountSQL.java @@ -17,11 +17,11 @@ */ package org.apache.flink.examples.java; -import org.apache.flink.api.table.Table; +import org.apache.flink.table.Table; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.table.BatchTableEnvironment; -import org.apache.flink.api.table.TableEnvironment; +import org.apache.flink.table.api.java.BatchTableEnvironment; +import org.apache.flink.table.TableEnvironment; /** * Simple example that shows how the Batch SQL API is used in Java. diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountTable.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountTable.java index c339cf19f35c2..a5c80ddcc6a93 100644 --- a/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountTable.java +++ b/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountTable.java @@ -17,11 +17,11 @@ */ package org.apache.flink.examples.java; -import org.apache.flink.api.table.Table; +import org.apache.flink.table.Table; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.table.BatchTableEnvironment; -import org.apache.flink.api.table.TableEnvironment; +import org.apache.flink.table.api.java.BatchTableEnvironment; +import org.apache.flink.table.TableEnvironment; /** * Simple example for demonstrating the use of the Table API for a Word Count in Java. diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/api/java/table/package-info.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/api/java/package-info.java similarity index 69% rename from flink-libraries/flink-table/src/main/java/org/apache/flink/api/java/table/package-info.java rename to flink-libraries/flink-table/src/main/java/org/apache/flink/table/api/java/package-info.java index 1db4cb8be9ff0..9daadb92fda10 100644 --- a/flink-libraries/flink-table/src/main/java/org/apache/flink/api/java/table/package-info.java +++ b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/api/java/package-info.java @@ -19,15 +19,15 @@ /** * Table API (Java)
* - * A {@link org.apache.flink.api.java.table.BatchTableEnvironment} can be used to create a - * {@link org.apache.flink.api.table.Table} from a {@link org.apache.flink.api.java.DataSet}. - * Equivalently, a {@link org.apache.flink.api.java.table.StreamTableEnvironment} can be used to - * create a {@link org.apache.flink.api.table.Table} from a + * A {@link org.apache.flink.table.api.java.BatchTableEnvironment} can be used to create a + * {@link org.apache.flink.table.Table} from a {@link org.apache.flink.api.java.DataSet}. + * Equivalently, a {@link org.apache.flink.table.api.java.StreamTableEnvironment} can be used to + * create a {@link org.apache.flink.table.Table} from a * {@link org.apache.flink.streaming.api.datastream.DataStream}. * *

* Tables can be used to perform SQL-like queries on data. Please have - * a look at {@link org.apache.flink.api.table.Table} to see which operations are supported and + * a look at {@link org.apache.flink.table.Table} to see which operations are supported and * how query strings are written. * *

@@ -55,9 +55,9 @@ * } * *

- * As seen above, a {@link org.apache.flink.api.table.Table} can be converted back to the + * As seen above, a {@link org.apache.flink.table.Table} can be converted back to the * underlying API representation using - * {@link org.apache.flink.api.java.table.BatchTableEnvironment#toDataSet(org.apache.flink.api.table.Table, java.lang.Class)} - * or {@link org.apache.flink.api.java.table.StreamTableEnvironment#toDataStream(org.apache.flink.api.table.Table, java.lang.Class)}}. + * {@link org.apache.flink.table.api.java.BatchTableEnvironment#toDataSet(org.apache.flink.table.Table, java.lang.Class)} + * or {@link org.apache.flink.table.api.java.StreamTableEnvironment#toDataStream(org.apache.flink.table.Table, java.lang.Class)}}. */ -package org.apache.flink.api.java.table; +package org.apache.flink.table.api.java; diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/api/table/explain/Node.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/Node.java similarity index 98% rename from flink-libraries/flink-table/src/main/java/org/apache/flink/api/table/explain/Node.java rename to flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/Node.java index 915226041bcd6..4616728973902 100644 --- a/flink-libraries/flink-table/src/main/java/org/apache/flink/api/table/explain/Node.java +++ b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/Node.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.explain; +package org.apache.flink.table.explain; import java.util.List; diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/api/table/explain/PlanJsonParser.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/PlanJsonParser.java similarity index 99% rename from flink-libraries/flink-table/src/main/java/org/apache/flink/api/table/explain/PlanJsonParser.java rename to flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/PlanJsonParser.java index bd14cd2f4a803..f13c042186a2d 100644 --- a/flink-libraries/flink-table/src/main/java/org/apache/flink/api/table/explain/PlanJsonParser.java +++ b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/PlanJsonParser.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.explain; +package org.apache.flink.table.explain; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamSQLExample.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamSQLExample.scala index 63a541312e1fb..1763ae6f05465 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamSQLExample.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamSQLExample.scala @@ -18,8 +18,8 @@ package org.apache.flink.examples.scala import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.TableEnvironment +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.TableEnvironment import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment} /** diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamTableExample.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamTableExample.scala index 2ce26847ba7d9..ef7f1818ea521 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamTableExample.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamTableExample.scala @@ -18,8 +18,8 @@ package org.apache.flink.examples.scala import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.TableEnvironment +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.TableEnvironment import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment} /** diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala index a95098887cb82..99265d2b220ea 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala @@ -18,8 +18,8 @@ package org.apache.flink.examples.scala import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.TableEnvironment +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.TableEnvironment /** * This program implements a modified version of the TPC-H query 3. The diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountSQL.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountSQL.scala index 96a603e2ba3d6..6b6dd9c02bab2 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountSQL.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountSQL.scala @@ -18,8 +18,8 @@ package org.apache.flink.examples.scala import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.TableEnvironment +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.TableEnvironment /** * Simple example that shows how the Batch SQL API is used in Scala. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountTable.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountTable.scala index 587a7167802a7..3d3d23d59e523 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountTable.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountTable.scala @@ -19,8 +19,8 @@ package org.apache.flink.examples.scala import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.TableEnvironment +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.TableEnvironment /** * Simple example for demonstrating the use of the Table API for a Word Count in Scala. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/BatchTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/BatchTableEnvironment.scala similarity index 93% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/BatchTableEnvironment.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/BatchTableEnvironment.scala index 918b01b66db05..f1195b4a28cd5 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/BatchTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/BatchTableEnvironment.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import java.util.concurrent.atomic.AtomicInteger @@ -29,22 +29,22 @@ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.io.DiscardingOutputFormat import org.apache.flink.api.java.typeutils.TypeExtractor import org.apache.flink.api.java.{DataSet, ExecutionEnvironment} -import org.apache.flink.api.table.explain.PlanJsonParser -import org.apache.flink.api.table.expressions.Expression -import org.apache.flink.api.table.plan.logical.{CatalogNode, LogicalRelNode} -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetConvention, DataSetRel} -import org.apache.flink.api.table.plan.rules.FlinkRuleSets -import org.apache.flink.api.table.plan.schema.{DataSetTable, TableSourceTable} -import org.apache.flink.api.table.sinks.{BatchTableSink, TableSink} -import org.apache.flink.api.table.sources.BatchTableSource +import org.apache.flink.table.explain.PlanJsonParser +import org.apache.flink.table.expressions.Expression +import org.apache.flink.table.plan.logical.{CatalogNode, LogicalRelNode} +import org.apache.flink.table.plan.nodes.dataset.{DataSetConvention, DataSetRel} +import org.apache.flink.table.plan.rules.FlinkRuleSets +import org.apache.flink.table.plan.schema.{DataSetTable, TableSourceTable} +import org.apache.flink.table.sinks.{BatchTableSink, TableSink} +import org.apache.flink.table.sources.BatchTableSource /** * The abstract base class for batch TableEnvironments. * * A TableEnvironment can be used to: * - convert a [[DataSet]] to a [[Table]] - * - register a [[DataSet]] in the [[org.apache.flink.api.table.TableEnvironment]]'s catalog - * - register a [[Table]] in the [[org.apache.flink.api.table.TableEnvironment]]'s catalog + * - register a [[DataSet]] in the [[org.apache.flink.table.TableEnvironment]]'s catalog + * - register a [[Table]] in the [[org.apache.flink.table.TableEnvironment]]'s catalog * - scan a registered table to obtain a [[Table]] * - specify a SQL query on registered tables to obtain a [[Table]] * - convert a [[Table]] into a [[DataSet]] diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/CalciteConfig.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/CalciteConfig.scala similarity index 99% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/CalciteConfig.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/CalciteConfig.scala index 06b3edc3ced41..87bb81fd4f2ca 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/CalciteConfig.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/CalciteConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import org.apache.calcite.plan.RelOptRule import org.apache.calcite.sql.SqlOperatorTable diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkCalciteSqlValidator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkCalciteSqlValidator.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkCalciteSqlValidator.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkCalciteSqlValidator.scala index b1ccc096594ca..7357203883dcd 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkCalciteSqlValidator.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkCalciteSqlValidator.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import org.apache.calcite.adapter.java.JavaTypeFactory import org.apache.calcite.prepare.CalciteCatalogReader diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkPlannerImpl.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkPlannerImpl.scala similarity index 99% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkPlannerImpl.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkPlannerImpl.scala index 131cdc6c94cea..df96477bf0ce6 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkPlannerImpl.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkPlannerImpl.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import java.util diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkRelBuilder.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkRelBuilder.scala similarity index 91% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkRelBuilder.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkRelBuilder.scala index 8508e5314e7de..5438d52292fe8 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkRelBuilder.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkRelBuilder.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import java.util.Collections @@ -30,10 +30,10 @@ import org.apache.calcite.rel.logical.LogicalAggregate import org.apache.calcite.rex.RexBuilder import org.apache.calcite.tools.RelBuilder.{AggCall, GroupKey} import org.apache.calcite.tools.{FrameworkConfig, RelBuilder} -import org.apache.flink.api.table.FlinkRelBuilder.NamedWindowProperty -import org.apache.flink.api.table.expressions.WindowProperty -import org.apache.flink.api.table.plan.logical.LogicalWindow -import org.apache.flink.api.table.plan.logical.rel.LogicalWindowAggregate +import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty +import org.apache.flink.table.expressions.WindowProperty +import org.apache.flink.table.plan.logical.LogicalWindow +import org.apache.flink.table.plan.logical.rel.LogicalWindowAggregate /** * Flink specific [[RelBuilder]] that changes the default type factory to a [[FlinkTypeFactory]]. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkTypeFactory.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeFactory.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkTypeFactory.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeFactory.scala index 8dcd66085a8b0..dae4311ea7d1e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkTypeFactory.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeFactory.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import org.apache.calcite.avatica.util.TimeUnit import org.apache.calcite.jdbc.JavaTypeFactoryImpl @@ -30,10 +30,10 @@ import org.apache.flink.api.common.typeinfo.{NothingTypeInfo, PrimitiveArrayType import org.apache.flink.api.common.typeutils.CompositeType import org.apache.flink.api.java.typeutils.ObjectArrayTypeInfo import org.apache.flink.api.java.typeutils.ValueTypeInfo._ -import org.apache.flink.api.table.FlinkTypeFactory.typeInfoToSqlTypeName -import org.apache.flink.api.table.plan.schema.{ArrayRelDataType, CompositeRelDataType, GenericRelDataType} -import org.apache.flink.api.table.typeutils.TimeIntervalTypeInfo -import org.apache.flink.api.table.typeutils.TypeCheckUtils.isSimple +import org.apache.flink.table.FlinkTypeFactory.typeInfoToSqlTypeName +import org.apache.flink.table.plan.schema.{CompositeRelDataType, GenericRelDataType} +import org.apache.flink.table.typeutils.TimeIntervalTypeInfo +import org.apache.flink.table.typeutils.TypeCheckUtils.isSimple import scala.collection.mutable diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkTypeSystem.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeSystem.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkTypeSystem.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeSystem.scala index 3222eee2dda39..e3418b068b0d1 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/FlinkTypeSystem.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeSystem.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import org.apache.calcite.rel.`type`.RelDataTypeSystemImpl import org.apache.calcite.sql.`type`.SqlTypeName diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/Row.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/Row.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/Row.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/Row.scala index e3baab3f9a3ca..d81a2a44777c0 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/Row.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/Row.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table /** * This is used for executing Table API operations. We use manually generated diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/StreamTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/StreamTableEnvironment.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/StreamTableEnvironment.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/StreamTableEnvironment.scala index 8f00586d700b3..8a5b88432d3e6 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/StreamTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/StreamTableEnvironment.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import java.util.concurrent.atomic.AtomicInteger @@ -27,17 +27,18 @@ import org.apache.calcite.sql2rel.RelDecorrelator import org.apache.calcite.tools.{Programs, RuleSet} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.TypeExtractor -import org.apache.flink.api.table.explain.PlanJsonParser -import org.apache.flink.api.table.expressions.Expression -import org.apache.flink.api.table.plan.logical.{CatalogNode, LogicalRelNode} -import org.apache.flink.api.table.plan.nodes.datastream.{DataStreamConvention, DataStreamRel} -import org.apache.flink.api.table.plan.rules.FlinkRuleSets -import org.apache.flink.api.table.plan.schema.{DataStreamTable, TableSourceTable} -import org.apache.flink.api.table.sinks.{StreamTableSink, TableSink} -import org.apache.flink.api.table.sources.StreamTableSource +import org.apache.flink.table.explain.PlanJsonParser +import org.apache.flink.table.expressions.Expression +import org.apache.flink.table.plan.logical.{CatalogNode, LogicalRelNode} +import org.apache.flink.table.plan.nodes.datastream.{DataStreamConvention, DataStreamRel} +import org.apache.flink.table.plan.rules.FlinkRuleSets +import org.apache.flink.table.plan.schema.{DataStreamTable, TableSourceTable} +import org.apache.flink.table.sinks.{StreamTableSink, TableSink} +import org.apache.flink.table.sources.StreamTableSource import org.apache.flink.streaming.api.datastream.DataStream import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment + /** * The base class for stream TableEnvironments. * @@ -148,7 +149,7 @@ abstract class StreamTableEnvironment( * Registered tables can be referenced in SQL queries. * * @param name The name under which the [[StreamTableSource]] is registered. - * @param tableSource The [[org.apache.flink.api.table.sources.StreamTableSource]] to register. + * @param tableSource The [[org.apache.flink.table.sources.StreamTableSource]] to register. */ def registerTableSource(name: String, tableSource: StreamTableSource[_]): Unit = { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/TableConfig.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableConfig.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/TableConfig.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableConfig.scala index 37d9cb5a152fc..3b97e75605d52 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/TableConfig.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableConfig.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import java.util.TimeZone diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/TableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableEnvironment.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/TableEnvironment.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableEnvironment.scala index b6d0e31883cab..d9d0b2873f570 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/TableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableEnvironment.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import java.lang.reflect.Modifier import java.util.concurrent.atomic.AtomicInteger @@ -31,20 +31,20 @@ import org.apache.calcite.sql.parser.SqlParser import org.apache.calcite.sql.util.ChainedSqlOperatorTable import org.apache.calcite.tools.{FrameworkConfig, Frameworks, RuleSet, RuleSets} import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation} -import org.apache.flink.api.java.table.{BatchTableEnvironment => JavaBatchTableEnv, StreamTableEnvironment => JavaStreamTableEnv} +import org.apache.flink.table.api.java.{BatchTableEnvironment => JavaBatchTableEnv, StreamTableEnvironment => JavaStreamTableEnv} import org.apache.flink.api.java.typeutils.{PojoTypeInfo, TupleTypeInfo} import org.apache.flink.api.java.{ExecutionEnvironment => JavaBatchExecEnv} -import org.apache.flink.api.scala.table.{BatchTableEnvironment => ScalaBatchTableEnv, StreamTableEnvironment => ScalaStreamTableEnv} +import org.apache.flink.table.api.scala.{BatchTableEnvironment => ScalaBatchTableEnv, StreamTableEnvironment => ScalaStreamTableEnv} import org.apache.flink.api.scala.typeutils.CaseClassTypeInfo import org.apache.flink.api.scala.{ExecutionEnvironment => ScalaBatchExecEnv} -import org.apache.flink.api.table.codegen.ExpressionReducer -import org.apache.flink.api.table.expressions.{Alias, Expression, UnresolvedFieldReference} -import org.apache.flink.api.table.functions.utils.UserDefinedFunctionUtils.{checkForInstantiation, checkNotSingleton, createTableSqlFunctions, createScalarSqlFunction} -import org.apache.flink.api.table.functions.{TableFunction, ScalarFunction} -import org.apache.flink.api.table.plan.cost.DataSetCostFactory -import org.apache.flink.api.table.plan.schema.RelTable -import org.apache.flink.api.table.sinks.TableSink -import org.apache.flink.api.table.validate.FunctionCatalog +import org.apache.flink.table.codegen.ExpressionReducer +import org.apache.flink.table.expressions.{Alias, Expression, UnresolvedFieldReference} +import org.apache.flink.table.functions.utils.UserDefinedFunctionUtils.{checkForInstantiation, checkNotSingleton, createTableSqlFunctions, createScalarSqlFunction} +import org.apache.flink.table.functions.{TableFunction, ScalarFunction} +import org.apache.flink.table.plan.cost.DataSetCostFactory +import org.apache.flink.table.plan.schema.RelTable +import org.apache.flink.table.sinks.TableSink +import org.apache.flink.table.validate.FunctionCatalog import org.apache.flink.streaming.api.environment.{StreamExecutionEnvironment => JavaStreamExecEnv} import org.apache.flink.streaming.api.scala.{StreamExecutionEnvironment => ScalaStreamExecEnv} @@ -214,7 +214,7 @@ abstract class TableEnvironment(val config: TableConfig) { /** * Replaces a registered Table with another Table under the same name. - * We use this method to replace a [[org.apache.flink.api.table.plan.schema.DataStreamTable]] + * We use this method to replace a [[org.apache.flink.table.plan.schema.DataStreamTable]] * with a [[org.apache.calcite.schema.TranslatableTable]]. * * @param name Name of the table to replace. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/Types.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/Types.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/Types.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/Types.scala index a9881520b24f3..bfcab7732d902 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/Types.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/Types.scala @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, SqlTimeTypeInfo} -import org.apache.flink.api.table.typeutils.TimeIntervalTypeInfo +import org.apache.flink.table.typeutils.TimeIntervalTypeInfo /** * This class enumerates all supported types of the Table API. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/BatchTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala similarity index 87% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/BatchTableEnvironment.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala index 3517338bec11c..f2e0da563cce9 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/BatchTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala @@ -15,23 +15,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.java.table +package org.apache.flink.table.api.java import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.TypeExtractor import org.apache.flink.api.java.{DataSet, ExecutionEnvironment} -import org.apache.flink.api.table.expressions.ExpressionParser -import org.apache.flink.api.table.functions.TableFunction -import org.apache.flink.api.table.{Table, TableConfig} +import org.apache.flink.table.expressions.ExpressionParser +import org.apache.flink.table.{Table, TableConfig} /** - * The [[org.apache.flink.api.table.TableEnvironment]] for a Java batch [[DataSet]] + * The [[org.apache.flink.table.TableEnvironment]] for a Java batch [[DataSet]] * [[ExecutionEnvironment]]. * * A TableEnvironment can be used to: * - convert a [[DataSet]] to a [[Table]] - * - register a [[DataSet]] in the [[org.apache.flink.api.table.TableEnvironment]]'s catalog - * - register a [[Table]] in the [[org.apache.flink.api.table.TableEnvironment]]'s catalog + * - register a [[DataSet]] in the [[org.apache.flink.table.TableEnvironment]]'s catalog + * - register a [[Table]] in the [[org.apache.flink.table.TableEnvironment]]'s catalog * - scan a registered table to obtain a [[Table]] * - specify a SQL query on registered tables to obtain a [[Table]] * - convert a [[Table]] into a [[DataSet]] @@ -43,7 +42,7 @@ import org.apache.flink.api.table.{Table, TableConfig} class BatchTableEnvironment( execEnv: ExecutionEnvironment, config: TableConfig) - extends org.apache.flink.api.table.BatchTableEnvironment(execEnv, config) { + extends org.apache.flink.table.BatchTableEnvironment(execEnv, config) { /** * Converts the given [[DataSet]] into a [[Table]]. @@ -88,7 +87,7 @@ class BatchTableEnvironment( /** * Registers the given [[DataSet]] as table in the - * [[org.apache.flink.api.table.TableEnvironment]]'s catalog. + * [[org.apache.flink.table.TableEnvironment]]'s catalog. * Registered tables can be referenced in SQL queries. * * The field names of the [[Table]] are automatically derived from the type of the [[DataSet]]. @@ -105,7 +104,7 @@ class BatchTableEnvironment( /** * Registers the given [[DataSet]] as table with specified field names in the - * [[org.apache.flink.api.table.TableEnvironment]]'s catalog. + * [[org.apache.flink.table.TableEnvironment]]'s catalog. * Registered tables can be referenced in SQL queries. * * Example: @@ -133,7 +132,7 @@ class BatchTableEnvironment( * Converts the given [[Table]] into a [[DataSet]] of a specified type. * * The fields of the [[Table]] are mapped to [[DataSet]] fields as follows: - * - [[org.apache.flink.api.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] + * - [[org.apache.flink.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] * types: Fields are mapped by position, field types must match. * - POJO [[DataSet]] types: Fields are mapped by field name, field types must match. * @@ -150,7 +149,7 @@ class BatchTableEnvironment( * Converts the given [[Table]] into a [[DataSet]] of a specified type. * * The fields of the [[Table]] are mapped to [[DataSet]] fields as follows: - * - [[org.apache.flink.api.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] + * - [[org.apache.flink.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] * types: Fields are mapped by position, field types must match. * - POJO [[DataSet]] types: Fields are mapped by field name, field types must match. * diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/StreamTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala similarity index 87% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/StreamTableEnvironment.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala index 83293e3d99c1b..e3c0170786822 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/StreamTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala @@ -15,23 +15,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.java.table +package org.apache.flink.table.api.java import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.TypeExtractor -import org.apache.flink.api.table.functions.TableFunction -import org.apache.flink.api.table.{TableConfig, Table} -import org.apache.flink.api.table.expressions.ExpressionParser +import org.apache.flink.table.{TableConfig, Table} +import org.apache.flink.table.expressions.ExpressionParser import org.apache.flink.streaming.api.datastream.DataStream import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment /** - * The [[org.apache.flink.api.table.TableEnvironment]] for a Java [[StreamExecutionEnvironment]]. + * The [[org.apache.flink.table.TableEnvironment]] for a Java [[StreamExecutionEnvironment]]. * * A TableEnvironment can be used to: * - convert a [[DataStream]] to a [[Table]] - * - register a [[DataStream]] in the [[org.apache.flink.api.table.TableEnvironment]]'s catalog - * - register a [[Table]] in the [[org.apache.flink.api.table.TableEnvironment]]'s catalog + * - register a [[DataStream]] in the [[org.apache.flink.table.TableEnvironment]]'s catalog + * - register a [[Table]] in the [[org.apache.flink.table.TableEnvironment]]'s catalog * - scan a registered table to obtain a [[Table]] * - specify a SQL query on registered tables to obtain a [[Table]] * - convert a [[Table]] into a [[DataStream]] @@ -43,7 +42,7 @@ import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment class StreamTableEnvironment( execEnv: StreamExecutionEnvironment, config: TableConfig) - extends org.apache.flink.api.table.StreamTableEnvironment(execEnv, config) { + extends org.apache.flink.table.StreamTableEnvironment(execEnv, config) { /** * Converts the given [[DataStream]] into a [[Table]]. @@ -89,7 +88,7 @@ class StreamTableEnvironment( /** * Registers the given [[DataStream]] as table in the - * [[org.apache.flink.api.table.TableEnvironment]]'s catalog. + * [[org.apache.flink.table.TableEnvironment]]'s catalog. * Registered tables can be referenced in SQL queries. * * The field names of the [[Table]] are automatically derived @@ -107,7 +106,7 @@ class StreamTableEnvironment( /** * Registers the given [[DataStream]] as table with specified field names in the - * [[org.apache.flink.api.table.TableEnvironment]]'s catalog. + * [[org.apache.flink.table.TableEnvironment]]'s catalog. * Registered tables can be referenced in SQL queries. * * Example: @@ -135,7 +134,7 @@ class StreamTableEnvironment( * Converts the given [[Table]] into a [[DataStream]] of a specified type. * * The fields of the [[Table]] are mapped to [[DataStream]] fields as follows: - * - [[org.apache.flink.api.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] + * - [[org.apache.flink.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] * types: Fields are mapped by position, field types must match. * - POJO [[DataStream]] types: Fields are mapped by field name, field types must match. * @@ -152,7 +151,7 @@ class StreamTableEnvironment( * Converts the given [[Table]] into a [[DataStream]] of a specified type. * * The fields of the [[Table]] are mapped to [[DataStream]] fields as follows: - * - [[org.apache.flink.api.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] + * - [[org.apache.flink.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] * types: Fields are mapped by position, field types must match. * - POJO [[DataStream]] types: Fields are mapped by field name, field types must match. * diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/groupWindows.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/groupWindows.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/groupWindows.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/groupWindows.scala index 3bbe7532970a8..4408a9751a5f0 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/groupWindows.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/groupWindows.scala @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.flink.api.java.table +package org.apache.flink.table.api.java -import org.apache.flink.api.table.{SessionWindow, SlideWithSize, TumblingWindow} +import org.apache.flink.table.{SessionWindow, SlideWithSize, TumblingWindow} /** * Helper class for creating a tumbling window. Tumbling windows are consecutive, non-overlapping diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/BatchTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala similarity index 86% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/BatchTableEnvironment.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala index f4bfe31c9a02e..b28f8ef87d5a9 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/BatchTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala @@ -15,24 +15,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.scala.table +package org.apache.flink.table.api.scala import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.scala._ -import org.apache.flink.api.table.expressions.Expression -import org.apache.flink.api.table.functions.TableFunction -import org.apache.flink.api.table.{TableConfig, Table} +import org.apache.flink.table.expressions.Expression +import org.apache.flink.table.functions.TableFunction +import org.apache.flink.table.{TableConfig, Table} import scala.reflect.ClassTag /** - * The [[org.apache.flink.api.table.TableEnvironment]] for a Scala batch [[DataSet]] + * The [[org.apache.flink.table.TableEnvironment]] for a Scala batch [[DataSet]] * [[ExecutionEnvironment]]. * * A TableEnvironment can be used to: * - convert a [[DataSet]] to a [[Table]] - * - register a [[DataSet]] in the [[org.apache.flink.api.table.TableEnvironment]]'s catalog - * - register a [[Table]] in the [[org.apache.flink.api.table.TableEnvironment]]'s catalog + * - register a [[DataSet]] in the [[org.apache.flink.table.TableEnvironment]]'s catalog + * - register a [[Table]] in the [[org.apache.flink.table.TableEnvironment]]'s catalog * - scan a registered table to obtain a [[Table]] * - specify a SQL query on registered tables to obtain a [[Table]] * - convert a [[Table]] into a [[DataSet]] @@ -44,7 +44,7 @@ import scala.reflect.ClassTag class BatchTableEnvironment( execEnv: ExecutionEnvironment, config: TableConfig) - extends org.apache.flink.api.table.BatchTableEnvironment(execEnv.getJavaEnv, config) { + extends org.apache.flink.table.BatchTableEnvironment(execEnv.getJavaEnv, config) { /** * Converts the given [[DataSet]] into a [[Table]]. @@ -86,7 +86,7 @@ class BatchTableEnvironment( /** * Registers the given [[DataSet]] as table in the - * [[org.apache.flink.api.table.TableEnvironment]]'s catalog. + * [[org.apache.flink.table.TableEnvironment]]'s catalog. * Registered tables can be referenced in SQL queries. * * The field names of the [[Table]] are automatically derived from the type of the [[DataSet]]. @@ -103,7 +103,7 @@ class BatchTableEnvironment( /** * Registers the given [[DataSet]] as table with specified field names in the - * [[org.apache.flink.api.table.TableEnvironment]]'s catalog. + * [[org.apache.flink.table.TableEnvironment]]'s catalog. * Registered tables can be referenced in SQL queries. * * Example: @@ -128,7 +128,7 @@ class BatchTableEnvironment( * Converts the given [[Table]] into a [[DataSet]] of a specified type. * * The fields of the [[Table]] are mapped to [[DataSet]] fields as follows: - * - [[org.apache.flink.api.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] + * - [[org.apache.flink.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] * types: Fields are mapped by position, field types must match. * - POJO [[DataSet]] types: Fields are mapped by field name, field types must match. * diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataSetConversions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataSetConversions.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataSetConversions.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataSetConversions.scala index ce437c3fdf5b0..969047782173a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataSetConversions.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataSetConversions.scala @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.scala.table +package org.apache.flink.table.api.scala import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.scala._ -import org.apache.flink.api.table._ -import org.apache.flink.api.table.expressions.Expression +import org.apache.flink.table._ +import org.apache.flink.table.expressions.Expression /** * Holds methods to convert a [[DataSet]] into a [[Table]]. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataStreamConversions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataStreamConversions.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala index 3b724cf90b88d..7e81bdfd54844 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataStreamConversions.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.scala.table +package org.apache.flink.table.api.scala import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table._ -import org.apache.flink.api.table.expressions.Expression +import org.apache.flink.table._ +import org.apache.flink.table.expressions.Expression import org.apache.flink.streaming.api.scala.DataStream /** diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/StreamTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala similarity index 87% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/StreamTableEnvironment.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala index dde69d508934f..db7789cfae549 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/StreamTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala @@ -15,23 +15,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.scala.table +package org.apache.flink.table.api.scala import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.functions.TableFunction -import org.apache.flink.api.table.{TableConfig, Table} -import org.apache.flink.api.table.expressions.Expression +import org.apache.flink.table.functions.TableFunction +import org.apache.flink.table.{TableConfig, Table} +import org.apache.flink.table.expressions.Expression import org.apache.flink.streaming.api.scala.{StreamExecutionEnvironment, DataStream} import org.apache.flink.streaming.api.scala.asScalaStream /** - * The [[org.apache.flink.api.table.TableEnvironment]] for a Scala [[StreamExecutionEnvironment]]. + * The [[org.apache.flink.table.TableEnvironment]] for a Scala [[StreamExecutionEnvironment]]. * * A TableEnvironment can be used to: * - convert a [[DataStream]] to a [[Table]] - * - register a [[DataStream]] in the [[org.apache.flink.api.table.TableEnvironment]]'s catalog - * - register a [[Table]] in the [[org.apache.flink.api.table.TableEnvironment]]'s catalog + * - register a [[DataStream]] in the [[org.apache.flink.table.TableEnvironment]]'s catalog + * - register a [[Table]] in the [[org.apache.flink.table.TableEnvironment]]'s catalog * - scan a registered table to obtain a [[Table]] * - specify a SQL query on registered tables to obtain a [[Table]] * - convert a [[Table]] into a [[DataStream]] @@ -43,7 +43,7 @@ import org.apache.flink.streaming.api.scala.asScalaStream class StreamTableEnvironment( execEnv: StreamExecutionEnvironment, config: TableConfig) - extends org.apache.flink.api.table.StreamTableEnvironment( + extends org.apache.flink.table.StreamTableEnvironment( execEnv.getWrappedStreamExecutionEnvironment, config) { @@ -88,7 +88,7 @@ class StreamTableEnvironment( /** * Registers the given [[DataStream]] as table in the - * [[org.apache.flink.api.table.TableEnvironment]]'s catalog. + * [[org.apache.flink.table.TableEnvironment]]'s catalog. * Registered tables can be referenced in SQL queries. * * The field names of the [[Table]] are automatically derived @@ -106,7 +106,7 @@ class StreamTableEnvironment( /** * Registers the given [[DataStream]] as table with specified field names in the - * [[org.apache.flink.api.table.TableEnvironment]]'s catalog. + * [[org.apache.flink.table.TableEnvironment]]'s catalog. * Registered tables can be referenced in SQL queries. * * Example: @@ -131,7 +131,7 @@ class StreamTableEnvironment( * Converts the given [[Table]] into a [[DataStream]] of a specified type. * * The fields of the [[Table]] are mapped to [[DataStream]] fields as follows: - * - [[org.apache.flink.api.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] + * - [[org.apache.flink.table.Row]] and [[org.apache.flink.api.java.tuple.Tuple]] * types: Fields are mapped by position, field types must match. * - POJO [[DataStream]] types: Fields are mapped by field name, field types must match. * diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/TableConversions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala similarity index 89% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/TableConversions.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala index 720dac02709f8..37e0ec3ba2efe 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/TableConversions.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table +package org.apache.flink.table.api.scala import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.scala._ import org.apache.flink.streaming.api.scala.DataStream -import org.apache.flink.api.table.{Table, TableException} -import org.apache.flink.api.scala.table.{BatchTableEnvironment => ScalaBatchTableEnv} -import org.apache.flink.api.scala.table.{StreamTableEnvironment => ScalaStreamTableEnv} +import org.apache.flink.table.{Table, TableException} +import org.apache.flink.table.api.scala.{BatchTableEnvironment => ScalaBatchTableEnv} +import org.apache.flink.table.api.scala.{StreamTableEnvironment => ScalaStreamTableEnv} /** * Holds methods to convert a [[Table]] into a [[DataSet]] or a [[DataStream]]. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/expressionDsl.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/expressionDsl.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/expressionDsl.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/expressionDsl.scala index 823458a4f2f25..0634f0b825f0f 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/expressionDsl.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/expressionDsl.scala @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.scala.table +package org.apache.flink.table.api.scala import java.sql.{Date, Time, Timestamp} import org.apache.calcite.avatica.util.DateTimeUtils._ import org.apache.flink.api.common.typeinfo.{SqlTimeTypeInfo, TypeInformation} -import org.apache.flink.api.table.expressions.ExpressionUtils.{convertArray, toMilliInterval, toMonthInterval, toRowInterval} -import org.apache.flink.api.table.expressions.TimeIntervalUnit.TimeIntervalUnit -import org.apache.flink.api.table.expressions._ +import org.apache.flink.table.expressions.ExpressionUtils.{convertArray, toMilliInterval, toMonthInterval, toRowInterval} +import org.apache.flink.table.expressions.TimeIntervalUnit.TimeIntervalUnit +import org.apache.flink.table.expressions._ import java.math.{BigDecimal => JBigDecimal} import scala.language.implicitConversions @@ -33,7 +33,7 @@ import scala.language.implicitConversions * operations. * * These operations must be kept in sync with the parser in - * [[org.apache.flink.api.table.expressions.ExpressionParser]]. + * [[org.apache.flink.table.expressions.ExpressionParser]]. */ trait ImplicitExpressionOperations { private[flink] def expr: Expression diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/groupWindows.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/groupWindows.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/groupWindows.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/groupWindows.scala index 16fda5baec466..fe7e0ff7c4fbb 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/groupWindows.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/groupWindows.scala @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table +package org.apache.flink.table.api.scala -import org.apache.flink.api.table.expressions.Expression -import org.apache.flink.api.table.{SessionWindow, SlideWithSize, TumblingWindow} +import org.apache.flink.table.expressions.Expression +import org.apache.flink.table.{SessionWindow, SlideWithSize, TumblingWindow} /** * Helper object for creating a tumbling window. Tumbling windows are consecutive, non-overlapping diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/package.scala similarity index 86% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/package.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/package.scala index 3bce5cf29d510..68ac58fac41ad 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/package.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/package.scala @@ -15,14 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.scala +package org.apache.flink.table.api import org.apache.flink.api.common.typeutils.CompositeType -import org.apache.flink.api.table.{Row, Table} -import scala.language.implicitConversions +import org.apache.flink.table.{Row, Table} +import _root_.scala.language.implicitConversions +import org.apache.flink.api.scala.DataSet import org.apache.flink.streaming.api.scala._ -import scala.reflect.ClassTag +import _root_.scala.reflect.ClassTag /** * == Table API (Scala) == @@ -30,13 +31,13 @@ import scala.reflect.ClassTag * Importing this package with: * * {{{ - * import org.apache.flink.api.scala.table._ + * import org.apache.flink.table.api.scala._ * }}} * * imports implicit conversions for converting a [[DataSet]] and a [[DataStream]] to a * [[Table]]. This can be used to perform SQL-like queries on data. Please have * a look at [[Table]] to see which operations are supported and - * [[org.apache.flink.api.scala.table.ImplicitExpressionOperations]] to see how an + * [[org.apache.flink.table.api.scala.ImplicitExpressionOperations]] to see how an * expression can be specified. * * When writing a query you can use Scala Symbols to refer to field names. One would @@ -47,7 +48,7 @@ import scala.reflect.ClassTag * * {{{ * import org.apache.flink.api.scala._ - * import org.apache.flink.api.scala.table._ + * import org.apache.flink.table.api.scala._ * * val env = ExecutionEnvironment.getExecutionEnvironment * val tEnv = TableEnvironment.getTableEnvironment(env) @@ -62,7 +63,7 @@ import scala.reflect.ClassTag * }}} * */ -package object table extends ImplicitExpressionConversions { +package object scala extends ImplicitExpressionConversions { implicit def table2TableConversions(table: Table): TableConversions = { new TableConversions(table) diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/CodeGenException.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenException.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/CodeGenException.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenException.scala index 8b7559ff9a4a8..1f2e9a94006fe 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/CodeGenException.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenException.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen +package org.apache.flink.table.codegen /** * Exception for all errors occurring during code generation. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/CodeGenUtils.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenUtils.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/CodeGenUtils.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenUtils.scala index 4092a24c3556b..3d33bd785a804 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/CodeGenUtils.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenUtils.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen +package org.apache.flink.table.codegen import java.lang.reflect.{Field, Method} import java.util.concurrent.atomic.AtomicInteger @@ -28,7 +28,7 @@ import org.apache.flink.api.common.typeinfo.{FractionalTypeInfo, SqlTimeTypeInfo import org.apache.flink.api.common.typeutils.CompositeType import org.apache.flink.api.java.typeutils.{PojoTypeInfo, TupleTypeInfo, TypeExtractor} import org.apache.flink.api.scala.typeutils.CaseClassTypeInfo -import org.apache.flink.api.table.typeutils.{TimeIntervalTypeInfo, RowTypeInfo, TypeCheckUtils} +import org.apache.flink.table.typeutils.{TimeIntervalTypeInfo, RowTypeInfo, TypeCheckUtils} object CodeGenUtils { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/CodeGenerator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/CodeGenerator.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala index 7caad126acf0f..f75c6d20ebacc 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/CodeGenerator.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen +package org.apache.flink.table.codegen import java.math.{BigDecimal => JBigDecimal} @@ -31,15 +31,15 @@ import org.apache.flink.api.common.typeinfo.{AtomicType, SqlTimeTypeInfo, TypeIn import org.apache.flink.api.common.typeutils.CompositeType import org.apache.flink.api.java.typeutils.{GenericTypeInfo, PojoTypeInfo, TupleTypeInfo} import org.apache.flink.api.scala.typeutils.CaseClassTypeInfo -import org.apache.flink.api.table.codegen.CodeGenUtils._ -import org.apache.flink.api.table.codegen.GeneratedExpression.{NEVER_NULL, NO_CODE} -import org.apache.flink.api.table.codegen.Indenter.toISC -import org.apache.flink.api.table.codegen.calls.FunctionGenerator -import org.apache.flink.api.table.codegen.calls.ScalarOperators._ -import org.apache.flink.api.table.functions.UserDefinedFunction -import org.apache.flink.api.table.typeutils.{RowTypeInfo, TypeConverter} -import org.apache.flink.api.table.typeutils.TypeCheckUtils._ -import org.apache.flink.api.table.{FlinkTypeFactory, TableConfig} +import org.apache.flink.table.codegen.CodeGenUtils._ +import org.apache.flink.table.codegen.GeneratedExpression.{NEVER_NULL, NO_CODE} +import org.apache.flink.table.codegen.Indenter.toISC +import org.apache.flink.table.codegen.calls.FunctionGenerator +import org.apache.flink.table.codegen.calls.ScalarOperators._ +import org.apache.flink.table.functions.UserDefinedFunction +import org.apache.flink.table.typeutils.{RowTypeInfo, TypeConverter} +import org.apache.flink.table.typeutils.TypeCheckUtils._ +import org.apache.flink.table.{FlinkTypeFactory, TableConfig} import scala.collection.JavaConversions._ import scala.collection.mutable diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/Compiler.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/Compiler.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/Compiler.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/Compiler.scala index fce13bacae25f..4c120030edf20 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/Compiler.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/Compiler.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen +package org.apache.flink.table.codegen import org.apache.flink.api.common.InvalidProgramException import org.codehaus.commons.compiler.CompileException diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionReducer.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/ExpressionReducer.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionReducer.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/ExpressionReducer.scala index 731452f5e5718..6c65d3beacac0 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionReducer.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/ExpressionReducer.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen +package org.apache.flink.table.codegen import java.util @@ -25,8 +25,8 @@ import org.apache.calcite.rex.{RexBuilder, RexNode} import org.apache.calcite.sql.`type`.SqlTypeName import org.apache.flink.api.common.functions.MapFunction import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} -import org.apache.flink.api.table.typeutils.{RowTypeInfo, TypeConverter} -import org.apache.flink.api.table.{FlinkTypeFactory, Row, TableConfig} +import org.apache.flink.table.typeutils.{RowTypeInfo, TypeConverter} +import org.apache.flink.table.{FlinkTypeFactory, Row, TableConfig} import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/Indenter.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/Indenter.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/Indenter.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/Indenter.scala index c7d9a2ee21e0d..187e7300a0230 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/Indenter.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/Indenter.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.codegen +package org.apache.flink.table.codegen class IndentStringContext(sc: StringContext) { def j(args: Any*): String = { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/BuiltInMethods.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/BuiltInMethods.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/BuiltInMethods.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/BuiltInMethods.scala index c7c7477be2a83..649d3b27ffba4 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/BuiltInMethods.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/BuiltInMethods.scala @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls import java.math.{BigDecimal => JBigDecimal} import org.apache.calcite.linq4j.tree.Types import org.apache.calcite.runtime.SqlFunctions -import org.apache.flink.api.table.functions.utils.MathFunctions +import org.apache.flink.table.functions.utils.MathFunctions object BuiltInMethods { val LOG10 = Types.lookupMethod(classOf[Math], "log10", classOf[Double]) diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/CallGenerator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/CallGenerator.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/CallGenerator.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/CallGenerator.scala index 96d0b74290c92..1bc9fbb20903e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/CallGenerator.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/CallGenerator.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.codegen.CodeGenUtils._ -import org.apache.flink.api.table.codegen.{CodeGenerator, GeneratedExpression} +import org.apache.flink.table.codegen.CodeGenUtils._ +import org.apache.flink.table.codegen.{CodeGenerator, GeneratedExpression} trait CallGenerator { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/CurrentTimePointCallGen.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/CurrentTimePointCallGen.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/CurrentTimePointCallGen.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/CurrentTimePointCallGen.scala index 4aaa209db3129..d6448474b75b1 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/CurrentTimePointCallGen.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/CurrentTimePointCallGen.scala @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls import org.apache.flink.api.common.typeinfo.{SqlTimeTypeInfo, TypeInformation} -import org.apache.flink.api.table.codegen.{CodeGenerator, GeneratedExpression} +import org.apache.flink.table.codegen.{CodeGenerator, GeneratedExpression} /** * Generates function call to determine current time point (as date/time/timestamp) in diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/FloorCeilCallGen.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FloorCeilCallGen.scala similarity index 88% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/FloorCeilCallGen.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FloorCeilCallGen.scala index d41e9a717cbcf..dfbb436f0a1f3 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/FloorCeilCallGen.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FloorCeilCallGen.scala @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls import java.lang.reflect.Method import org.apache.calcite.avatica.util.TimeUnitRange import org.apache.calcite.avatica.util.TimeUnitRange.{MONTH, YEAR} import org.apache.flink.api.common.typeinfo.BasicTypeInfo.{BIG_DEC_TYPE_INFO, DOUBLE_TYPE_INFO, FLOAT_TYPE_INFO} -import org.apache.flink.api.table.codegen.CodeGenUtils.{getEnum, primitiveTypeTermForTypeInfo, qualifyMethod} -import org.apache.flink.api.table.codegen.calls.CallGenerator.generateCallIfArgsNotNull -import org.apache.flink.api.table.codegen.{CodeGenerator, GeneratedExpression} +import org.apache.flink.table.codegen.CodeGenUtils.{getEnum, primitiveTypeTermForTypeInfo, qualifyMethod} +import org.apache.flink.table.codegen.calls.CallGenerator.generateCallIfArgsNotNull +import org.apache.flink.table.codegen.{CodeGenerator, GeneratedExpression} /** * Generates floor/ceil function calls. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/MethodCallGen.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/MethodCallGen.scala similarity index 83% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/MethodCallGen.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/MethodCallGen.scala index 376f54ab8dbf1..2e0d34017307b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/MethodCallGen.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/MethodCallGen.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls import java.lang.reflect.Method import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.codegen.CodeGenUtils.qualifyMethod -import org.apache.flink.api.table.codegen.calls.CallGenerator.generateCallIfArgsNotNull -import org.apache.flink.api.table.codegen.{CodeGenerator, GeneratedExpression} +import org.apache.flink.table.codegen.CodeGenUtils.qualifyMethod +import org.apache.flink.table.codegen.calls.CallGenerator.generateCallIfArgsNotNull +import org.apache.flink.table.codegen.{CodeGenerator, GeneratedExpression} /** * Generates a function call by using a [[java.lang.reflect.Method]]. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/MultiTypeMethodCallGen.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/MultiTypeMethodCallGen.scala similarity index 88% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/MultiTypeMethodCallGen.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/MultiTypeMethodCallGen.scala index e9e8f1852ecb4..e5958a021494d 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/MultiTypeMethodCallGen.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/MultiTypeMethodCallGen.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls import java.lang.reflect.Method -import org.apache.flink.api.table.codegen.calls.CallGenerator._ -import org.apache.flink.api.table.codegen.{CodeGenerator, GeneratedExpression} +import org.apache.flink.table.codegen.calls.CallGenerator._ +import org.apache.flink.table.codegen.{CodeGenerator, GeneratedExpression} /** * Generates a function call that calls a method which returns the same type that it diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/NotCallGenerator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/NotCallGenerator.scala similarity index 85% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/NotCallGenerator.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/NotCallGenerator.scala index 5cd358a05ead5..52397c959a362 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/NotCallGenerator.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/NotCallGenerator.scala @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls -import org.apache.flink.api.table.codegen.calls.ScalarOperators.generateNot -import org.apache.flink.api.table.codegen.{GeneratedExpression, CodeGenerator} +import org.apache.flink.table.codegen.calls.ScalarOperators.generateNot +import org.apache.flink.table.codegen.{GeneratedExpression, CodeGenerator} /** * Inverts the boolean value of a CallGenerator result. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/ScalarFunctionCallGen.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarFunctionCallGen.scala similarity index 91% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/ScalarFunctionCallGen.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarFunctionCallGen.scala index b6ef8ad863c21..ac840dfc2b93f 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/ScalarFunctionCallGen.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarFunctionCallGen.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.codegen.CodeGenUtils._ -import org.apache.flink.api.table.codegen.{CodeGenException, CodeGenerator, GeneratedExpression} -import org.apache.flink.api.table.functions.ScalarFunction -import org.apache.flink.api.table.functions.utils.UserDefinedFunctionUtils._ +import org.apache.flink.table.codegen.CodeGenUtils._ +import org.apache.flink.table.codegen.{CodeGenException, CodeGenerator, GeneratedExpression} +import org.apache.flink.table.functions.ScalarFunction +import org.apache.flink.table.functions.utils.UserDefinedFunctionUtils._ /** * Generates a call to user-defined [[ScalarFunction]]. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarFunctions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarFunctions.scala new file mode 100644 index 0000000000000..cf2e9f939074e --- /dev/null +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarFunctions.scala @@ -0,0 +1,359 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.table.codegen.calls + +import java.lang.reflect.Method + +import org.apache.calcite.avatica.util.TimeUnitRange +import org.apache.calcite.sql.SqlOperator +import org.apache.calcite.sql.fun.SqlStdOperatorTable._ +import org.apache.calcite.sql.fun.SqlTrimFunction +import org.apache.calcite.util.BuiltInMethod +import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ +import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, SqlTimeTypeInfo, TypeInformation} +import org.apache.flink.api.java.typeutils.GenericTypeInfo +import org.apache.flink.table.functions.utils.ScalarSqlFunction + +import scala.collection.mutable + +/** + * Global hub for user-defined and built-in advanced SQL scalar functions. + */ +object ScalarFunctions { + + private val sqlFunctions: mutable.Map[(SqlOperator, Seq[TypeInformation[_]]), CallGenerator] = + mutable.Map() + + // ---------------------------------------------------------------------------------------------- + // String functions + // ---------------------------------------------------------------------------------------------- + + addSqlFunctionMethod( + SUBSTRING, + Seq(STRING_TYPE_INFO, INT_TYPE_INFO, INT_TYPE_INFO), + STRING_TYPE_INFO, + BuiltInMethod.SUBSTRING.method) + + addSqlFunctionMethod( + SUBSTRING, + Seq(STRING_TYPE_INFO, INT_TYPE_INFO), + STRING_TYPE_INFO, + BuiltInMethod.SUBSTRING.method) + + addSqlFunction( + TRIM, + Seq(new GenericTypeInfo(classOf[SqlTrimFunction.Flag]), STRING_TYPE_INFO, STRING_TYPE_INFO), + new TrimCallGen()) + + addSqlFunctionMethod( + CHAR_LENGTH, + Seq(STRING_TYPE_INFO), + INT_TYPE_INFO, + BuiltInMethod.CHAR_LENGTH.method) + + addSqlFunctionMethod( + CHARACTER_LENGTH, + Seq(STRING_TYPE_INFO), + INT_TYPE_INFO, + BuiltInMethod.CHAR_LENGTH.method) + + addSqlFunctionMethod( + UPPER, + Seq(STRING_TYPE_INFO), + STRING_TYPE_INFO, + BuiltInMethod.UPPER.method) + + addSqlFunctionMethod( + LOWER, + Seq(STRING_TYPE_INFO), + STRING_TYPE_INFO, + BuiltInMethod.LOWER.method) + + addSqlFunctionMethod( + INITCAP, + Seq(STRING_TYPE_INFO), + STRING_TYPE_INFO, + BuiltInMethod.INITCAP.method) + + addSqlFunctionMethod( + LIKE, + Seq(STRING_TYPE_INFO, STRING_TYPE_INFO), + BOOLEAN_TYPE_INFO, + BuiltInMethod.LIKE.method) + + addSqlFunctionMethod( + LIKE, + Seq(STRING_TYPE_INFO, STRING_TYPE_INFO, STRING_TYPE_INFO), + BOOLEAN_TYPE_INFO, + BuiltInMethods.LIKE_WITH_ESCAPE) + + addSqlFunctionNotMethod( + NOT_LIKE, + Seq(STRING_TYPE_INFO, STRING_TYPE_INFO), + BuiltInMethod.LIKE.method) + + addSqlFunctionMethod( + SIMILAR_TO, + Seq(STRING_TYPE_INFO, STRING_TYPE_INFO), + BOOLEAN_TYPE_INFO, + BuiltInMethod.SIMILAR.method) + + addSqlFunctionMethod( + SIMILAR_TO, + Seq(STRING_TYPE_INFO, STRING_TYPE_INFO, STRING_TYPE_INFO), + BOOLEAN_TYPE_INFO, + BuiltInMethods.SIMILAR_WITH_ESCAPE) + + addSqlFunctionNotMethod( + NOT_SIMILAR_TO, + Seq(STRING_TYPE_INFO, STRING_TYPE_INFO), + BuiltInMethod.SIMILAR.method) + + addSqlFunctionMethod( + POSITION, + Seq(STRING_TYPE_INFO, STRING_TYPE_INFO), + INT_TYPE_INFO, + BuiltInMethod.POSITION.method) + + addSqlFunctionMethod( + OVERLAY, + Seq(STRING_TYPE_INFO, STRING_TYPE_INFO, INT_TYPE_INFO), + STRING_TYPE_INFO, + BuiltInMethod.OVERLAY.method) + + addSqlFunctionMethod( + OVERLAY, + Seq(STRING_TYPE_INFO, STRING_TYPE_INFO, INT_TYPE_INFO, INT_TYPE_INFO), + STRING_TYPE_INFO, + BuiltInMethod.OVERLAY.method) + + // ---------------------------------------------------------------------------------------------- + // Arithmetic functions + // ---------------------------------------------------------------------------------------------- + + addSqlFunctionMethod( + LOG10, + Seq(DOUBLE_TYPE_INFO), + DOUBLE_TYPE_INFO, + BuiltInMethods.LOG10) + + addSqlFunctionMethod( + LN, + Seq(DOUBLE_TYPE_INFO), + DOUBLE_TYPE_INFO, + BuiltInMethods.LN) + + addSqlFunctionMethod( + EXP, + Seq(DOUBLE_TYPE_INFO), + DOUBLE_TYPE_INFO, + BuiltInMethods.EXP) + + addSqlFunctionMethod( + POWER, + Seq(DOUBLE_TYPE_INFO, DOUBLE_TYPE_INFO), + DOUBLE_TYPE_INFO, + BuiltInMethods.POWER) + + addSqlFunctionMethod( + POWER, + Seq(DOUBLE_TYPE_INFO, BIG_DEC_TYPE_INFO), + DOUBLE_TYPE_INFO, + BuiltInMethods.POWER_DEC) + + addSqlFunction( + ABS, + Seq(DOUBLE_TYPE_INFO), + new MultiTypeMethodCallGen(BuiltInMethods.ABS)) + + addSqlFunction( + ABS, + Seq(BIG_DEC_TYPE_INFO), + new MultiTypeMethodCallGen(BuiltInMethods.ABS_DEC)) + + addSqlFunction( + FLOOR, + Seq(DOUBLE_TYPE_INFO), + new FloorCeilCallGen(BuiltInMethod.FLOOR.method)) + + addSqlFunction( + FLOOR, + Seq(BIG_DEC_TYPE_INFO), + new FloorCeilCallGen(BuiltInMethod.FLOOR.method)) + + addSqlFunction( + CEIL, + Seq(DOUBLE_TYPE_INFO), + new FloorCeilCallGen(BuiltInMethod.CEIL.method)) + + addSqlFunction( + CEIL, + Seq(BIG_DEC_TYPE_INFO), + new FloorCeilCallGen(BuiltInMethod.CEIL.method)) + + // ---------------------------------------------------------------------------------------------- + // Temporal functions + // ---------------------------------------------------------------------------------------------- + + addSqlFunctionMethod( + EXTRACT_DATE, + Seq(new GenericTypeInfo(classOf[TimeUnitRange]), LONG_TYPE_INFO), + LONG_TYPE_INFO, + BuiltInMethod.UNIX_DATE_EXTRACT.method) + + addSqlFunctionMethod( + EXTRACT_DATE, + Seq(new GenericTypeInfo(classOf[TimeUnitRange]), SqlTimeTypeInfo.DATE), + LONG_TYPE_INFO, + BuiltInMethod.UNIX_DATE_EXTRACT.method) + + addSqlFunction( + FLOOR, + Seq(SqlTimeTypeInfo.DATE, new GenericTypeInfo(classOf[TimeUnitRange])), + new FloorCeilCallGen( + BuiltInMethod.FLOOR.method, + Some(BuiltInMethod.UNIX_DATE_FLOOR.method))) + + addSqlFunction( + FLOOR, + Seq(SqlTimeTypeInfo.TIME, new GenericTypeInfo(classOf[TimeUnitRange])), + new FloorCeilCallGen( + BuiltInMethod.FLOOR.method, + Some(BuiltInMethod.UNIX_DATE_FLOOR.method))) + + addSqlFunction( + FLOOR, + Seq(SqlTimeTypeInfo.TIMESTAMP, new GenericTypeInfo(classOf[TimeUnitRange])), + new FloorCeilCallGen( + BuiltInMethod.FLOOR.method, + Some(BuiltInMethod.UNIX_TIMESTAMP_FLOOR.method))) + + addSqlFunction( + CEIL, + Seq(SqlTimeTypeInfo.DATE, new GenericTypeInfo(classOf[TimeUnitRange])), + new FloorCeilCallGen( + BuiltInMethod.CEIL.method, + Some(BuiltInMethod.UNIX_DATE_CEIL.method))) + + addSqlFunction( + CEIL, + Seq(SqlTimeTypeInfo.TIME, new GenericTypeInfo(classOf[TimeUnitRange])), + new FloorCeilCallGen( + BuiltInMethod.CEIL.method, + Some(BuiltInMethod.UNIX_DATE_CEIL.method))) + + addSqlFunction( + CEIL, + Seq(SqlTimeTypeInfo.TIMESTAMP, new GenericTypeInfo(classOf[TimeUnitRange])), + new FloorCeilCallGen( + BuiltInMethod.CEIL.method, + Some(BuiltInMethod.UNIX_TIMESTAMP_CEIL.method))) + + addSqlFunction( + CURRENT_DATE, + Seq(), + new CurrentTimePointCallGen(SqlTimeTypeInfo.DATE, local = false)) + + addSqlFunction( + CURRENT_TIME, + Seq(), + new CurrentTimePointCallGen(SqlTimeTypeInfo.TIME, local = false)) + + addSqlFunction( + CURRENT_TIMESTAMP, + Seq(), + new CurrentTimePointCallGen(SqlTimeTypeInfo.TIMESTAMP, local = false)) + + addSqlFunction( + LOCALTIME, + Seq(), + new CurrentTimePointCallGen(SqlTimeTypeInfo.TIME, local = true)) + + addSqlFunction( + LOCALTIMESTAMP, + Seq(), + new CurrentTimePointCallGen(SqlTimeTypeInfo.TIMESTAMP, local = true)) + + // ---------------------------------------------------------------------------------------------- + + /** + * Returns a [[CallGenerator]] that generates all required code for calling the given + * [[SqlOperator]]. + * + * @param sqlOperator SQL operator (might be overloaded) + * @param operandTypes actual operand types + * @param resultType expected return type + * @return [[CallGenerator]] + */ + def getCallGenerator( + sqlOperator: SqlOperator, + operandTypes: Seq[TypeInformation[_]], + resultType: TypeInformation[_]) + : Option[CallGenerator] = sqlOperator match { + + // user-defined scalar function + case ssf: ScalarSqlFunction => + Some( + new ScalarFunctionCallGen( + ssf.getScalarFunction, + operandTypes, + resultType + ) + ) + + // built-in scalar function + case _ => + sqlFunctions.get((sqlOperator, operandTypes)) + .orElse(sqlFunctions.find(entry => entry._1._1 == sqlOperator + && entry._1._2.length == operandTypes.length + && entry._1._2.zip(operandTypes).forall { + case (x: BasicTypeInfo[_], y: BasicTypeInfo[_]) => y.shouldAutocastTo(x) || x == y + case _ => false + }).map(_._2)) + } + + // ---------------------------------------------------------------------------------------------- + + private def addSqlFunctionMethod( + sqlOperator: SqlOperator, + operandTypes: Seq[TypeInformation[_]], + returnType: TypeInformation[_], + method: Method) + : Unit = { + sqlFunctions((sqlOperator, operandTypes)) = new MethodCallGen(returnType, method) + } + + private def addSqlFunctionNotMethod( + sqlOperator: SqlOperator, + operandTypes: Seq[TypeInformation[_]], + method: Method) + : Unit = { + sqlFunctions((sqlOperator, operandTypes)) = + new NotCallGenerator(new MethodCallGen(BOOLEAN_TYPE_INFO, method)) + } + + private def addSqlFunction( + sqlOperator: SqlOperator, + operandTypes: Seq[TypeInformation[_]], + callGenerator: CallGenerator) + : Unit = { + sqlFunctions((sqlOperator, operandTypes)) = callGenerator + } + +} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/ScalarOperators.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala similarity index 99% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/ScalarOperators.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala index 330e2fe021a9a..3f7c91ffe271b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/ScalarOperators.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/ScalarOperators.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls import org.apache.calcite.avatica.util.DateTimeUtils.MILLIS_PER_DAY import org.apache.calcite.avatica.util.{DateTimeUtils, TimeUnitRange} @@ -23,10 +23,10 @@ import org.apache.calcite.util.BuiltInMethod import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.{NumericTypeInfo, PrimitiveArrayTypeInfo, SqlTimeTypeInfo, TypeInformation} import org.apache.flink.api.java.typeutils.ObjectArrayTypeInfo -import org.apache.flink.api.table.codegen.CodeGenUtils._ -import org.apache.flink.api.table.codegen.{CodeGenerator, CodeGenException, GeneratedExpression} -import org.apache.flink.api.table.typeutils.TimeIntervalTypeInfo -import org.apache.flink.api.table.typeutils.TypeCheckUtils._ +import org.apache.flink.table.codegen.CodeGenUtils._ +import org.apache.flink.table.codegen.{CodeGenerator, CodeGenException, GeneratedExpression} +import org.apache.flink.table.typeutils.TimeIntervalTypeInfo +import org.apache.flink.table.typeutils.TypeCheckUtils._ object ScalarOperators { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/TrimCallGen.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TrimCallGen.scala similarity index 88% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/TrimCallGen.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TrimCallGen.scala index 678016b4b919d..9d50bf9285325 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/TrimCallGen.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TrimCallGen.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls import org.apache.calcite.sql.fun.SqlTrimFunction.Flag.{BOTH, LEADING, TRAILING} import org.apache.calcite.util.BuiltInMethod import org.apache.flink.api.common.typeinfo.BasicTypeInfo.STRING_TYPE_INFO -import org.apache.flink.api.table.codegen.CodeGenUtils._ -import org.apache.flink.api.table.codegen.calls.CallGenerator._ -import org.apache.flink.api.table.codegen.{CodeGenerator, GeneratedExpression} +import org.apache.flink.table.codegen.CodeGenUtils._ +import org.apache.flink.table.codegen.calls.CallGenerator._ +import org.apache.flink.table.codegen.{CodeGenerator, GeneratedExpression} /** * Generates a TRIM function call. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/generated.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/generated.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/generated.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/generated.scala index bb52ad893b955..0d60dc186e29c 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/generated.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/generated.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen +package org.apache.flink.table.codegen import org.apache.flink.api.common.typeinfo.TypeInformation diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/package.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/package.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/package.scala index b69ac1c0149f0..743f8461a9082 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/package.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/package.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table package object codegen { // Used in ExpressionCodeGenerator because Scala 2.10 reflection is not thread safe. We might diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/exceptions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/exceptions.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/exceptions.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/exceptions.scala index 0a100ddf4c189..3681f7ed4cf5c 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/exceptions.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/exceptions.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table /** * Exception for all errors occurring during expression parsing. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/Expression.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/Expression.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/Expression.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/Expression.scala index c284bd37cc49c..0d07e55a69c49 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/Expression.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/Expression.scala @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.trees.TreeNode -import org.apache.flink.api.table.validate.{ValidationResult, ValidationSuccess} +import org.apache.flink.table.trees.TreeNode +import org.apache.flink.table.validate.{ValidationResult, ValidationSuccess} abstract class Expression extends TreeNode[Expression] { /** diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/ExpressionParser.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionParser.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/ExpressionParser.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionParser.scala index c960a79a7a0c8..1065629d1699b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/ExpressionParser.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionParser.scala @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.avatica.util.DateTimeUtils.{MILLIS_PER_DAY, MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND} import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, SqlTimeTypeInfo, TypeInformation} -import org.apache.flink.api.table.ExpressionParserException -import org.apache.flink.api.table.expressions.ExpressionUtils.{toMilliInterval, toMonthInterval} -import org.apache.flink.api.table.expressions.TimeIntervalUnit.TimeIntervalUnit -import org.apache.flink.api.table.expressions.TimePointUnit.TimePointUnit -import org.apache.flink.api.table.expressions.TrimMode.TrimMode -import org.apache.flink.api.table.typeutils.TimeIntervalTypeInfo +import org.apache.flink.table.ExpressionParserException +import org.apache.flink.table.expressions.ExpressionUtils.{toMilliInterval, toMonthInterval} +import org.apache.flink.table.expressions.TimeIntervalUnit.TimeIntervalUnit +import org.apache.flink.table.expressions.TimePointUnit.TimePointUnit +import org.apache.flink.table.expressions.TrimMode.TrimMode +import org.apache.flink.table.typeutils.TimeIntervalTypeInfo import scala.language.implicitConversions import scala.util.parsing.combinator.{JavaTokenParsers, PackratParsers} @@ -33,8 +33,8 @@ import scala.util.parsing.combinator.{JavaTokenParsers, PackratParsers} * Parser for expressions inside a String. This parses exactly the same expressions that * would be accepted by the Scala Expression DSL. * - * See [[org.apache.flink.api.scala.table.ImplicitExpressionConversions]] and - * [[org.apache.flink.api.scala.table.ImplicitExpressionOperations]] for the constructs + * See [[org.apache.flink.table.api.scala.ImplicitExpressionConversions]] and + * [[org.apache.flink.table.api.scala.ImplicitExpressionOperations]] for the constructs * available in the Scala Expression DSL. This parser must be kept in sync with the Scala DSL * lazy valined in the above files. */ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/ExpressionUtils.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionUtils.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/ExpressionUtils.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionUtils.scala index 86575347add3c..958a7030b27f6 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/ExpressionUtils.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionUtils.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import java.lang.{Boolean => JBoolean, Byte => JByte, Short => JShort, Integer => JInteger, Long => JLong, Float => JFloat, Double => JDouble} import java.math.{BigDecimal => JBigDecimal} @@ -27,8 +27,8 @@ import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rex.{RexBuilder, RexNode} import org.apache.calcite.sql.fun.SqlStdOperatorTable import org.apache.flink.api.common.typeinfo.BasicTypeInfo -import org.apache.flink.api.table.ValidationException -import org.apache.flink.api.table.typeutils.{RowIntervalTypeInfo, TimeIntervalTypeInfo} +import org.apache.flink.table.ValidationException +import org.apache.flink.table.typeutils.{RowIntervalTypeInfo, TimeIntervalTypeInfo} object ExpressionUtils { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/InputTypeSpec.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/InputTypeSpec.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/InputTypeSpec.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/InputTypeSpec.scala index 67e44a1a8c46c..39e1fe273aaa4 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/InputTypeSpec.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/InputTypeSpec.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import scala.collection.mutable import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.validate._ +import org.apache.flink.table.validate._ /** * Expressions that have specification on its inputs. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/aggregations.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/aggregations.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/aggregations.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/aggregations.scala index 259f7e5bba503..b2fca883901e8 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/aggregations.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/aggregations.scala @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.sql.fun.SqlStdOperatorTable import org.apache.calcite.tools.RelBuilder import org.apache.calcite.tools.RelBuilder.AggCall import org.apache.flink.api.common.typeinfo.BasicTypeInfo -import org.apache.flink.api.table.typeutils.TypeCheckUtils +import org.apache.flink.table.typeutils.TypeCheckUtils abstract sealed class Aggregation extends UnaryExpression { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/arithmetic.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/arithmetic.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/arithmetic.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/arithmetic.scala index 87028864e2dec..ad1af63140239 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/arithmetic.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/arithmetic.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.sql.`type`.IntervalSqlType @@ -23,9 +23,9 @@ import org.apache.calcite.sql.SqlOperator import org.apache.calcite.sql.fun.SqlStdOperatorTable import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} -import org.apache.flink.api.table.typeutils.TypeCheckUtils._ -import org.apache.flink.api.table.typeutils.TypeCoercion -import org.apache.flink.api.table.validate._ +import org.apache.flink.table.typeutils.TypeCheckUtils._ +import org.apache.flink.table.typeutils.TypeCoercion +import org.apache.flink.table.validate._ import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/call.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala similarity index 91% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/call.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala index 3bb9dac4f78b4..302918b214359 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/call.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.functions.{ScalarFunction, TableFunction} -import org.apache.flink.api.table.functions.utils.UserDefinedFunctionUtils._ -import org.apache.flink.api.table.plan.logical.{LogicalNode, LogicalTableFunctionCall} -import org.apache.flink.api.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} -import org.apache.flink.api.table.{FlinkTypeFactory, UnresolvedException, ValidationException} +import org.apache.flink.table.functions.{ScalarFunction, TableFunction} +import org.apache.flink.table.functions.utils.UserDefinedFunctionUtils._ +import org.apache.flink.table.plan.logical.{LogicalNode, LogicalTableFunctionCall} +import org.apache.flink.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} +import org.apache.flink.table.{FlinkTypeFactory, UnresolvedException, ValidationException} /** * General expression for unresolved function calls. The function can be a built-in diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/cast.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/cast.scala similarity index 90% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/cast.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/cast.scala index 2232a91f929a1..651e62368038d 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/cast.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/cast.scala @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.FlinkTypeFactory -import org.apache.flink.api.table.typeutils.TypeCoercion -import org.apache.flink.api.table.validate._ +import org.apache.flink.table.FlinkTypeFactory +import org.apache.flink.table.typeutils.TypeCoercion +import org.apache.flink.table.validate._ case class Cast(child: Expression, resultType: TypeInformation[_]) extends UnaryExpression { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/comparison.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/comparison.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/comparison.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/comparison.scala index 5a150f864126f..0c7e57c84dcfa 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/comparison.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/comparison.scala @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.sql.SqlOperator import org.apache.calcite.sql.fun.SqlStdOperatorTable import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ -import org.apache.flink.api.table.typeutils.TypeCheckUtils.{isComparable, isNumeric} -import org.apache.flink.api.table.validate._ +import org.apache.flink.table.typeutils.TypeCheckUtils.{isComparable, isNumeric} +import org.apache.flink.table.validate._ import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/composite.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/composite.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/composite.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/composite.scala index ee1eb46bb8b83..55e40e8fb85b2 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/composite.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/composite.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.common.typeutils.CompositeType -import org.apache.flink.api.table.UnresolvedException -import org.apache.flink.api.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} +import org.apache.flink.table.UnresolvedException +import org.apache.flink.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} /** * Flattening of composite types. All flattenings are resolved into diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/fieldExpression.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/fieldExpression.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/fieldExpression.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/fieldExpression.scala index e651bb3f2c0a8..2e023f91a8e40 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/fieldExpression.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/fieldExpression.scala @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} -import org.apache.flink.api.table.{UnresolvedException, ValidationException} -import org.apache.flink.api.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} +import org.apache.flink.table.{UnresolvedException, ValidationException} +import org.apache.flink.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} trait NamedExpression extends Expression { private[flink] def name: String diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/literals.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/literals.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/literals.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/literals.scala index 6382abef647b6..edabfe60173ab 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/literals.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/literals.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import java.sql.{Date, Time, Timestamp} import java.util.{Calendar, TimeZone} @@ -27,8 +27,8 @@ import org.apache.calcite.sql.`type`.SqlTypeName import org.apache.calcite.sql.parser.SqlParserPos import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, SqlTimeTypeInfo, TypeInformation} -import org.apache.flink.api.table.FlinkTypeFactory -import org.apache.flink.api.table.typeutils.{RowIntervalTypeInfo, TimeIntervalTypeInfo} +import org.apache.flink.table.FlinkTypeFactory +import org.apache.flink.table.typeutils.{RowIntervalTypeInfo, TimeIntervalTypeInfo} object Literal { private[flink] def apply(l: Any): Literal = l match { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/logic.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/logic.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/logic.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/logic.scala index 9c8e279106527..dfe00ccb45a92 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/logic.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/logic.scala @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.sql.fun.SqlStdOperatorTable import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.BasicTypeInfo -import org.apache.flink.api.table.validate._ +import org.apache.flink.table.validate._ abstract class BinaryPredicate extends BinaryExpression { override private[flink] def resultType = BasicTypeInfo.BOOLEAN_TYPE_INFO diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/mathExpressions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/mathExpressions.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/mathExpressions.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/mathExpressions.scala index e0f4691733152..b31367c4fec90 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/mathExpressions.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/mathExpressions.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.sql.fun.SqlStdOperatorTable @@ -23,8 +23,8 @@ import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.typeutils.TypeCheckUtils -import org.apache.flink.api.table.validate._ +import org.apache.flink.table.typeutils.TypeCheckUtils +import org.apache.flink.table.validate._ case class Abs(child: Expression) extends UnaryExpression { override private[flink] def resultType: TypeInformation[_] = child.resultType diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/ordering.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ordering.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/ordering.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ordering.scala index c15d4621e75b0..7f03827db38cd 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/ordering.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ordering.scala @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.validate._ +import org.apache.flink.table.validate._ abstract class Ordering extends UnaryExpression { override private[flink] def validateInput(): ValidationResult = { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/package.scala similarity index 88% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/package.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/package.scala index 2e5d0b2f71eae..41e0c9f5bc384 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/package.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/package.scala @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table /** * This package contains the base class of AST nodes and all the expression language AST classes. * Expression trees should not be manually constructed by users. They are implicitly constructed * from the implicit DSL conversions in - * [[org.apache.flink.api.scala.table.ImplicitExpressionConversions]] and - * [[org.apache.flink.api.scala.table.ImplicitExpressionOperations]]. For the Java API, + * [[org.apache.flink.table.api.scala.ImplicitExpressionConversions]] and + * [[org.apache.flink.table.api.scala.ImplicitExpressionOperations]]. For the Java API, * expression trees should be generated from a string parser that parses expressions and creates * AST nodes. */ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/stringExpressions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/stringExpressions.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/stringExpressions.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/stringExpressions.scala index 56b5b5efb06a0..f4b58ccfdf9f8 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/stringExpressions.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/stringExpressions.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import scala.collection.JavaConversions._ import org.apache.calcite.rex.RexNode @@ -23,8 +23,8 @@ import org.apache.calcite.sql.fun.SqlStdOperatorTable import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.expressions.TrimMode.TrimMode -import org.apache.flink.api.table.validate._ +import org.apache.flink.table.expressions.TrimMode.TrimMode +import org.apache.flink.table.validate._ /** * Returns the length of this `str`. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/symbols.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/symbols.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/symbols.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/symbols.scala index dfa8820986fc9..0d71fb22b430a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/symbols.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/symbols.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.avatica.util.{TimeUnit, TimeUnitRange} import org.apache.calcite.rex.RexNode diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/time.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/time.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/time.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/time.scala index cd5ca0ab9482e..aa6ef3808f118 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/time.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/time.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.avatica.util.{TimeUnit, TimeUnitRange} import org.apache.calcite.rex._ @@ -25,12 +25,12 @@ import org.apache.calcite.sql.fun.SqlStdOperatorTable import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.{SqlTimeTypeInfo, TypeInformation} -import org.apache.flink.api.table.FlinkRelBuilder -import org.apache.flink.api.table.expressions.ExpressionUtils.{divide, getFactor, mod} -import org.apache.flink.api.table.expressions.TimeIntervalUnit.TimeIntervalUnit -import org.apache.flink.api.table.typeutils.TypeCheckUtils.isTimeInterval -import org.apache.flink.api.table.typeutils.{TimeIntervalTypeInfo, TypeCheckUtils} -import org.apache.flink.api.table.validate.{ValidationResult, ValidationFailure, ValidationSuccess} +import org.apache.flink.table.FlinkRelBuilder +import org.apache.flink.table.expressions.ExpressionUtils.{divide, getFactor, mod} +import org.apache.flink.table.expressions.TimeIntervalUnit.TimeIntervalUnit +import org.apache.flink.table.typeutils.TypeCheckUtils.isTimeInterval +import org.apache.flink.table.typeutils.{TimeIntervalTypeInfo, TypeCheckUtils} +import org.apache.flink.table.validate.{ValidationResult, ValidationFailure, ValidationSuccess} import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/windowProperties.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/windowProperties.scala similarity index 90% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/windowProperties.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/windowProperties.scala index 8386c46700c0c..5933885fb3046 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/windowProperties.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/windowProperties.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.SqlTimeTypeInfo -import org.apache.flink.api.table.FlinkRelBuilder.NamedWindowProperty -import org.apache.flink.api.table.validate.{ValidationFailure, ValidationSuccess} +import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty +import org.apache.flink.table.validate.{ValidationFailure, ValidationSuccess} abstract class WindowProperty(child: Expression) extends UnaryExpression { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/ScalarFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/ScalarFunction.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/ScalarFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/ScalarFunction.scala index 2e160969ee26e..32df1441fcb9d 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/ScalarFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/ScalarFunction.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.functions +package org.apache.flink.table.functions import org.apache.flink.api.common.functions.InvalidTypesException import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.TypeExtractor -import org.apache.flink.api.table.ValidationException -import org.apache.flink.api.table.expressions.{Expression, ScalarFunctionCall} +import org.apache.flink.table.ValidationException +import org.apache.flink.table.expressions.{Expression, ScalarFunctionCall} /** * Base class for a user-defined scalar function. A user-defined scalar functions maps zero, one, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/UserDefinedFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/UserDefinedFunction.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/UserDefinedFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/UserDefinedFunction.scala index cdf6b070495bd..b99ab8d1b8f48 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/UserDefinedFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/UserDefinedFunction.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.functions +package org.apache.flink.table.functions /** * Base class for all user-defined functions such as scalar functions, table functions, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/MathFunctions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/MathFunctions.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/MathFunctions.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/MathFunctions.scala index 8a0fe65074968..64e4bc4af1f20 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/MathFunctions.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/MathFunctions.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.functions.utils +package org.apache.flink.table.functions.utils import java.math.{BigDecimal => JBigDecimal} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/ScalarSqlFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/ScalarSqlFunction.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/ScalarSqlFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/ScalarSqlFunction.scala index 7953b25260683..3a2089e19b4b1 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/ScalarSqlFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/ScalarSqlFunction.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.functions.utils +package org.apache.flink.table.functions.utils import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.sql._ @@ -24,10 +24,10 @@ import org.apache.calcite.sql.`type`.SqlOperandTypeChecker.Consistency import org.apache.calcite.sql.`type`._ import org.apache.calcite.sql.parser.SqlParserPos import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.functions.ScalarFunction -import org.apache.flink.api.table.functions.utils.ScalarSqlFunction.{createOperandTypeChecker, createOperandTypeInference, createReturnTypeInference} -import org.apache.flink.api.table.functions.utils.UserDefinedFunctionUtils.{getResultType, getSignature, getSignatures, signatureToString, signaturesToString} -import org.apache.flink.api.table.{FlinkTypeFactory, ValidationException} +import org.apache.flink.table.functions.ScalarFunction +import org.apache.flink.table.functions.utils.ScalarSqlFunction.{createOperandTypeChecker, createOperandTypeInference, createReturnTypeInference} +import org.apache.flink.table.functions.utils.UserDefinedFunctionUtils.{getResultType, getSignature, getSignatures, signatureToString, signaturesToString} +import org.apache.flink.table.{FlinkTypeFactory, ValidationException} import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/UserDefinedFunctionUtils.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/UserDefinedFunctionUtils.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/UserDefinedFunctionUtils.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/UserDefinedFunctionUtils.scala index 48996914561a3..babaee387f7ba 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/UserDefinedFunctionUtils.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/UserDefinedFunctionUtils.scala @@ -17,7 +17,7 @@ */ -package org.apache.flink.api.table.functions.utils +package org.apache.flink.table.functions.utils import java.lang.reflect.{Method, Modifier} import java.sql.{Date, Time, Timestamp} @@ -28,9 +28,9 @@ import org.apache.flink.api.common.functions.InvalidTypesException import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation} import org.apache.flink.api.common.typeutils.CompositeType import org.apache.flink.api.java.typeutils.TypeExtractor -import org.apache.flink.api.table.{FlinkTypeFactory, TableException, ValidationException} -import org.apache.flink.api.table.functions.{ScalarFunction, TableFunction, UserDefinedFunction} -import org.apache.flink.api.table.plan.schema.FlinkTableFunctionImpl +import org.apache.flink.table.{FlinkTypeFactory, TableException, ValidationException} +import org.apache.flink.table.functions.{ScalarFunction, TableFunction, UserDefinedFunction} +import org.apache.flink.table.plan.schema.FlinkTableFunctionImpl import org.apache.flink.util.InstantiationUtil object UserDefinedFunctionUtils { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/package.scala similarity index 91% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/package.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/package.scala index bdcb22c218694..6ce6e3cacb4d5 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/package.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/package.scala @@ -23,11 +23,11 @@ package org.apache.flink.api * This package contains the generic part of the Table API. It can be used with Flink Streaming * and Flink Batch. From Scala as well as from Java. * - * When using the Table API, as user creates a [[org.apache.flink.api.table.Table]] from + * When using the Table API, as user creates a [[org.apache.flink.table.Table]] from * a DataSet or DataStream. On this relational operations can be performed. A table can also * be converted back to a DataSet or DataStream. * - * Packages [[org.apache.flink.api.scala.table]] and [[org.apache.flink.api.java.table]] contain + * Packages [[org.apache.flink.table.api.scala]] and [[org.apache.flink.table.api.java]] contain * the language specific part of the API. Refer to these packages for documentation on how * the Table API can be used in Java and Scala. */ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/ProjectionTranslator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/ProjectionTranslator.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/ProjectionTranslator.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/ProjectionTranslator.scala index 22b77b47a32b5..f057272f4356a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/ProjectionTranslator.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/ProjectionTranslator.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan +package org.apache.flink.table.plan import org.apache.flink.api.common.typeutils.CompositeType -import org.apache.flink.api.table.TableEnvironment -import org.apache.flink.api.table.expressions._ -import org.apache.flink.api.table.plan.logical.{LogicalNode, Project} +import org.apache.flink.table.TableEnvironment +import org.apache.flink.table.expressions._ +import org.apache.flink.table.plan.logical.{LogicalNode, Project} import scala.collection.mutable.ListBuffer diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/cost/DataSetCost.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/DataSetCost.scala similarity index 99% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/cost/DataSetCost.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/DataSetCost.scala index 58537ddc737cc..7b439ecc02627 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/cost/DataSetCost.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/DataSetCost.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.cost +package org.apache.flink.table.plan.cost import org.apache.calcite.plan.{RelOptUtil, RelOptCostFactory, RelOptCost} import org.apache.calcite.util.Util diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/cost/DataSetCostFactory.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/DataSetCostFactory.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/cost/DataSetCostFactory.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/DataSetCostFactory.scala index 87d57d60bec91..50d3842c69ca8 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/cost/DataSetCostFactory.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/cost/DataSetCostFactory.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.cost +package org.apache.flink.table.plan.cost import org.apache.calcite.plan.{RelOptCost, RelOptCostFactory} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/LogicalNode.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalNode.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/LogicalNode.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalNode.scala index 21290d4763ff0..0a98cd79bc5e8 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/LogicalNode.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalNode.scala @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.plan.logical +package org.apache.flink.table.plan.logical import org.apache.calcite.rel.RelNode import org.apache.calcite.tools.RelBuilder -import org.apache.flink.api.table.{TableEnvironment, ValidationException} -import org.apache.flink.api.table.expressions._ -import org.apache.flink.api.table.trees.TreeNode -import org.apache.flink.api.table.typeutils.TypeCoercion -import org.apache.flink.api.table.validate._ +import org.apache.flink.table.{TableEnvironment, ValidationException} +import org.apache.flink.table.expressions._ +import org.apache.flink.table.trees.TreeNode +import org.apache.flink.table.typeutils.TypeCoercion +import org.apache.flink.table.validate._ /** * LogicalNode is created and validated as we construct query plan using Table API. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/LogicalWindow.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalWindow.scala similarity index 82% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/LogicalWindow.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalWindow.scala index 19fd6032d9881..27636667498ee 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/LogicalWindow.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalWindow.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.logical +package org.apache.flink.table.plan.logical -import org.apache.flink.api.table.TableEnvironment -import org.apache.flink.api.table.expressions.{Expression, WindowReference} -import org.apache.flink.api.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} +import org.apache.flink.table.TableEnvironment +import org.apache.flink.table.expressions.{Expression, WindowReference} +import org.apache.flink.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} abstract class LogicalWindow(val alias: Option[Expression]) extends Resolvable[LogicalWindow] { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/Resolvable.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/Resolvable.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/Resolvable.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/Resolvable.scala index 7540d432c0ce0..995bac587c8ac 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/Resolvable.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/Resolvable.scala @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.logical +package org.apache.flink.table.plan.logical -import org.apache.flink.api.table.expressions.Expression +import org.apache.flink.table.expressions.Expression /** * A class implementing this interface can resolve the expressions of its parameters and diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/groupWindows.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/groupWindows.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/groupWindows.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/groupWindows.scala index aeb9676c757ee..ba8fbb04ed188 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/groupWindows.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/groupWindows.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.logical +package org.apache.flink.table.plan.logical import org.apache.flink.api.common.typeinfo.BasicTypeInfo -import org.apache.flink.api.table.{BatchTableEnvironment, StreamTableEnvironment, TableEnvironment} -import org.apache.flink.api.table.expressions._ -import org.apache.flink.api.table.typeutils.{RowIntervalTypeInfo, TimeIntervalTypeInfo, TypeCoercion} -import org.apache.flink.api.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} +import org.apache.flink.table.{BatchTableEnvironment, StreamTableEnvironment, TableEnvironment} +import org.apache.flink.table.expressions._ +import org.apache.flink.table.typeutils.{RowIntervalTypeInfo, TimeIntervalTypeInfo, TypeCoercion} +import org.apache.flink.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} abstract class EventTimeGroupWindow( name: Option[Expression], diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/operators.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/operators.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/operators.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/operators.scala index 438698a66de92..fad62a333b307 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/operators.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/operators.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.plan.logical +package org.apache.flink.table.plan.logical import java.lang.reflect.Method import java.util @@ -29,14 +29,14 @@ import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.operators.join.JoinType -import org.apache.flink.api.table._ -import org.apache.flink.api.table.expressions._ -import org.apache.flink.api.table.functions.TableFunction -import org.apache.flink.api.table.functions.utils.TableSqlFunction -import org.apache.flink.api.table.functions.utils.UserDefinedFunctionUtils._ -import org.apache.flink.api.table.plan.schema.FlinkTableFunctionImpl -import org.apache.flink.api.table.typeutils.TypeConverter -import org.apache.flink.api.table.validate.{ValidationFailure, ValidationSuccess} +import org.apache.flink.table._ +import org.apache.flink.table.expressions._ +import org.apache.flink.table.functions.TableFunction +import org.apache.flink.table.functions.utils.TableSqlFunction +import org.apache.flink.table.functions.utils.UserDefinedFunctionUtils._ +import org.apache.flink.table.plan.schema.FlinkTableFunctionImpl +import org.apache.flink.table.typeutils.TypeConverter +import org.apache.flink.table.validate.{ValidationFailure, ValidationSuccess} import scala.collection.JavaConverters._ import scala.collection.mutable diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/rel/LogicalWindowAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalWindowAggregate.scala similarity index 93% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/rel/LogicalWindowAggregate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalWindowAggregate.scala index 9615168f4b4f7..b6ea3ea368ebb 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/logical/rel/LogicalWindowAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalWindowAggregate.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.logical.rel +package org.apache.flink.table.plan.logical.rel import java.util @@ -25,9 +25,9 @@ import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rel.core.{Aggregate, AggregateCall} import org.apache.calcite.rel.{RelNode, RelShuttle} import org.apache.calcite.util.ImmutableBitSet -import org.apache.flink.api.table.FlinkRelBuilder.NamedWindowProperty -import org.apache.flink.api.table.FlinkTypeFactory -import org.apache.flink.api.table.plan.logical.LogicalWindow +import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty +import org.apache.flink.table.FlinkTypeFactory +import org.apache.flink.table.plan.logical.LogicalWindow class LogicalWindowAggregate( window: LogicalWindow, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkAggregate.scala similarity index 91% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkAggregate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkAggregate.scala index 85129c42e8689..b55fdafeb3569 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkAggregate.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes +package org.apache.flink.table.plan.nodes import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rel.core.AggregateCall -import org.apache.flink.api.table.FlinkRelBuilder.NamedWindowProperty -import org.apache.flink.api.table.runtime.aggregate.AggregateUtil._ +import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty +import org.apache.flink.table.runtime.aggregate.AggregateUtil._ import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkCalc.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkCalc.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkCalc.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkCalc.scala index d5f80105bb7f2..ecfe6b68672e9 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkCalc.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkCalc.scala @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes +package org.apache.flink.table.plan.nodes import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rex.{RexNode, RexProgram} import org.apache.flink.api.common.functions.{FlatMapFunction, RichFlatMapFunction} import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.TableConfig -import org.apache.flink.api.table.codegen.{GeneratedFunction, CodeGenerator} -import org.apache.flink.api.table.runtime.FlatMapRunner -import org.apache.flink.api.table.typeutils.TypeConverter._ +import org.apache.flink.table.TableConfig +import org.apache.flink.table.codegen.{GeneratedFunction, CodeGenerator} +import org.apache.flink.table.runtime.FlatMapRunner +import org.apache.flink.table.typeutils.TypeConverter._ import scala.collection.JavaConversions._ import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkRel.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkRel.scala similarity index 93% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkRel.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkRel.scala index 7932e1104229e..dc85ba451d741 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkRel.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkRel.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes +package org.apache.flink.table.plan.nodes import org.apache.calcite.rex._ import org.apache.flink.api.common.functions.MapFunction import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.TableConfig -import org.apache.flink.api.table.codegen.CodeGenerator -import org.apache.flink.api.table.runtime.MapRunner +import org.apache.flink.table.TableConfig +import org.apache.flink.table.codegen.CodeGenerator +import org.apache.flink.table.runtime.MapRunner import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/BatchScan.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchScan.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/BatchScan.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchScan.scala index a6de2378548ff..6749564e12186 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/BatchScan.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchScan.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan._ import org.apache.calcite.rel.core.TableScan @@ -24,9 +24,9 @@ import org.apache.calcite.rel.metadata.RelMetadataQuery import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet import org.apache.flink.api.java.typeutils.PojoTypeInfo -import org.apache.flink.api.table.TableConfig -import org.apache.flink.api.table.plan.schema.FlinkTable -import org.apache.flink.api.table.typeutils.TypeConverter.determineReturnType +import org.apache.flink.table.TableConfig +import org.apache.flink.table.plan.schema.FlinkTable +import org.apache.flink.table.typeutils.TypeConverter.determineReturnType import scala.collection.JavaConversions._ import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/BatchTableSourceScan.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchTableSourceScan.scala similarity index 90% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/BatchTableSourceScan.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchTableSourceScan.scala index e368219b552b3..17ad143284eec 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/BatchTableSourceScan.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchTableSourceScan.scala @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan._ import org.apache.calcite.rel.metadata.RelMetadataQuery import org.apache.calcite.rel.{RelNode, RelWriter} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.{BatchTableEnvironment, FlinkTypeFactory} -import org.apache.flink.api.table.plan.schema.TableSourceTable -import org.apache.flink.api.table.sources.BatchTableSource +import org.apache.flink.table.{BatchTableEnvironment, FlinkTypeFactory} +import org.apache.flink.table.plan.schema.TableSourceTable +import org.apache.flink.table.sources.BatchTableSource /** Flink RelNode to read data from an external source defined by a [[BatchTableSource]]. */ class BatchTableSourceScan( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetAggregate.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetAggregate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetAggregate.scala index e85ade040ac5d..d8edd87ebf901 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetAggregate.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan.{RelOptCluster, RelOptCost, RelOptPlanner, RelTraitSet} import org.apache.calcite.rel.`type`.RelDataType @@ -25,11 +25,11 @@ import org.apache.calcite.rel.metadata.RelMetadataQuery import org.apache.calcite.rel.{RelNode, RelWriter, SingleRel} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.plan.nodes.FlinkAggregate -import org.apache.flink.api.table.runtime.aggregate.AggregateUtil -import org.apache.flink.api.table.runtime.aggregate.AggregateUtil.CalcitePair -import org.apache.flink.api.table.typeutils.{RowTypeInfo, TypeConverter} -import org.apache.flink.api.table.{BatchTableEnvironment, FlinkTypeFactory, Row} +import org.apache.flink.table.plan.nodes.FlinkAggregate +import org.apache.flink.table.runtime.aggregate.AggregateUtil +import org.apache.flink.table.runtime.aggregate.AggregateUtil.CalcitePair +import org.apache.flink.table.typeutils.{RowTypeInfo, TypeConverter} +import org.apache.flink.table.{BatchTableEnvironment, FlinkTypeFactory, Row} import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetCalc.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCalc.scala similarity index 93% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetCalc.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCalc.scala index c0881b7f018ca..bf55b9c518c0e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetCalc.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCalc.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan.{RelOptPlanner, RelOptCost, RelOptCluster, RelTraitSet} import org.apache.calcite.rel.`type`.RelDataType @@ -25,11 +25,11 @@ import org.apache.calcite.rel.{RelNode, RelWriter, SingleRel} import org.apache.flink.api.common.functions.FlatMapFunction import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.codegen.CodeGenerator -import org.apache.flink.api.table.plan.nodes.FlinkCalc -import org.apache.flink.api.table.typeutils.TypeConverter +import org.apache.flink.table.codegen.CodeGenerator +import org.apache.flink.table.plan.nodes.FlinkCalc +import org.apache.flink.table.typeutils.TypeConverter import TypeConverter._ -import org.apache.flink.api.table.BatchTableEnvironment +import org.apache.flink.table.BatchTableEnvironment import org.apache.calcite.rex._ import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetConvention.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetConvention.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetConvention.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetConvention.scala index 03d9a51692d5b..1b7bab5e4e8cd 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetConvention.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetConvention.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetIntersect.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetIntersect.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetIntersect.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetIntersect.scala index d2203d0016f7f..eca3b2f6a8c73 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetIntersect.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetIntersect.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan.{RelOptCluster, RelOptCost, RelOptPlanner, RelTraitSet} import org.apache.calcite.rel.`type`.RelDataType @@ -24,9 +24,9 @@ import org.apache.calcite.rel.metadata.RelMetadataQuery import org.apache.calcite.rel.{BiRel, RelNode, RelWriter} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.BatchTableEnvironment -import org.apache.flink.api.table.runtime.IntersectCoGroupFunction -import org.apache.flink.api.table.typeutils.TypeConverter._ +import org.apache.flink.table.BatchTableEnvironment +import org.apache.flink.table.runtime.IntersectCoGroupFunction +import org.apache.flink.table.typeutils.TypeConverter._ import scala.collection.JavaConversions._ import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetJoin.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetJoin.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala index ccd84cadae329..d406bc420f993 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetJoin.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetJoin.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan._ import org.apache.calcite.rel.`type`.RelDataType @@ -27,10 +27,10 @@ import org.apache.calcite.util.mapping.IntPair import org.apache.flink.api.common.operators.base.JoinOperatorBase.JoinHint import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.codegen.CodeGenerator -import org.apache.flink.api.table.runtime.FlatJoinRunner -import org.apache.flink.api.table.typeutils.TypeConverter.determineReturnType -import org.apache.flink.api.table.{BatchTableEnvironment, TableException} +import org.apache.flink.table.codegen.CodeGenerator +import org.apache.flink.table.runtime.FlatJoinRunner +import org.apache.flink.table.typeutils.TypeConverter.determineReturnType +import org.apache.flink.table.{BatchTableEnvironment, TableException} import org.apache.flink.api.common.functions.FlatJoinFunction import org.apache.calcite.rex.RexNode diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetMinus.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetMinus.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetMinus.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetMinus.scala index 6a5cbd1bc568b..fb090e0dd8404 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetMinus.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetMinus.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan.{RelOptCluster, RelOptCost, RelOptPlanner, RelTraitSet} import org.apache.calcite.rel.`type`.RelDataType @@ -24,9 +24,9 @@ import org.apache.calcite.rel.metadata.RelMetadataQuery import org.apache.calcite.rel.{BiRel, RelNode, RelWriter} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.BatchTableEnvironment -import org.apache.flink.api.table.runtime.MinusCoGroupFunction -import org.apache.flink.api.table.typeutils.TypeConverter._ +import org.apache.flink.table.BatchTableEnvironment +import org.apache.flink.table.runtime.MinusCoGroupFunction +import org.apache.flink.table.typeutils.TypeConverter._ import scala.collection.JavaConversions._ import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetRel.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetRel.scala similarity index 87% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetRel.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetRel.scala index 82c75e166ccf9..08458b824af0f 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetRel.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetRel.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.`type`.RelDataType @@ -24,10 +24,10 @@ import org.apache.calcite.sql.`type`.SqlTypeName import org.apache.flink.api.common.functions.MapFunction import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.codegen.CodeGenerator -import org.apache.flink.api.table.plan.nodes.FlinkRel -import org.apache.flink.api.table.runtime.MapRunner -import org.apache.flink.api.table.{BatchTableEnvironment, TableConfig, TableException} +import org.apache.flink.table.codegen.CodeGenerator +import org.apache.flink.table.plan.nodes.FlinkRel +import org.apache.flink.table.runtime.MapRunner +import org.apache.flink.table.{BatchTableEnvironment, TableConfig, TableException} import scala.collection.JavaConversions._ @@ -36,7 +36,7 @@ trait DataSetRel extends RelNode with FlinkRel { /** * Translates the [[DataSetRel]] node into a [[DataSet]] operator. * - * @param tableEnv [[org.apache.flink.api.table.BatchTableEnvironment]] of the translated Table. + * @param tableEnv [[org.apache.flink.table.BatchTableEnvironment]] of the translated Table. * @param expectedType specifies the type the Flink operator should return. The type must * have the same arity as the result. For instance, if the * expected type is a RowTypeInfo this method will return a DataSet of diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetScan.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetScan.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetScan.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetScan.scala index b7831368c8052..dce7f4e4fdeaf 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetScan.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetScan.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan._ import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.`type`.RelDataType import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.BatchTableEnvironment -import org.apache.flink.api.table.plan.schema.DataSetTable +import org.apache.flink.table.BatchTableEnvironment +import org.apache.flink.table.plan.schema.DataSetTable /** * Flink RelNode which matches along with DataSource. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetSingleRowJoin.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSingleRowJoin.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetSingleRowJoin.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSingleRowJoin.scala index 0306c005b211e..aecfe85f09a1a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetSingleRowJoin.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSingleRowJoin.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan._ import org.apache.calcite.rel.`type`.RelDataType @@ -26,10 +26,10 @@ import org.apache.calcite.rex.RexNode import org.apache.flink.api.common.functions.{FlatJoinFunction, FlatMapFunction} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.codegen.CodeGenerator -import org.apache.flink.api.table.runtime.{MapJoinLeftRunner, MapJoinRightRunner} -import org.apache.flink.api.table.typeutils.TypeConverter.determineReturnType -import org.apache.flink.api.table.{BatchTableEnvironment, TableConfig} +import org.apache.flink.table.codegen.CodeGenerator +import org.apache.flink.table.runtime.{MapJoinLeftRunner, MapJoinRightRunner} +import org.apache.flink.table.typeutils.TypeConverter.determineReturnType +import org.apache.flink.table.{BatchTableEnvironment, TableConfig} import scala.collection.JavaConversions._ import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetSort.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSort.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetSort.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSort.scala index 661aeef5e114f..a71f0a3aa061b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetSort.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetSort.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import java.util @@ -28,9 +28,9 @@ import org.apache.calcite.rex.{RexLiteral, RexNode} import org.apache.flink.api.common.operators.Order import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.{BatchTableEnvironment, TableException} -import org.apache.flink.api.table.runtime.{CountPartitionFunction, LimitFilterFunction} -import org.apache.flink.api.table.typeutils.TypeConverter._ +import org.apache.flink.table.{BatchTableEnvironment, TableException} +import org.apache.flink.table.runtime.{CountPartitionFunction, LimitFilterFunction} +import org.apache.flink.table.typeutils.TypeConverter._ import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetUnion.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetUnion.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetUnion.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetUnion.scala index 6e43fae3e98ea..a450100ee1e1c 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetUnion.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetUnion.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan.{RelOptCluster, RelOptCost, RelOptPlanner, RelTraitSet} import org.apache.calcite.rel.`type`.RelDataType @@ -24,7 +24,7 @@ import org.apache.calcite.rel.metadata.RelMetadataQuery import org.apache.calcite.rel.{BiRel, RelNode, RelWriter} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.BatchTableEnvironment +import org.apache.flink.table.BatchTableEnvironment import scala.collection.JavaConversions._ import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetValues.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetValues.scala similarity index 91% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetValues.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetValues.scala index 4f3a2577d4623..a014ba9b57fdc 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetValues.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetValues.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import com.google.common.collect.ImmutableList import org.apache.calcite.plan.{RelOptCluster, RelTraitSet} @@ -26,10 +26,10 @@ import org.apache.calcite.rel.{RelNode, RelWriter} import org.apache.calcite.rex.RexLiteral import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.BatchTableEnvironment -import org.apache.flink.api.table.codegen.CodeGenerator -import org.apache.flink.api.table.runtime.io.ValuesInputFormat -import org.apache.flink.api.table.typeutils.TypeConverter._ +import org.apache.flink.table.BatchTableEnvironment +import org.apache.flink.table.codegen.CodeGenerator +import org.apache.flink.table.runtime.io.ValuesInputFormat +import org.apache.flink.table.typeutils.TypeConverter._ import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamAggregate.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamAggregate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamAggregate.scala index c7d51313f1a8e..dc1cb875a3f80 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamAggregate.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.datastream +package org.apache.flink.table.plan.nodes.datastream import org.apache.calcite.plan.{RelOptCluster, RelTraitSet} import org.apache.calcite.rel.`type`.RelDataType @@ -24,16 +24,16 @@ import org.apache.calcite.rel.core.AggregateCall import org.apache.calcite.rel.{RelNode, RelWriter, SingleRel} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.tuple.Tuple -import org.apache.flink.api.table.FlinkRelBuilder.NamedWindowProperty -import org.apache.flink.api.table.expressions._ -import org.apache.flink.api.table.plan.logical._ -import org.apache.flink.api.table.plan.nodes.FlinkAggregate -import org.apache.flink.api.table.plan.nodes.datastream.DataStreamAggregate._ -import org.apache.flink.api.table.runtime.aggregate.AggregateUtil._ -import org.apache.flink.api.table.runtime.aggregate.{Aggregate, _} -import org.apache.flink.api.table.typeutils.TypeCheckUtils.isTimeInterval -import org.apache.flink.api.table.typeutils.{RowIntervalTypeInfo, RowTypeInfo, TimeIntervalTypeInfo, TypeConverter} -import org.apache.flink.api.table.{FlinkTypeFactory, Row, StreamTableEnvironment} +import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty +import org.apache.flink.table.expressions._ +import org.apache.flink.table.plan.logical._ +import org.apache.flink.table.plan.nodes.FlinkAggregate +import org.apache.flink.table.plan.nodes.datastream.DataStreamAggregate._ +import org.apache.flink.table.runtime.aggregate.AggregateUtil._ +import org.apache.flink.table.runtime.aggregate.{Aggregate, _} +import org.apache.flink.table.typeutils.TypeCheckUtils.isTimeInterval +import org.apache.flink.table.typeutils.{RowIntervalTypeInfo, RowTypeInfo, TimeIntervalTypeInfo, TypeConverter} +import org.apache.flink.table.{FlinkTypeFactory, Row, StreamTableEnvironment} import org.apache.flink.streaming.api.datastream.{AllWindowedStream, DataStream, KeyedStream, WindowedStream} import org.apache.flink.streaming.api.windowing.assigners._ import org.apache.flink.streaming.api.windowing.time.Time diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamCalc.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCalc.scala similarity index 91% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamCalc.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCalc.scala index 5312a5fa25b7f..090c59c80255c 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamCalc.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCalc.scala @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.datastream +package org.apache.flink.table.plan.nodes.datastream import org.apache.calcite.plan.{RelOptCluster, RelTraitSet} import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rel.{RelNode, RelWriter, SingleRel} import org.apache.calcite.rex.RexProgram import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.StreamTableEnvironment -import org.apache.flink.api.table.codegen.CodeGenerator -import org.apache.flink.api.table.plan.nodes.FlinkCalc -import org.apache.flink.api.table.typeutils.TypeConverter._ +import org.apache.flink.table.StreamTableEnvironment +import org.apache.flink.table.codegen.CodeGenerator +import org.apache.flink.table.plan.nodes.FlinkCalc +import org.apache.flink.table.typeutils.TypeConverter._ import org.apache.flink.api.common.functions.FlatMapFunction import org.apache.flink.streaming.api.datastream.DataStream diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamConvention.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamConvention.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamConvention.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamConvention.scala index 3b6a6535b5560..9525d1f0e3412 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamConvention.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamConvention.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.datastream +package org.apache.flink.table.plan.nodes.datastream import org.apache.calcite.plan._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamRel.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamRel.scala similarity index 90% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamRel.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamRel.scala index 6cf13a54ce14d..887170407bd5b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamRel.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamRel.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.datastream +package org.apache.flink.table.plan.nodes.datastream import org.apache.calcite.rel.RelNode import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.{StreamTableEnvironment, TableConfig} -import org.apache.flink.api.table.plan.nodes.FlinkRel +import org.apache.flink.table.{StreamTableEnvironment, TableConfig} +import org.apache.flink.table.plan.nodes.FlinkRel import org.apache.flink.streaming.api.datastream.DataStream trait DataStreamRel extends RelNode with FlinkRel { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamScan.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamScan.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamScan.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamScan.scala index da83b647dec00..f5d51ab7cb7b3 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamScan.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamScan.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.datastream +package org.apache.flink.table.plan.nodes.datastream import org.apache.calcite.plan._ import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.`type`.RelDataType import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.StreamTableEnvironment -import org.apache.flink.api.table.plan.schema.DataStreamTable +import org.apache.flink.table.StreamTableEnvironment +import org.apache.flink.table.plan.schema.DataStreamTable import org.apache.flink.streaming.api.datastream.DataStream /** diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamUnion.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamUnion.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamUnion.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamUnion.scala index f490d31e6094d..344e1f6de4b4b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamUnion.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamUnion.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.datastream +package org.apache.flink.table.plan.nodes.datastream import org.apache.calcite.plan.{RelOptCluster, RelTraitSet} import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rel.{RelNode, RelWriter, BiRel} import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.StreamTableEnvironment +import org.apache.flink.table.StreamTableEnvironment import org.apache.flink.streaming.api.datastream.DataStream import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamValues.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamValues.scala similarity index 90% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamValues.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamValues.scala index 3b986538cfe2c..6bfae60cd0eca 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamValues.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamValues.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.datastream +package org.apache.flink.table.plan.nodes.datastream import com.google.common.collect.ImmutableList import org.apache.calcite.plan._ @@ -25,10 +25,10 @@ import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rel.core.Values import org.apache.calcite.rex.RexLiteral import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.StreamTableEnvironment -import org.apache.flink.api.table.codegen.CodeGenerator -import org.apache.flink.api.table.runtime.io.ValuesInputFormat -import org.apache.flink.api.table.typeutils.TypeConverter._ +import org.apache.flink.table.StreamTableEnvironment +import org.apache.flink.table.codegen.CodeGenerator +import org.apache.flink.table.runtime.io.ValuesInputFormat +import org.apache.flink.table.typeutils.TypeConverter._ import org.apache.flink.streaming.api.datastream.DataStream import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/StreamScan.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamScan.scala similarity index 90% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/StreamScan.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamScan.scala index b13770e6e740d..e252baef70666 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/StreamScan.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamScan.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.datastream +package org.apache.flink.table.plan.nodes.datastream import org.apache.calcite.plan._ import org.apache.calcite.rel.`type`.RelDataType @@ -24,11 +24,11 @@ import org.apache.calcite.rel.core.TableScan import org.apache.flink.api.common.functions.MapFunction import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.PojoTypeInfo -import org.apache.flink.api.table.TableConfig -import org.apache.flink.api.table.codegen.CodeGenerator -import org.apache.flink.api.table.plan.schema.FlinkTable -import org.apache.flink.api.table.runtime.MapRunner -import org.apache.flink.api.table.typeutils.TypeConverter.determineReturnType +import org.apache.flink.table.TableConfig +import org.apache.flink.table.codegen.CodeGenerator +import org.apache.flink.table.plan.schema.FlinkTable +import org.apache.flink.table.runtime.MapRunner +import org.apache.flink.table.typeutils.TypeConverter.determineReturnType import org.apache.flink.streaming.api.datastream.DataStream import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/StreamTableSourceScan.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamTableSourceScan.scala similarity index 89% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/StreamTableSourceScan.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamTableSourceScan.scala index 8201070ce5756..01f3c9b95ff83 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/StreamTableSourceScan.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamTableSourceScan.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.datastream +package org.apache.flink.table.plan.nodes.datastream import org.apache.calcite.plan._ import org.apache.calcite.rel.RelNode import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.plan.schema.TableSourceTable -import org.apache.flink.api.table.sources.StreamTableSource -import org.apache.flink.api.table.{FlinkTypeFactory, StreamTableEnvironment} +import org.apache.flink.table.plan.schema.TableSourceTable +import org.apache.flink.table.sources.StreamTableSource +import org.apache.flink.table.{FlinkTypeFactory, StreamTableEnvironment} import org.apache.flink.streaming.api.datastream.DataStream /** Flink RelNode to read data from an external source defined by a [[StreamTableSource]]. */ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/EnumerableToLogicalTableScan.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/EnumerableToLogicalTableScan.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/EnumerableToLogicalTableScan.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/EnumerableToLogicalTableScan.scala index ee515c954f73a..86b8a231846d5 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/EnumerableToLogicalTableScan.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/EnumerableToLogicalTableScan.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules +package org.apache.flink.table.plan.rules import org.apache.calcite.plan.RelOptRule.{any, operand} import org.apache.calcite.adapter.enumerable.EnumerableTableScan diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/FlinkRuleSets.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/FlinkRuleSets.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/FlinkRuleSets.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/FlinkRuleSets.scala index 183065c974cf4..bcd12a41de254 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/FlinkRuleSets.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/FlinkRuleSets.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules +package org.apache.flink.table.plan.rules import org.apache.calcite.rel.rules._ import org.apache.calcite.tools.{RuleSets, RuleSet} -import org.apache.flink.api.table.plan.rules.dataSet._ -import org.apache.flink.api.table.plan.rules.datastream._ -import org.apache.flink.api.table.plan.rules.datastream.{DataStreamCalcRule, DataStreamScanRule, DataStreamUnionRule} +import org.apache.flink.table.plan.rules.dataSet._ +import org.apache.flink.table.plan.rules.datastream._ +import org.apache.flink.table.plan.rules.datastream.{DataStreamCalcRule, DataStreamScanRule, DataStreamUnionRule} object FlinkRuleSets { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/BatchTableSourceScanRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/BatchTableSourceScanRule.scala similarity index 89% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/BatchTableSourceScanRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/BatchTableSourceScanRule.scala index 8e3d8bb159696..d6995850827ea 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/BatchTableSourceScanRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/BatchTableSourceScanRule.scala @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.{Convention, RelOptRule, RelOptRuleCall, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.core.TableScan import org.apache.calcite.rel.logical.LogicalTableScan -import org.apache.flink.api.table.plan.nodes.dataset.{BatchTableSourceScan, DataSetConvention} -import org.apache.flink.api.table.plan.schema.TableSourceTable -import org.apache.flink.api.table.sources.BatchTableSource +import org.apache.flink.table.plan.nodes.dataset.{BatchTableSourceScan, DataSetConvention} +import org.apache.flink.table.plan.schema.TableSourceTable +import org.apache.flink.table.sources.BatchTableSource /** Rule to convert a [[LogicalTableScan]] into a [[BatchTableSourceScan]]. */ class BatchTableSourceScanRule diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetAggregateRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetAggregateRule.scala similarity index 93% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetAggregateRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetAggregateRule.scala index 0311c48d339eb..4c6a74f4c439c 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetAggregateRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetAggregateRule.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.{RelOptRuleCall, Convention, RelOptRule, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.LogicalAggregate -import org.apache.flink.api.table.TableException -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetAggregate, DataSetConvention} +import org.apache.flink.table.TableException +import org.apache.flink.table.plan.nodes.dataset.{DataSetAggregate, DataSetConvention} import scala.collection.JavaConversions._ class DataSetAggregateRule diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetAggregateWithNullValuesRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetAggregateWithNullValuesRule.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetAggregateWithNullValuesRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetAggregateWithNullValuesRule.scala index 54cb8d1e465a9..605328514fe7e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetAggregateWithNullValuesRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetAggregateWithNullValuesRule.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan._ import scala.collection.JavaConversions._ @@ -24,8 +24,8 @@ import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.{LogicalValues, LogicalUnion, LogicalAggregate} import org.apache.calcite.rex.RexLiteral -import org.apache.flink.api.table._ -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetAggregate, DataSetConvention} +import org.apache.flink.table._ +import org.apache.flink.table.plan.nodes.dataset.{DataSetAggregate, DataSetConvention} /** * Rule for insert [[Row]] with null records into a [[DataSetAggregate]] diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetCalcRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCalcRule.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetCalcRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCalcRule.scala index 88e74a9aca8bc..1d100fab61e12 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetCalcRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCalcRule.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.{Convention, RelOptRule, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.LogicalCalc -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetCalc, DataSetConvention} +import org.apache.flink.table.plan.nodes.dataset.{DataSetCalc, DataSetConvention} class DataSetCalcRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetIntersectRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetIntersectRule.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetIntersectRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetIntersectRule.scala index c0e3269f0461f..d158f34d9b57d 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetIntersectRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetIntersectRule.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.{Convention, RelOptRule, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.LogicalIntersect -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetIntersect, DataSetConvention} +import org.apache.flink.table.plan.nodes.dataset.{DataSetIntersect, DataSetConvention} class DataSetIntersectRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetJoinRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetJoinRule.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetJoinRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetJoinRule.scala index 3fab8bfa4d6ab..2874198f77954 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetJoinRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetJoinRule.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.{Convention, RelOptRule, RelOptRuleCall, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.LogicalJoin -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetJoin, DataSetConvention} +import org.apache.flink.table.plan.nodes.dataset.{DataSetJoin, DataSetConvention} import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetMinusRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetMinusRule.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetMinusRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetMinusRule.scala index 44bead0f3bce4..71725965d1755 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetMinusRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetMinusRule.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.{Convention, RelOptRule, RelOptRuleCall, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.LogicalMinus import org.apache.calcite.rel.rules.UnionToDistinctRule -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetConvention, DataSetMinus} +import org.apache.flink.table.plan.nodes.dataset.{DataSetConvention, DataSetMinus} class DataSetMinusRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetScanRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetScanRule.scala similarity index 91% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetScanRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetScanRule.scala index 747769012f381..9d593aaa0ca9b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetScanRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetScanRule.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.{RelOptRuleCall, Convention, RelOptRule, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.core.TableScan import org.apache.calcite.rel.logical.LogicalTableScan -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetConvention, DataSetScan} -import org.apache.flink.api.table.plan.schema.DataSetTable +import org.apache.flink.table.plan.nodes.dataset.{DataSetConvention, DataSetScan} +import org.apache.flink.table.plan.schema.DataSetTable class DataSetScanRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetSingleRowJoinRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSingleRowJoinRule.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetSingleRowJoinRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSingleRowJoinRule.scala index 8109fcfa1f8ef..1f5c91ae1e5db 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetSingleRowJoinRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSingleRowJoinRule.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.volcano.RelSubset import org.apache.calcite.plan.{Convention, RelOptRule, RelOptRuleCall} @@ -24,7 +24,7 @@ import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.core.JoinRelType import org.apache.calcite.rel.logical.{LogicalAggregate, LogicalJoin} -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetConvention, DataSetSingleRowJoin} +import org.apache.flink.table.plan.nodes.dataset.{DataSetConvention, DataSetSingleRowJoin} class DataSetSingleRowJoinRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetSortRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSortRule.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetSortRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSortRule.scala index 5c1fb5323250b..14b94590ae85b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetSortRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetSortRule.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.{Convention, RelOptRule, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.{LogicalJoin, LogicalSort} -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetConvention, DataSetSort} +import org.apache.flink.table.plan.nodes.dataset.{DataSetConvention, DataSetSort} class DataSetSortRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetUnionRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetUnionRule.scala similarity index 93% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetUnionRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetUnionRule.scala index ea35637efe4dc..e24f477ab4d4b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetUnionRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetUnionRule.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.{RelOptRuleCall, Convention, RelOptRule, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.LogicalUnion import org.apache.calcite.rel.rules.UnionToDistinctRule -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetConvention, DataSetUnion} +import org.apache.flink.table.plan.nodes.dataset.{DataSetConvention, DataSetUnion} class DataSetUnionRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetValuesRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetValuesRule.scala similarity index 91% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetValuesRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetValuesRule.scala index 3d6c0de55fb6b..8ecdc74e21251 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetValuesRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetValuesRule.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.{RelOptRule, RelTraitSet, Convention} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.LogicalValues -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetValues, DataSetConvention} +import org.apache.flink.table.plan.nodes.dataset.{DataSetValues, DataSetConvention} class DataSetValuesRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamAggregateRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamAggregateRule.scala similarity index 88% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamAggregateRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamAggregateRule.scala index dff2adcb2e421..87df596a3f057 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamAggregateRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamAggregateRule.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.datastream +package org.apache.flink.table.plan.rules.datastream import org.apache.calcite.plan.{Convention, RelOptRule, RelOptRuleCall, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule -import org.apache.flink.api.table.TableException -import org.apache.flink.api.table.expressions.Alias -import org.apache.flink.api.table.plan.logical.rel.LogicalWindowAggregate -import org.apache.flink.api.table.plan.nodes.datastream.{DataStreamAggregate, DataStreamConvention} +import org.apache.flink.table.TableException +import org.apache.flink.table.expressions.Alias +import org.apache.flink.table.plan.logical.rel.LogicalWindowAggregate +import org.apache.flink.table.plan.nodes.datastream.{DataStreamAggregate, DataStreamConvention} import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamCalcRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCalcRule.scala similarity index 89% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamCalcRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCalcRule.scala index b62967a5c530c..4e620c967ca6c 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamCalcRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCalcRule.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.datastream +package org.apache.flink.table.plan.rules.datastream import org.apache.calcite.plan.{Convention, RelOptRule, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.LogicalCalc -import org.apache.flink.api.table.plan.nodes.datastream.DataStreamCalc -import org.apache.flink.api.table.plan.nodes.datastream.DataStreamConvention +import org.apache.flink.table.plan.nodes.datastream.DataStreamCalc +import org.apache.flink.table.plan.nodes.datastream.DataStreamConvention class DataStreamCalcRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamScanRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamScanRule.scala similarity index 88% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamScanRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamScanRule.scala index 62638bcd6c822..91fd6e28d0b33 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamScanRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamScanRule.scala @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.datastream +package org.apache.flink.table.plan.rules.datastream import org.apache.calcite.plan.{RelOptRuleCall, Convention, RelOptRule, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.core.TableScan import org.apache.calcite.rel.logical.LogicalTableScan -import org.apache.flink.api.table.plan.nodes.datastream.DataStreamConvention -import org.apache.flink.api.table.plan.nodes.datastream.DataStreamScan -import org.apache.flink.api.table.plan.schema.DataStreamTable +import org.apache.flink.table.plan.nodes.datastream.DataStreamConvention +import org.apache.flink.table.plan.nodes.datastream.DataStreamScan +import org.apache.flink.table.plan.schema.DataStreamTable class DataStreamScanRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamUnionRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamUnionRule.scala similarity index 89% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamUnionRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamUnionRule.scala index 78a5486aef41b..475c050930d7a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamUnionRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamUnionRule.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.datastream +package org.apache.flink.table.plan.rules.datastream import org.apache.calcite.plan.{Convention, RelOptRule, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.LogicalUnion -import org.apache.flink.api.table.plan.nodes.datastream.DataStreamConvention -import org.apache.flink.api.table.plan.nodes.datastream.DataStreamUnion +import org.apache.flink.table.plan.nodes.datastream.DataStreamConvention +import org.apache.flink.table.plan.nodes.datastream.DataStreamUnion class DataStreamUnionRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamValuesRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamValuesRule.scala similarity index 91% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamValuesRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamValuesRule.scala index 738642d6a55dd..db338425ff5ae 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamValuesRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamValuesRule.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.datastream +package org.apache.flink.table.plan.rules.datastream import org.apache.calcite.plan.{Convention, RelOptRule, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.LogicalValues -import org.apache.flink.api.table.plan.nodes.datastream.{DataStreamValues, DataStreamConvention} +import org.apache.flink.table.plan.nodes.datastream.{DataStreamValues, DataStreamConvention} class DataStreamValuesRule extends ConverterRule( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/StreamTableSourceScanRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/StreamTableSourceScanRule.scala similarity index 91% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/StreamTableSourceScanRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/StreamTableSourceScanRule.scala index 91dd255db0e76..296c86be54137 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/StreamTableSourceScanRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/StreamTableSourceScanRule.scala @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.datastream +package org.apache.flink.table.plan.rules.datastream import org.apache.calcite.plan.{Convention, RelOptRule, RelOptRuleCall, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.core.TableScan import org.apache.calcite.rel.logical.LogicalTableScan -import org.apache.flink.api.table.plan.nodes.datastream. +import org.apache.flink.table.plan.nodes.datastream. {StreamTableSourceScan, DataStreamConvention} -import org.apache.flink.api.table.plan.schema.TableSourceTable -import org.apache.flink.api.table.sources.StreamTableSource +import org.apache.flink.table.plan.schema.TableSourceTable +import org.apache.flink.table.sources.StreamTableSource /** Rule to convert a [[LogicalTableScan]] into a [[StreamTableSourceScan]]. */ class StreamTableSourceScanRule diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/CompositeRelDataType.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/CompositeRelDataType.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/CompositeRelDataType.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/CompositeRelDataType.scala index b9ceff0e6a1bc..27eca2914502a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/CompositeRelDataType.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/CompositeRelDataType.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.schema +package org.apache.flink.table.plan.schema import java.util import org.apache.calcite.rel.`type`.{RelDataTypeField, RelDataTypeFieldImpl, RelRecordType} import org.apache.flink.api.common.typeutils.CompositeType -import org.apache.flink.api.table.FlinkTypeFactory -import org.apache.flink.api.table.plan.schema.CompositeRelDataType.createFieldList +import org.apache.flink.table.FlinkTypeFactory +import org.apache.flink.table.plan.schema.CompositeRelDataType.createFieldList import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/DataSetTable.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/DataSetTable.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/DataSetTable.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/DataSetTable.scala index bbcba1309d5ae..f8c68359b5474 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/DataSetTable.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/DataSetTable.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.schema +package org.apache.flink.table.plan.schema import java.lang.Double import java.util diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/DataStreamTable.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/DataStreamTable.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/DataStreamTable.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/DataStreamTable.scala index 570d723a2cca6..0355fac324f0a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/DataStreamTable.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/DataStreamTable.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.schema +package org.apache.flink.table.plan.schema import org.apache.flink.streaming.api.datastream.DataStream diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/FlinkTable.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTable.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/FlinkTable.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTable.scala index 84d6d7ead2fbc..b14df9972f55b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/FlinkTable.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTable.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.schema +package org.apache.flink.table.plan.schema import org.apache.calcite.rel.`type`.{RelDataType, RelDataTypeFactory} import org.apache.calcite.schema.impl.AbstractTable import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation} import org.apache.flink.api.common.typeutils.CompositeType -import org.apache.flink.api.table.{FlinkTypeFactory, TableException} +import org.apache.flink.table.{FlinkTypeFactory, TableException} abstract class FlinkTable[T]( val typeInfo: TypeInformation[T], diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/GenericRelDataType.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/GenericRelDataType.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/GenericRelDataType.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/GenericRelDataType.scala index a3012d1009cbb..9ca6162231d32 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/GenericRelDataType.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/GenericRelDataType.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.schema +package org.apache.flink.table.plan.schema import org.apache.calcite.sql.`type`.{BasicSqlType, SqlTypeName} import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.FlinkTypeSystem +import org.apache.flink.table.FlinkTypeSystem /** * Generic type for encapsulating Flink's [[TypeInformation]]. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/RelTable.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/RelTable.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/RelTable.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/RelTable.scala index f952d83032b86..30052a8404cb1 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/RelTable.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/RelTable.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.schema +package org.apache.flink.table.plan.schema import org.apache.calcite.plan.RelOptTable import org.apache.calcite.plan.RelOptTable.ToRelContext diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/TableSourceTable.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/TableSourceTable.scala similarity index 85% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/TableSourceTable.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/TableSourceTable.scala index a11e8c1c365e5..6f0f2734c5541 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/TableSourceTable.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/TableSourceTable.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.schema +package org.apache.flink.table.plan.schema -import org.apache.flink.api.table.Row -import org.apache.flink.api.table.sources.TableSource -import org.apache.flink.api.table.typeutils.RowTypeInfo +import org.apache.flink.table.Row +import org.apache.flink.table.sources.TableSource +import org.apache.flink.table.typeutils.RowTypeInfo /** Table which defines an external table via a [[TableSource]] */ class TableSourceTable(val tableSource: TableSource[_]) diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/CountPartitionFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CountPartitionFunction.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/CountPartitionFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CountPartitionFunction.scala index 5896f4c713abb..9fe4ec313ef6e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/CountPartitionFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CountPartitionFunction.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime +package org.apache.flink.table.runtime import java.lang.Iterable diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/FlatJoinRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatJoinRunner.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/FlatJoinRunner.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatJoinRunner.scala index 2e57a0f5089f4..715848d026893 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/FlatJoinRunner.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatJoinRunner.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime +package org.apache.flink.table.runtime import org.apache.flink.api.common.functions.{FlatJoinFunction, RichFlatJoinFunction} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.ResultTypeQueryable -import org.apache.flink.api.table.codegen.Compiler +import org.apache.flink.table.codegen.Compiler import org.apache.flink.configuration.Configuration import org.apache.flink.util.Collector import org.slf4j.LoggerFactory diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/FlatMapRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatMapRunner.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/FlatMapRunner.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatMapRunner.scala index e228e2b5b9e16..a7bd980cf8ef0 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/FlatMapRunner.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatMapRunner.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime +package org.apache.flink.table.runtime import org.apache.flink.api.common.functions.{FlatMapFunction, RichFlatMapFunction} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.ResultTypeQueryable -import org.apache.flink.api.table.codegen.Compiler +import org.apache.flink.table.codegen.Compiler import org.apache.flink.configuration.Configuration import org.apache.flink.util.Collector import org.slf4j.LoggerFactory diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/IntersectCoGroupFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/IntersectCoGroupFunction.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/IntersectCoGroupFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/IntersectCoGroupFunction.scala index 99308110589e5..39d29148a1a36 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/IntersectCoGroupFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/IntersectCoGroupFunction.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime +package org.apache.flink.table.runtime import java.lang.{Iterable => JIterable} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/LimitFilterFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/LimitFilterFunction.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/LimitFilterFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/LimitFilterFunction.scala index 5ec9035589baf..84412450dee87 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/LimitFilterFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/LimitFilterFunction.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime +package org.apache.flink.table.runtime import org.apache.flink.api.common.functions.RichFilterFunction import org.apache.flink.configuration.Configuration diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapJoinLeftRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapJoinLeftRunner.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapJoinLeftRunner.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapJoinLeftRunner.scala index 76650c2ad5792..cf32404cab738 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapJoinLeftRunner.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapJoinLeftRunner.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime +package org.apache.flink.table.runtime import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.util.Collector diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapJoinRightRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapJoinRightRunner.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapJoinRightRunner.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapJoinRightRunner.scala index 52b01cfc17f5c..c4bc0d12dfb4f 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapJoinRightRunner.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapJoinRightRunner.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime +package org.apache.flink.table.runtime import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.util.Collector diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapRunner.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapRunner.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapRunner.scala index 9fd187673a6bb..51e2fc59a4540 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapRunner.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapRunner.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime +package org.apache.flink.table.runtime import org.apache.flink.api.common.functions.{MapFunction, RichMapFunction} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.ResultTypeQueryable -import org.apache.flink.api.table.codegen.Compiler +import org.apache.flink.table.codegen.Compiler import org.apache.flink.configuration.Configuration import org.slf4j.LoggerFactory diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapSideJoinRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapSideJoinRunner.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapSideJoinRunner.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapSideJoinRunner.scala index b355d498599d5..f12590fe154f7 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MapSideJoinRunner.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapSideJoinRunner.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime +package org.apache.flink.table.runtime import org.apache.flink.api.common.functions.{FlatJoinFunction, RichFlatMapFunction} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.ResultTypeQueryable -import org.apache.flink.api.table.codegen.Compiler +import org.apache.flink.table.codegen.Compiler import org.apache.flink.configuration.Configuration import org.slf4j.LoggerFactory diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MinusCoGroupFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MinusCoGroupFunction.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MinusCoGroupFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MinusCoGroupFunction.scala index cac4fe693fe26..41679ee36e865 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/MinusCoGroupFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MinusCoGroupFunction.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime +package org.apache.flink.table.runtime import java.lang.Iterable diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/Aggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/Aggregate.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/Aggregate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/Aggregate.scala index 1e91711c02eb6..1bb33b5f5ba70 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/Aggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/Aggregate.scala @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row /** * The interface for all Flink aggregate functions, which expressed in terms of initiate(), diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateAllTimeWindowFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateAllTimeWindowFunction.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateAllTimeWindowFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateAllTimeWindowFunction.scala index 7ace2c5adc9d6..9da041ee553df 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateAllTimeWindowFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateAllTimeWindowFunction.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.lang.Iterable import org.apache.flink.api.common.functions.RichGroupReduceFunction -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.streaming.api.functions.windowing.RichAllWindowFunction import org.apache.flink.streaming.api.windowing.windows.TimeWindow diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateAllWindowFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateAllWindowFunction.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateAllWindowFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateAllWindowFunction.scala index 4b045bec7470d..bb44f5de82355 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateAllWindowFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateAllWindowFunction.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.lang.Iterable import org.apache.flink.api.common.functions.RichGroupReduceFunction -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.streaming.api.functions.windowing.RichAllWindowFunction import org.apache.flink.streaming.api.windowing.windows.Window diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateMapFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateMapFunction.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateMapFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateMapFunction.scala index 7559cec3b4afd..e45a9dd240f64 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateMapFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateMapFunction.scala @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import org.apache.flink.api.common.functions.RichMapFunction import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.ResultTypeQueryable -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.util.Preconditions diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateReduceCombineFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateReduceCombineFunction.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateReduceCombineFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateReduceCombineFunction.scala index ebf0ca73565ce..2fe0ecb593cbd 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateReduceCombineFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateReduceCombineFunction.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.lang.Iterable import org.apache.flink.api.common.functions.{CombineFunction, RichGroupReduceFunction} -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.util.{Collector, Preconditions} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateReduceGroupFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateReduceGroupFunction.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateReduceGroupFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateReduceGroupFunction.scala index 8f096cc65f812..bf7d83c5aca42 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateReduceGroupFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateReduceGroupFunction.scala @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.lang.Iterable import org.apache.flink.api.common.functions.RichGroupReduceFunction -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.util.{Collector, Preconditions} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateTimeWindowFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateTimeWindowFunction.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateTimeWindowFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateTimeWindowFunction.scala index 9b7ea0b8ec208..4245d38e949d2 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateTimeWindowFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateTimeWindowFunction.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.lang.Iterable import org.apache.flink.api.common.functions.RichGroupReduceFunction import org.apache.flink.api.java.tuple.Tuple -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.streaming.api.functions.windowing.RichWindowFunction import org.apache.flink.streaming.api.windowing.windows.TimeWindow diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateUtil.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateUtil.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala index 4428963bb6a5e..589fbdf3247dd 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateUtil.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.util @@ -28,12 +28,12 @@ import org.apache.calcite.sql.fun._ import org.apache.flink.api.common.functions.{MapFunction, RichGroupReduceFunction} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.tuple.Tuple -import org.apache.flink.api.table.FlinkRelBuilder.NamedWindowProperty -import org.apache.flink.api.table.expressions.{WindowEnd, WindowStart} -import org.apache.flink.api.table.plan.logical._ -import org.apache.flink.api.table.typeutils.RowTypeInfo -import org.apache.flink.api.table.typeutils.TypeCheckUtils._ -import org.apache.flink.api.table.{FlinkTypeFactory, Row, TableException} +import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty +import org.apache.flink.table.expressions.{WindowEnd, WindowStart} +import org.apache.flink.table.plan.logical._ +import org.apache.flink.table.typeutils.RowTypeInfo +import org.apache.flink.table.typeutils.TypeCheckUtils._ +import org.apache.flink.table.{FlinkTypeFactory, Row, TableException} import org.apache.flink.streaming.api.functions.windowing.{AllWindowFunction, WindowFunction} import org.apache.flink.streaming.api.windowing.windows.{Window => DataStreamWindow} import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateWindowFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateWindowFunction.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateWindowFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateWindowFunction.scala index 6fd890de672a8..08932ed0f0fc7 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateWindowFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateWindowFunction.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.lang.Iterable import org.apache.flink.api.common.functions.RichGroupReduceFunction import org.apache.flink.api.java.tuple.Tuple -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.streaming.api.functions.windowing.RichWindowFunction import org.apache.flink.streaming.api.windowing.windows.Window diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AvgAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AvgAggregate.scala similarity index 99% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AvgAggregate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AvgAggregate.scala index ce5bc818f1a64..5fc329e9ea83f 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AvgAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AvgAggregate.scala @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import com.google.common.math.LongMath import org.apache.flink.api.common.typeinfo.BasicTypeInfo -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import java.math.BigDecimal import java.math.BigInteger diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/CountAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/CountAggregate.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/CountAggregate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/CountAggregate.scala index d9f288a2f7832..396706bce8af9 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/CountAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/CountAggregate.scala @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row class CountAggregate extends Aggregate[Long] { private var countIndex: Int = _ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateAllTimeWindowFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllTimeWindowFunction.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateAllTimeWindowFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllTimeWindowFunction.scala index 85ad8e56cfea4..79d154133b861 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateAllTimeWindowFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllTimeWindowFunction.scala @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.lang.Iterable -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.streaming.api.windowing.windows.{TimeWindow, Window} import org.apache.flink.util.Collector diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateAllWindowFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllWindowFunction.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateAllWindowFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllWindowFunction.scala index d3f871a5e5c81..7bcc667763f6c 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateAllWindowFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateAllWindowFunction.scala @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.lang.Iterable -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.streaming.api.functions.windowing.RichAllWindowFunction import org.apache.flink.streaming.api.windowing.windows.Window diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateReduceFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateReduceFunction.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateReduceFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateReduceFunction.scala index e2830da70f5f8..3105d068f5454 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateReduceFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateReduceFunction.scala @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import org.apache.flink.api.common.functions.ReduceFunction -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.util.Preconditions /** diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateTimeWindowFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateTimeWindowFunction.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateTimeWindowFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateTimeWindowFunction.scala index c880f87dc1521..f7973fce1ffb1 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateTimeWindowFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateTimeWindowFunction.scala @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.lang.Iterable import org.apache.flink.api.java.tuple.Tuple -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.streaming.api.windowing.windows.TimeWindow import org.apache.flink.util.Collector diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateWindowFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateWindowFunction.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateWindowFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateWindowFunction.scala index 81e6890fe2848..eeeb0e960467b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/IncrementalAggregateWindowFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/IncrementalAggregateWindowFunction.scala @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.lang.Iterable import org.apache.flink.api.java.tuple.Tuple -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.streaming.api.functions.windowing.RichWindowFunction import org.apache.flink.streaming.api.windowing.windows.Window diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/MaxAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/MaxAggregate.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/MaxAggregate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/MaxAggregate.scala index 9267527e38e12..c286ee757fce3 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/MaxAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/MaxAggregate.scala @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.math.BigDecimal import org.apache.flink.api.common.typeinfo.BasicTypeInfo -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row abstract class MaxAggregate[T](implicit ord: Ordering[T]) extends Aggregate[T] { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/MinAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/MinAggregate.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/MinAggregate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/MinAggregate.scala index 7e2ebf4010412..7cd3418b6dd46 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/MinAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/MinAggregate.scala @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.math.BigDecimal import org.apache.flink.api.common.typeinfo.BasicTypeInfo -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row abstract class MinAggregate[T](implicit ord: Ordering[T]) extends Aggregate[T] { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/SumAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/SumAggregate.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/SumAggregate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/SumAggregate.scala index 7ff23404c9140..2b97270e2ef51 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/SumAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/SumAggregate.scala @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.math.BigDecimal import org.apache.flink.api.common.typeinfo.BasicTypeInfo -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row abstract class SumAggregate[T: Numeric] extends Aggregate[T] { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/TimeWindowPropertyCollector.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/TimeWindowPropertyCollector.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/TimeWindowPropertyCollector.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/TimeWindowPropertyCollector.scala index 9f1c23b3b70a0..939cb07355ea2 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/TimeWindowPropertyCollector.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/TimeWindowPropertyCollector.scala @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import org.apache.calcite.runtime.SqlFunctions -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.streaming.api.windowing.windows.TimeWindow import org.apache.flink.util.Collector diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/io/RowCsvInputFormat.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/io/RowCsvInputFormat.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/io/RowCsvInputFormat.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/io/RowCsvInputFormat.scala index b0ab801fbf011..62b9d77161525 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/io/RowCsvInputFormat.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/io/RowCsvInputFormat.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.io +package org.apache.flink.table.runtime.io import org.apache.flink.annotation.Internal import org.apache.flink.api.common.io.ParseException import org.apache.flink.api.java.io.CsvInputFormat import org.apache.flink.api.java.io.CsvInputFormat.{DEFAULT_FIELD_DELIMITER, DEFAULT_LINE_DELIMITER, createDefaultMask, toBooleanMask} -import org.apache.flink.api.table.Row -import org.apache.flink.api.table.runtime.io.RowCsvInputFormat.extractTypeClasses -import org.apache.flink.api.table.typeutils.RowTypeInfo +import org.apache.flink.table.Row +import org.apache.flink.table.runtime.io.RowCsvInputFormat.extractTypeClasses +import org.apache.flink.table.typeutils.RowTypeInfo import org.apache.flink.core.fs.Path import org.apache.flink.types.parser.FieldParser import org.apache.flink.types.parser.FieldParser.ParseErrorState diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/io/ValuesInputFormat.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/io/ValuesInputFormat.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/io/ValuesInputFormat.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/io/ValuesInputFormat.scala index 2a4be466d1a7a..1a339e67d221f 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/io/ValuesInputFormat.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/io/ValuesInputFormat.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.io +package org.apache.flink.table.runtime.io import org.apache.flink.api.common.io.{GenericInputFormat, NonParallelInput} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.ResultTypeQueryable -import org.apache.flink.api.table.codegen.Compiler +import org.apache.flink.table.codegen.Compiler import org.apache.flink.core.io.GenericInputSplit import org.slf4j.LoggerFactory diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/BatchTableSink.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/BatchTableSink.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/BatchTableSink.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/BatchTableSink.scala index 27dbe8e2defe7..f47f77557a96c 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/BatchTableSink.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/BatchTableSink.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.table.sinks +package org.apache.flink.table.sinks import org.apache.flink.api.java.DataSet -/** Defines an external [[TableSink]] to emit a batch [[org.apache.flink.api.table.Table]]. +/** Defines an external [[TableSink]] to emit a batch [[org.apache.flink.table.Table]]. * * @tparam T Type of [[DataSet]] that this [[TableSink]] expects and supports. */ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/CsvTableSink.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/CsvTableSink.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/CsvTableSink.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/CsvTableSink.scala index 7567ba8169c37..e8e5e983bd114 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/CsvTableSink.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/CsvTableSink.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.sinks +package org.apache.flink.table.sinks import org.apache.flink.api.common.functions.MapFunction import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.Row -import org.apache.flink.api.table.typeutils.RowTypeInfo +import org.apache.flink.table.Row +import org.apache.flink.table.typeutils.RowTypeInfo import org.apache.flink.streaming.api.datastream.DataStream /** diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/StreamTableSink.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/StreamTableSink.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/StreamTableSink.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/StreamTableSink.scala index 61ef3b27f4b03..cec7a3acb6fd8 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/StreamTableSink.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/StreamTableSink.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.table.sinks +package org.apache.flink.table.sinks import org.apache.flink.streaming.api.datastream.DataStream -/** Defines an external [[TableSink]] to emit a batch [[org.apache.flink.api.table.Table]]. +/** Defines an external [[TableSink]] to emit a batch [[org.apache.flink.table.Table]]. * * @tparam T Type of [[DataStream]] that this [[TableSink]] expects and supports. */ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/TableSink.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSink.scala similarity index 88% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/TableSink.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSink.scala index 3dfc6f14887ec..f8b85d75d02fa 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/TableSink.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSink.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.table.sinks +package org.apache.flink.table.sinks import org.apache.flink.api.common.typeinfo.TypeInformation -/** A [[TableSink]] specifies how to emit a [[org.apache.flink.api.table.Table]] to an external +/** A [[TableSink]] specifies how to emit a [[org.apache.flink.table.Table]] to an external * system or location. * * The interface is generic such that it can support different storage locations and formats. @@ -46,12 +46,12 @@ trait TableSink[T] { /** * Return a copy of this [[TableSink]] configured with the field names and types of the - * [[org.apache.flink.api.table.Table]] to emit. + * [[org.apache.flink.table.Table]] to emit. * * @param fieldNames The field names of the table to emit. * @param fieldTypes The field types of the table to emit. * @return A copy of this [[TableSink]] configured with the field names and types of the - * [[org.apache.flink.api.table.Table]] to emit. + * [[org.apache.flink.table.Table]] to emit. */ def configure(fieldNames: Array[String], fieldTypes: Array[TypeInformation[_]]): TableSink[T] diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/TableSinkBase.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSinkBase.scala similarity index 87% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/TableSinkBase.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSinkBase.scala index 612ee0ad160be..a0585e5b61390 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sinks/TableSinkBase.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSinkBase.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.sinks +package org.apache.flink.table.sinks import org.apache.flink.api.common.typeinfo.TypeInformation @@ -28,7 +28,7 @@ trait TableSinkBase[T] extends TableSink[T] { protected def copy: TableSinkBase[T] /** - * Return the field names of the [[org.apache.flink.api.table.Table]] to emit. */ + * Return the field names of the [[org.apache.flink.table.Table]] to emit. */ def getFieldNames: Array[String] = { fieldNames match { case Some(n) => n @@ -37,7 +37,7 @@ trait TableSinkBase[T] extends TableSink[T] { } } - /** Return the field types of the [[org.apache.flink.api.table.Table]] to emit. */ + /** Return the field types of the [[org.apache.flink.table.Table]] to emit. */ def getFieldTypes: Array[TypeInformation[_]] = { fieldTypes match { case Some(t) => t @@ -48,12 +48,12 @@ trait TableSinkBase[T] extends TableSink[T] { /** * Return a copy of this [[TableSink]] configured with the field names and types of the - * [[org.apache.flink.api.table.Table]] to emit. + * [[org.apache.flink.table.Table]] to emit. * * @param fieldNames The field names of the table to emit. * @param fieldTypes The field types of the table to emit. * @return A copy of this [[TableSink]] configured with the field names and types of the - * [[org.apache.flink.api.table.Table]] to emit. + * [[org.apache.flink.table.Table]] to emit. */ final def configure(fieldNames: Array[String], fieldTypes: Array[TypeInformation[_]]): TableSink[T] = { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/BatchTableSource.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/BatchTableSource.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/BatchTableSource.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/BatchTableSource.scala index 74e4cd6a85e6c..0478dc9ec4ee9 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/BatchTableSource.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/BatchTableSource.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.sources +package org.apache.flink.table.sources import org.apache.flink.api.java.{ExecutionEnvironment, DataSet} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/CsvTableSource.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/CsvTableSource.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/CsvTableSource.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/CsvTableSource.scala index 9cf4397f0ce0d..9e437dbe1288e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/CsvTableSource.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/CsvTableSource.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.sources +package org.apache.flink.table.sources import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.io.CsvInputFormat import org.apache.flink.api.java.{DataSet, ExecutionEnvironment} -import org.apache.flink.api.table.{Row, TableException} -import org.apache.flink.api.table.runtime.io.RowCsvInputFormat -import org.apache.flink.api.table.typeutils.RowTypeInfo +import org.apache.flink.table.{Row, TableException} +import org.apache.flink.table.runtime.io.RowCsvInputFormat +import org.apache.flink.table.typeutils.RowTypeInfo import org.apache.flink.core.fs.Path import org.apache.flink.streaming.api.datastream.DataStream import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/StreamTableSource.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/StreamTableSource.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/StreamTableSource.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/StreamTableSource.scala index cdae0b3e5b0ff..7a2737c5dfd73 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/StreamTableSource.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/StreamTableSource.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.sources +package org.apache.flink.table.sources import org.apache.flink.streaming.api.datastream.DataStream import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/TableSource.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/TableSource.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/TableSource.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/TableSource.scala index e1ada62c80938..9d4ba6861cd99 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/TableSource.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/TableSource.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.sources +package org.apache.flink.table.sources import org.apache.flink.api.common.typeinfo.TypeInformation diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/table.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/table.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/table.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/table.scala index b74ddb0c584fa..4e8a5164775c7 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/table.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/table.scala @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import org.apache.calcite.rel.RelNode import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.operators.join.JoinType -import org.apache.flink.api.table.plan.logical.Minus -import org.apache.flink.api.table.expressions.{Alias, Asc, Call, Expression, ExpressionParser, Ordering, TableFunctionCall} -import org.apache.flink.api.table.plan.ProjectionTranslator._ -import org.apache.flink.api.table.plan.logical._ -import org.apache.flink.api.table.sinks.TableSink +import org.apache.flink.table.plan.logical.Minus +import org.apache.flink.table.expressions.{Alias, Asc, Call, Expression, ExpressionParser, Ordering, TableFunctionCall} +import org.apache.flink.table.plan.ProjectionTranslator._ +import org.apache.flink.table.plan.logical._ +import org.apache.flink.table.sinks.TableSink import scala.collection.JavaConverters._ @@ -744,8 +744,8 @@ class Table( * Writes the [[Table]] to a [[TableSink]]. A [[TableSink]] defines an external storage location. * * A batch [[Table]] can only be written to a - * [[org.apache.flink.api.table.sinks.BatchTableSink]], a streaming [[Table]] requires a - * [[org.apache.flink.api.table.sinks.StreamTableSink]]. + * [[org.apache.flink.table.sinks.BatchTableSink]], a streaming [[Table]] requires a + * [[org.apache.flink.table.sinks.StreamTableSink]]. * * @param sink The [[TableSink]] to which the [[Table]] is written. * @tparam T The data type that the [[TableSink]] expects. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/trees/TreeNode.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/trees/TreeNode.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/trees/TreeNode.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/trees/TreeNode.scala index 8eecc74ab1b68..53776ec2d8a92 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/trees/TreeNode.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/trees/TreeNode.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.trees +package org.apache.flink.table.trees import org.apache.commons.lang.ClassUtils diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/InternalTypeInfo.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/InternalTypeInfo.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/InternalTypeInfo.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/InternalTypeInfo.scala index 2f896ecf7882a..b4af152b747dc 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/InternalTypeInfo.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/InternalTypeInfo.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import java.util.Objects diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/NullAwareComparator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/NullAwareComparator.scala similarity index 99% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/NullAwareComparator.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/NullAwareComparator.scala index 86a768dd401ca..60c08d1a43c65 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/NullAwareComparator.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/NullAwareComparator.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import org.apache.flink.api.common.typeutils.{CompositeTypeComparator, TypeComparator} import org.apache.flink.core.memory.{DataInputView, DataOutputView, MemorySegment} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/NullMaskUtils.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/NullMaskUtils.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/NullMaskUtils.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/NullMaskUtils.scala index dcdc775780aba..13ca1ddb68c43 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/NullMaskUtils.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/NullMaskUtils.scala @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.core.memory.{DataInputView, DataOutputView} object NullMaskUtils { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowComparator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowComparator.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowComparator.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowComparator.scala index 8bbe4d887bca9..15e7cc7804695 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowComparator.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowComparator.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import java.util import org.apache.flink.api.common.typeutils.{CompositeTypeComparator, TypeComparator, TypeSerializer} import org.apache.flink.api.java.typeutils.runtime.TupleComparatorBase -import org.apache.flink.api.table.Row -import org.apache.flink.api.table.typeutils.NullMaskUtils.readIntoNullMask -import org.apache.flink.api.table.typeutils.RowComparator.{createAuxiliaryFields, makeNullAware} +import org.apache.flink.table.Row +import org.apache.flink.table.typeutils.NullMaskUtils.readIntoNullMask +import org.apache.flink.table.typeutils.RowComparator.{createAuxiliaryFields, makeNullAware} import org.apache.flink.core.memory.{DataInputView, DataOutputView, MemorySegment} import org.apache.flink.types.KeyFieldOutOfBoundsException diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowIntervalTypeInfo.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowIntervalTypeInfo.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowIntervalTypeInfo.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowIntervalTypeInfo.scala index 4dc83d071625e..bbc20aac13d6c 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowIntervalTypeInfo.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowIntervalTypeInfo.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils /** * TypeInformation for row intervals. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowSerializer.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowSerializer.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowSerializer.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowSerializer.scala index 825a99c1385da..6b8cbdb5c6fd0 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowSerializer.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowSerializer.scala @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import org.apache.flink.api.common.typeutils.TypeSerializer -import org.apache.flink.api.table.Row -import org.apache.flink.api.table.typeutils.NullMaskUtils.{writeNullMask, readIntoNullMask, readIntoAndCopyNullMask} +import org.apache.flink.table.Row +import org.apache.flink.table.typeutils.NullMaskUtils.{writeNullMask, readIntoNullMask, readIntoAndCopyNullMask} import org.apache.flink.core.memory.{DataInputView, DataOutputView} /** diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowTypeInfo.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowTypeInfo.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowTypeInfo.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowTypeInfo.scala index 711bb492cb357..5876158509bd3 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/RowTypeInfo.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/RowTypeInfo.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.typeinfo.TypeInformation @@ -25,7 +25,7 @@ import org.apache.flink.api.scala.typeutils.CaseClassTypeInfo import scala.collection.mutable.ArrayBuffer import org.apache.flink.api.common.typeutils.TypeSerializer -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row /** * TypeInformation for [[Row]]. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TimeIntervalTypeInfo.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TimeIntervalTypeInfo.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TimeIntervalTypeInfo.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TimeIntervalTypeInfo.scala index b516745b943b3..9d76050552e91 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TimeIntervalTypeInfo.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TimeIntervalTypeInfo.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import java.util.Objects @@ -24,7 +24,7 @@ import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation} import org.apache.flink.api.common.typeutils.base.{IntComparator, IntSerializer, LongComparator, LongSerializer} import org.apache.flink.api.common.typeutils.{TypeComparator, TypeSerializer} -import org.apache.flink.api.table.typeutils.TimeIntervalTypeInfo.instantiateComparator +import org.apache.flink.table.typeutils.TimeIntervalTypeInfo.instantiateComparator import org.apache.flink.util.Preconditions._ /** diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TypeCheckUtils.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeCheckUtils.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TypeCheckUtils.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeCheckUtils.scala index e30e2733a1fa3..40f0cf298b90f 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TypeCheckUtils.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeCheckUtils.scala @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import org.apache.flink.api.common.typeinfo.BasicTypeInfo.{BIG_DEC_TYPE_INFO, BOOLEAN_TYPE_INFO, INT_TYPE_INFO, STRING_TYPE_INFO} import org.apache.flink.api.common.typeinfo._ import org.apache.flink.api.java.typeutils.ObjectArrayTypeInfo -import org.apache.flink.api.table.validate._ +import org.apache.flink.table.validate._ object TypeCheckUtils { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TypeCoercion.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeCoercion.scala similarity index 99% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TypeCoercion.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeCoercion.scala index 23154a58247b9..99e94b39829b3 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TypeCoercion.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeCoercion.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.{SqlTimeTypeInfo, NumericTypeInfo, TypeInformation} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TypeConverter.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeConverter.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TypeConverter.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeConverter.scala index a162d9f26bdf3..1235bcb25f035 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeutils/TypeConverter.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeConverter.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rel.core.JoinRelType @@ -26,7 +26,7 @@ import org.apache.flink.api.common.typeutils.CompositeType import org.apache.flink.api.java.operators.join.JoinType import org.apache.flink.api.java.tuple.Tuple import org.apache.flink.api.java.typeutils.{PojoTypeInfo, TupleTypeInfo} -import org.apache.flink.api.table.{FlinkTypeFactory, Row, TableException} +import org.apache.flink.table.{FlinkTypeFactory, Row, TableException} import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/validate/FunctionCatalog.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/FunctionCatalog.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/validate/FunctionCatalog.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/FunctionCatalog.scala index 8e409cc892e61..28376267aa6b6 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/validate/FunctionCatalog.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/FunctionCatalog.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table.validate +package org.apache.flink.table.validate import org.apache.calcite.sql.fun.SqlStdOperatorTable import org.apache.calcite.sql.util.{ChainedSqlOperatorTable, ListSqlOperatorTable, ReflectiveSqlOperatorTable} import org.apache.calcite.sql.{SqlFunction, SqlOperator, SqlOperatorTable} -import org.apache.flink.api.table.ValidationException -import org.apache.flink.api.table.expressions._ -import org.apache.flink.api.table.functions.{ScalarFunction, TableFunction} -import org.apache.flink.api.table.functions.utils.{TableSqlFunction, UserDefinedFunctionUtils} +import org.apache.flink.table.ValidationException +import org.apache.flink.table.expressions._ +import org.apache.flink.table.functions.{ScalarFunction, TableFunction} +import org.apache.flink.table.functions.utils.{TableSqlFunction, UserDefinedFunctionUtils} import scala.collection.JavaConversions._ import scala.collection.mutable diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/validate/ValidationResult.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/ValidationResult.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/validate/ValidationResult.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/ValidationResult.scala index 5cc7d03d3c4ec..64a568b3ea6cf 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/validate/ValidationResult.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/ValidationResult.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.validate +package org.apache.flink.table.validate /** * Represents the result of a validation. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/windows.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/windows.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/windows.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/windows.scala index 32d67d7ae6d45..f772a9074ffbb 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/windows.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/windows.scala @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table -import org.apache.flink.api.table.expressions.{Expression, ExpressionParser} -import org.apache.flink.api.table.plan.logical._ +import org.apache.flink.table.expressions.{Expression, ExpressionParser} +import org.apache.flink.table.plan.logical._ /** * A group-window specification. diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/ExplainTest.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/ExplainTest.java similarity index 96% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/ExplainTest.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/ExplainTest.java index 747cd921a5321..3cbae61e19685 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/ExplainTest.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/ExplainTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.java.batch; +package org.apache.flink.table.api.java.batch; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.table.BatchTableEnvironment; +import org.apache.flink.table.api.java.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.api.table.Table; -import org.apache.flink.api.table.TableEnvironment; +import org.apache.flink.table.Table; +import org.apache.flink.table.TableEnvironment; import org.apache.flink.test.util.MultipleProgramsTestBase; import org.junit.Test; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableEnvironmentITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java similarity index 97% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableEnvironmentITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java index 294cba226e93f..df32141c9d08c 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableEnvironmentITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.java.batch; +package org.apache.flink.table.api.java.batch; import java.util.ArrayList; import java.util.Arrays; @@ -28,19 +28,18 @@ import org.apache.calcite.tools.RuleSets; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.table.BatchTableEnvironment; +import org.apache.flink.table.api.java.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple4; import org.apache.flink.api.java.tuple.Tuple5; import org.apache.flink.api.java.typeutils.TupleTypeInfo; -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; -import org.apache.flink.api.table.CalciteConfig; -import org.apache.flink.api.table.CalciteConfigBuilder; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.Table; -import org.apache.flink.api.table.TableEnvironment; -import org.apache.flink.api.table.TableException; -import org.apache.flink.api.table.ValidationException; +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; +import org.apache.flink.table.CalciteConfig; +import org.apache.flink.table.CalciteConfigBuilder; +import org.apache.flink.table.Row; +import org.apache.flink.table.Table; +import org.apache.flink.table.TableEnvironment; +import org.apache.flink.table.TableException; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableSourceITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableSourceITCase.java similarity index 88% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableSourceITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableSourceITCase.java index b634d511d98fa..8d7850bc48808 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableSourceITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableSourceITCase.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package org.apache.flink.api.java.batch; +package org.apache.flink.table.api.java.batch; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.table.BatchTableEnvironment; -import org.apache.flink.api.scala.batch.GeneratingInputFormat; -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.Table; -import org.apache.flink.api.table.TableEnvironment; -import org.apache.flink.api.table.sources.BatchTableSource; -import org.apache.flink.api.table.typeutils.RowTypeInfo; +import org.apache.flink.table.api.java.BatchTableEnvironment; +import org.apache.flink.table.api.scala.batch.GeneratingInputFormat; +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; +import org.apache.flink.table.Row; +import org.apache.flink.table.Table; +import org.apache.flink.table.TableEnvironment; +import org.apache.flink.table.sources.BatchTableSource; +import org.apache.flink.table.typeutils.RowTypeInfo; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/sql/SqlITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/sql/SqlITCase.java similarity index 94% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/sql/SqlITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/sql/SqlITCase.java index 1364cbd921c89..a31d2bc29e67d 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/sql/SqlITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/sql/SqlITCase.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.flink.api.java.batch.sql; +package org.apache.flink.table.api.java.batch.sql; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.table.BatchTableEnvironment; +import org.apache.flink.table.api.java.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple5; -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.Table; -import org.apache.flink.api.table.TableEnvironment; +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; +import org.apache.flink.table.Row; +import org.apache.flink.table.Table; +import org.apache.flink.table.TableEnvironment; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/AggregationsITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/AggregationsITCase.java similarity index 97% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/AggregationsITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/AggregationsITCase.java index 02f6e0b1ab04c..f8c77bef4d8f8 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/AggregationsITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/AggregationsITCase.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.java.batch.table; +package org.apache.flink.table.api.java.batch.table; import java.io.Serializable; import java.util.List; @@ -24,16 +24,16 @@ import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.operators.DataSource; -import org.apache.flink.api.java.table.BatchTableEnvironment; +import org.apache.flink.table.api.java.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple5; import org.apache.flink.api.java.tuple.Tuple7; -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.Table; -import org.apache.flink.api.table.TableEnvironment; -import org.apache.flink.api.table.ValidationException; +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; +import org.apache.flink.table.Row; +import org.apache.flink.table.Table; +import org.apache.flink.table.TableEnvironment; +import org.apache.flink.table.ValidationException; import org.apache.flink.examples.java.WordCountTable.WC; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/CalcITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CalcITCase.java similarity index 96% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/CalcITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CalcITCase.java index 6fc81738bb3f3..aced56ecbb7b9 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/CalcITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CalcITCase.java @@ -16,21 +16,21 @@ * limitations under the License. */ -package org.apache.flink.api.java.batch.table; +package org.apache.flink.table.api.java.batch.table; import java.util.Arrays; import java.util.Collection; import org.apache.flink.api.java.operators.DataSource; -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; -import org.apache.flink.api.table.Table; -import org.apache.flink.api.table.Row; +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; +import org.apache.flink.table.Table; +import org.apache.flink.table.Row; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.table.BatchTableEnvironment; +import org.apache.flink.table.api.java.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple3; -import org.apache.flink.api.table.TableEnvironment; -import org.apache.flink.api.table.ValidationException; -import org.apache.flink.api.table.functions.ScalarFunction; +import org.apache.flink.table.TableEnvironment; +import org.apache.flink.table.ValidationException; +import org.apache.flink.table.functions.ScalarFunction; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/CastingITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CastingITCase.java similarity index 93% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/CastingITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CastingITCase.java index 333953b414277..866c920c0c22f 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/CastingITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CastingITCase.java @@ -16,21 +16,21 @@ * limitations under the License. */ -package org.apache.flink.api.java.batch.table; +package org.apache.flink.table.api.java.batch.table; import java.util.List; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.operators.DataSource; -import org.apache.flink.api.java.table.BatchTableEnvironment; +import org.apache.flink.table.api.java.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple4; import org.apache.flink.api.java.tuple.Tuple6; import org.apache.flink.api.java.tuple.Tuple8; -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.Table; -import org.apache.flink.api.table.TableEnvironment; +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; +import org.apache.flink.table.Row; +import org.apache.flink.table.Table; +import org.apache.flink.table.TableEnvironment; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/JoinITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/JoinITCase.java similarity index 95% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/JoinITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/JoinITCase.java index 9676608bc6014..5b98fa27ffccb 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/JoinITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/JoinITCase.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package org.apache.flink.api.java.batch.table; +package org.apache.flink.table.api.java.batch.table; import java.util.List; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.table.BatchTableEnvironment; +import org.apache.flink.table.api.java.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple5; -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.Table; -import org.apache.flink.api.table.TableEnvironment; -import org.apache.flink.api.table.ValidationException; +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; +import org.apache.flink.table.Row; +import org.apache.flink.table.Table; +import org.apache.flink.table.TableEnvironment; +import org.apache.flink.table.ValidationException; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/sql/SqlITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/stream/sql/SqlITCase.java similarity index 91% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/sql/SqlITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/stream/sql/SqlITCase.java index 10ae5d96d291a..57cd33a7e21c6 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/sql/SqlITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/stream/sql/SqlITCase.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package org.apache.flink.api.java.stream.sql; +package org.apache.flink.table.api.java.stream.sql; -import org.apache.flink.api.java.table.StreamTableEnvironment; +import org.apache.flink.table.api.java.StreamTableEnvironment; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple5; -import org.apache.flink.api.scala.stream.utils.StreamITCase; -import org.apache.flink.api.table.Row; -import org.apache.flink.api.table.Table; -import org.apache.flink.api.table.TableEnvironment; +import org.apache.flink.table.api.scala.stream.utils.StreamITCase; +import org.apache.flink.table.Row; +import org.apache.flink.table.Table; +import org.apache.flink.table.TableEnvironment; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; -import org.apache.flink.api.java.stream.utils.StreamTestData; +import org.apache.flink.table.api.java.stream.utils.StreamTestData; import org.junit.Test; import java.util.ArrayList; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/utils/StreamTestData.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/stream/utils/StreamTestData.java similarity index 97% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/utils/StreamTestData.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/stream/utils/StreamTestData.java index 82ebf95234ed6..139801fa1d5c0 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/utils/StreamTestData.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/stream/utils/StreamTestData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.java.stream.utils; +package org.apache.flink.table.api.java.stream.utils; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple5; diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/AggregationTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/AggregationTest.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/AggregationTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/AggregationTest.scala index 6c9d2e82a612c..708e00766a0e7 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/AggregationTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/AggregationTest.scala @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.utils.TableTestBase -import org.apache.flink.api.table.utils.TableTestUtil._ +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.utils.TableTestBase +import org.apache.flink.table.utils.TableTestUtil._ import org.junit.Test /** diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/CalciteConfigBuilderTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/CalciteConfigBuilderTest.scala similarity index 99% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/CalciteConfigBuilderTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/CalciteConfigBuilderTest.scala index 2b0d4463c2661..c178632ebf446 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/CalciteConfigBuilderTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/CalciteConfigBuilderTest.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import org.apache.calcite.rel.rules.{CalcSplitRule, CalcMergeRule, FilterMergeRule} import org.apache.calcite.sql.fun.{SqlStdOperatorTable, OracleSqlOperatorTable} diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/CompositeFlatteningTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/CompositeFlatteningTest.scala similarity index 83% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/CompositeFlatteningTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/CompositeFlatteningTest.scala index f14b9d8108e9f..1b89b828bfb5f 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/CompositeFlatteningTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/CompositeFlatteningTest.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.scala.createTypeInformation -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.CompositeFlatteningTest.{TestCaseClass, giveMeCaseClass} -import org.apache.flink.api.table.functions.ScalarFunction -import org.apache.flink.api.table.utils.TableTestBase -import org.apache.flink.api.table.utils.TableTestUtil._ +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.CompositeFlatteningTest.{TestCaseClass, giveMeCaseClass} +import org.apache.flink.table.functions.ScalarFunction +import org.apache.flink.table.utils.TableTestBase +import org.apache.flink.table.utils.TableTestUtil._ import org.junit.Test @@ -118,10 +118,10 @@ class CompositeFlatteningTest extends TableTestBase { "DataSetCalc", batchTableNode(0), term("select", - "org.apache.flink.api.table.CompositeFlatteningTest.giveMeCaseClass$().my AS _c0", - "org.apache.flink.api.table.CompositeFlatteningTest.giveMeCaseClass$().clazz AS _c1", - "org.apache.flink.api.table.CompositeFlatteningTest.giveMeCaseClass$().my AS _c2", - "org.apache.flink.api.table.CompositeFlatteningTest.giveMeCaseClass$().clazz AS _c3" + "org.apache.flink.table.CompositeFlatteningTest.giveMeCaseClass$().my AS _c0", + "org.apache.flink.table.CompositeFlatteningTest.giveMeCaseClass$().clazz AS _c1", + "org.apache.flink.table.CompositeFlatteningTest.giveMeCaseClass$().my AS _c2", + "org.apache.flink.table.CompositeFlatteningTest.giveMeCaseClass$().clazz AS _c3" ) ) diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/ExpressionReductionTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/ExpressionReductionTest.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/ExpressionReductionTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/ExpressionReductionTest.scala index b8156a2046ded..211d3d2f32600 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/ExpressionReductionTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/ExpressionReductionTest.scala @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.utils.TableTestBase -import org.apache.flink.api.table.utils.TableTestUtil._ +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.utils.TableTestBase +import org.apache.flink.table.utils.TableTestUtil._ import org.junit.Test class ExpressionReductionTest extends TableTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/TableEnvironmentTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/TableEnvironmentTest.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/TableEnvironmentTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/TableEnvironmentTest.scala index db86ef3e56474..9e448141db5ba 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/TableEnvironmentTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/TableEnvironmentTest.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table +package org.apache.flink.table import org.apache.calcite.tools.RuleSet import org.apache.flink.api.scala._ import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.{TupleTypeInfo, TypeExtractor} -import org.apache.flink.api.table.expressions.{Alias, UnresolvedFieldReference} -import org.apache.flink.api.table.sinks.TableSink +import org.apache.flink.table.expressions.{Alias, UnresolvedFieldReference} +import org.apache.flink.table.sinks.TableSink import org.junit.Test import org.junit.Assert.assertEquals diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/ExplainTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/ExplainTest.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/ExplainTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/ExplainTest.scala index 9d00dda8e8b6d..d8cdd82da442f 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/ExplainTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/ExplainTest.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch +package org.apache.flink.table.api.scala.batch import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.TableEnvironment +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.TableEnvironment import org.apache.flink.test.util.MultipleProgramsTestBase import org.junit.Assert.assertEquals import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableEnvironmentITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableEnvironmentITCase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableEnvironmentITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableEnvironmentITCase.scala index 4c07615fed9b5..f480a94b7f6a8 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableEnvironmentITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableEnvironmentITCase.scala @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch +package org.apache.flink.table.api.scala.batch import java.util import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{Row, TableEnvironment, TableException, ValidationException} +import org.apache.flink.table.{Row, TableEnvironment, TableException, ValidationException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableSinkITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableSinkITCase.scala similarity index 84% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableSinkITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableSinkITCase.scala index d7e99d4e6627d..4426f1b85b1b3 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableSinkITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableSinkITCase.scala @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch +package org.apache.flink.table.api.scala.batch import java.io.File -import org.apache.flink.api.scala.{ExecutionEnvironment, _} -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ +import org.apache.flink.api.scala.{ExecutionEnvironment,_} +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.TableEnvironment -import org.apache.flink.api.table.sinks.CsvTableSink +import org.apache.flink.table.TableEnvironment +import org.apache.flink.table.sinks.CsvTableSink import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit.Test diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableSourceITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableSourceITCase.scala similarity index 90% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableSourceITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableSourceITCase.scala index 08bee72601a9d..9de2ffe254273 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableSourceITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableSourceITCase.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch +package org.apache.flink.table.api.scala.batch import java.io.{File, FileOutputStream, OutputStreamWriter} @@ -24,12 +24,13 @@ import org.apache.flink.api.common.io.GenericInputFormat import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} import org.apache.flink.api.java.{DataSet => JavaSet, ExecutionEnvironment => JavaExecEnv} import org.apache.flink.api.scala.ExecutionEnvironment -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.sources.{BatchTableSource, CsvTableSource} -import org.apache.flink.api.table.typeutils.RowTypeInfo -import org.apache.flink.api.table.{Row, TableEnvironment} +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.scala.DataSet +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.sources.{BatchTableSource, CsvTableSource} +import org.apache.flink.table.typeutils.RowTypeInfo +import org.apache.flink.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.{MultipleProgramsTestBase, TestBaseUtils} import org.junit.Test @@ -141,7 +142,7 @@ class TestBatchTableSource extends BatchTableSource[Row] { BasicTypeInfo.INT_TYPE_INFO ) - /** Returns the data of the table as a [[org.apache.flink.api.java.DataSet]]. */ + /** Returns the data of the table as a [[org.apache.flink.table.api.java.DataSet]]. */ override def getDataSet(execEnv: JavaExecEnv): JavaSet[Row] = { execEnv.createInput(new GeneratingInputFormat(33), getReturnType).setParallelism(1) } diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/AggregationsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/AggregationsITCase.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/AggregationsITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/AggregationsITCase.scala index 35bb7dc0f12b6..7bca93b7e0705 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/AggregationsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/AggregationsITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.sql +package org.apache.flink.table.api.scala.batch.sql import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets import TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.table.{TableException, Row, TableEnvironment} +import org.apache.flink.table.{TableException, Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/CalcITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/CalcITCase.scala similarity index 95% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/CalcITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/CalcITCase.scala index 155833b1c1afc..941aab0f130c5 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/CalcITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/CalcITCase.scala @@ -16,20 +16,20 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.sql +package org.apache.flink.table.api.scala.batch.sql import java.sql.{Date, Time, Timestamp} import java.util import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.batch.sql.FilterITCase.MyHashCode -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala.batch.sql.FilterITCase.MyHashCode +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.functions.ScalarFunction -import org.apache.flink.api.table.{Row, TableEnvironment, ValidationException} +import org.apache.flink.table.functions.ScalarFunction +import org.apache.flink.table.{Row, TableEnvironment, ValidationException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ @@ -297,7 +297,7 @@ class CalcITCase( val tEnv = TableEnvironment.getTableEnvironment(env, config) tEnv.registerFunction("hashCode", - new org.apache.flink.api.java.batch.table.CalcITCase.OldHashCode) + new org.apache.flink.table.api.java.batch.table.CalcITCase.OldHashCode) tEnv.registerFunction("hashCode", MyHashCode) val ds = env.fromElements("a", "b", "c") diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/JoinITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/JoinITCase.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/JoinITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/JoinITCase.scala index 68f63c3b8f6b6..5e617c13de3a0 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/JoinITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/JoinITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.sql +package org.apache.flink.table.api.scala.batch.sql import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{ValidationException, Row, TableEnvironment, TableException} +import org.apache.flink.table.{ValidationException, Row, TableEnvironment, TableException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SetOperatorsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SetOperatorsITCase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SetOperatorsITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SetOperatorsITCase.scala index 7cdb74637cd81..2577068ffe90e 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SetOperatorsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SetOperatorsITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.sql +package org.apache.flink.table.api.scala.batch.sql import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{Row, TableEnvironment} +import org.apache.flink.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SetOperatorsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SetOperatorsTest.scala similarity index 92% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SetOperatorsTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SetOperatorsTest.scala index d0c04003daeb3..6c07c6e631c1f 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SetOperatorsTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SetOperatorsTest.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.sql +package org.apache.flink.table.api.scala.batch.sql import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.utils.TableTestBase -import org.apache.flink.api.table.utils.TableTestUtil._ +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.utils.TableTestBase +import org.apache.flink.table.utils.TableTestUtil._ import org.junit.Test class SetOperatorsTest extends TableTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SingleRowJoinTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SingleRowJoinTest.scala similarity index 95% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SingleRowJoinTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SingleRowJoinTest.scala index 49f61afb0aa32..ecc685d7b2837 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SingleRowJoinTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SingleRowJoinTest.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.sql +package org.apache.flink.table.api.scala.batch.sql import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.utils.TableTestBase -import org.apache.flink.api.table.utils.TableTestUtil._ +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.utils.TableTestBase +import org.apache.flink.table.utils.TableTestUtil._ import org.junit.Test class SingleRowJoinTest extends TableTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SortITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SortITCase.scala similarity index 92% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SortITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SortITCase.scala index f3459848f03ff..3b3c96b93582d 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SortITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/SortITCase.scala @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.sql +package org.apache.flink.table.api.scala.batch.sql import org.apache.flink.api.scala.ExecutionEnvironment -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.batch.utils.SortTestUtils._ +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala.batch.utils.SortTestUtils._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala._ -import org.apache.flink.api.table.{Row, TableEnvironment, TableException} +import org.apache.flink.table.{Row, TableEnvironment, TableException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/TableWithSQLITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/TableWithSQLITCase.scala similarity index 92% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/TableWithSQLITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/TableWithSQLITCase.scala index a770a6e46ee71..234d3d1cc1ad8 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/TableWithSQLITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/TableWithSQLITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.sql +package org.apache.flink.table.api.scala.batch.sql import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{Row, TableEnvironment} +import org.apache.flink.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/AggregationsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/AggregationsITCase.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/AggregationsITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/AggregationsITCase.scala index 16c8ececdb982..2b33dc1ac6f66 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/AggregationsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/AggregationsITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.table +package org.apache.flink.table.api.scala.batch.table import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{Row, TableEnvironment, ValidationException} +import org.apache.flink.table.{Row, TableEnvironment, ValidationException} import org.apache.flink.examples.scala.WordCountTable.{WC => MyWC} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/CalcITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/CalcITCase.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/CalcITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/CalcITCase.scala index c3758a430d50b..9fc4aa53f4014 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/CalcITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/CalcITCase.scala @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.table +package org.apache.flink.table.api.scala.batch.table import java.sql.{Date, Time, Timestamp} import java.util import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.expressions.Literal -import org.apache.flink.api.table.{Row, TableEnvironment, TableException, ValidationException} +import org.apache.flink.table.expressions.Literal +import org.apache.flink.table.{Row, TableEnvironment, TableException, ValidationException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit.Assert._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/JoinITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/JoinITCase.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/JoinITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/JoinITCase.scala index 67cac14d655e3..155257c87113a 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/JoinITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/JoinITCase.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.table +package org.apache.flink.table.api.scala.batch.table import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.expressions.Literal -import org.apache.flink.api.table.{Row, TableEnvironment, TableException, ValidationException} +import org.apache.flink.table.expressions.Literal +import org.apache.flink.table.{Row, TableEnvironment, TableException, ValidationException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SetOperatorsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/SetOperatorsITCase.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SetOperatorsITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/SetOperatorsITCase.scala index 283ba10082b81..3d09b8c623b5f 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SetOperatorsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/SetOperatorsITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.table +package org.apache.flink.table.api.scala.batch.table import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{Row, TableEnvironment, ValidationException} +import org.apache.flink.table.{Row, TableEnvironment, ValidationException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SortITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/SortITCase.scala similarity index 93% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SortITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/SortITCase.scala index d4a1d8d1ab76b..c6bb5293db457 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SortITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/SortITCase.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.table +package org.apache.flink.table.api.scala.batch.table -import org.apache.flink.api.scala.batch.utils.SortTestUtils._ -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala.batch.utils.SortTestUtils._ +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets import org.apache.flink.api.scala.{ExecutionEnvironment, _} -import org.apache.flink.api.table.{Row, TableEnvironment, ValidationException} +import org.apache.flink.table.{Row, TableEnvironment, ValidationException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/SortTestUtils.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/utils/SortTestUtils.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/SortTestUtils.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/utils/SortTestUtils.scala index 8d1f653c10b0b..ef425d33dda23 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/SortTestUtils.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/utils/SortTestUtils.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.utils +package org.apache.flink.table.api.scala.batch.utils object SortTestUtils { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/TableProgramsTestBase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/utils/TableProgramsTestBase.scala similarity index 90% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/TableProgramsTestBase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/utils/TableProgramsTestBase.scala index 2ce42d439ea42..a71dc3b1ba361 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/TableProgramsTestBase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/utils/TableProgramsTestBase.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.utils +package org.apache.flink.table.api.scala.batch.utils import java.util -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.{EFFICIENT, NO_NULL, TableConfigMode} -import org.apache.flink.api.table.TableConfig +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.{EFFICIENT, NO_NULL, TableConfigMode} +import org.apache.flink.table.TableConfig import org.apache.flink.test.util.MultipleProgramsTestBase import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.junit.runners.Parameterized diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/ExplainStreamTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/ExplainStreamTest.scala similarity index 94% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/ExplainStreamTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/ExplainStreamTest.scala index 5eebb340343ec..4c8182a3778d8 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/ExplainStreamTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/ExplainStreamTest.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream +package org.apache.flink.table.api.scala.stream import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.TableEnvironment +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.TableEnvironment import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase import org.junit.Assert.assertEquals diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/TableSinkITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/TableSinkITCase.scala similarity index 88% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/TableSinkITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/TableSinkITCase.scala index f3eb87cb251f2..3bbe34b7538f9 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/TableSinkITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/TableSinkITCase.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream +package org.apache.flink.table.api.scala.stream import java.io.File import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.stream.utils.StreamTestData -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.TableEnvironment -import org.apache.flink.api.table.sinks.CsvTableSink +import org.apache.flink.table.api.scala.stream.utils.StreamTestData +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.TableEnvironment +import org.apache.flink.table.sinks.CsvTableSink import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase import org.apache.flink.test.util.TestBaseUtils diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/TableSourceITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/TableSourceITCase.scala similarity index 94% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/TableSourceITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/TableSourceITCase.scala index c14ad979636c6..b82dfed5e5497 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/TableSourceITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/TableSourceITCase.scala @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream +package org.apache.flink.table.api.scala.stream import java.io.{File, FileOutputStream, OutputStreamWriter} import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.stream.utils.StreamITCase -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.sources.{CsvTableSource, StreamTableSource} -import org.apache.flink.api.table.typeutils.RowTypeInfo -import org.apache.flink.api.table.{Row, TableEnvironment} +import org.apache.flink.table.api.scala.stream.utils.StreamITCase +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.sources.{CsvTableSource, StreamTableSource} +import org.apache.flink.table.typeutils.RowTypeInfo +import org.apache.flink.table.{Row, TableEnvironment} import org.apache.flink.streaming.api.datastream.DataStream import org.apache.flink.streaming.api.environment import org.apache.flink.streaming.api.functions.source.SourceFunction diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/sql/SqlITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/sql/SqlITCase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/sql/SqlITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/sql/SqlITCase.scala index 5b278c1e2018a..6454b95e519f4 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/sql/SqlITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/sql/SqlITCase.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream.sql +package org.apache.flink.table.api.scala.stream.sql import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.stream.utils.{StreamTestData, StreamITCase} -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.{Row, TableEnvironment} +import org.apache.flink.table.api.scala.stream.utils.{StreamTestData, StreamITCase} +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.{Row, TableEnvironment} import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase import org.junit.Assert._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/AggregationsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/AggregationsITCase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/AggregationsITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/AggregationsITCase.scala index 075348419d5bf..8317e303c0ad9 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/AggregationsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/AggregationsITCase.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream.table +package org.apache.flink.table.api.scala.stream.table import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.stream.table.GroupWindowITCase.TimestampWithEqualWatermark -import org.apache.flink.api.scala.stream.utils.StreamITCase -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.{Row, _} +import org.apache.flink.table.api.scala.stream.table.GroupWindowITCase.TimestampWithEqualWatermark +import org.apache.flink.table.api.scala.stream.utils.StreamITCase +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.{Row, _} import org.apache.flink.streaming.api.TimeCharacteristic import org.apache.flink.streaming.api.functions.AssignerWithPunctuatedWatermarks import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/CalcITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/CalcITCase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/CalcITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/CalcITCase.scala index 578ad30f2836f..1292d8509f5c3 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/CalcITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/CalcITCase.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream.table +package org.apache.flink.table.api.scala.stream.table import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.stream.utils.{StreamITCase, StreamTestData} -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.expressions.Literal -import org.apache.flink.api.table.{Row, TableEnvironment, TableException} +import org.apache.flink.table.api.scala.stream.utils.{StreamITCase, StreamTestData} +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.expressions.Literal +import org.apache.flink.table.{Row, TableEnvironment, TableException} import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase import org.junit.Assert._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/GroupWindowTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/GroupWindowTest.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/GroupWindowTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/GroupWindowTest.scala index b59b151d0934d..df7b7450280ef 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/GroupWindowTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/GroupWindowTest.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream.table +package org.apache.flink.table.api.scala.stream.table import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table._ -import org.apache.flink.api.table.expressions.{RowtimeAttribute, WindowReference} -import org.apache.flink.api.table.plan.logical._ -import org.apache.flink.api.table.utils.TableTestBase -import org.apache.flink.api.table.utils.TableTestUtil.{streamTableNode, term, unaryNode} +import org.apache.flink.table.api.scala._ +import org.apache.flink.table._ +import org.apache.flink.table.expressions.{RowtimeAttribute, WindowReference} +import org.apache.flink.table.plan.logical._ +import org.apache.flink.table.utils.TableTestBase +import org.apache.flink.table.utils.TableTestUtil.{streamTableNode, term, unaryNode} import org.junit.{Ignore, Test} class GroupWindowTest extends TableTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnionITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/UnionITCase.scala similarity index 94% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnionITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/UnionITCase.scala index 131974eca0221..cd8767330c684 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnionITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/UnionITCase.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream.table +package org.apache.flink.table.api.scala.stream.table import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.stream.utils.{StreamITCase, StreamTestData} -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.{Row, TableEnvironment, ValidationException} +import org.apache.flink.table.api.scala.stream.utils.{StreamITCase, StreamTestData} +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.{Row, TableEnvironment, ValidationException} import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase import org.junit.Assert._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnsupportedOpsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/UnsupportedOpsTest.scala similarity index 94% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnsupportedOpsTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/UnsupportedOpsTest.scala index 6d1a62e961140..487602042e536 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnsupportedOpsTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/UnsupportedOpsTest.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream.table +package org.apache.flink.table.api.scala.stream.table -import org.apache.flink.api.scala.stream.utils.StreamTestData -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.{TableEnvironment, ValidationException} +import org.apache.flink.table.api.scala.stream.utils.StreamTestData +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.{TableEnvironment, ValidationException} import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase import org.junit.Test diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/utils/StreamITCase.scala similarity index 94% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/utils/StreamITCase.scala index 48600055770cd..2f68d6406f533 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/utils/StreamITCase.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream.utils +package org.apache.flink.table.api.scala.stream.utils import java.util.Collections -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.junit.Assert._ import scala.collection.mutable import org.apache.flink.streaming.api.functions.sink.RichSinkFunction diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamTestData.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/utils/StreamTestData.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamTestData.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/utils/StreamTestData.scala index 321b8ac7909dd..6745039f1df05 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamTestData.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/utils/StreamTestData.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream.utils +package org.apache.flink.table.api.scala.stream.utils import org.apache.flink.api.scala._ import scala.collection.mutable diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/CompositeAccessTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/CompositeAccessTest.scala similarity index 92% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/CompositeAccessTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/CompositeAccessTest.scala index 3121c58540413..9b06d8a16087d 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/CompositeAccessTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/CompositeAccessTest.scala @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.{TupleTypeInfo, TypeExtractor} import org.apache.flink.api.scala.createTypeInformation -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.{Row, Types, ValidationException} -import org.apache.flink.api.table.expressions.CompositeAccessTest.{MyCaseClass, MyCaseClass2, MyPojo} -import org.apache.flink.api.table.expressions.utils.ExpressionTestBase -import org.apache.flink.api.table.typeutils.RowTypeInfo +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.{Row, Types, ValidationException} +import org.apache.flink.table.expressions.CompositeAccessTest.{MyCaseClass, MyCaseClass2, MyPojo} +import org.apache.flink.table.expressions.utils.ExpressionTestBase +import org.apache.flink.table.typeutils.RowTypeInfo import org.junit.Test diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/DecimalTypeTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/DecimalTypeTest.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/DecimalTypeTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/DecimalTypeTest.scala index 20a8af843443f..ed76afe2155a3 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/DecimalTypeTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/DecimalTypeTest.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.{Row, Types} -import org.apache.flink.api.table.expressions.utils.ExpressionTestBase -import org.apache.flink.api.table.typeutils.RowTypeInfo +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.{Row, Types} +import org.apache.flink.table.expressions.utils.ExpressionTestBase +import org.apache.flink.table.typeutils.RowTypeInfo import org.junit.Test class DecimalTypeTest extends ExpressionTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/NonDeterministicTests.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/NonDeterministicTests.scala similarity index 89% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/NonDeterministicTests.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/NonDeterministicTests.scala index de48849159d13..39c1d3d25db22 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/NonDeterministicTests.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/NonDeterministicTests.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.Row -import org.apache.flink.api.table.expressions.utils.ExpressionTestBase -import org.apache.flink.api.table.typeutils.RowTypeInfo +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.Row +import org.apache.flink.table.expressions.utils.ExpressionTestBase +import org.apache.flink.table.typeutils.RowTypeInfo import org.junit.{Ignore, Test} /** diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/ScalarFunctionsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/ScalarFunctionsTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala index 1d2a1b7dfd159..118e1b228dc6c 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/ScalarFunctionsTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import java.sql.{Date, Time, Timestamp} import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.expressions.utils.ExpressionTestBase -import org.apache.flink.api.table.typeutils.RowTypeInfo -import org.apache.flink.api.table.{Row, Types, ValidationException} +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.expressions.utils.ExpressionTestBase +import org.apache.flink.table.typeutils.RowTypeInfo +import org.apache.flink.table.{Row, Types, ValidationException} import org.junit.Test class ScalarFunctionsTest extends ExpressionTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/ScalarOperatorsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/ScalarOperatorsTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala index 7ad22120feaa7..90a7b5ae83eb2 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/ScalarOperatorsTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.expressions.utils.ExpressionTestBase -import org.apache.flink.api.table.typeutils.RowTypeInfo -import org.apache.flink.api.table.{Row, Types, ValidationException} +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.expressions.utils.ExpressionTestBase +import org.apache.flink.table.typeutils.RowTypeInfo +import org.apache.flink.table.{Row, Types, ValidationException} import org.junit.Test class ScalarOperatorsTest extends ExpressionTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/SqlExpressionTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/SqlExpressionTest.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/SqlExpressionTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/SqlExpressionTest.scala index 52dc848a93d23..60997f2ca617a 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/SqlExpressionTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/SqlExpressionTest.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.Row -import org.apache.flink.api.table.expressions.utils.ExpressionTestBase -import org.apache.flink.api.table.typeutils.RowTypeInfo +import org.apache.flink.table.Row +import org.apache.flink.table.expressions.utils.ExpressionTestBase +import org.apache.flink.table.typeutils.RowTypeInfo import org.junit.{Ignore, Test} /** diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/TemporalTypesTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/TemporalTypesTest.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/TemporalTypesTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/TemporalTypesTest.scala index 0547552cb17e8..50e41d5291c87 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/TemporalTypesTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/TemporalTypesTest.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import java.sql.{Date, Time, Timestamp} import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.expressions.utils.ExpressionTestBase -import org.apache.flink.api.table.typeutils.RowTypeInfo -import org.apache.flink.api.table.{Row, Types} +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.expressions.utils.ExpressionTestBase +import org.apache.flink.table.typeutils.RowTypeInfo +import org.apache.flink.table.{Row, Types} import org.junit.Test class TemporalTypesTest extends ExpressionTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/UserDefinedScalarFunctionTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala similarity index 94% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/UserDefinedScalarFunctionTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala index ffe3cd30fb4bd..a1f3f5cc95448 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/UserDefinedScalarFunctionTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import java.sql.{Date, Time, Timestamp} import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.expressions.utils._ -import org.apache.flink.api.table.functions.ScalarFunction -import org.apache.flink.api.table.typeutils.RowTypeInfo -import org.apache.flink.api.table.{Row, Types} +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.expressions.utils._ +import org.apache.flink.table.functions.ScalarFunction +import org.apache.flink.table.typeutils.RowTypeInfo +import org.apache.flink.table.{Row, Types} import org.junit.Test class UserDefinedScalarFunctionTest extends ExpressionTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/utils/ExpressionTestBase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala similarity index 93% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/utils/ExpressionTestBase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala index 958fd259e6a39..3e5d442d8c61f 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/utils/ExpressionTestBase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions.utils +package org.apache.flink.table.expressions.utils import org.apache.calcite.rex.RexNode import org.apache.calcite.sql.`type`.SqlTypeName._ @@ -27,13 +27,13 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.{DataSet => JDataSet} import org.apache.flink.api.scala.{DataSet, ExecutionEnvironment} -import org.apache.flink.api.table._ -import org.apache.flink.api.table.codegen.{CodeGenerator, Compiler, GeneratedFunction} -import org.apache.flink.api.table.expressions.{Expression, ExpressionParser} -import org.apache.flink.api.table.functions.ScalarFunction -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetCalc, DataSetConvention} -import org.apache.flink.api.table.plan.rules.FlinkRuleSets -import org.apache.flink.api.table.typeutils.RowTypeInfo +import org.apache.flink.table._ +import org.apache.flink.table.codegen.{CodeGenerator, Compiler, GeneratedFunction} +import org.apache.flink.table.expressions.{Expression, ExpressionParser} +import org.apache.flink.table.functions.ScalarFunction +import org.apache.flink.table.plan.nodes.dataset.{DataSetCalc, DataSetConvention} +import org.apache.flink.table.plan.rules.FlinkRuleSets +import org.apache.flink.table.typeutils.RowTypeInfo import org.junit.Assert._ import org.junit.{After, Before} import org.mockito.Mockito._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/utils/UserDefinedScalarFunctions.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/UserDefinedScalarFunctions.scala similarity index 94% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/utils/UserDefinedScalarFunctions.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/UserDefinedScalarFunctions.scala index d4772cf10f63e..27f47565b402b 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/utils/UserDefinedScalarFunctions.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/UserDefinedScalarFunctions.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions.utils +package org.apache.flink.table.expressions.utils import java.sql.{Date, Time, Timestamp} import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.Types -import org.apache.flink.api.table.functions.ScalarFunction +import org.apache.flink.table.Types +import org.apache.flink.table.functions.ScalarFunction case class SimplePojo(name: String, age: Int) diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/AggregateTestBase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/AggregateTestBase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/AggregateTestBase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/AggregateTestBase.scala index 54911a55742fc..bc67c1bd54e04 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/AggregateTestBase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/AggregateTestBase.scala @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.math.BigDecimal -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.junit.Test import org.junit.Assert.assertEquals diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/AvgAggregateTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/AvgAggregateTest.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/AvgAggregateTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/AvgAggregateTest.scala index 23b305481c646..a72d08b11a8a9 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/AvgAggregateTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/AvgAggregateTest.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.math.BigDecimal diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/CountAggregateTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/CountAggregateTest.scala similarity index 95% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/CountAggregateTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/CountAggregateTest.scala index 4389a3a0dde2d..55f73b4e7f59a 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/CountAggregateTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/CountAggregateTest.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate class CountAggregateTest extends AggregateTestBase[Long] { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/MaxAggregateTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/MaxAggregateTest.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/MaxAggregateTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/MaxAggregateTest.scala index aea3318dbd689..1bf879df7bbf5 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/MaxAggregateTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/MaxAggregateTest.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.math.BigDecimal diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/MinAggregateTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/MinAggregateTest.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/MinAggregateTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/MinAggregateTest.scala index f007d02cfddbe..3e2404de6f728 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/MinAggregateTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/MinAggregateTest.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.math.BigDecimal diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/SumAggregateTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/SumAggregateTest.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/SumAggregateTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/SumAggregateTest.scala index 7e4e47bee297a..c08533479fbbe 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/aggregate/SumAggregateTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/aggregate/SumAggregateTest.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.aggregate +package org.apache.flink.table.runtime.aggregate import java.math.BigDecimal diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/io/RowCsvInputFormatTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/io/RowCsvInputFormatTest.scala similarity index 99% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/io/RowCsvInputFormatTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/io/RowCsvInputFormatTest.scala index d72e7a8eba287..3d2bb7cf71aef 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/io/RowCsvInputFormatTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/io/RowCsvInputFormatTest.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.runtime.io +package org.apache.flink.table.runtime.io import java.io.{File, FileOutputStream, OutputStreamWriter} import java.nio.charset.StandardCharsets @@ -24,9 +24,9 @@ import java.sql.{Date, Time, Timestamp} import org.apache.flink.api.common.io.ParseException import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, SqlTimeTypeInfo} -import org.apache.flink.api.table.Row -import org.apache.flink.api.table.runtime.io.RowCsvInputFormatTest.{PATH, createTempFile, testRemovingTrailingCR} -import org.apache.flink.api.table.typeutils.RowTypeInfo +import org.apache.flink.table.Row +import org.apache.flink.table.runtime.io.RowCsvInputFormatTest.{PATH, createTempFile, testRemovingTrailingCR} +import org.apache.flink.table.typeutils.RowTypeInfo import org.apache.flink.configuration.Configuration import org.apache.flink.core.fs.{FileInputSplit, Path} import org.apache.flink.types.parser.{FieldParser, StringParser} diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowComparatorTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/typeutils/RowComparatorTest.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowComparatorTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/typeutils/RowComparatorTest.scala index 557db3abba594..3ac7dab323013 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowComparatorTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/typeutils/RowComparatorTest.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.typeinfo.BasicTypeInfo import org.apache.flink.api.common.typeutils.{ComparatorTestBase, TypeComparator, TypeSerializer} import org.apache.flink.api.java.tuple import org.apache.flink.api.java.typeutils.{TupleTypeInfo, TypeExtractor} -import org.apache.flink.api.table.Row -import org.apache.flink.api.table.typeutils.RowComparatorTest.MyPojo +import org.apache.flink.table.Row +import org.apache.flink.table.typeutils.RowComparatorTest.MyPojo import org.junit.Assert._ class RowComparatorTest extends ComparatorTestBase[Row] { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowComparatorWithManyFieldsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/typeutils/RowComparatorWithManyFieldsTest.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowComparatorWithManyFieldsTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/typeutils/RowComparatorWithManyFieldsTest.scala index 33715c1835f85..9e423ed62d28c 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowComparatorWithManyFieldsTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/typeutils/RowComparatorWithManyFieldsTest.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} import org.apache.flink.api.common.typeutils.{ComparatorTestBase, TypeComparator, TypeSerializer} -import org.apache.flink.api.table.Row +import org.apache.flink.table.Row import org.apache.flink.util.Preconditions import org.junit.Assert._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowSerializerTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/typeutils/RowSerializerTest.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowSerializerTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/typeutils/RowSerializerTest.scala index b52dd4d63762c..f153dc5ca12bb 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowSerializerTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/typeutils/RowSerializerTest.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.table.typeutils import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} import org.apache.flink.api.common.typeutils.{SerializerTestInstance, TypeSerializer} import org.apache.flink.api.java.tuple import org.apache.flink.api.java.typeutils.{TupleTypeInfo, TypeExtractor} -import org.apache.flink.api.table.Row -import org.apache.flink.api.table.typeutils.RowSerializerTest.MyPojo +import org.apache.flink.table.Row +import org.apache.flink.table.typeutils.RowSerializerTest.MyPojo import org.junit.Assert._ import org.junit.Test diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/utils/TableTestBase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/TableTestBase.scala similarity index 95% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/utils/TableTestBase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/TableTestBase.scala index 4eaba90e17969..e14b125448359 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/utils/TableTestBase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/TableTestBase.scala @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.flink.api.table.utils +package org.apache.flink.table.utils import org.apache.calcite.plan.RelOptUtil import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.{DataSet => JDataSet} -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.{DataSet, ExecutionEnvironment} -import org.apache.flink.api.table.expressions.Expression -import org.apache.flink.api.table.functions.{ScalarFunction, TableFunction} -import org.apache.flink.api.table.{Table, TableEnvironment} +import org.apache.flink.table.expressions.Expression +import org.apache.flink.table.functions.{ScalarFunction, TableFunction} +import org.apache.flink.table.{Table, TableEnvironment} import org.apache.flink.streaming.api.datastream.{DataStream => JDataStream} import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment} import org.junit.Assert.assertEquals From a2d30eef6e1aebc2f8046cfba62975ac40befe0b Mon Sep 17 00:00:00 2001 From: Anton Mushin Date: Wed, 14 Dec 2016 16:34:04 +0400 Subject: [PATCH 2/3] [FLINK-4704] Move Table API to org.apache.flink.table move table api to org.apache.flink.table package --- docs/dev/table_api.md | 2 +- .../flink/table/api/java/package-info.java | 14 ++++++++------ .../{ => table}/examples/java/WordCountSQL.java | 4 ++-- .../examples/java/WordCountTable.java | 4 ++-- .../flink/table/BatchTableEnvironment.scala | 2 ++ .../flink/table/StreamTableEnvironment.scala | 2 ++ .../org/apache/flink/table/TableConfig.scala | 2 ++ .../apache/flink/table/TableEnvironment.scala | 2 ++ .../org/apache/flink/table/{ => api}/Types.scala | 2 +- .../flink/table/{table.scala => api/api.scala} | 6 ++++-- .../table/api/java/BatchTableEnvironment.scala | 4 +++- .../table/api/java/StreamTableEnvironment.scala | 4 +++- .../flink/table/api/java/groupWindows.scala | 2 +- .../table/api/scala/BatchTableEnvironment.scala | 3 ++- .../table/api/scala/DataSetConversions.scala | 1 + .../table/api/scala/DataStreamConversions.scala | 1 + .../table/api/scala/StreamTableEnvironment.scala | 3 ++- .../flink/table/api/scala/TableConversions.scala | 3 ++- .../flink/table/api/scala/groupWindows.scala | 2 +- .../apache/flink/table/api/scala/package.scala | 2 +- .../apache/flink/table/{ => api}/windows.scala | 2 +- .../table/{ => calcite}/CalciteConfig.scala | 4 ++-- .../{ => calcite}/FlinkCalciteSqlValidator.scala | 4 ++-- .../table/{ => calcite}/FlinkPlannerImpl.scala | 3 ++- .../table/{ => calcite}/FlinkRelBuilder.scala | 4 ++-- .../table/{ => calcite}/FlinkTypeFactory.scala | 6 ++++-- .../table/{ => calcite}/FlinkTypeSystem.scala | 2 +- .../flink/table/codegen/CodeGenerator.scala | 3 ++- .../flink/table/codegen/ExpressionReducer.scala | 3 ++- .../table/codegen/calls/FunctionGenerator.scala | 4 ++-- .../codegen/calls/TableFunctionCallGen.scala | 12 ++++++------ .../examples/scala/StreamSQLExample.scala | 2 +- .../examples/scala/StreamTableExample.scala | 2 +- .../examples/scala/TPCHQuery3Table.scala | 2 +- .../examples/scala/WordCountSQL.scala | 2 +- .../examples/scala/WordCountTable.scala | 2 +- .../flink/table/expressions/Expression.scala | 2 +- .../{api => }/table/expressions/array.scala | 6 +++--- .../apache/flink/table/expressions/call.scala | 3 ++- .../apache/flink/table/expressions/cast.scala | 2 +- .../flink/table/expressions/literals.scala | 2 +- .../apache/flink/table/expressions/time.scala | 2 +- .../table/expressions/windowProperties.scala | 3 ++- .../table/functions/TableFunction.scala | 4 ++-- .../functions/utils/ScalarSqlFunction.scala | 3 ++- .../table/functions/utils/TableSqlFunction.scala | 8 ++++---- .../utils/UserDefinedFunctionUtils.scala | 5 ++++- .../scala/org/apache/flink/table/package.scala | 4 ++-- .../flink/table/{trees => plan}/TreeNode.scala | 2 +- .../flink/table/plan/logical/LogicalNode.scala | 2 +- .../flink/table/plan/logical/operators.scala | 1 + .../logical/rel/LogicalWindowAggregate.scala | 4 ++-- .../flink/table/plan/nodes/FlinkAggregate.scala | 3 ++- .../table/plan/nodes/FlinkCorrelate.scala | 16 ++++++++-------- .../nodes/dataset/BatchTableSourceScan.scala | 3 ++- .../plan/nodes/dataset/DataSetAggregate.scala | 3 ++- .../plan/nodes/dataset/DataSetCorrelate.scala | 12 ++++++------ .../nodes/datastream/DataStreamAggregate.scala | 5 +++-- .../nodes/datastream/DataStreamCorrelate.scala | 12 ++++++------ .../nodes/datastream/StreamTableSourceScan.scala | 3 ++- .../rules/dataSet/DataSetCorrelateRule.scala | 4 ++-- ...PushProjectIntoBatchTableSourceScanRule.scala | 8 ++++---- .../datastream/DataStreamCorrelateRule.scala | 5 +++-- .../rules/util/RexProgramProjectExtractor.scala | 2 +- .../table/plan/schema/ArrayRelDataType.scala | 2 +- .../table/plan/schema/CompositeRelDataType.scala | 2 +- .../flink/table/plan/schema/FlinkTable.scala | 3 ++- .../plan/schema/FlinkTableFunctionImpl.scala | 7 ++++--- .../table/plan/schema/GenericRelDataType.scala | 2 +- .../table/runtime/aggregate/AggregateUtil.scala | 5 +++-- .../flink/table/sinks/BatchTableSink.scala | 3 ++- .../flink/table/sinks/StreamTableSink.scala | 3 ++- .../org/apache/flink/table/sinks/TableSink.scala | 7 ++++--- .../apache/flink/table/sinks/TableSinkBase.scala | 9 +++++---- .../table/sources/ProjectableTableSource.scala | 2 +- .../flink/table/typeutils/TypeConverter.scala | 3 ++- .../flink/table/api/java/batch/ExplainTest.java | 2 +- .../api/java/batch/TableEnvironmentITCase.java | 6 +++--- .../table/api/java/batch/TableSourceITCase.java | 2 +- .../table/api/java/batch/sql/SqlITCase.java | 2 +- .../api/java/batch/table/AggregationsITCase.java | 4 ++-- .../table/api/java/batch/table/CalcITCase.java | 2 +- .../api/java/batch/table/CastingITCase.java | 2 +- .../table/api/java/batch/table/JoinITCase.java | 2 +- .../table/api/java/stream/sql/SqlITCase.java | 2 +- .../flink/table/CalciteConfigBuilderTest.scala | 1 + .../flink/table/ExpressionReductionTest.scala | 1 + .../flink/table/TableEnvironmentTest.scala | 1 + .../batch/ProjectableTableSourceITCase.scala | 14 +++++++------- .../batch/sql/UserDefinedTableFunctionTest.scala | 10 +++++----- .../scala/batch/table/AggregationsITCase.scala | 2 +- .../table/UserDefinedTableFunctionTest.scala | 13 +++++++------ .../sql/UserDefinedTableFunctionTest.scala | 10 +++++----- .../table/UserDefinedTableFunctionTest.scala | 15 ++++++++------- .../table/expressions/ArrayTypeTest.scala | 11 ++++++----- .../table/expressions/CompositeAccessTest.scala | 3 ++- .../table/expressions/DecimalTypeTest.scala | 3 ++- .../table/expressions/ScalarFunctionsTest.scala | 3 ++- .../table/expressions/ScalarOperatorsTest.scala | 3 ++- .../table/expressions/TemporalTypesTest.scala | 3 ++- .../UserDefinedScalarFunctionTest.scala | 3 ++- .../expressions/utils/ExpressionTestBase.scala | 1 + .../utils/UserDefinedScalarFunctions.scala | 2 +- .../util/RexProgramProjectExtractorTest.scala | 5 +++-- .../runtime/dataset/DataSetCorrelateITCase.scala | 13 ++++++------- .../datastream/DataStreamCorrelateITCase.scala | 10 +++++----- .../apache/flink/table/utils/TableTestBase.scala | 3 ++- .../table/utils/UserDefinedTableFunctions.scala | 8 ++++---- 108 files changed, 261 insertions(+), 200 deletions(-) rename flink-libraries/flink-table/src/main/java/org/apache/flink/{ => table}/examples/java/WordCountSQL.java (96%) rename flink-libraries/flink-table/src/main/java/org/apache/flink/{ => table}/examples/java/WordCountTable.java (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/table/{ => api}/Types.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/table/{table.scala => api/api.scala} (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/table/{ => api}/windows.scala (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/table/{ => calcite}/CalciteConfig.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/table/{ => calcite}/FlinkCalciteSqlValidator.scala (93%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/table/{ => calcite}/FlinkPlannerImpl.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/table/{ => calcite}/FlinkRelBuilder.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/table/{ => calcite}/FlinkTypeFactory.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/table/{ => calcite}/FlinkTypeSystem.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/FunctionGenerator.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/codegen/calls/TableFunctionCallGen.scala (87%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{ => table}/examples/scala/StreamSQLExample.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{ => table}/examples/scala/StreamTableExample.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{ => table}/examples/scala/TPCHQuery3Table.scala (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{ => table}/examples/scala/WordCountSQL.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{ => table}/examples/scala/WordCountTable.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/expressions/array.scala (96%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/functions/TableFunction.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/functions/utils/TableSqlFunction.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/table/{trees => plan}/TreeNode.scala (99%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/FlinkCorrelate.scala (90%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/dataset/DataSetCorrelate.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/nodes/datastream/DataStreamCorrelate.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/DataSetCorrelateRule.scala (95%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/dataSet/PushProjectIntoBatchTableSourceScanRule.scala (90%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/datastream/DataStreamCorrelateRule.scala (94%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/rules/util/RexProgramProjectExtractor.scala (98%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/schema/ArrayRelDataType.scala (97%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/plan/schema/FlinkTableFunctionImpl.scala (92%) rename flink-libraries/flink-table/src/main/scala/org/apache/flink/{api => }/table/sources/ProjectableTableSource.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/ProjectableTableSourceITCase.scala (91%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/sql/UserDefinedTableFunctionTest.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/batch/table/UserDefinedTableFunctionTest.scala (94%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/sql/UserDefinedTableFunctionTest.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{ => table}/api/scala/stream/table/UserDefinedTableFunctionTest.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/expressions/ArrayTypeTest.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/plan/rules/util/RexProgramProjectExtractorTest.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/runtime/dataset/DataSetCorrelateITCase.scala (93%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/runtime/datastream/DataStreamCorrelateITCase.scala (91%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/{api => }/table/utils/UserDefinedTableFunctions.scala (94%) diff --git a/docs/dev/table_api.md b/docs/dev/table_api.md index c7e84119d1ecd..fe076c333a6bb 100644 --- a/docs/dev/table_api.md +++ b/docs/dev/table_api.md @@ -3901,7 +3901,7 @@ object TimestampModifier extends ScalarFunction { A user-defined table function is implemented similar to a user-defined scalar function but can return a set of values instead of a single value. The returned set of values can consist of multiple columns and multiple rows similar to a standard table. A user-defined table function works on zero, one, or multiple scalar values as input and returns multiple rows as output. -In order to define a table function one has to extend the base class `TableFunction` in `org.apache.flink.api.table.functions` and implement (one or more) evaluation methods. The behavior of a table function is determined by its evaluation methods. An evaluation method must be declared `public` and named `eval`. The `TableFunction` can be overloaded by implementing multiple methods named `eval`. The parameter types of the evaluation methods determine all valid parameters of the table function. The type of the returned table is determined by the generic type of `TableFunction`. Evaluation methods emit output rows using the protected `collect(T)` method. +In order to define a table function one has to extend the base class `TableFunction` in `org.apache.flink.table.functions` and implement (one or more) evaluation methods. The behavior of a table function is determined by its evaluation methods. An evaluation method must be declared `public` and named `eval`. The `TableFunction` can be overloaded by implementing multiple methods named `eval`. The parameter types of the evaluation methods determine all valid parameters of the table function. The type of the returned table is determined by the generic type of `TableFunction`. Evaluation methods emit output rows using the protected `collect(T)` method. In the Table API, a table function is used with `.join(Expression)` or `.leftOuterJoin(Expression)` for Scala users and `.join(String)` or `.leftOuterJoin(String)` for Java users. The `join` operator (cross) joins each row from the outer table (table on the left of the operator) with all rows produced by the table-valued function (which is on the right side of the operator). The `leftOuterJoin` operator joins each row from the outer table (table on the left of the operator) with all rows produced by the table-valued function (which is on the right side of the operator) and preserves outer rows for which the table function returns an empty table. In SQL use `LATERAL TABLE()` with CROSS JOIN and LEFT JOIN with ON TRUE condition (see examples below). diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/table/api/java/package-info.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/api/java/package-info.java index 9daadb92fda10..2409872033f57 100644 --- a/flink-libraries/flink-table/src/main/java/org/apache/flink/table/api/java/package-info.java +++ b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/api/java/package-info.java @@ -20,14 +20,14 @@ * Table API (Java)
* * A {@link org.apache.flink.table.api.java.BatchTableEnvironment} can be used to create a - * {@link org.apache.flink.table.Table} from a {@link org.apache.flink.api.java.DataSet}. + * {@link org.apache.flink.table.api.Table} from a {@link org.apache.flink.api.java.DataSet}. * Equivalently, a {@link org.apache.flink.table.api.java.StreamTableEnvironment} can be used to - * create a {@link org.apache.flink.table.Table} from a + * create a {@link org.apache.flink.table.api.Table} from a * {@link org.apache.flink.streaming.api.datastream.DataStream}. * *

* Tables can be used to perform SQL-like queries on data. Please have - * a look at {@link org.apache.flink.table.Table} to see which operations are supported and + * a look at {@link org.apache.flink.table.api.Table} to see which operations are supported and * how query strings are written. * *

@@ -55,9 +55,11 @@ * } * *

- * As seen above, a {@link org.apache.flink.table.Table} can be converted back to the + * As seen above, a {@link org.apache.flink.table.api.Table} can be converted back to the * underlying API representation using - * {@link org.apache.flink.table.api.java.BatchTableEnvironment#toDataSet(org.apache.flink.table.Table, java.lang.Class)} - * or {@link org.apache.flink.table.api.java.StreamTableEnvironment#toDataStream(org.apache.flink.table.Table, java.lang.Class)}}. + * {@link org.apache.flink.table.api.java.BatchTableEnvironment#toDataSet(Table, java.lang.Class)} + * or {@link org.apache.flink.table.api.java.StreamTableEnvironment#toDataStream(Table, java.lang.Class)}}. */ package org.apache.flink.table.api.java; + +import org.apache.flink.table.api.Table; diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountSQL.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/examples/java/WordCountSQL.java similarity index 96% rename from flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountSQL.java rename to flink-libraries/flink-table/src/main/java/org/apache/flink/table/examples/java/WordCountSQL.java index d1f748eb74986..c03b1b228298c 100644 --- a/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountSQL.java +++ b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/examples/java/WordCountSQL.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.examples.java; +package org.apache.flink.table.examples.java; -import org.apache.flink.table.Table; +import org.apache.flink.table.api.Table; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.table.api.java.BatchTableEnvironment; diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountTable.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/examples/java/WordCountTable.java similarity index 96% rename from flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountTable.java rename to flink-libraries/flink-table/src/main/java/org/apache/flink/table/examples/java/WordCountTable.java index a5c80ddcc6a93..fe4573dd75651 100644 --- a/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/WordCountTable.java +++ b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/examples/java/WordCountTable.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.examples.java; +package org.apache.flink.table.examples.java; -import org.apache.flink.table.Table; +import org.apache.flink.table.api.Table; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.table.api.java.BatchTableEnvironment; diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/BatchTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/BatchTableEnvironment.scala index f1195b4a28cd5..1f3c1fb6b2f70 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/BatchTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/BatchTableEnvironment.scala @@ -29,6 +29,8 @@ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.io.DiscardingOutputFormat import org.apache.flink.api.java.typeutils.TypeExtractor import org.apache.flink.api.java.{DataSet, ExecutionEnvironment} +import org.apache.flink.table.api.Table +import org.apache.flink.table.calcite.FlinkPlannerImpl import org.apache.flink.table.explain.PlanJsonParser import org.apache.flink.table.expressions.Expression import org.apache.flink.table.plan.logical.{CatalogNode, LogicalRelNode} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/StreamTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/StreamTableEnvironment.scala index 8a5b88432d3e6..87153d8b6110e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/StreamTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/StreamTableEnvironment.scala @@ -27,6 +27,8 @@ import org.apache.calcite.sql2rel.RelDecorrelator import org.apache.calcite.tools.{Programs, RuleSet} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.TypeExtractor +import org.apache.flink.table.api.Table +import org.apache.flink.table.calcite.FlinkPlannerImpl import org.apache.flink.table.explain.PlanJsonParser import org.apache.flink.table.expressions.Expression import org.apache.flink.table.plan.logical.{CatalogNode, LogicalRelNode} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableConfig.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableConfig.scala index 3b97e75605d52..0e15d8a3a1bc5 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableConfig.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableConfig.scala @@ -19,6 +19,8 @@ package org.apache.flink.table import java.util.TimeZone +import org.apache.flink.table.calcite.CalciteConfig + /** * A config to define the runtime behavior of the Table API. */ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableEnvironment.scala index d9d0b2873f570..30f0c288dc63e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/TableEnvironment.scala @@ -31,12 +31,14 @@ import org.apache.calcite.sql.parser.SqlParser import org.apache.calcite.sql.util.ChainedSqlOperatorTable import org.apache.calcite.tools.{FrameworkConfig, Frameworks, RuleSet, RuleSets} import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation} +import org.apache.flink.table.api.Table import org.apache.flink.table.api.java.{BatchTableEnvironment => JavaBatchTableEnv, StreamTableEnvironment => JavaStreamTableEnv} import org.apache.flink.api.java.typeutils.{PojoTypeInfo, TupleTypeInfo} import org.apache.flink.api.java.{ExecutionEnvironment => JavaBatchExecEnv} import org.apache.flink.table.api.scala.{BatchTableEnvironment => ScalaBatchTableEnv, StreamTableEnvironment => ScalaStreamTableEnv} import org.apache.flink.api.scala.typeutils.CaseClassTypeInfo import org.apache.flink.api.scala.{ExecutionEnvironment => ScalaBatchExecEnv} +import org.apache.flink.table.calcite.{FlinkTypeSystem, FlinkTypeFactory, FlinkRelBuilder} import org.apache.flink.table.codegen.ExpressionReducer import org.apache.flink.table.expressions.{Alias, Expression, UnresolvedFieldReference} import org.apache.flink.table.functions.utils.UserDefinedFunctionUtils.{checkForInstantiation, checkNotSingleton, createTableSqlFunctions, createScalarSqlFunction} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/Types.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/Types.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/Types.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/Types.scala index bfcab7732d902..939cb67b0212a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/Types.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/Types.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.table +package org.apache.flink.table.api import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, SqlTimeTypeInfo} import org.apache.flink.table.typeutils.TimeIntervalTypeInfo diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/table.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/api.scala similarity index 99% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/table.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/api.scala index 4e8a5164775c7..6f564986509d5 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/table.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/api.scala @@ -15,18 +15,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.table +package org.apache.flink.table.api import org.apache.calcite.rel.RelNode import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.operators.join.JoinType +import org.apache.flink.table.calcite.FlinkTypeFactory import org.apache.flink.table.plan.logical.Minus import org.apache.flink.table.expressions.{Alias, Asc, Call, Expression, ExpressionParser, Ordering, TableFunctionCall} import org.apache.flink.table.plan.ProjectionTranslator._ import org.apache.flink.table.plan.logical._ import org.apache.flink.table.sinks.TableSink +import org.apache.flink.table._ -import scala.collection.JavaConverters._ +import _root_.scala.collection.JavaConverters._ /** * A Table is the core component of the Table API. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala index f2e0da563cce9..8039b48e74f14 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala @@ -21,7 +21,9 @@ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.TypeExtractor import org.apache.flink.api.java.{DataSet, ExecutionEnvironment} import org.apache.flink.table.expressions.ExpressionParser -import org.apache.flink.table.{Table, TableConfig} +import org.apache.flink.table.TableConfig +import org.apache.flink.table.api.Table +import org.apache.flink.table.functions.TableFunction /** * The [[org.apache.flink.table.TableEnvironment]] for a Java batch [[DataSet]] diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala index e3c0170786822..7dc662f9eece0 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala @@ -19,7 +19,9 @@ package org.apache.flink.table.api.java import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.TypeExtractor -import org.apache.flink.table.{TableConfig, Table} +import org.apache.flink.table.TableConfig +import org.apache.flink.table.api.Table +import org.apache.flink.table.functions.TableFunction import org.apache.flink.table.expressions.ExpressionParser import org.apache.flink.streaming.api.datastream.DataStream import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/groupWindows.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/groupWindows.scala index 4408a9751a5f0..9c82e9b525333 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/groupWindows.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/java/groupWindows.scala @@ -18,7 +18,7 @@ package org.apache.flink.table.api.java -import org.apache.flink.table.{SessionWindow, SlideWithSize, TumblingWindow} +import org.apache.flink.table.api.{SessionWindow, SlideWithSize, TumblingWindow} /** * Helper class for creating a tumbling window. Tumbling windows are consecutive, non-overlapping diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala index b28f8ef87d5a9..5ff61ef03fe68 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala @@ -19,9 +19,10 @@ package org.apache.flink.table.api.scala import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.scala._ +import org.apache.flink.table.api.Table import org.apache.flink.table.expressions.Expression import org.apache.flink.table.functions.TableFunction -import org.apache.flink.table.{TableConfig, Table} +import org.apache.flink.table.TableConfig import scala.reflect.ClassTag diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataSetConversions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataSetConversions.scala index 969047782173a..519f2b0206f2a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataSetConversions.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataSetConversions.scala @@ -20,6 +20,7 @@ package org.apache.flink.table.api.scala import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.scala._ import org.apache.flink.table._ +import org.apache.flink.table.api.Table import org.apache.flink.table.expressions.Expression /** diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala index 7e81bdfd54844..d469a09b15158 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala @@ -19,6 +19,7 @@ package org.apache.flink.table.api.scala import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.table._ +import org.apache.flink.table.api.Table import org.apache.flink.table.expressions.Expression import org.apache.flink.streaming.api.scala.DataStream diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala index db7789cfae549..4c07b289884e3 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala @@ -18,8 +18,9 @@ package org.apache.flink.table.api.scala import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.table.api.Table import org.apache.flink.table.functions.TableFunction -import org.apache.flink.table.{TableConfig, Table} +import org.apache.flink.table.TableConfig import org.apache.flink.table.expressions.Expression import org.apache.flink.streaming.api.scala.{StreamExecutionEnvironment, DataStream} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala index 37e0ec3ba2efe..f4f798a11d3f7 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala @@ -22,7 +22,8 @@ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.scala._ import org.apache.flink.streaming.api.scala.DataStream -import org.apache.flink.table.{Table, TableException} +import org.apache.flink.table.TableException +import org.apache.flink.table.api.Table import org.apache.flink.table.api.scala.{BatchTableEnvironment => ScalaBatchTableEnv} import org.apache.flink.table.api.scala.{StreamTableEnvironment => ScalaStreamTableEnv} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/groupWindows.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/groupWindows.scala index fe7e0ff7c4fbb..0e4c1c7606da9 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/groupWindows.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/groupWindows.scala @@ -19,7 +19,7 @@ package org.apache.flink.table.api.scala import org.apache.flink.table.expressions.Expression -import org.apache.flink.table.{SessionWindow, SlideWithSize, TumblingWindow} +import org.apache.flink.table.api.{SessionWindow, SlideWithSize, TumblingWindow} /** * Helper object for creating a tumbling window. Tumbling windows are consecutive, non-overlapping diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/package.scala index 68ac58fac41ad..e11298ef869c3 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/package.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/package.scala @@ -18,7 +18,7 @@ package org.apache.flink.table.api import org.apache.flink.api.common.typeutils.CompositeType -import org.apache.flink.table.{Row, Table} +import org.apache.flink.table.Row import _root_.scala.language.implicitConversions import org.apache.flink.api.scala.DataSet import org.apache.flink.streaming.api.scala._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/windows.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/windows.scala similarity index 99% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/windows.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/windows.scala index f772a9074ffbb..ee7fab0bff9be 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/windows.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/windows.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table +package org.apache.flink.table.api import org.apache.flink.table.expressions.{Expression, ExpressionParser} import org.apache.flink.table.plan.logical._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/CalciteConfig.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/CalciteConfig.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/CalciteConfig.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/CalciteConfig.scala index 87bb81fd4f2ca..f646caf8b237d 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/CalciteConfig.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/CalciteConfig.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.table +package org.apache.flink.table.calcite import org.apache.calcite.plan.RelOptRule import org.apache.calcite.sql.SqlOperatorTable import org.apache.calcite.sql.parser.SqlParser import org.apache.calcite.sql.util.ChainedSqlOperatorTable -import org.apache.calcite.tools.{RuleSets, RuleSet} +import org.apache.calcite.tools.{RuleSet, RuleSets} import org.apache.flink.util.Preconditions import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkCalciteSqlValidator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkCalciteSqlValidator.scala similarity index 93% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkCalciteSqlValidator.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkCalciteSqlValidator.scala index 7357203883dcd..b4a3c422c3849 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkCalciteSqlValidator.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkCalciteSqlValidator.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.table +package org.apache.flink.table.calcite import org.apache.calcite.adapter.java.JavaTypeFactory import org.apache.calcite.prepare.CalciteCatalogReader import org.apache.calcite.rel.`type`.RelDataType +import org.apache.calcite.sql.validate.{SqlConformance, SqlValidatorImpl} import org.apache.calcite.sql.{SqlInsert, SqlOperatorTable} -import org.apache.calcite.sql.validate.{SqlValidatorImpl, SqlConformance} /** * This is a copy of Calcite's CalciteSqlValidator to use with [[FlinkPlannerImpl]]. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkPlannerImpl.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkPlannerImpl.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkPlannerImpl.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkPlannerImpl.scala index df96477bf0ce6..777d3e2b47900 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkPlannerImpl.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkPlannerImpl.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table +package org.apache.flink.table.calcite import java.util @@ -34,6 +34,7 @@ import org.apache.calcite.sql.validate.SqlValidator import org.apache.calcite.sql.{SqlNode, SqlOperatorTable} import org.apache.calcite.sql2rel.{RelDecorrelator, SqlRexConvertletTable, SqlToRelConverter} import org.apache.calcite.tools.{FrameworkConfig, RelConversionException} +import org.apache.flink.table.{SqlParserException, TableException, ValidationException} import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkRelBuilder.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkRelBuilder.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkRelBuilder.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkRelBuilder.scala index 5438d52292fe8..8465ec69f4110 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkRelBuilder.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkRelBuilder.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table +package org.apache.flink.table.calcite import java.util.Collections @@ -30,7 +30,7 @@ import org.apache.calcite.rel.logical.LogicalAggregate import org.apache.calcite.rex.RexBuilder import org.apache.calcite.tools.RelBuilder.{AggCall, GroupKey} import org.apache.calcite.tools.{FrameworkConfig, RelBuilder} -import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty +import org.apache.flink.table.calcite.FlinkRelBuilder.NamedWindowProperty import org.apache.flink.table.expressions.WindowProperty import org.apache.flink.table.plan.logical.LogicalWindow import org.apache.flink.table.plan.logical.rel.LogicalWindowAggregate diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeFactory.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkTypeFactory.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeFactory.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkTypeFactory.scala index dae4311ea7d1e..2bc525ec55cfe 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeFactory.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkTypeFactory.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table +package org.apache.flink.table.calcite import org.apache.calcite.avatica.util.TimeUnit import org.apache.calcite.jdbc.JavaTypeFactoryImpl @@ -30,10 +30,12 @@ import org.apache.flink.api.common.typeinfo.{NothingTypeInfo, PrimitiveArrayType import org.apache.flink.api.common.typeutils.CompositeType import org.apache.flink.api.java.typeutils.ObjectArrayTypeInfo import org.apache.flink.api.java.typeutils.ValueTypeInfo._ -import org.apache.flink.table.FlinkTypeFactory.typeInfoToSqlTypeName import org.apache.flink.table.plan.schema.{CompositeRelDataType, GenericRelDataType} import org.apache.flink.table.typeutils.TimeIntervalTypeInfo import org.apache.flink.table.typeutils.TypeCheckUtils.isSimple +import org.apache.flink.table.plan.schema.ArrayRelDataType +import org.apache.flink.table.calcite.FlinkTypeFactory.typeInfoToSqlTypeName +import org.apache.flink.table.TableException import scala.collection.mutable diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeSystem.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkTypeSystem.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeSystem.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkTypeSystem.scala index e3418b068b0d1..59352974ab1bb 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/FlinkTypeSystem.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/calcite/FlinkTypeSystem.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table +package org.apache.flink.table.calcite import org.apache.calcite.rel.`type`.RelDataTypeSystemImpl import org.apache.calcite.sql.`type`.SqlTypeName diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala index f75c6d20ebacc..569d0543b552e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala @@ -31,6 +31,7 @@ import org.apache.flink.api.common.typeinfo.{AtomicType, SqlTimeTypeInfo, TypeIn import org.apache.flink.api.common.typeutils.CompositeType import org.apache.flink.api.java.typeutils.{GenericTypeInfo, PojoTypeInfo, TupleTypeInfo} import org.apache.flink.api.scala.typeutils.CaseClassTypeInfo +import org.apache.flink.table.calcite.FlinkTypeFactory import org.apache.flink.table.codegen.CodeGenUtils._ import org.apache.flink.table.codegen.GeneratedExpression.{NEVER_NULL, NO_CODE} import org.apache.flink.table.codegen.Indenter.toISC @@ -39,7 +40,7 @@ import org.apache.flink.table.codegen.calls.ScalarOperators._ import org.apache.flink.table.functions.UserDefinedFunction import org.apache.flink.table.typeutils.{RowTypeInfo, TypeConverter} import org.apache.flink.table.typeutils.TypeCheckUtils._ -import org.apache.flink.table.{FlinkTypeFactory, TableConfig} +import org.apache.flink.table.TableConfig import scala.collection.JavaConversions._ import scala.collection.mutable diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/ExpressionReducer.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/ExpressionReducer.scala index 6c65d3beacac0..7a429f9bb8ebf 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/ExpressionReducer.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/ExpressionReducer.scala @@ -25,8 +25,9 @@ import org.apache.calcite.rex.{RexBuilder, RexNode} import org.apache.calcite.sql.`type`.SqlTypeName import org.apache.flink.api.common.functions.MapFunction import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} +import org.apache.flink.table.calcite.FlinkTypeFactory import org.apache.flink.table.typeutils.{RowTypeInfo, TypeConverter} -import org.apache.flink.table.{FlinkTypeFactory, Row, TableConfig} +import org.apache.flink.table.{Row, TableConfig} import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/FunctionGenerator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FunctionGenerator.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/FunctionGenerator.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FunctionGenerator.scala index 9b144ba67c8db..dfc90552e2201 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/FunctionGenerator.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FunctionGenerator.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls import java.lang.reflect.Method @@ -28,7 +28,7 @@ import org.apache.calcite.util.BuiltInMethod import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, SqlTimeTypeInfo, TypeInformation} import org.apache.flink.api.java.typeutils.GenericTypeInfo -import org.apache.flink.api.table.functions.utils.{TableSqlFunction, ScalarSqlFunction} +import org.apache.flink.table.functions.utils.{TableSqlFunction, ScalarSqlFunction} import scala.collection.mutable diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/TableFunctionCallGen.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TableFunctionCallGen.scala similarity index 87% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/TableFunctionCallGen.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TableFunctionCallGen.scala index 37e70e48915ba..50c569f0009c6 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/calls/TableFunctionCallGen.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/TableFunctionCallGen.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.codegen.calls +package org.apache.flink.table.codegen.calls import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.codegen.CodeGenUtils._ -import org.apache.flink.api.table.codegen.GeneratedExpression.NEVER_NULL -import org.apache.flink.api.table.codegen.{CodeGenException, CodeGenerator, GeneratedExpression} -import org.apache.flink.api.table.functions.TableFunction -import org.apache.flink.api.table.functions.utils.UserDefinedFunctionUtils._ +import org.apache.flink.table.codegen.CodeGenUtils._ +import org.apache.flink.table.codegen.GeneratedExpression.NEVER_NULL +import org.apache.flink.table.codegen.{CodeGenException, CodeGenerator, GeneratedExpression} +import org.apache.flink.table.functions.TableFunction +import org.apache.flink.table.functions.utils.UserDefinedFunctionUtils._ /** * Generates a call to user-defined [[TableFunction]]. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamSQLExample.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/StreamSQLExample.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamSQLExample.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/StreamSQLExample.scala index 1763ae6f05465..6f7e50ebe5e8d 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamSQLExample.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/StreamSQLExample.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.examples.scala +package org.apache.flink.table.examples.scala import org.apache.flink.api.scala._ import org.apache.flink.table.api.scala._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamTableExample.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/StreamTableExample.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamTableExample.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/StreamTableExample.scala index ef7f1818ea521..6eab12365560a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamTableExample.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/StreamTableExample.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.examples.scala +package org.apache.flink.table.examples.scala import org.apache.flink.api.scala._ import org.apache.flink.table.api.scala._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/TPCHQuery3Table.scala similarity index 99% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/TPCHQuery3Table.scala index 99265d2b220ea..b937d5a3be0d5 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/TPCHQuery3Table.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.examples.scala +package org.apache.flink.table.examples.scala import org.apache.flink.api.scala._ import org.apache.flink.table.api.scala._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountSQL.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/WordCountSQL.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountSQL.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/WordCountSQL.scala index 6b6dd9c02bab2..445818020f786 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountSQL.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/WordCountSQL.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.examples.scala +package org.apache.flink.table.examples.scala import org.apache.flink.api.scala._ import org.apache.flink.table.api.scala._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountTable.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/WordCountTable.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountTable.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/WordCountTable.scala index 3d3d23d59e523..5135de9d5b597 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountTable.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/examples/scala/WordCountTable.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.examples.scala +package org.apache.flink.table.examples.scala import org.apache.flink.api.scala._ import org.apache.flink.table.api.scala._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/Expression.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/Expression.scala index 0d07e55a69c49..14d899daba892 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/Expression.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/Expression.scala @@ -21,7 +21,7 @@ import org.apache.calcite.rex.RexNode import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.table.trees.TreeNode +import org.apache.flink.table.plan.TreeNode import org.apache.flink.table.validate.{ValidationResult, ValidationSuccess} abstract class Expression extends TreeNode[Expression] { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/array.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/array.scala similarity index 96% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/array.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/array.scala index 78084de084201..b087b617bad79 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/array.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/array.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.sql.fun.SqlStdOperatorTable @@ -24,8 +24,8 @@ import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.BasicTypeInfo.INT_TYPE_INFO import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, PrimitiveArrayTypeInfo, TypeInformation} import org.apache.flink.api.java.typeutils.ObjectArrayTypeInfo -import org.apache.flink.api.table.FlinkRelBuilder -import org.apache.flink.api.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} +import org.apache.flink.table.calcite.FlinkRelBuilder +import org.apache.flink.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala index 302918b214359..cae9a5176d1c7 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala @@ -20,11 +20,12 @@ package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.table.calcite.FlinkTypeFactory import org.apache.flink.table.functions.{ScalarFunction, TableFunction} import org.apache.flink.table.functions.utils.UserDefinedFunctionUtils._ import org.apache.flink.table.plan.logical.{LogicalNode, LogicalTableFunctionCall} import org.apache.flink.table.validate.{ValidationFailure, ValidationResult, ValidationSuccess} -import org.apache.flink.table.{FlinkTypeFactory, UnresolvedException, ValidationException} +import org.apache.flink.table.{UnresolvedException, ValidationException} /** * General expression for unresolved function calls. The function can be a built-in diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/cast.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/cast.scala index 651e62368038d..312bf1296b29b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/cast.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/cast.scala @@ -20,7 +20,7 @@ package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.table.FlinkTypeFactory +import org.apache.flink.table.calcite.FlinkTypeFactory import org.apache.flink.table.typeutils.TypeCoercion import org.apache.flink.table.validate._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/literals.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/literals.scala index edabfe60173ab..ccdfc2d053327 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/literals.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/literals.scala @@ -27,7 +27,7 @@ import org.apache.calcite.sql.`type`.SqlTypeName import org.apache.calcite.sql.parser.SqlParserPos import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, SqlTimeTypeInfo, TypeInformation} -import org.apache.flink.table.FlinkTypeFactory +import org.apache.flink.table.calcite.FlinkTypeFactory import org.apache.flink.table.typeutils.{RowIntervalTypeInfo, TimeIntervalTypeInfo} object Literal { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/time.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/time.scala index aa6ef3808f118..f09e2adab5ef3 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/time.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/time.scala @@ -25,7 +25,7 @@ import org.apache.calcite.sql.fun.SqlStdOperatorTable import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.{SqlTimeTypeInfo, TypeInformation} -import org.apache.flink.table.FlinkRelBuilder +import org.apache.flink.table.calcite.FlinkRelBuilder import org.apache.flink.table.expressions.ExpressionUtils.{divide, getFactor, mod} import org.apache.flink.table.expressions.TimeIntervalUnit.TimeIntervalUnit import org.apache.flink.table.typeutils.TypeCheckUtils.isTimeInterval diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/windowProperties.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/windowProperties.scala index 5933885fb3046..990d928f9e180 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/windowProperties.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/windowProperties.scala @@ -21,7 +21,8 @@ package org.apache.flink.table.expressions import org.apache.calcite.rex.RexNode import org.apache.calcite.tools.RelBuilder import org.apache.flink.api.common.typeinfo.SqlTimeTypeInfo -import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty +import org.apache.flink.table.calcite.FlinkRelBuilder +import FlinkRelBuilder.NamedWindowProperty import org.apache.flink.table.validate.{ValidationFailure, ValidationSuccess} abstract class WindowProperty(child: Expression) extends UnaryExpression { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/TableFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/TableFunction.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/TableFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/TableFunction.scala index ca9aaf1df3b50..653793e26c27c 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/TableFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/TableFunction.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.table.functions +package org.apache.flink.table.functions import java.util import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.expressions.{Expression, TableFunctionCall} +import org.apache.flink.table.expressions.{Expression, TableFunctionCall} /** * Base class for a user-defined table function (UDTF). A user-defined table functions works on diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/ScalarSqlFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/ScalarSqlFunction.scala index 3a2089e19b4b1..bd7f4cb4d54b9 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/ScalarSqlFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/ScalarSqlFunction.scala @@ -24,10 +24,11 @@ import org.apache.calcite.sql.`type`.SqlOperandTypeChecker.Consistency import org.apache.calcite.sql.`type`._ import org.apache.calcite.sql.parser.SqlParserPos import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.table.calcite.FlinkTypeFactory import org.apache.flink.table.functions.ScalarFunction import org.apache.flink.table.functions.utils.ScalarSqlFunction.{createOperandTypeChecker, createOperandTypeInference, createReturnTypeInference} import org.apache.flink.table.functions.utils.UserDefinedFunctionUtils.{getResultType, getSignature, getSignatures, signatureToString, signaturesToString} -import org.apache.flink.table.{FlinkTypeFactory, ValidationException} +import org.apache.flink.table.ValidationException import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/TableSqlFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/TableSqlFunction.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/TableSqlFunction.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/TableSqlFunction.scala index 738238dd72a50..74f3374445171 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/functions/utils/TableSqlFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/TableSqlFunction.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.functions.utils +package org.apache.flink.table.functions.utils import com.google.common.base.Predicate import org.apache.calcite.rel.`type`.RelDataType @@ -26,9 +26,9 @@ import org.apache.calcite.sql.parser.SqlParserPos import org.apache.calcite.sql.validate.SqlUserDefinedTableFunction import org.apache.calcite.util.Util import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.functions.TableFunction -import org.apache.flink.api.table.FlinkTypeFactory -import org.apache.flink.api.table.plan.schema.FlinkTableFunctionImpl +import org.apache.flink.table.calcite.FlinkTypeFactory +import org.apache.flink.table.functions.TableFunction +import org.apache.flink.table.plan.schema.FlinkTableFunctionImpl import scala.collection.JavaConverters._ import java.util diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/UserDefinedFunctionUtils.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/UserDefinedFunctionUtils.scala index babaee387f7ba..835e1b54724a9 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/UserDefinedFunctionUtils.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/utils/UserDefinedFunctionUtils.scala @@ -28,7 +28,8 @@ import org.apache.flink.api.common.functions.InvalidTypesException import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation} import org.apache.flink.api.common.typeutils.CompositeType import org.apache.flink.api.java.typeutils.TypeExtractor -import org.apache.flink.table.{FlinkTypeFactory, TableException, ValidationException} +import org.apache.flink.table.calcite.FlinkTypeFactory +import org.apache.flink.table.{TableException, ValidationException} import org.apache.flink.table.functions.{ScalarFunction, TableFunction, UserDefinedFunction} import org.apache.flink.table.plan.schema.FlinkTableFunctionImpl import org.apache.flink.util.InstantiationUtil @@ -167,6 +168,7 @@ object UserDefinedFunctionUtils { /** * Create [[SqlFunction]] for a [[ScalarFunction]] + * * @param name function name * @param function scalar function * @param typeFactory type factory @@ -182,6 +184,7 @@ object UserDefinedFunctionUtils { /** * Create [[SqlFunction]]s for a [[TableFunction]]'s every eval method + * * @param name function name * @param tableFunction table function * @param resultType the type information of returned table diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/package.scala index 6ce6e3cacb4d5..461d6442731eb 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/package.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/package.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api +package org.apache.flink /** * == Table API == @@ -23,7 +23,7 @@ package org.apache.flink.api * This package contains the generic part of the Table API. It can be used with Flink Streaming * and Flink Batch. From Scala as well as from Java. * - * When using the Table API, as user creates a [[org.apache.flink.table.Table]] from + * When using the Table API, as user creates a [[org.apache.flink.table.api.Table]] from * a DataSet or DataStream. On this relational operations can be performed. A table can also * be converted back to a DataSet or DataStream. * diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/trees/TreeNode.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/TreeNode.scala similarity index 99% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/table/trees/TreeNode.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/TreeNode.scala index 53776ec2d8a92..fdf45e79af51d 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/trees/TreeNode.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/TreeNode.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.table.trees +package org.apache.flink.table.plan import org.apache.commons.lang.ClassUtils diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalNode.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalNode.scala index 0a98cd79bc5e8..6126eba424c9b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalNode.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/LogicalNode.scala @@ -19,9 +19,9 @@ package org.apache.flink.table.plan.logical import org.apache.calcite.rel.RelNode import org.apache.calcite.tools.RelBuilder +import org.apache.flink.table.plan.TreeNode import org.apache.flink.table.{TableEnvironment, ValidationException} import org.apache.flink.table.expressions._ -import org.apache.flink.table.trees.TreeNode import org.apache.flink.table.typeutils.TypeCoercion import org.apache.flink.table.validate._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/operators.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/operators.scala index fad62a333b307..2d00deae9f8e1 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/operators.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/operators.scala @@ -30,6 +30,7 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.operators.join.JoinType import org.apache.flink.table._ +import org.apache.flink.table.calcite.{FlinkTypeFactory, FlinkRelBuilder} import org.apache.flink.table.expressions._ import org.apache.flink.table.functions.TableFunction import org.apache.flink.table.functions.utils.TableSqlFunction diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalWindowAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalWindowAggregate.scala index b6ea3ea368ebb..d0d9af4343874 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalWindowAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/logical/rel/LogicalWindowAggregate.scala @@ -25,8 +25,8 @@ import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rel.core.{Aggregate, AggregateCall} import org.apache.calcite.rel.{RelNode, RelShuttle} import org.apache.calcite.util.ImmutableBitSet -import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty -import org.apache.flink.table.FlinkTypeFactory +import org.apache.flink.table.calcite.{FlinkTypeFactory, FlinkRelBuilder} +import FlinkRelBuilder.NamedWindowProperty import org.apache.flink.table.plan.logical.LogicalWindow class LogicalWindowAggregate( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkAggregate.scala index b55fdafeb3569..729059495ff04 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkAggregate.scala @@ -20,7 +20,8 @@ package org.apache.flink.table.plan.nodes import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rel.core.AggregateCall -import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty +import org.apache.flink.table.calcite.FlinkRelBuilder +import FlinkRelBuilder.NamedWindowProperty import org.apache.flink.table.runtime.aggregate.AggregateUtil._ import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkCorrelate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkCorrelate.scala similarity index 90% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkCorrelate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkCorrelate.scala index c058265473291..979c67a9178ad 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/FlinkCorrelate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkCorrelate.scala @@ -15,20 +15,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes +package org.apache.flink.table.plan.nodes import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rex.{RexCall, RexNode} import org.apache.calcite.sql.SemiJoinType import org.apache.flink.api.common.functions.FlatMapFunction import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.codegen.{CodeGenerator, GeneratedExpression, GeneratedFunction} -import org.apache.flink.api.table.codegen.CodeGenUtils.primitiveDefaultValue -import org.apache.flink.api.table.codegen.GeneratedExpression.{ALWAYS_NULL, NO_CODE} -import org.apache.flink.api.table.functions.utils.TableSqlFunction -import org.apache.flink.api.table.runtime.FlatMapRunner -import org.apache.flink.api.table.typeutils.TypeConverter._ -import org.apache.flink.api.table.{TableConfig, TableException} +import org.apache.flink.table.codegen.{CodeGenerator, GeneratedExpression, GeneratedFunction} +import org.apache.flink.table.codegen.CodeGenUtils.primitiveDefaultValue +import org.apache.flink.table.codegen.GeneratedExpression.{ALWAYS_NULL, NO_CODE} +import org.apache.flink.table.functions.utils.TableSqlFunction +import org.apache.flink.table.runtime.FlatMapRunner +import org.apache.flink.table.typeutils.TypeConverter._ +import org.apache.flink.table.{TableConfig, TableException} import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchTableSourceScan.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchTableSourceScan.scala index 17ad143284eec..3db11d3bb97a3 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchTableSourceScan.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/BatchTableSourceScan.scala @@ -23,7 +23,8 @@ import org.apache.calcite.rel.metadata.RelMetadataQuery import org.apache.calcite.rel.{RelNode, RelWriter} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.table.{BatchTableEnvironment, FlinkTypeFactory} +import org.apache.flink.table.BatchTableEnvironment +import org.apache.flink.table.calcite.FlinkTypeFactory import org.apache.flink.table.plan.schema.TableSourceTable import org.apache.flink.table.sources.BatchTableSource diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetAggregate.scala index d8edd87ebf901..5b4672dbb965a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetAggregate.scala @@ -25,11 +25,12 @@ import org.apache.calcite.rel.metadata.RelMetadataQuery import org.apache.calcite.rel.{RelNode, RelWriter, SingleRel} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet +import org.apache.flink.table.calcite.FlinkTypeFactory import org.apache.flink.table.plan.nodes.FlinkAggregate import org.apache.flink.table.runtime.aggregate.AggregateUtil import org.apache.flink.table.runtime.aggregate.AggregateUtil.CalcitePair import org.apache.flink.table.typeutils.{RowTypeInfo, TypeConverter} -import org.apache.flink.table.{BatchTableEnvironment, FlinkTypeFactory, Row} +import org.apache.flink.table.{BatchTableEnvironment, Row} import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetCorrelate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCorrelate.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetCorrelate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCorrelate.scala index 95eb15b231e44..e9e4048e6a70a 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/dataset/DataSetCorrelate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/dataset/DataSetCorrelate.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.dataset +package org.apache.flink.table.plan.nodes.dataset import org.apache.calcite.plan.{RelOptCluster, RelOptCost, RelOptPlanner, RelTraitSet} import org.apache.calcite.rel.`type`.RelDataType @@ -27,11 +27,11 @@ import org.apache.calcite.sql.SemiJoinType import org.apache.flink.api.common.functions.FlatMapFunction import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.DataSet -import org.apache.flink.api.table.BatchTableEnvironment -import org.apache.flink.api.table.codegen.CodeGenerator -import org.apache.flink.api.table.functions.utils.TableSqlFunction -import org.apache.flink.api.table.plan.nodes.FlinkCorrelate -import org.apache.flink.api.table.typeutils.TypeConverter._ +import org.apache.flink.table.BatchTableEnvironment +import org.apache.flink.table.codegen.CodeGenerator +import org.apache.flink.table.functions.utils.TableSqlFunction +import org.apache.flink.table.plan.nodes.FlinkCorrelate +import org.apache.flink.table.typeutils.TypeConverter._ /** * Flink RelNode which matches along with join a user defined table function. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamAggregate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamAggregate.scala index dc1cb875a3f80..eae3927327eb3 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamAggregate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamAggregate.scala @@ -24,7 +24,8 @@ import org.apache.calcite.rel.core.AggregateCall import org.apache.calcite.rel.{RelNode, RelWriter, SingleRel} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.tuple.Tuple -import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty +import org.apache.flink.table.calcite.{FlinkTypeFactory, FlinkRelBuilder} +import FlinkRelBuilder.NamedWindowProperty import org.apache.flink.table.expressions._ import org.apache.flink.table.plan.logical._ import org.apache.flink.table.plan.nodes.FlinkAggregate @@ -33,7 +34,7 @@ import org.apache.flink.table.runtime.aggregate.AggregateUtil._ import org.apache.flink.table.runtime.aggregate.{Aggregate, _} import org.apache.flink.table.typeutils.TypeCheckUtils.isTimeInterval import org.apache.flink.table.typeutils.{RowIntervalTypeInfo, RowTypeInfo, TimeIntervalTypeInfo, TypeConverter} -import org.apache.flink.table.{FlinkTypeFactory, Row, StreamTableEnvironment} +import org.apache.flink.table.{Row, StreamTableEnvironment} import org.apache.flink.streaming.api.datastream.{AllWindowedStream, DataStream, KeyedStream, WindowedStream} import org.apache.flink.streaming.api.windowing.assigners._ import org.apache.flink.streaming.api.windowing.time.Time diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamCorrelate.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCorrelate.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamCorrelate.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCorrelate.scala index 3bfa6e24cc891..81a5f865c9934 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/nodes/datastream/DataStreamCorrelate.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/DataStreamCorrelate.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.plan.nodes.datastream +package org.apache.flink.table.plan.nodes.datastream import org.apache.calcite.plan.{RelOptCluster, RelTraitSet} import org.apache.calcite.rel.`type`.RelDataType @@ -25,11 +25,11 @@ import org.apache.calcite.rex.{RexCall, RexNode} import org.apache.calcite.sql.SemiJoinType import org.apache.flink.api.common.functions.FlatMapFunction import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.table.StreamTableEnvironment -import org.apache.flink.api.table.codegen.CodeGenerator -import org.apache.flink.api.table.functions.utils.TableSqlFunction -import org.apache.flink.api.table.plan.nodes.FlinkCorrelate -import org.apache.flink.api.table.typeutils.TypeConverter._ +import org.apache.flink.table.StreamTableEnvironment +import org.apache.flink.table.codegen.CodeGenerator +import org.apache.flink.table.functions.utils.TableSqlFunction +import org.apache.flink.table.plan.nodes.FlinkCorrelate +import org.apache.flink.table.typeutils.TypeConverter._ import org.apache.flink.streaming.api.datastream.DataStream /** diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamTableSourceScan.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamTableSourceScan.scala index 01f3c9b95ff83..688805e3332bb 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamTableSourceScan.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/datastream/StreamTableSourceScan.scala @@ -21,9 +21,10 @@ package org.apache.flink.table.plan.nodes.datastream import org.apache.calcite.plan._ import org.apache.calcite.rel.RelNode import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.table.calcite.FlinkTypeFactory import org.apache.flink.table.plan.schema.TableSourceTable import org.apache.flink.table.sources.StreamTableSource -import org.apache.flink.table.{FlinkTypeFactory, StreamTableEnvironment} +import org.apache.flink.table.StreamTableEnvironment import org.apache.flink.streaming.api.datastream.DataStream /** Flink RelNode to read data from an external source defined by a [[StreamTableSource]]. */ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetCorrelateRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCorrelateRule.scala similarity index 95% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetCorrelateRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCorrelateRule.scala index 39756bef11230..819bcae1ba332 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/DataSetCorrelateRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/DataSetCorrelateRule.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.volcano.RelSubset import org.apache.calcite.plan.{Convention, RelOptRule, RelOptRuleCall, RelTraitSet} @@ -23,7 +23,7 @@ import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.{LogicalFilter, LogicalCorrelate, LogicalTableFunctionScan} import org.apache.calcite.rex.RexNode -import org.apache.flink.api.table.plan.nodes.dataset.{DataSetConvention, DataSetCorrelate} +import org.apache.flink.table.plan.nodes.dataset.{DataSetConvention, DataSetCorrelate} /** * Rule to convert a LogicalCorrelate into a DataSetCorrelate. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/PushProjectIntoBatchTableSourceScanRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/PushProjectIntoBatchTableSourceScanRule.scala similarity index 90% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/PushProjectIntoBatchTableSourceScanRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/PushProjectIntoBatchTableSourceScanRule.scala index 301a45b2eb118..5d91c62e3f69e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/dataSet/PushProjectIntoBatchTableSourceScanRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/dataSet/PushProjectIntoBatchTableSourceScanRule.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.dataSet +package org.apache.flink.table.plan.rules.dataSet import org.apache.calcite.plan.{RelOptRule, RelOptRuleCall} import org.apache.calcite.plan.RelOptRule.{none, operand} -import org.apache.flink.api.table.plan.nodes.dataset.{BatchTableSourceScan, DataSetCalc} -import org.apache.flink.api.table.plan.rules.util.RexProgramProjectExtractor._ -import org.apache.flink.api.table.sources.{BatchTableSource, ProjectableTableSource} +import org.apache.flink.table.plan.nodes.dataset.{BatchTableSourceScan, DataSetCalc} +import org.apache.flink.table.plan.rules.util.RexProgramProjectExtractor._ +import org.apache.flink.table.sources.{BatchTableSource, ProjectableTableSource} /** * This rule tries to push projections into a BatchTableSourceScan. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamCorrelateRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCorrelateRule.scala similarity index 94% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamCorrelateRule.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCorrelateRule.scala index 554c6c163396a..adce9f4516c98 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/datastream/DataStreamCorrelateRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamCorrelateRule.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.datastream +package org.apache.flink.table.plan.rules.datastream import org.apache.calcite.plan.volcano.RelSubset import org.apache.calcite.plan.{Convention, RelOptRule, RelOptRuleCall, RelTraitSet} @@ -23,7 +23,8 @@ import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.{LogicalFilter, LogicalCorrelate, LogicalTableFunctionScan} import org.apache.calcite.rex.RexNode -import org.apache.flink.api.table.plan.nodes.datastream.{DataStreamCorrelate, DataStreamConvention} +import org.apache.flink.table.plan.nodes.datastream.DataStreamConvention +import org.apache.flink.table.plan.nodes.datastream.DataStreamCorrelate /** * Rule to convert a LogicalCorrelate into a DataStreamCorrelate. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/util/RexProgramProjectExtractor.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/util/RexProgramProjectExtractor.scala similarity index 98% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/util/RexProgramProjectExtractor.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/util/RexProgramProjectExtractor.scala index d78e07fe475de..129cfd13b1ba8 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/rules/util/RexProgramProjectExtractor.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/util/RexProgramProjectExtractor.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.util +package org.apache.flink.table.plan.rules.util import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rex._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/ArrayRelDataType.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/ArrayRelDataType.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/ArrayRelDataType.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/ArrayRelDataType.scala index 92fcb83000900..f7d9e1d4d8657 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/ArrayRelDataType.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/ArrayRelDataType.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.schema +package org.apache.flink.table.plan.schema import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.sql.`type`.ArraySqlType diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/CompositeRelDataType.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/CompositeRelDataType.scala index 27eca2914502a..92f9199b0f831 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/CompositeRelDataType.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/CompositeRelDataType.scala @@ -22,7 +22,7 @@ import java.util import org.apache.calcite.rel.`type`.{RelDataTypeField, RelDataTypeFieldImpl, RelRecordType} import org.apache.flink.api.common.typeutils.CompositeType -import org.apache.flink.table.FlinkTypeFactory +import org.apache.flink.table.calcite.FlinkTypeFactory import org.apache.flink.table.plan.schema.CompositeRelDataType.createFieldList import scala.collection.JavaConverters._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTable.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTable.scala index b14df9972f55b..aab9c2ddeea7e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTable.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTable.scala @@ -22,7 +22,8 @@ import org.apache.calcite.rel.`type`.{RelDataType, RelDataTypeFactory} import org.apache.calcite.schema.impl.AbstractTable import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation} import org.apache.flink.api.common.typeutils.CompositeType -import org.apache.flink.table.{FlinkTypeFactory, TableException} +import org.apache.flink.table.TableException +import org.apache.flink.table.calcite.FlinkTypeFactory abstract class FlinkTable[T]( val typeInfo: TypeInformation[T], diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/FlinkTableFunctionImpl.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTableFunctionImpl.scala similarity index 92% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/FlinkTableFunctionImpl.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTableFunctionImpl.scala index 540a5c8382706..5b1c9ecfd57e2 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/schema/FlinkTableFunctionImpl.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/FlinkTableFunctionImpl.scala @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.plan.schema +package org.apache.flink.table.plan.schema import java.lang.reflect.{Method, Type} import java.util @@ -25,11 +25,12 @@ import org.apache.calcite.schema.TableFunction import org.apache.calcite.schema.impl.ReflectiveFunctionBase import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation} import org.apache.flink.api.common.typeutils.CompositeType -import org.apache.flink.api.table.{FlinkTypeFactory, TableException} +import org.apache.flink.table.TableException +import org.apache.flink.table.calcite.FlinkTypeFactory /** * This is heavily inspired by Calcite's [[org.apache.calcite.schema.impl.TableFunctionImpl]]. - * We need it in order to create a [[org.apache.flink.api.table.functions.utils.TableSqlFunction]]. + * We need it in order to create a [[org.apache.flink.table.functions.utils.TableSqlFunction]]. * The main difference is that we override the [[getRowType()]] and [[getElementType()]]. */ class FlinkTableFunctionImpl[T]( diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/GenericRelDataType.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/GenericRelDataType.scala index 9ca6162231d32..d93908b4ff6e2 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/GenericRelDataType.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/schema/GenericRelDataType.scala @@ -20,7 +20,7 @@ package org.apache.flink.table.plan.schema import org.apache.calcite.sql.`type`.{BasicSqlType, SqlTypeName} import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.table.FlinkTypeSystem +import org.apache.flink.table.calcite.FlinkTypeSystem /** * Generic type for encapsulating Flink's [[TypeInformation]]. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala index 589fbdf3247dd..695967503b72e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/AggregateUtil.scala @@ -28,12 +28,13 @@ import org.apache.calcite.sql.fun._ import org.apache.flink.api.common.functions.{MapFunction, RichGroupReduceFunction} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.tuple.Tuple -import org.apache.flink.table.FlinkRelBuilder.NamedWindowProperty +import org.apache.flink.table.calcite.{FlinkTypeFactory, FlinkRelBuilder} +import FlinkRelBuilder.NamedWindowProperty import org.apache.flink.table.expressions.{WindowEnd, WindowStart} import org.apache.flink.table.plan.logical._ import org.apache.flink.table.typeutils.RowTypeInfo import org.apache.flink.table.typeutils.TypeCheckUtils._ -import org.apache.flink.table.{FlinkTypeFactory, Row, TableException} +import org.apache.flink.table.{Row, TableException} import org.apache.flink.streaming.api.functions.windowing.{AllWindowFunction, WindowFunction} import org.apache.flink.streaming.api.windowing.windows.{Window => DataStreamWindow} import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/BatchTableSink.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/BatchTableSink.scala index f47f77557a96c..edfe11350f244 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/BatchTableSink.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/BatchTableSink.scala @@ -19,8 +19,9 @@ package org.apache.flink.table.sinks import org.apache.flink.api.java.DataSet +import org.apache.flink.table.api.Table -/** Defines an external [[TableSink]] to emit a batch [[org.apache.flink.table.Table]]. +/** Defines an external [[TableSink]] to emit a batch [[Table]]. * * @tparam T Type of [[DataSet]] that this [[TableSink]] expects and supports. */ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/StreamTableSink.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/StreamTableSink.scala index cec7a3acb6fd8..360252e619a55 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/StreamTableSink.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/StreamTableSink.scala @@ -19,8 +19,9 @@ package org.apache.flink.table.sinks import org.apache.flink.streaming.api.datastream.DataStream +import org.apache.flink.table.api.Table -/** Defines an external [[TableSink]] to emit a batch [[org.apache.flink.table.Table]]. +/** Defines an external [[TableSink]] to emit a batch [[Table]]. * * @tparam T Type of [[DataStream]] that this [[TableSink]] expects and supports. */ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSink.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSink.scala index f8b85d75d02fa..8304867fe18aa 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSink.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSink.scala @@ -19,8 +19,9 @@ package org.apache.flink.table.sinks import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.table.api.Table -/** A [[TableSink]] specifies how to emit a [[org.apache.flink.table.Table]] to an external +/** A [[TableSink]] specifies how to emit a [[Table]] to an external * system or location. * * The interface is generic such that it can support different storage locations and formats. @@ -46,12 +47,12 @@ trait TableSink[T] { /** * Return a copy of this [[TableSink]] configured with the field names and types of the - * [[org.apache.flink.table.Table]] to emit. + * [[Table]] to emit. * * @param fieldNames The field names of the table to emit. * @param fieldTypes The field types of the table to emit. * @return A copy of this [[TableSink]] configured with the field names and types of the - * [[org.apache.flink.table.Table]] to emit. + * [[Table]] to emit. */ def configure(fieldNames: Array[String], fieldTypes: Array[TypeInformation[_]]): TableSink[T] diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSinkBase.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSinkBase.scala index a0585e5b61390..45866ca4f8c61 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSinkBase.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sinks/TableSinkBase.scala @@ -18,6 +18,7 @@ package org.apache.flink.table.sinks import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.table.api.Table trait TableSinkBase[T] extends TableSink[T] { @@ -28,7 +29,7 @@ trait TableSinkBase[T] extends TableSink[T] { protected def copy: TableSinkBase[T] /** - * Return the field names of the [[org.apache.flink.table.Table]] to emit. */ + * Return the field names of the [[Table]] to emit. */ def getFieldNames: Array[String] = { fieldNames match { case Some(n) => n @@ -37,7 +38,7 @@ trait TableSinkBase[T] extends TableSink[T] { } } - /** Return the field types of the [[org.apache.flink.table.Table]] to emit. */ + /** Return the field types of the [[Table]] to emit. */ def getFieldTypes: Array[TypeInformation[_]] = { fieldTypes match { case Some(t) => t @@ -48,12 +49,12 @@ trait TableSinkBase[T] extends TableSink[T] { /** * Return a copy of this [[TableSink]] configured with the field names and types of the - * [[org.apache.flink.table.Table]] to emit. + * [[Table]] to emit. * * @param fieldNames The field names of the table to emit. * @param fieldTypes The field types of the table to emit. * @return A copy of this [[TableSink]] configured with the field names and types of the - * [[org.apache.flink.table.Table]] to emit. + * [[Table]] to emit. */ final def configure(fieldNames: Array[String], fieldTypes: Array[TypeInformation[_]]): TableSink[T] = { diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/ProjectableTableSource.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/ProjectableTableSource.scala similarity index 97% rename from flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/ProjectableTableSource.scala rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/ProjectableTableSource.scala index c04138ab8db1f..429cccb7e23de 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/sources/ProjectableTableSource.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/sources/ProjectableTableSource.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.sources +package org.apache.flink.table.sources /** * Adds support for projection push-down to a [[TableSource]]. diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeConverter.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeConverter.scala index 1235bcb25f035..7227f5cc26eb2 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeConverter.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/typeutils/TypeConverter.scala @@ -26,7 +26,8 @@ import org.apache.flink.api.common.typeutils.CompositeType import org.apache.flink.api.java.operators.join.JoinType import org.apache.flink.api.java.tuple.Tuple import org.apache.flink.api.java.typeutils.{PojoTypeInfo, TupleTypeInfo} -import org.apache.flink.table.{FlinkTypeFactory, Row, TableException} +import org.apache.flink.table.calcite.FlinkTypeFactory +import org.apache.flink.table.{Row, TableException} import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/ExplainTest.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/ExplainTest.java index 3cbae61e19685..0cf378e6f2c8f 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/ExplainTest.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/ExplainTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.table.api.java.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.table.Table; +import org.apache.flink.table.api.Table; import org.apache.flink.table.TableEnvironment; import org.apache.flink.test.util.MultipleProgramsTestBase; import org.junit.Test; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java index df32141c9d08c..90c6728364073 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java @@ -34,10 +34,10 @@ import org.apache.flink.api.java.tuple.Tuple5; import org.apache.flink.api.java.typeutils.TupleTypeInfo; import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; -import org.apache.flink.table.CalciteConfig; -import org.apache.flink.table.CalciteConfigBuilder; +import org.apache.flink.table.calcite.CalciteConfig; +import org.apache.flink.table.calcite.CalciteConfigBuilder; import org.apache.flink.table.Row; -import org.apache.flink.table.Table; +import org.apache.flink.table.api.Table; import org.apache.flink.table.TableEnvironment; import org.apache.flink.table.TableException; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableSourceITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableSourceITCase.java index 8d7850bc48808..030c2171b71b7 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableSourceITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableSourceITCase.java @@ -26,7 +26,7 @@ import org.apache.flink.table.api.scala.batch.GeneratingInputFormat; import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.table.Row; -import org.apache.flink.table.Table; +import org.apache.flink.table.api.Table; import org.apache.flink.table.TableEnvironment; import org.apache.flink.table.sources.BatchTableSource; import org.apache.flink.table.typeutils.RowTypeInfo; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/sql/SqlITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/sql/SqlITCase.java index a31d2bc29e67d..09ef3a2b8209d 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/sql/SqlITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/sql/SqlITCase.java @@ -25,7 +25,7 @@ import org.apache.flink.api.java.tuple.Tuple5; import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.table.Row; -import org.apache.flink.table.Table; +import org.apache.flink.table.api.Table; import org.apache.flink.table.TableEnvironment; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/AggregationsITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/AggregationsITCase.java index f8c77bef4d8f8..4d72446d8c1c0 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/AggregationsITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/AggregationsITCase.java @@ -31,10 +31,10 @@ import org.apache.flink.api.java.tuple.Tuple7; import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.table.Row; -import org.apache.flink.table.Table; +import org.apache.flink.table.api.Table; import org.apache.flink.table.TableEnvironment; import org.apache.flink.table.ValidationException; -import org.apache.flink.examples.java.WordCountTable.WC; +import org.apache.flink.table.examples.java.WordCountTable.WC; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CalcITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CalcITCase.java index aced56ecbb7b9..8d1111b7d2afc 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CalcITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CalcITCase.java @@ -22,7 +22,7 @@ import java.util.Collection; import org.apache.flink.api.java.operators.DataSource; import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; -import org.apache.flink.table.Table; +import org.apache.flink.table.api.Table; import org.apache.flink.table.Row; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CastingITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CastingITCase.java index 866c920c0c22f..7a061c0090dd3 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CastingITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/CastingITCase.java @@ -29,7 +29,7 @@ import org.apache.flink.api.java.tuple.Tuple8; import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.table.Row; -import org.apache.flink.table.Table; +import org.apache.flink.table.api.Table; import org.apache.flink.table.TableEnvironment; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/JoinITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/JoinITCase.java index 5b98fa27ffccb..b3564bb0e20d7 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/JoinITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/table/JoinITCase.java @@ -26,7 +26,7 @@ import org.apache.flink.api.java.tuple.Tuple5; import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.table.Row; -import org.apache.flink.table.Table; +import org.apache.flink.table.api.Table; import org.apache.flink.table.TableEnvironment; import org.apache.flink.table.ValidationException; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/stream/sql/SqlITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/stream/sql/SqlITCase.java index 57cd33a7e21c6..5f666b64238f6 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/stream/sql/SqlITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/stream/sql/SqlITCase.java @@ -23,7 +23,7 @@ import org.apache.flink.api.java.tuple.Tuple5; import org.apache.flink.table.api.scala.stream.utils.StreamITCase; import org.apache.flink.table.Row; -import org.apache.flink.table.Table; +import org.apache.flink.table.api.Table; import org.apache.flink.table.TableEnvironment; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/CalciteConfigBuilderTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/CalciteConfigBuilderTest.scala index c178632ebf446..09a4c4e9b5334 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/CalciteConfigBuilderTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/CalciteConfigBuilderTest.scala @@ -21,6 +21,7 @@ package org.apache.flink.table import org.apache.calcite.rel.rules.{CalcSplitRule, CalcMergeRule, FilterMergeRule} import org.apache.calcite.sql.fun.{SqlStdOperatorTable, OracleSqlOperatorTable} import org.apache.calcite.tools.RuleSets +import org.apache.flink.table.calcite.{CalciteConfigBuilder, CalciteConfig} import org.junit.Test import org.junit.Assert._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/ExpressionReductionTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/ExpressionReductionTest.scala index 211d3d2f32600..b66024345d674 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/ExpressionReductionTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/ExpressionReductionTest.scala @@ -18,6 +18,7 @@ package org.apache.flink.table import org.apache.flink.api.scala._ +import org.apache.flink.table.api.Types import org.apache.flink.table.api.scala._ import org.apache.flink.table.utils.TableTestBase import org.apache.flink.table.utils.TableTestUtil._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/TableEnvironmentTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/TableEnvironmentTest.scala index 9e448141db5ba..c9b96dd4c14fa 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/TableEnvironmentTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/TableEnvironmentTest.scala @@ -23,6 +23,7 @@ import org.apache.flink.api.scala._ import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.{TupleTypeInfo, TypeExtractor} +import org.apache.flink.table.api.Table import org.apache.flink.table.expressions.{Alias, UnresolvedFieldReference} import org.apache.flink.table.sinks.TableSink import org.junit.Test diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/ProjectableTableSourceITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/ProjectableTableSourceITCase.scala similarity index 91% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/ProjectableTableSourceITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/ProjectableTableSourceITCase.scala index 42b9de0ff3294..0b7999ddbf36d 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/ProjectableTableSourceITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/ProjectableTableSourceITCase.scala @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch +package org.apache.flink.table.api.scala.batch import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} import org.apache.flink.api.java.{DataSet => JavaSet, ExecutionEnvironment => JavaExecEnv} import org.apache.flink.api.scala.ExecutionEnvironment -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.sources.{BatchTableSource, ProjectableTableSource} -import org.apache.flink.api.table.typeutils.RowTypeInfo -import org.apache.flink.api.table.{Row, TableEnvironment} +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.sources.{BatchTableSource, ProjectableTableSource} +import org.apache.flink.table.typeutils.RowTypeInfo +import org.apache.flink.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit.{Before, Test} diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/UserDefinedTableFunctionTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/UserDefinedTableFunctionTest.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/UserDefinedTableFunctionTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/UserDefinedTableFunctionTest.scala index 245f117757432..e091da243f645 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/UserDefinedTableFunctionTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/sql/UserDefinedTableFunctionTest.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.scala.batch.sql +package org.apache.flink.table.api.scala.batch.sql import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.utils.{HierarchyTableFunction, PojoTableFunc, TableFunc2} -import org.apache.flink.api.table.utils._ -import org.apache.flink.api.table.utils.TableTestUtil._ +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.utils.{HierarchyTableFunction, PojoTableFunc, TableFunc2} +import org.apache.flink.table.utils._ +import org.apache.flink.table.utils.TableTestUtil._ import org.junit.Test class UserDefinedTableFunctionTest extends TableTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/AggregationsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/AggregationsITCase.scala index 2b33dc1ac6f66..474078f0fd009 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/AggregationsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/AggregationsITCase.scala @@ -24,7 +24,7 @@ import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableC import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.util.CollectionDataSets import org.apache.flink.table.{Row, TableEnvironment, ValidationException} -import org.apache.flink.examples.scala.WordCountTable.{WC => MyWC} +import org.apache.flink.table.examples.scala.WordCountTable.{WC => MyWC} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/UserDefinedTableFunctionTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/UserDefinedTableFunctionTest.scala similarity index 94% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/UserDefinedTableFunctionTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/UserDefinedTableFunctionTest.scala index 7e170d428a322..ba78d7fb31d03 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/UserDefinedTableFunctionTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/table/UserDefinedTableFunctionTest.scala @@ -15,16 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.scala.batch.table +package org.apache.flink.table.api.scala.batch.table import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.{DataSet => JDataSet, ExecutionEnvironment => JavaExecutionEnv} -import org.apache.flink.api.scala.table._ +import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.{DataSet, ExecutionEnvironment => ScalaExecutionEnv, _} -import org.apache.flink.api.table.typeutils.RowTypeInfo -import org.apache.flink.api.table.utils.TableTestUtil._ -import org.apache.flink.api.table.utils.{PojoTableFunc, TableFunc2, _} -import org.apache.flink.api.table.{Row, TableEnvironment, Types} +import org.apache.flink.table.typeutils.RowTypeInfo +import org.apache.flink.table.utils.TableTestUtil._ +import org.apache.flink.table.utils.{PojoTableFunc, TableFunc2, _} +import org.apache.flink.table.{Row, TableEnvironment} +import org.apache.flink.table.api.Types import org.junit.Test import org.mockito.Mockito._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/sql/UserDefinedTableFunctionTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/sql/UserDefinedTableFunctionTest.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/sql/UserDefinedTableFunctionTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/sql/UserDefinedTableFunctionTest.scala index 21629e4d653f0..58eedd0c041a2 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/sql/UserDefinedTableFunctionTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/sql/UserDefinedTableFunctionTest.scala @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.scala.stream.sql +package org.apache.flink.table.api.scala.stream.sql import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.utils.{HierarchyTableFunction, PojoTableFunc, TableFunc2} -import org.apache.flink.api.table.utils._ -import org.apache.flink.api.table.utils.TableTestUtil._ +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.utils.{HierarchyTableFunction, PojoTableFunc, TableFunc2} +import org.apache.flink.table.utils._ +import org.apache.flink.table.utils.TableTestUtil._ import org.junit.Test class UserDefinedTableFunctionTest extends TableTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UserDefinedTableFunctionTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/UserDefinedTableFunctionTest.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UserDefinedTableFunctionTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/UserDefinedTableFunctionTest.scala index b45ae8e436ee3..72cffa3cb52b5 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UserDefinedTableFunctionTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/stream/table/UserDefinedTableFunctionTest.scala @@ -15,16 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.scala.stream.table +package org.apache.flink.table.api.scala.stream.table import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table._ -import org.apache.flink.api.table.expressions.utils._ -import org.apache.flink.api.table.typeutils.RowTypeInfo -import org.apache.flink.api.table.utils.TableTestUtil._ -import org.apache.flink.api.table.utils._ +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.api.Types +import org.apache.flink.table._ +import org.apache.flink.table.expressions.utils._ +import org.apache.flink.table.typeutils.RowTypeInfo +import org.apache.flink.table.utils.TableTestUtil._ +import org.apache.flink.table.utils._ import org.apache.flink.streaming.api.datastream.{DataStream => JDataStream} import org.apache.flink.streaming.api.environment.{StreamExecutionEnvironment => JavaExecutionEnv} import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment => ScalaExecutionEnv} diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/ArrayTypeTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ArrayTypeTest.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/ArrayTypeTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ArrayTypeTest.scala index 034ce0ba191e5..735dcd76659ff 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/expressions/ArrayTypeTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ArrayTypeTest.scala @@ -16,16 +16,17 @@ * limitations under the License. */ -package org.apache.flink.api.table.expressions +package org.apache.flink.table.expressions import java.sql.Date import org.apache.flink.api.common.typeinfo.{PrimitiveArrayTypeInfo, TypeInformation} import org.apache.flink.api.java.typeutils.ObjectArrayTypeInfo -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.expressions.utils.ExpressionTestBase -import org.apache.flink.api.table.typeutils.RowTypeInfo -import org.apache.flink.api.table.{Row, Types, ValidationException} +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.expressions.utils.ExpressionTestBase +import org.apache.flink.table.typeutils.RowTypeInfo +import org.apache.flink.table.{Row, ValidationException} +import org.apache.flink.table.api.Types import org.junit.Test class ArrayTypeTest extends ExpressionTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/CompositeAccessTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/CompositeAccessTest.scala index 9b06d8a16087d..a9ad83ffcedb2 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/CompositeAccessTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/CompositeAccessTest.scala @@ -21,8 +21,9 @@ package org.apache.flink.table.expressions import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.{TupleTypeInfo, TypeExtractor} import org.apache.flink.api.scala.createTypeInformation +import org.apache.flink.table.api.Types import org.apache.flink.table.api.scala._ -import org.apache.flink.table.{Row, Types, ValidationException} +import org.apache.flink.table.{Row, ValidationException} import org.apache.flink.table.expressions.CompositeAccessTest.{MyCaseClass, MyCaseClass2, MyPojo} import org.apache.flink.table.expressions.utils.ExpressionTestBase import org.apache.flink.table.typeutils.RowTypeInfo diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/DecimalTypeTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/DecimalTypeTest.scala index ed76afe2155a3..c9a12fd6ace4e 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/DecimalTypeTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/DecimalTypeTest.scala @@ -19,8 +19,9 @@ package org.apache.flink.table.expressions import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.table.api.Types import org.apache.flink.table.api.scala._ -import org.apache.flink.table.{Row, Types} +import org.apache.flink.table.Row import org.apache.flink.table.expressions.utils.ExpressionTestBase import org.apache.flink.table.typeutils.RowTypeInfo import org.junit.Test diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala index 118e1b228dc6c..d291dce2db4ad 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala @@ -21,10 +21,11 @@ package org.apache.flink.table.expressions import java.sql.{Date, Time, Timestamp} import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.table.api.Types import org.apache.flink.table.api.scala._ import org.apache.flink.table.expressions.utils.ExpressionTestBase import org.apache.flink.table.typeutils.RowTypeInfo -import org.apache.flink.table.{Row, Types, ValidationException} +import org.apache.flink.table.{Row, ValidationException} import org.junit.Test class ScalarFunctionsTest extends ExpressionTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala index 90a7b5ae83eb2..b2143929f1d8e 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarOperatorsTest.scala @@ -19,10 +19,11 @@ package org.apache.flink.table.expressions import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.table.api.Types import org.apache.flink.table.api.scala._ import org.apache.flink.table.expressions.utils.ExpressionTestBase import org.apache.flink.table.typeutils.RowTypeInfo -import org.apache.flink.table.{Row, Types, ValidationException} +import org.apache.flink.table.{Row, ValidationException} import org.junit.Test class ScalarOperatorsTest extends ExpressionTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/TemporalTypesTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/TemporalTypesTest.scala index 50e41d5291c87..31a7a76a758f8 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/TemporalTypesTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/TemporalTypesTest.scala @@ -21,10 +21,11 @@ package org.apache.flink.table.expressions import java.sql.{Date, Time, Timestamp} import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.table.api.Types import org.apache.flink.table.api.scala._ import org.apache.flink.table.expressions.utils.ExpressionTestBase import org.apache.flink.table.typeutils.RowTypeInfo -import org.apache.flink.table.{Row, Types} +import org.apache.flink.table.Row import org.junit.Test class TemporalTypesTest extends ExpressionTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala index a1f3f5cc95448..3f919fbb642bd 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala @@ -22,11 +22,12 @@ import java.sql.{Date, Time, Timestamp} import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.table.api.Types import org.apache.flink.table.api.scala._ import org.apache.flink.table.expressions.utils._ import org.apache.flink.table.functions.ScalarFunction import org.apache.flink.table.typeutils.RowTypeInfo -import org.apache.flink.table.{Row, Types} +import org.apache.flink.table.Row import org.junit.Test class UserDefinedScalarFunctionTest extends ExpressionTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala index 3e5d442d8c61f..7410d92541aee 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala @@ -28,6 +28,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.{DataSet => JDataSet} import org.apache.flink.api.scala.{DataSet, ExecutionEnvironment} import org.apache.flink.table._ +import org.apache.flink.table.calcite.FlinkPlannerImpl import org.apache.flink.table.codegen.{CodeGenerator, Compiler, GeneratedFunction} import org.apache.flink.table.expressions.{Expression, ExpressionParser} import org.apache.flink.table.functions.ScalarFunction diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/UserDefinedScalarFunctions.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/UserDefinedScalarFunctions.scala index 27f47565b402b..4e9b6d383d6d8 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/UserDefinedScalarFunctions.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/UserDefinedScalarFunctions.scala @@ -21,7 +21,7 @@ package org.apache.flink.table.expressions.utils import java.sql.{Date, Time, Timestamp} import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.table.Types +import org.apache.flink.table.api.Types import org.apache.flink.table.functions.ScalarFunction case class SimplePojo(name: String, age: Int) diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/plan/rules/util/RexProgramProjectExtractorTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/rules/util/RexProgramProjectExtractorTest.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/plan/rules/util/RexProgramProjectExtractorTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/rules/util/RexProgramProjectExtractorTest.scala index 156f281812933..f7385acb58f03 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/plan/rules/util/RexProgramProjectExtractorTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/plan/rules/util/RexProgramProjectExtractorTest.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.plan.rules.util +package org.apache.flink.table.plan.rules.util import java.math.BigDecimal @@ -26,9 +26,10 @@ import org.apache.calcite.rel.`type`.{RelDataType, RelDataTypeSystem} import org.apache.calcite.sql.`type`.SqlTypeName.{BIGINT, DOUBLE, INTEGER, VARCHAR} import org.apache.calcite.rex.{RexBuilder, RexProgram, RexProgramBuilder} import org.apache.calcite.sql.fun.SqlStdOperatorTable +import org.apache.flink.table.plan.rules.util.RexProgramProjectExtractor import scala.collection.JavaConverters._ -import org.apache.flink.api.table.plan.rules.util.RexProgramProjectExtractor._ +import RexProgramProjectExtractor._ import org.junit.{Assert, Before, Test} /** diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/dataset/DataSetCorrelateITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/dataset/DataSetCorrelateITCase.scala similarity index 93% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/dataset/DataSetCorrelateITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/dataset/DataSetCorrelateITCase.scala index 32559f16c9b2d..6314776bcb0b7 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/dataset/DataSetCorrelateITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/dataset/DataSetCorrelateITCase.scala @@ -15,15 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.dataset +package org.apache.flink.table.runtime.dataset import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase -import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.expressions.utils._ -import org.apache.flink.api.table.utils._ -import org.apache.flink.api.table.{Row, TableEnvironment} +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.{Row, TableEnvironment} +import org.apache.flink.table.utils._ import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit.Test diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/datastream/DataStreamCorrelateITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/datastream/DataStreamCorrelateITCase.scala similarity index 91% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/datastream/DataStreamCorrelateITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/datastream/DataStreamCorrelateITCase.scala index 70b0359207485..662009b429eb9 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/runtime/datastream/DataStreamCorrelateITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/datastream/DataStreamCorrelateITCase.scala @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.runtime.datastream +package org.apache.flink.table.runtime.datastream import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.stream.utils.StreamITCase -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.utils.TableFunc0 -import org.apache.flink.api.table.{Row, TableEnvironment} +import org.apache.flink.table.api.scala.stream.utils.StreamITCase +import org.apache.flink.table.api.scala._ +import org.apache.flink.table.utils.TableFunc0 +import org.apache.flink.table.{Row, TableEnvironment} import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment} import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase import org.junit.Assert._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/TableTestBase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/TableTestBase.scala index e14b125448359..4ac2bcb4eec29 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/TableTestBase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/TableTestBase.scala @@ -21,11 +21,12 @@ package org.apache.flink.table.utils import org.apache.calcite.plan.RelOptUtil import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.{DataSet => JDataSet} +import org.apache.flink.table.api.Table import org.apache.flink.table.api.scala._ import org.apache.flink.api.scala.{DataSet, ExecutionEnvironment} import org.apache.flink.table.expressions.Expression import org.apache.flink.table.functions.{ScalarFunction, TableFunction} -import org.apache.flink.table.{Table, TableEnvironment} +import org.apache.flink.table.TableEnvironment import org.apache.flink.streaming.api.datastream.{DataStream => JDataStream} import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment} import org.junit.Assert.assertEquals diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/utils/UserDefinedTableFunctions.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/UserDefinedTableFunctions.scala similarity index 94% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/utils/UserDefinedTableFunctions.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/UserDefinedTableFunctions.scala index 3da3857f33ae5..25528e4400ba5 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/utils/UserDefinedTableFunctions.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/utils/UserDefinedTableFunctions.scala @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.table.utils +package org.apache.flink.table.utils import java.lang.Boolean import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} import org.apache.flink.api.java.tuple.Tuple3 -import org.apache.flink.api.table.Row -import org.apache.flink.api.table.functions.TableFunction -import org.apache.flink.api.table.typeutils.RowTypeInfo +import org.apache.flink.table.Row +import org.apache.flink.table.functions.TableFunction +import org.apache.flink.table.typeutils.RowTypeInfo case class SimpleUser(name: String, age: Int) From 701413a8a3b869ed94b4c6d8ab4d282215cbfd29 Mon Sep 17 00:00:00 2001 From: Anton Mushin Date: Thu, 15 Dec 2016 15:30:57 +0400 Subject: [PATCH 3/3] [FLINK-4704] Move Table API to org.apache.flink.table move table api to org.apache.flink.table package --- docs/dev/table_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/dev/table_api.md b/docs/dev/table_api.md index fe076c333a6bb..66034e6ea15ef 100644 --- a/docs/dev/table_api.md +++ b/docs/dev/table_api.md @@ -1451,7 +1451,7 @@ A, ABS, ABSOLUTE, ACTION, ADA, ADD, ADMIN, AFTER, ALL, ALLOCATE, ALLOW, ALTER, A Data Types ---------- -The Table API is built on top of Flink's DataSet and DataStream API. Internally, it also uses Flink's `TypeInformation` to distinguish between types. The Table API does not support all Flink types so far. All supported simple types are listed in `org.apache.flink.table.Types`. The following table summarizes the relation between Table API types, SQL types, and the resulting Java class. +The Table API is built on top of Flink's DataSet and DataStream API. Internally, it also uses Flink's `TypeInformation` to distinguish between types. The Table API does not support all Flink types so far. All supported simple types are listed in `org.apache.flink.table.api.Types`. The following table summarizes the relation between Table API types, SQL types, and the resulting Java class. | Table API | SQL | Java type | | :--------------------- | :-------------------------- | :--------------------- |