You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ku...@apache.org on 2019/07/08 08:27:07 UTC
[flink] branch master updated (2a91b05 -> 7e101d5)
This is an automated email from the ASF dual-hosted git repository.
kurt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from 2a91b05 [FLINK-13137][py][docs] Remove legacy python docs
add 7e101d5 [FLINK-13114][table-planner-blink] adapt blink planner to new unified TableEnvironment
No new revisions were added by this update.
Summary of changes:
.../java/internal/StreamTableEnvironmentImpl.java | 5 +
.../flink/table/api/EnvironmentSettings.java | 4 +-
.../internal/StreamTableEnvironmentImpl.scala | 5 +
.../apache/flink/table/executor/BatchExecutor.java | 88 ++
.../table/executor/BlinkExecutorFactory.java} | 17 +-
.../apache/flink/table/executor/ExecutorBase.java} | 27 +-
.../flink/table/executor/StreamExecutor.java | 18 +-
.../table/operations/DataStreamQueryOperation.java | 4 +-
.../flink/table/plan/QueryOperationConverter.java | 35 +
.../plan/nodes/process/DAGProcessContext.java | 16 +-
.../resource/parallelism/ParallelismProcessor.java | 13 +-
.../flink/table/planner/BlinkPlannerFactory.java} | 16 +-
.../org.apache.flink.table.factories.TableFactory | 3 +-
.../flink/table/api/BatchTableEnvironment.scala | 304 ------
.../flink/table/api/StreamTableEnvironment.scala | 574 -----------
.../org/apache/flink/table/api/TableConfig.scala | 79 +-
.../apache/flink/table/api/TableEnvironment.scala | 1058 --------------------
.../table/api/java/BatchTableEnvironment.scala | 96 --
.../table/api/java/StreamTableEnvironment.scala | 195 ----
.../table/api/scala/BatchTableEnvironment.scala | 125 ---
.../table/api/scala/DataStreamConversions.scala | 63 --
.../table/api/scala/StreamTableEnvironment.scala | 271 -----
.../flink/table/api/scala/TableConversions.scala | 101 --
.../table/codegen/CorrelateCodeGenerator.scala | 14 +-
.../flink/table/codegen/ValuesCodeGenerator.scala | 5 +-
.../functions/utils/UserDefinedFunctionUtils.scala | 7 +-
.../table/plan/nodes/exec/BatchExecNode.scala | 4 +-
.../flink/table/plan/nodes/exec/ExecNode.scala | 22 +-
.../table/plan/nodes/exec/StreamExecNode.scala | 4 +-
.../batch/BatchExecBoundedStreamScan.scala | 17 +-
.../plan/nodes/physical/batch/BatchExecCalc.scala | 21 +-
.../nodes/physical/batch/BatchExecCorrelate.scala | 30 +-
.../nodes/physical/batch/BatchExecExchange.scala | 16 +-
.../nodes/physical/batch/BatchExecExpand.scala | 19 +-
.../physical/batch/BatchExecHashAggregate.scala | 2 +-
.../batch/BatchExecHashAggregateBase.scala | 25 +-
.../nodes/physical/batch/BatchExecHashJoin.scala | 19 +-
.../batch/BatchExecHashWindowAggregateBase.scala | 27 +-
.../plan/nodes/physical/batch/BatchExecLimit.scala | 19 +-
.../batch/BatchExecLocalHashAggregate.scala | 7 +-
.../batch/BatchExecLocalSortAggregate.scala | 7 +-
.../nodes/physical/batch/BatchExecLookupJoin.scala | 34 +-
.../physical/batch/BatchExecNestedLoopJoin.scala | 18 +-
.../physical/batch/BatchExecOverAggregate.scala | 27 +-
.../plan/nodes/physical/batch/BatchExecRank.scala | 26 +-
.../plan/nodes/physical/batch/BatchExecSink.scala | 64 +-
.../plan/nodes/physical/batch/BatchExecSort.scala | 22 +-
.../physical/batch/BatchExecSortAggregate.scala | 3 +-
.../batch/BatchExecSortAggregateBase.scala | 21 +-
.../nodes/physical/batch/BatchExecSortLimit.scala | 22 +-
.../physical/batch/BatchExecSortMergeJoin.scala | 26 +-
.../batch/BatchExecSortWindowAggregateBase.scala | 24 +-
.../physical/batch/BatchExecTableSourceScan.scala | 30 +-
.../plan/nodes/physical/batch/BatchExecUnion.scala | 19 +-
.../nodes/physical/batch/BatchExecValues.scala | 19 +-
.../nodes/physical/stream/StreamExecCalc.scala | 21 +-
.../physical/stream/StreamExecCorrelate.scala | 25 +-
.../physical/stream/StreamExecDataStreamScan.scala | 17 +-
.../physical/stream/StreamExecDeduplicate.scala | 21 +-
.../nodes/physical/stream/StreamExecExchange.scala | 17 +-
.../nodes/physical/stream/StreamExecExpand.scala | 19 +-
.../stream/StreamExecGlobalGroupAggregate.scala | 24 +-
.../physical/stream/StreamExecGroupAggregate.scala | 22 +-
.../stream/StreamExecGroupWindowAggregate.scala | 22 +-
.../StreamExecIncrementalGroupAggregate.scala | 29 +-
.../nodes/physical/stream/StreamExecJoin.scala | 35 +-
.../nodes/physical/stream/StreamExecLimit.scala | 20 +-
.../stream/StreamExecLocalGroupAggregate.scala | 25 +-
.../physical/stream/StreamExecLookupJoin.scala | 23 +-
.../nodes/physical/stream/StreamExecMatch.scala | 41 +-
.../physical/stream/StreamExecOverAggregate.scala | 26 +-
.../nodes/physical/stream/StreamExecRank.scala | 22 +-
.../nodes/physical/stream/StreamExecSink.scala | 37 +-
.../nodes/physical/stream/StreamExecSort.scala | 31 +-
.../physical/stream/StreamExecSortLimit.scala | 20 +-
.../stream/StreamExecTableSourceScan.scala | 25 +-
.../physical/stream/StreamExecTemporalJoin.scala | 17 +-
.../physical/stream/StreamExecTemporalSort.scala | 28 +-
.../nodes/physical/stream/StreamExecUnion.scala | 17 +-
.../nodes/physical/stream/StreamExecValues.scala | 19 +-
.../stream/StreamExecWatermarkAssigner.scala | 18 +-
.../physical/stream/StreamExecWindowJoin.scala | 22 +-
.../BatchCommonSubGraphBasedOptimizer.scala | 11 +-
.../flink/table/plan/optimize/Optimizer.scala | 7 +-
.../StreamCommonSubGraphBasedOptimizer.scala | 22 +-
.../apache/flink/table/planner/BatchPlanner.scala | 118 +++
.../apache/flink/table/planner/PlannerBase.scala | 273 +++++
.../apache/flink/table/planner/StreamPlanner.scala | 119 +++
.../flink/table/sinks/DataStreamTableSink.scala | 7 +-
.../apache/flink/table/sinks/TableSinkUtils.scala | 23 +-
.../apache/flink/table/util/FieldInfoUtils.scala | 218 ++++
.../apache/flink/table/api/batch/ExplainTest.xml | 32 +-
.../apache/flink/table/api/stream/ExplainTest.xml | 48 +-
.../table/plan/batch/sql/DagOptimizationTest.xml | 132 +--
.../table/plan/batch/sql/DeadlockBreakupTest.xml | 74 ++
.../apache/flink/table/plan/batch/sql/SinkTest.xml | 12 +-
.../table/plan/stream/sql/DagOptimizationTest.xml | 160 +--
.../plan/stream/sql/MiniBatchIntervalInferTest.xml | 12 +-
.../flink/table/plan/stream/sql/SinkTest.xml | 48 +-
.../table/plan/stream/sql/agg/AggregateTest.xml | 11 +-
.../flink/table/api/TableEnvironmentTest.scala | 9 +-
.../apache/flink/table/api/batch/ExplainTest.scala | 7 +-
.../flink/table/api/stream/ExplainTest.scala | 19 +-
.../validation/MatchRecognizeValidationTest.scala | 17 +-
.../sql/validation/OverWindowValidationTest.scala | 4 +-
.../flink/table/codegen/agg/AggTestBase.scala | 27 +-
.../codegen/agg/AggsHandlerCodeGeneratorTest.scala | 2 +-
.../table/codegen/agg/batch/BatchAggTestBase.scala | 2 +-
.../expressions/utils/ExpressionTestBase.scala | 23 +-
.../table/match/PatternTranslatorTestBase.scala | 33 +-
.../flink/table/plan/batch/sql/CalcTest.scala | 1 +
.../table/plan/batch/sql/DagOptimizationTest.scala | 72 +-
.../table/plan/batch/sql/DeadlockBreakupTest.scala | 15 +-
.../flink/table/plan/batch/sql/LimitTest.scala | 1 +
.../flink/table/plan/batch/sql/RankTest.scala | 1 +
.../table/plan/batch/sql/RemoveCollationTest.scala | 8 +-
.../table/plan/batch/sql/RemoveShuffleTest.scala | 8 +-
.../table/plan/batch/sql/SetOperatorsTest.scala | 3 +-
.../flink/table/plan/batch/sql/SinkTest.scala | 8 +-
.../flink/table/plan/batch/sql/SortLimitTest.scala | 1 +
.../flink/table/plan/batch/sql/SortTest.scala | 1 +
.../table/plan/batch/sql/SubplanReuseTest.scala | 11 +-
.../flink/table/plan/batch/sql/TableScanTest.scala | 1 +
.../table/plan/batch/sql/TableSourceTest.scala | 2 +-
.../flink/table/plan/batch/sql/UnionTest.scala | 1 +
.../plan/batch/sql/agg/AggregateTestBase.scala | 5 +-
.../plan/batch/sql/agg/DistinctAggregateTest.scala | 1 +
.../plan/batch/sql/agg/GroupingSetsTest.scala | 5 +-
.../plan/batch/sql/agg/OverAggregateTest.scala | 1 +
.../plan/batch/sql/agg/WindowAggregateTest.scala | 3 +-
.../table/plan/batch/sql/join/JoinTestBase.scala | 1 +
.../table/plan/batch/sql/join/LookupJoinTest.scala | 1 +
.../plan/batch/sql/join/SemiAntiJoinTestBase.scala | 1 +
.../plan/batch/sql/join/SingleRowJoinTest.scala | 1 +
.../plan/batch/sql/join/TemporalJoinTest.scala | 6 +-
.../flink/table/plan/common/UnnestTestBase.scala | 3 +-
.../metadata/AggCallSelectivityEstimatorTest.scala | 8 +-
.../plan/metadata/FlinkRelMdHandlerTestBase.scala | 5 +-
.../plan/metadata/SelectivityEstimatorTest.scala | 3 +-
.../plan/nodes/resource/ExecNodeResourceTest.scala | 40 +-
.../rules/logical/CalcRankTransposeRuleTest.scala | 3 +-
.../rules/logical/ConvertToNotInOrInRuleTest.scala | 1 +
.../logical/DecomposeGroupingSetsRuleTest.scala | 1 +
...AggregateExpandDistinctAggregatesRuleTest.scala | 1 +
.../FlinkAggregateInnerJoinTransposeRuleTest.scala | 1 +
.../FlinkAggregateOuterJoinTransposeRuleTest.scala | 1 +
.../logical/FlinkAggregateRemoveRuleTest.scala | 1 +
.../rules/logical/FlinkCalcMergeRuleTest.scala | 1 +
.../rules/logical/FlinkFilterJoinRuleTest.scala | 4 +-
.../logical/FlinkJoinPushExpressionsRuleTest.scala | 2 +-
.../rules/logical/FlinkLimit0RemoveRuleTest.scala | 1 +
.../FlinkLogicalRankRuleForConstantRangeTest.scala | 1 +
.../FlinkLogicalRankRuleForRangeEndTest.scala | 1 +
.../rules/logical/FlinkPruneEmptyRulesTest.scala | 1 +
.../FlinkSemiAntiJoinFilterTransposeRuleTest.scala | 1 +
.../FlinkSemiAntiJoinJoinTransposeRuleTest.scala | 1 +
...FlinkSemiAntiJoinProjectTransposeRuleTest.scala | 1 +
.../JoinConditionEqualityTransferRuleTest.scala | 1 +
.../logical/JoinConditionTypeCoerceRuleTest.scala | 1 +
.../JoinDependentConditionDerivationRuleTest.scala | 1 +
.../ProjectSemiAntiJoinTransposeRuleTest.scala | 1 +
.../logical/PruneAggregateCallRuleTestBase.scala | 1 +
.../PushProjectIntoTableSourceScanRuleTest.scala | 2 +-
.../logical/RankNumberColumnRemoveRuleTest.scala | 3 +-
.../ReplaceIntersectWithSemiJoinRuleTest.scala | 4 +-
.../logical/ReplaceMinusWithAntiJoinRuleTest.scala | 1 +
.../rules/logical/RewriteCoalesceRuleTest.scala | 1 +
.../logical/RewriteIntersectAllRuleTest.scala | 1 +
.../rules/logical/RewriteMinusAllRuleTest.scala | 1 +
.../RewriteMultiJoinConditionRuleTest.scala | 3 +-
.../logical/SimplifyFilterConditionRuleTest.scala | 1 +
.../logical/SimplifyJoinConditionRuleTest.scala | 1 +
.../rules/logical/SplitAggregateRuleTest.scala | 1 +
.../rules/logical/WindowGroupReorderRuleTest.scala | 1 +
.../subquery/FlinkRewriteSubQueryRuleTest.scala | 1 +
.../logical/subquery/SubQueryAntiJoinTest.scala | 1 +
.../logical/subquery/SubQuerySemiJoinTest.scala | 1 +
.../rules/logical/subquery/SubQueryTestBase.scala | 2 +-
.../SubqueryCorrelateVariablesValidationTest.scala | 1 +
.../RemoveRedundantLocalHashAggRuleTest.scala | 3 +-
.../batch/RemoveRedundantLocalRankRuleTest.scala | 1 +
.../RemoveRedundantLocalSortAggRuleTest.scala | 3 +-
.../physical/stream/RetractionRulesTest.scala | 1 +
.../RetractionRulesWithTwoStageAggTest.scala | 1 +
.../flink/table/plan/stream/sql/CalcTest.scala | 1 +
.../plan/stream/sql/DagOptimizationTest.scala | 89 +-
.../flink/table/plan/stream/sql/LimitTest.scala | 4 +-
.../stream/sql/MiniBatchIntervalInferTest.scala | 13 +-
.../plan/stream/sql/ModifiedMonotonicityTest.scala | 6 +-
.../flink/table/plan/stream/sql/RankTest.scala | 4 +-
.../stream/sql/RelTimeIndicatorConverterTest.scala | 8 +-
.../table/plan/stream/sql/SetOperatorsTest.scala | 1 +
.../flink/table/plan/stream/sql/SinkTest.scala | 29 +-
.../table/plan/stream/sql/SortLimitTest.scala | 4 +-
.../flink/table/plan/stream/sql/SortTest.scala | 4 +-
.../table/plan/stream/sql/SubplanReuseTest.scala | 11 +-
.../table/plan/stream/sql/TableScanTest.scala | 1 +
.../flink/table/plan/stream/sql/UnionTest.scala | 1 +
.../table/plan/stream/sql/agg/AggregateTest.scala | 4 +-
.../stream/sql/agg/DistinctAggregateTest.scala | 1 +
.../plan/stream/sql/agg/GroupingSetsTest.scala | 5 +-
.../plan/stream/sql/agg/OverAggregateTest.scala | 8 +-
.../stream/sql/agg/TwoStageAggregateTest.scala | 1 +
.../plan/stream/sql/agg/WindowAggregateTest.scala | 4 +-
.../table/plan/stream/sql/join/JoinTest.scala | 2 +-
.../plan/stream/sql/join/LookupJoinTest.scala | 11 +-
.../plan/stream/sql/join/SemiAntiJoinTest.scala | 1 +
.../plan/stream/sql/join/TemporalJoinTest.scala | 32 +-
.../plan/stream/sql/join/WindowJoinTest.scala | 15 +-
.../flink/table/plan/util/RelDigestUtilTest.scala | 9 +-
.../table/plan/util/RexNodeRewriterTest.scala | 1 -
.../flink/table/runtime/batch/sql/CalcITCase.scala | 61 +-
.../table/runtime/batch/sql/CorrelateITCase.scala | 61 +-
.../table/runtime/batch/sql/CorrelateITCase2.scala | 47 +-
.../table/runtime/batch/sql/DecimalITCase.scala | 5 +-
.../runtime/batch/sql/Limit0RemoveITCase.scala | 1 +
.../table/runtime/batch/sql/LimitITCase.scala | 3 +-
.../flink/table/runtime/batch/sql/MiscITCase.scala | 1 +
.../table/runtime/batch/sql/OverWindowITCase.scala | 2 +-
.../flink/table/runtime/batch/sql/RankITCase.scala | 2 +-
.../runtime/batch/sql/SetOperatorsITCase.scala | 11 +-
.../table/runtime/batch/sql/SortLimitITCase.scala | 2 +-
.../runtime/batch/sql/TableSourceITCase.scala | 5 +-
.../table/runtime/batch/sql/UnionITCase.scala | 4 +-
.../batch/sql/agg/AggregateITCaseBase.scala | 5 +-
.../sql/agg/AggregateJoinTransposeITCase.scala | 2 +-
.../sql/agg/AggregateReduceGroupingITCase.scala | 1 +
.../batch/sql/agg/AggregateRemoveITCase.scala | 1 +
.../sql/agg/DistinctAggregateITCaseBase.scala | 3 +-
.../runtime/batch/sql/agg/GroupingSetsITCase.scala | 2 +-
.../batch/sql/agg/PruneAggregateCallITCase.scala | 1 +
.../runtime/batch/sql/agg/SortAggITCase.scala | 4 +-
.../batch/sql/agg/WindowAggregateITCase.scala | 3 +-
.../runtime/batch/sql/join/InnerJoinITCase.scala | 2 +-
.../sql/join/JoinConditionTypeCoerceITCase.scala | 4 +-
.../table/runtime/batch/sql/join/JoinITCase.scala | 11 +-
.../batch/sql/join/JoinWithoutKeyITCase.scala | 3 +-
.../runtime/batch/sql/join/LookupJoinITCase.scala | 4 +-
.../runtime/batch/sql/join/OuterJoinITCase.scala | 3 +-
.../runtime/batch/sql/join/ScalarQueryITCase.scala | 6 -
.../runtime/batch/sql/join/SemiJoinITCase.scala | 3 +-
.../runtime/batch/table/AggregationITCase.scala | 42 +-
.../table/runtime/batch/table/CalcITCase.scala | 51 +-
.../runtime/batch/table/CorrelateITCase.scala | 12 +-
.../runtime/batch/table/GroupWindowITCase.scala | 41 +-
.../table/runtime/batch/table/JoinITCase.scala | 4 +-
.../runtime/batch/table/OverWindowITCase.scala | 1 +
.../runtime/batch/table/SetOperatorsITCase.scala | 15 +-
.../runtime/harness/OverWindowHarnessTest.scala | 14 +-
.../table/runtime/stream/sql/AggregateITCase.scala | 2 +-
.../runtime/stream/sql/AsyncLookupJoinITCase.scala | 22 +-
.../table/runtime/stream/sql/CalcITCase.scala | 6 +-
.../table/runtime/stream/sql/CorrelateITCase.scala | 35 +-
.../runtime/stream/sql/DeduplicateITCase.scala | 4 +-
.../runtime/stream/sql/Limit0RemoveITCase.scala | 50 +-
.../runtime/stream/sql/LookupJoinITCase.scala | 30 +-
.../runtime/stream/sql/MatchRecognizeITCase.scala | 26 +-
.../runtime/stream/sql/OverWindowITCase.scala | 42 +-
.../table/runtime/stream/sql/RankITCase.scala | 95 +-
.../runtime/stream/sql/TemporalJoinITCase.scala | 20 +-
.../runtime/stream/sql/TemporalSortITCase.scala | 6 +-
.../table/runtime/stream/sql/UnnestITCase.scala | 14 +-
.../runtime/stream/sql/WindowAggregateITCase.scala | 14 +-
.../runtime/stream/sql/WindowJoinITCase.scala | 68 +-
.../runtime/stream/table/AggregateITCase.scala | 5 +-
.../table/runtime/stream/table/JoinITCase.scala | 36 +-
.../runtime/utils/BatchScalaTableEnvUtil.scala | 115 ---
.../table/runtime/utils/BatchTableEnvUtil.scala | 150 ++-
.../flink/table/runtime/utils/BatchTestBase.scala | 191 ++--
.../runtime/utils/CollectionBatchExecTable.scala | 75 +-
.../table/runtime/utils/StreamTableEnvUtil.scala | 12 +-
.../table/runtime/utils/StreamingTestBase.scala | 9 +-
.../runtime/utils/StreamingWithStateTestBase.scala | 5 +-
.../flink/table/runtime/utils/TableUtil.scala | 21 +-
.../apache/flink/table/util/TableTestBase.scala | 678 +++++++++----
.../flink/table/typeutils/BaseRowTypeInfo.java | 47 +-
.../streaming/util/TestStreamEnvironment.java | 1 +
277 files changed, 3665 insertions(+), 4958 deletions(-)
create mode 100644 flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/executor/BatchExecutor.java
copy flink-table/{flink-table-planner/src/main/java/org/apache/flink/table/executor/StreamExecutorFactory.java => flink-table-planner-blink/src/main/java/org/apache/flink/table/executor/BlinkExecutorFactory.java} (84%)
copy flink-table/{flink-table-planner/src/main/java/org/apache/flink/table/executor/StreamExecutor.java => flink-table-planner-blink/src/main/java/org/apache/flink/table/executor/ExecutorBase.java} (73%)
copy flink-table/{flink-table-planner => flink-table-planner-blink}/src/main/java/org/apache/flink/table/executor/StreamExecutor.java (81%)
copy flink-table/{flink-table-planner/src/main/java/org/apache/flink/table/planner/StreamPlannerFactory.java => flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/BlinkPlannerFactory.java} (80%)
copy {flink-connectors/flink-connector-elasticsearch6 => flink-table/flink-table-planner-blink}/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory (88%)
delete mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/api/BatchTableEnvironment.scala
delete mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/api/StreamTableEnvironment.scala
delete mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/api/TableEnvironment.scala
delete mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/api/java/BatchTableEnvironment.scala
delete mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/api/java/StreamTableEnvironment.scala
delete mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/api/scala/BatchTableEnvironment.scala
delete mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/api/scala/DataStreamConversions.scala
delete mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/api/scala/StreamTableEnvironment.scala
delete mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/api/scala/TableConversions.scala
create mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/BatchPlanner.scala
create mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/PlannerBase.scala
create mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/StreamPlanner.scala
copy flink-table/{flink-table-planner => flink-table-planner-blink}/src/main/scala/org/apache/flink/table/sinks/TableSinkUtils.scala (76%)
create mode 100644 flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/util/FieldInfoUtils.scala
delete mode 100644 flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/utils/BatchScalaTableEnvUtil.scala