From 4e3760e55580dd5e0ae195496a36e0d10c3104e1 Mon Sep 17 00:00:00 2001 From: zentol Date: Sun, 28 May 2017 09:11:10 +0200 Subject: [PATCH 1/3] [FLINK-6739] Apply checkstyle import order to flink-optimizer --- .../flink/optimizer/DataStatistics.java | 4 +- .../org/apache/flink/optimizer/Optimizer.java | 24 +++++------ .../flink/optimizer/costs/CostEstimator.java | 4 +- .../dag/AbstractPartialSolutionNode.java | 8 ++-- .../flink/optimizer/dag/BinaryUnionNode.java | 10 ++--- .../dag/BulkPartialSolutionNode.java | 6 +-- .../flink/optimizer/dag/CoGroupNode.java | 8 ++-- .../flink/optimizer/dag/CoGroupRawNode.java | 5 ++- .../apache/flink/optimizer/dag/CrossNode.java | 10 ++--- .../flink/optimizer/dag/DataSinkNode.java | 10 ++--- .../flink/optimizer/dag/DataSourceNode.java | 12 +++--- .../flink/optimizer/dag/FilterNode.java | 6 +-- .../flink/optimizer/dag/FlatMapNode.java | 6 +-- .../flink/optimizer/dag/GroupReduceNode.java | 10 ++--- .../apache/flink/optimizer/dag/JoinNode.java | 10 ++--- .../apache/flink/optimizer/dag/MapNode.java | 6 +-- .../flink/optimizer/dag/MapPartitionNode.java | 10 ++--- .../flink/optimizer/dag/OptimizerNode.java | 18 ++++---- .../flink/optimizer/dag/PartitionNode.java | 6 +-- .../flink/optimizer/dag/ReduceNode.java | 6 +-- .../flink/optimizer/dag/SingleInputNode.java | 26 +++++------ .../flink/optimizer/dag/SinkJoiner.java | 8 ++-- .../flink/optimizer/dag/SolutionSetNode.java | 6 +-- .../flink/optimizer/dag/TwoInputNode.java | 24 +++++------ .../optimizer/dag/UnaryOperatorNode.java | 8 ++-- .../optimizer/dag/WorksetIterationNode.java | 16 +++---- .../flink/optimizer/dag/WorksetNode.java | 6 +-- .../dataproperties/GlobalProperties.java | 1 + .../dataproperties/InterestingProperties.java | 8 ++-- .../dataproperties/LocalProperties.java | 7 +-- .../RequestedLocalProperties.java | 4 +- .../operators/AbstractJoinDescriptor.java | 8 ++-- .../operators/AllGroupReduceProperties.java | 6 +-- ...AllGroupWithPartialPreGroupProperties.java | 6 +-- .../operators/AllReduceProperties.java | 6 +-- .../operators/BinaryUnionOpDescriptor.java | 6 +-- .../operators/CartesianProductDescriptor.java | 8 ++-- .../operators/CoGroupDescriptor.java | 8 ++-- .../operators/CoGroupRawDescriptor.java | 5 ++- ...CoGroupWithSolutionSetFirstDescriptor.java | 6 +-- ...oGroupWithSolutionSetSecondDescriptor.java | 6 +-- .../optimizer/operators/FilterDescriptor.java | 6 +-- .../operators/FlatMapDescriptor.java | 6 +-- .../operators/GroupReduceProperties.java | 6 +-- .../GroupReduceWithCombineProperties.java | 7 +-- .../HashJoinBuildFirstProperties.java | 6 +-- .../HashJoinBuildSecondProperties.java | 6 +-- .../optimizer/operators/MapDescriptor.java | 6 +-- .../operators/MapPartitionDescriptor.java | 6 +-- .../optimizer/operators/NoOpDescriptor.java | 6 +-- .../operators/OperatorDescriptorDual.java | 4 +- .../operators/OperatorDescriptorSingle.java | 4 +- .../operators/PartialGroupProperties.java | 6 +-- .../optimizer/operators/ReduceProperties.java | 7 +-- .../operators/SolutionSetDeltaOperator.java | 6 +-- .../operators/UtilSinkJoinOpDescriptor.java | 6 +-- .../optimizer/plan/BulkIterationPlanNode.java | 10 ++--- .../plan/BulkPartialSolutionPlanNode.java | 14 +++--- .../optimizer/plan/DualInputPlanNode.java | 16 +++---- .../optimizer/plan/NAryUnionPlanNode.java | 8 ++-- .../flink/optimizer/plan/OptimizedPlan.java | 4 +- .../optimizer/plan/SingleInputPlanNode.java | 18 ++++---- .../optimizer/plan/SinkJoinerPlanNode.java | 4 +- .../optimizer/plan/SolutionSetPlanNode.java | 14 +++--- .../flink/optimizer/plan/SourcePlanNode.java | 10 ++--- .../flink/optimizer/plan/StreamingPlan.java | 4 +- .../plan/WorksetIterationPlanNode.java | 12 +++--- .../flink/optimizer/plan/WorksetPlanNode.java | 14 +++--- .../plandump/PlanJSONDumpGenerator.java | 3 +- .../plantranslate/JobGraphGenerator.java | 12 +++--- .../optimizer/plantranslate/JsonMapper.java | 5 ++- .../postpass/GenericFlatTypePostPass.java | 4 +- .../optimizer/postpass/JavaApiPostPass.java | 8 ++-- .../traversals/RangePartitionRewriter.java | 16 +++---- .../flink/optimizer/util/NoOpBinaryUdfOp.java | 4 +- .../flink/optimizer/util/NoOpUnaryUdfOp.java | 4 +- .../apache/flink/optimizer/util/Utils.java | 4 +- .../optimizer/AdditionalOperatorsTest.java | 9 ++-- .../optimizer/BranchingPlansCompilerTest.java | 43 ++++++++++--------- .../BroadcastVariablePipelinebreakerTest.java | 14 +++--- .../CachedMatchStrategyCompilerTest.java | 17 ++++---- .../CoGroupSolutionSetFirstTest.java | 13 +++--- .../optimizer/DisjointDataFlowsTest.java | 5 ++- .../optimizer/DistinctCompilationTest.java | 1 + .../FeedbackPropertiesMatchTest.java | 20 ++++++--- .../flink/optimizer/GroupOrderTest.java | 7 +-- .../optimizer/HardPlansCompilationTest.java | 1 + .../optimizer/IterationsCompilerTest.java | 33 ++++++++------ .../flink/optimizer/NestedIterationsTest.java | 6 ++- .../optimizer/ParallelismChangeTest.java | 3 +- .../optimizer/PartitionPushdownTest.java | 8 ++-- .../optimizer/PartitioningReusageTest.java | 1 + .../flink/optimizer/PipelineBreakerTest.java | 21 ++++----- .../optimizer/PropertyDataSourceTest.java | 1 + .../apache/flink/optimizer/ReduceAllTest.java | 5 ++- .../optimizer/ReplicatingDataSourceTest.java | 7 +-- .../SemanticPropertiesAPIToPlanTest.java | 3 +- .../flink/optimizer/SortPartialReuseTest.java | 12 +++--- .../UnionBetweenDynamicAndStaticPathTest.java | 8 +++- .../UnionPropertyPropagationTest.java | 25 +++++------ .../flink/optimizer/UnionReplacementTest.java | 7 ++- .../WorksetIterationCornerCasesTest.java | 6 ++- ...orksetIterationsRecordApiCompilerTest.java | 11 ++--- .../costs/DefaultCostEstimatorTest.java | 5 ++- ...ryCustomPartitioningCompatibilityTest.java | 6 ++- .../CoGroupCustomPartitioningTest.java | 7 ++- ...tomPartitioningGlobalOptimizationTest.java | 9 ++-- .../CustomPartitioningTest.java | 6 ++- .../GroupingKeySelectorTranslationTest.java | 6 ++- .../GroupingPojoTranslationTest.java | 8 ++-- .../GroupingTupleTranslationTest.java | 6 ++- .../JoinCustomPartitioningTest.java | 7 ++- .../flink/optimizer/dag/CoGroupNodeTest.java | 1 + .../optimizer/dag/GroupCombineNodeTest.java | 1 + .../optimizer/dag/GroupReduceNodeTest.java | 1 + .../optimizer/dag/MapPartitionNodeTest.java | 1 + .../DataExchangeModeClosedBranchingTest.java | 1 + .../DataExchangeModeForwardTest.java | 1 + .../DataExchangeModeOpenBranchingTest.java | 1 + .../dataexchange/PipelineBreakingTest.java | 6 ++- .../UnionClosedBranchingTest.java | 1 + .../GlobalPropertiesFilteringTest.java | 7 ++- .../GlobalPropertiesMatchingTest.java | 1 + .../GlobalPropertiesPushdownTest.java | 7 ++- .../LocalPropertiesFilteringTest.java | 8 +++- ...equestedGlobalPropertiesFilteringTest.java | 8 +++- ...RequestedLocalPropertiesFilteringTest.java | 8 +++- .../java/DeltaIterationDependenciesTest.java | 12 +++--- .../DistinctAndGroupingOptimizerTest.java | 12 +++--- .../java/GroupReduceCompilationTest.java | 18 ++++---- .../optimizer/java/IterationCompilerTest.java | 6 ++- .../optimizer/java/JoinTranslationTest.java | 7 ++- .../optimizer/java/OpenIterationTest.java | 5 ++- .../optimizer/java/PartitionOperatorTest.java | 12 +++--- .../optimizer/java/ReduceCompilationTest.java | 14 +++--- .../WorksetIterationsJavaApiCompilerTest.java | 17 ++++---- ...roupGlobalPropertiesCompatibilityTest.java | 7 ++- ...CoGroupOnConflictingPartitioningsTest.java | 7 +-- .../CoGroupWithDistributionTest.java | 8 +++- ...JoinGlobalPropertiesCompatibilityTest.java | 7 ++- .../JoinOnConflictingPartitioningsTest.java | 7 +-- .../operators/JoinWithDistributionTest.java | 6 ++- .../flink/optimizer/plan/ChannelTest.java | 5 ++- .../plandump/NumberFormattingTest.java | 4 +- .../plantranslate/JobGraphGeneratorTest.java | 1 + .../plantranslate/TempInIterationsTest.java | 3 +- .../programs/ConnectedComponentsTest.java | 2 +- .../optimizer/util/CompilerTestBase.java | 13 +++--- .../optimizer/util/OperatorResolver.java | 14 +++--- 149 files changed, 682 insertions(+), 539 deletions(-) diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/DataStatistics.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/DataStatistics.java index cf6f4ecf0e6fd..60024160f1677 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/DataStatistics.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/DataStatistics.java @@ -18,11 +18,11 @@ package org.apache.flink.optimizer; +import org.apache.flink.api.common.io.statistics.BaseStatistics; + import java.util.HashMap; import java.util.Map; -import org.apache.flink.api.common.io.statistics.BaseStatistics; - /** * The collection of access methods that can be used to retrieve statistical information about the * data processed in a job. Currently this method acts as an entry point only for obtaining cached diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/Optimizer.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/Optimizer.java index f73abe277c333..f2906768a6c85 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/Optimizer.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/Optimizer.java @@ -18,19 +18,10 @@ package org.apache.flink.optimizer; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.apache.flink.configuration.Configuration; -import org.apache.flink.optimizer.traversals.BinaryUnionReplacer; -import org.apache.flink.optimizer.traversals.BranchesVisitor; -import org.apache.flink.optimizer.traversals.GraphCreatingVisitor; -import org.apache.flink.optimizer.traversals.IdAndEstimatesVisitor; -import org.apache.flink.optimizer.traversals.InterestingPropertyVisitor; -import org.apache.flink.optimizer.traversals.PlanFinalizer; import org.apache.flink.api.common.ExecutionMode; import org.apache.flink.api.common.Plan; +import org.apache.flink.configuration.ConfigConstants; +import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.costs.CostEstimator; import org.apache.flink.optimizer.costs.DefaultCostEstimator; import org.apache.flink.optimizer.dag.DataSinkNode; @@ -41,13 +32,22 @@ import org.apache.flink.optimizer.plan.SinkJoinerPlanNode; import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.postpass.OptimizerPostPass; -import org.apache.flink.configuration.ConfigConstants; +import org.apache.flink.optimizer.traversals.BinaryUnionReplacer; +import org.apache.flink.optimizer.traversals.BranchesVisitor; +import org.apache.flink.optimizer.traversals.GraphCreatingVisitor; +import org.apache.flink.optimizer.traversals.IdAndEstimatesVisitor; +import org.apache.flink.optimizer.traversals.InterestingPropertyVisitor; +import org.apache.flink.optimizer.traversals.PlanFinalizer; import org.apache.flink.optimizer.traversals.RangePartitionRewriter; import org.apache.flink.util.InstantiationUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + /** * The optimizer that takes the user specified program plan and creates an optimized plan that contains * exact descriptions about how the physical execution will take place. It first translates the user diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/CostEstimator.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/CostEstimator.java index 9cc5e48b9c58e..2b01c6e6a524e 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/CostEstimator.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/CostEstimator.java @@ -19,14 +19,14 @@ package org.apache.flink.optimizer.costs; -import java.util.Iterator; - import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.dag.EstimateProvider; import org.apache.flink.optimizer.dag.TempMode; import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.PlanNode; +import java.util.Iterator; + /** * Abstract base class for a cost estimator. Defines cost estimation methods and implements the basic work * method that computes the cost of an operator by adding input shipping cost, input local cost, and diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/AbstractPartialSolutionNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/AbstractPartialSolutionNode.java index d199ae786d521..07a38a28721e1 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/AbstractPartialSolutionNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/AbstractPartialSolutionNode.java @@ -18,10 +18,6 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; -import java.util.Map; - import org.apache.flink.api.common.ExecutionMode; import org.apache.flink.api.common.operators.Operator; import org.apache.flink.api.common.operators.SemanticProperties; @@ -31,6 +27,10 @@ import org.apache.flink.optimizer.plan.PlanNode; import org.apache.flink.util.Visitor; +import java.util.Collections; +import java.util.List; +import java.util.Map; + /** * The optimizer's internal representation of the partial solution that is input to a bulk iteration. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BinaryUnionNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BinaryUnionNode.java index cb496a2f67ffb..4b1a8f7b6bedd 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BinaryUnionNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BinaryUnionNode.java @@ -18,11 +18,6 @@ package org.apache.flink.optimizer.dag; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; - import org.apache.flink.api.common.ExecutionMode; import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.Union; @@ -42,6 +37,11 @@ import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; + /** * The Optimizer representation of a binary Union. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkPartialSolutionNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkPartialSolutionNode.java index 0a02dd136ea98..b04b1f72b085f 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkPartialSolutionNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkPartialSolutionNode.java @@ -18,9 +18,6 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.base.BulkIterationBase.PartialSolutionPlaceHolder; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.dataproperties.GlobalProperties; @@ -29,6 +26,9 @@ import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.PlanNode; +import java.util.Collections; +import java.util.List; + /** * The optimizer's internal representation of the partial solution that is input to a bulk iteration. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupNode.java index 58bce4b177a44..eb7ccfb4f6b31 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupNode.java @@ -18,21 +18,21 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.DualInputOperator; import org.apache.flink.api.common.operators.DualInputSemanticProperties; import org.apache.flink.api.common.operators.Ordering; import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.base.CoGroupOperatorBase; +import org.apache.flink.api.common.operators.util.FieldSet; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.operators.CoGroupDescriptor; import org.apache.flink.optimizer.operators.CoGroupWithSolutionSetFirstDescriptor; import org.apache.flink.optimizer.operators.CoGroupWithSolutionSetSecondDescriptor; import org.apache.flink.optimizer.operators.OperatorDescriptorDual; -import org.apache.flink.api.common.operators.util.FieldSet; + +import java.util.Collections; +import java.util.List; /** * The Optimizer representation of a CoGroup operator. diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupRawNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupRawNode.java index dcc3102ea302f..f9543a8ed27c1 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupRawNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupRawNode.java @@ -17,14 +17,15 @@ */ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; import org.apache.flink.api.common.operators.Ordering; import org.apache.flink.api.common.operators.base.CoGroupRawOperatorBase; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.operators.CoGroupRawDescriptor; import org.apache.flink.optimizer.operators.OperatorDescriptorDual; +import java.util.Collections; +import java.util.List; + /** * The Optimizer representation of a CoGroupRaw operator. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CrossNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CrossNode.java index 622bfac561396..7613b8a54f203 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CrossNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CrossNode.java @@ -18,12 +18,9 @@ package org.apache.flink.optimizer.dag; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.base.CrossOperatorBase; import org.apache.flink.api.common.operators.base.CrossOperatorBase.CrossHint; +import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.Optimizer; @@ -32,7 +29,10 @@ import org.apache.flink.optimizer.operators.CrossStreamOuterFirstDescriptor; import org.apache.flink.optimizer.operators.CrossStreamOuterSecondDescriptor; import org.apache.flink.optimizer.operators.OperatorDescriptorDual; -import org.apache.flink.configuration.Configuration; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** * The Optimizer representation of a Cross (Cartesian product) operator. diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DataSinkNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DataSinkNode.java index ad50fa2b29c1e..f489b7203c08d 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DataSinkNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DataSinkNode.java @@ -18,11 +18,6 @@ package org.apache.flink.optimizer.dag; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - import org.apache.flink.api.common.ExecutionMode; import org.apache.flink.api.common.operators.GenericDataSinkBase; import org.apache.flink.api.common.operators.Operator; @@ -40,6 +35,11 @@ import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.util.Visitor; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + /** * The Optimizer representation of a data sink. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DataSourceNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DataSourceNode.java index 867698d95b550..7364be368ffdb 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DataSourceNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DataSourceNode.java @@ -18,11 +18,6 @@ package org.apache.flink.optimizer.dag; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - import org.apache.flink.api.common.ExecutionMode; import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.io.FileInputFormat; @@ -37,6 +32,7 @@ import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.SemanticProperties.EmptySemanticProperties; import org.apache.flink.api.common.operators.util.FieldList; +import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.Optimizer; import org.apache.flink.optimizer.costs.CostEstimator; @@ -45,9 +41,13 @@ import org.apache.flink.optimizer.dataproperties.LocalProperties; import org.apache.flink.optimizer.plan.PlanNode; import org.apache.flink.optimizer.plan.SourcePlanNode; -import org.apache.flink.configuration.Configuration; import org.apache.flink.util.Visitor; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + /** * The optimizer's internal representation of a data source. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/FilterNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/FilterNode.java index 89bd3371e7eaa..5cc253e54fa51 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/FilterNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/FilterNode.java @@ -18,9 +18,6 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.SingleInputSemanticProperties; import org.apache.flink.api.common.operators.base.FilterOperatorBase; @@ -28,6 +25,9 @@ import org.apache.flink.optimizer.operators.FilterDescriptor; import org.apache.flink.optimizer.operators.OperatorDescriptorSingle; +import java.util.Collections; +import java.util.List; + /** * The optimizer's internal representation of a Filter operator node. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/FlatMapNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/FlatMapNode.java index 7dd84b2156ba5..8b28f17ab0a80 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/FlatMapNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/FlatMapNode.java @@ -18,14 +18,14 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.base.FlatMapOperatorBase; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.operators.FlatMapDescriptor; import org.apache.flink.optimizer.operators.OperatorDescriptorSingle; +import java.util.Collections; +import java.util.List; + /** * The optimizer's internal representation of a FlatMap operator node. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/GroupReduceNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/GroupReduceNode.java index bd118ec830111..418109bbb9393 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/GroupReduceNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/GroupReduceNode.java @@ -18,14 +18,13 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.Ordering; import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.SingleInputSemanticProperties; import org.apache.flink.api.common.operators.base.GroupReduceOperatorBase; +import org.apache.flink.api.common.operators.util.FieldSet; +import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.Optimizer; @@ -34,8 +33,9 @@ import org.apache.flink.optimizer.operators.GroupReduceProperties; import org.apache.flink.optimizer.operators.GroupReduceWithCombineProperties; import org.apache.flink.optimizer.operators.OperatorDescriptorSingle; -import org.apache.flink.api.common.operators.util.FieldSet; -import org.apache.flink.configuration.Configuration; + +import java.util.Collections; +import java.util.List; /** * The optimizer representation of a GroupReduce operation. diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/JoinNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/JoinNode.java index 383bbe195a6d5..1da279e00388b 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/JoinNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/JoinNode.java @@ -18,13 +18,10 @@ package org.apache.flink.optimizer.dag; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.base.InnerJoinOperatorBase; import org.apache.flink.api.common.operators.base.JoinOperatorBase.JoinHint; +import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.Optimizer; @@ -33,7 +30,10 @@ import org.apache.flink.optimizer.operators.HashJoinBuildSecondProperties; import org.apache.flink.optimizer.operators.OperatorDescriptorDual; import org.apache.flink.optimizer.operators.SortMergeInnerJoinDescriptor; -import org.apache.flink.configuration.Configuration; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** * The Optimizer representation of a join operator. diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapNode.java index afbf4a8d5f328..f7d75a4f5302b 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapNode.java @@ -18,14 +18,14 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.SingleInputOperator; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.operators.MapDescriptor; import org.apache.flink.optimizer.operators.OperatorDescriptorSingle; +import java.util.Collections; +import java.util.List; + /** * The optimizer's internal representation of a Map operator node. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapPartitionNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapPartitionNode.java index 575dd6329d64f..08ec53b64ff67 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapPartitionNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapPartitionNode.java @@ -19,16 +19,16 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.SingleInputOperator; +import org.apache.flink.api.common.operators.SingleInputSemanticProperties; +import org.apache.flink.api.common.operators.util.FieldSet; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.operators.MapPartitionDescriptor; import org.apache.flink.optimizer.operators.OperatorDescriptorSingle; -import org.apache.flink.api.common.operators.SingleInputSemanticProperties; -import org.apache.flink.api.common.operators.util.FieldSet; + +import java.util.Collections; +import java.util.List; /** * The optimizer's internal representation of a MapPartition operator node. diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/OptimizerNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/OptimizerNode.java index cff8f1859c68f..f054be74cf883 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/OptimizerNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/OptimizerNode.java @@ -18,15 +18,6 @@ package org.apache.flink.optimizer.dag; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.ExecutionMode; import org.apache.flink.api.common.operators.AbstractUdfOperator; @@ -47,6 +38,15 @@ import org.apache.flink.util.Visitable; import org.apache.flink.util.Visitor; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * The OptimizerNode is the base class of all nodes in the optimizer DAG. The optimizer DAG is the * optimizer's representation of a program, created before the actual optimization (which creates different diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/PartitionNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/PartitionNode.java index 2d3c6463f598b..873cc23c14a84 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/PartitionNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/PartitionNode.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.distributions.DataDistribution; import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.Ordering; @@ -41,6 +38,9 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.util.Preconditions; +import java.util.Collections; +import java.util.List; + /** * The optimizer's internal representation of a Partition operator node. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/ReduceNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/ReduceNode.java index e83352eaba3e3..d08bbb6eca240 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/ReduceNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/ReduceNode.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.base.ReduceOperatorBase; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.operators.AllReduceProperties; @@ -29,6 +26,9 @@ import org.apache.flink.optimizer.operators.ReduceProperties; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + /** * The Optimizer representation of a Reduce operator. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java index 5691d194ec152..8b3b4044c6007 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java @@ -19,22 +19,12 @@ package org.apache.flink.optimizer.dag; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.flink.api.common.ExecutionMode; import org.apache.flink.api.common.operators.Operator; import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.SingleInputOperator; import org.apache.flink.api.common.operators.util.FieldSet; +import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.Optimizer; import org.apache.flink.optimizer.costs.CostEstimator; @@ -47,16 +37,26 @@ import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.NamedChannel; import org.apache.flink.optimizer.plan.PlanNode; -import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport; +import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.util.NoOpUnaryUdfOp; -import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Visitor; import com.google.common.collect.Sets; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; + /** * A node in the optimizer's program representation for an operation with a single input. * diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SinkJoiner.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SinkJoiner.java index 979d254438c96..11dc7f4d131e8 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SinkJoiner.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SinkJoiner.java @@ -18,10 +18,6 @@ package org.apache.flink.optimizer.dag; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.ExecutionMode; import org.apache.flink.api.common.typeinfo.NothingTypeInfo; import org.apache.flink.optimizer.DataStatistics; @@ -30,6 +26,10 @@ import org.apache.flink.optimizer.util.NoOpBinaryUdfOp; import org.apache.flink.types.Nothing; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * This class represents a utility node that is not part of the actual plan. * It is used for plans with multiple data sinks to transform it into a plan with diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SolutionSetNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SolutionSetNode.java index 9b5399923cac8..299c6388bf40c 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SolutionSetNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SolutionSetNode.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.base.DeltaIterationBase.SolutionSetPlaceHolder; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.dataproperties.GlobalProperties; @@ -30,6 +27,9 @@ import org.apache.flink.optimizer.plan.PlanNode; import org.apache.flink.optimizer.plan.SolutionSetPlanNode; +import java.util.Collections; +import java.util.List; + /** * The optimizer's internal representation of the solution set of a workset iteration. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java index a4199a80fdb72..dba06838ecceb 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java @@ -19,22 +19,12 @@ package org.apache.flink.optimizer.dag; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.flink.api.common.ExecutionMode; import org.apache.flink.api.common.operators.DualInputOperator; import org.apache.flink.api.common.operators.Operator; import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.util.FieldList; +import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.Optimizer; import org.apache.flink.optimizer.costs.CostEstimator; @@ -51,7 +41,6 @@ import org.apache.flink.optimizer.plan.NamedChannel; import org.apache.flink.optimizer.plan.PlanNode; import org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport; -import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.runtime.operators.DamBehavior; import org.apache.flink.runtime.operators.DriverStrategy; @@ -60,6 +49,17 @@ import com.google.common.collect.Sets; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; + /** * A node in the optimizer plan that represents an operator with a two different inputs, such as Join, * Cross, CoGroup, or Union. diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/UnaryOperatorNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/UnaryOperatorNode.java index 0ec026408533c..0efdc0a88d850 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/UnaryOperatorNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/UnaryOperatorNode.java @@ -18,10 +18,6 @@ package org.apache.flink.optimizer.dag; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.SingleInputOperator; import org.apache.flink.api.common.operators.SingleInputSemanticProperties; @@ -29,6 +25,10 @@ import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.operators.OperatorDescriptorSingle; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class UnaryOperatorNode extends SingleInputNode { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetIterationNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetIterationNode.java index e62e727315e3f..db35ce2e26f48 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetIterationNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetIterationNode.java @@ -18,12 +18,6 @@ package org.apache.flink.optimizer.dag; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - import org.apache.flink.api.common.ExecutionMode; import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.SemanticProperties.EmptySemanticProperties; @@ -32,7 +26,6 @@ import org.apache.flink.api.common.typeinfo.NothingTypeInfo; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.DataStatistics; -import org.apache.flink.optimizer.traversals.InterestingPropertyVisitor; import org.apache.flink.optimizer.costs.CostEstimator; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.InterestingProperties; @@ -46,11 +39,12 @@ import org.apache.flink.optimizer.plan.DualInputPlanNode; import org.apache.flink.optimizer.plan.NamedChannel; import org.apache.flink.optimizer.plan.PlanNode; +import org.apache.flink.optimizer.plan.PlanNode.FeedbackPropertiesMeetRequirementsReport; import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plan.SolutionSetPlanNode; import org.apache.flink.optimizer.plan.WorksetIterationPlanNode; import org.apache.flink.optimizer.plan.WorksetPlanNode; -import org.apache.flink.optimizer.plan.PlanNode.FeedbackPropertiesMeetRequirementsReport; +import org.apache.flink.optimizer.traversals.InterestingPropertyVisitor; import org.apache.flink.optimizer.util.NoOpBinaryUdfOp; import org.apache.flink.optimizer.util.NoOpUnaryUdfOp; import org.apache.flink.runtime.operators.DriverStrategy; @@ -59,6 +53,12 @@ import org.apache.flink.types.Nothing; import org.apache.flink.util.Visitor; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + /** * A node in the optimizer's program representation for a workset iteration. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetNode.java index ae636c5789217..42fc3d52893b1 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetNode.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.dag; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.base.DeltaIterationBase.WorksetPlaceHolder; import org.apache.flink.optimizer.DataStatistics; import org.apache.flink.optimizer.dataproperties.GlobalProperties; @@ -30,6 +27,9 @@ import org.apache.flink.optimizer.plan.PlanNode; import org.apache.flink.optimizer.plan.WorksetPlanNode; +import java.util.Collections; +import java.util.List; + /** * The optimizer's internal representation of the partial solution that is input to a bulk iteration. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/GlobalProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/GlobalProperties.java index 654b0545e57f8..a00fb3c3416f3 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/GlobalProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/GlobalProperties.java @@ -31,6 +31,7 @@ import org.apache.flink.optimizer.util.Utils; import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/InterestingProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/InterestingProperties.java index 6946641c6fad9..2a584b6953da3 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/InterestingProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/InterestingProperties.java @@ -18,15 +18,15 @@ package org.apache.flink.optimizer.dataproperties; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.optimizer.dag.OptimizerNode; import org.apache.flink.optimizer.dag.SingleInputNode; import org.apache.flink.optimizer.dag.TwoInputNode; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + /** * Interesting properties are propagated from parent operators to child operators. They tell the child * what data properties would help the parent in operating in a cheaper fashion. A reduce operator, for diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/LocalProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/LocalProperties.java index e0231aa0fe05f..9e4a5c50cca46 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/LocalProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/LocalProperties.java @@ -19,16 +19,17 @@ package org.apache.flink.optimizer.dataproperties; -import java.util.HashSet; -import java.util.Set; - import org.apache.flink.api.common.operators.Ordering; import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.common.operators.util.FieldSet; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.HashSet; +import java.util.Set; + /** * This class represents local properties of the data. A local property is a property that exists * within the data of a single partition, such as sort order, or data grouping. diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedLocalProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedLocalProperties.java index a9d14e82ec7bd..b0ed33634a92f 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedLocalProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedLocalProperties.java @@ -19,8 +19,6 @@ package org.apache.flink.optimizer.dataproperties; -import java.util.Arrays; - import org.apache.flink.api.common.operators.Ordering; import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.util.FieldSet; @@ -28,6 +26,8 @@ import org.apache.flink.optimizer.util.Utils; import org.apache.flink.runtime.operators.util.LocalStrategy; +import java.util.Arrays; + /** * This class represents the local properties of the data that are requested by an operator. * Local properties are the properties within one partition. diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractJoinDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractJoinDescriptor.java index 1f2f42afaa13d..ded82ed5939c1 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractJoinDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractJoinDescriptor.java @@ -18,16 +18,16 @@ package org.apache.flink.optimizer.operators; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.PartitioningProperty; import org.apache.flink.optimizer.dataproperties.RequestedGlobalProperties; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * Defines the possible global properties for a join. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupReduceProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupReduceProperties.java index 9efd8c7a71fb8..df76257ed6ff1 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupReduceProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupReduceProperties.java @@ -18,9 +18,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.optimizer.dag.SingleInputNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.LocalProperties; @@ -31,6 +28,9 @@ import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + public final class AllGroupReduceProperties extends OperatorDescriptorSingle { @Override diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupWithPartialPreGroupProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupWithPartialPreGroupProperties.java index 4990a5d662d7d..0c0c3217cfd62 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupWithPartialPreGroupProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupWithPartialPreGroupProperties.java @@ -18,9 +18,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.optimizer.costs.Costs; import org.apache.flink.optimizer.dag.GroupReduceNode; import org.apache.flink.optimizer.dag.SingleInputNode; @@ -35,6 +32,9 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; +import java.util.Collections; +import java.util.List; + public final class AllGroupWithPartialPreGroupProperties extends OperatorDescriptorSingle { @Override diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllReduceProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllReduceProperties.java index bd600e4a988eb..ab498db3e4db9 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllReduceProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllReduceProperties.java @@ -18,9 +18,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.optimizer.costs.Costs; import org.apache.flink.optimizer.dag.ReduceNode; import org.apache.flink.optimizer.dag.SingleInputNode; @@ -34,6 +31,9 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; +import java.util.Collections; +import java.util.List; + public final class AllReduceProperties extends OperatorDescriptorSingle { @Override diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/BinaryUnionOpDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/BinaryUnionOpDescriptor.java index acfb2290182a4..266fa5c53b864 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/BinaryUnionOpDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/BinaryUnionOpDescriptor.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.optimizer.dag.BinaryUnionNode; import org.apache.flink.optimizer.dag.TwoInputNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; @@ -34,6 +31,9 @@ import org.apache.flink.optimizer.plan.DualInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java index f48e297407c4a..c8fe48841252d 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java @@ -19,10 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.flink.optimizer.dag.TwoInputNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.LocalProperties; @@ -32,6 +28,10 @@ import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.DualInputPlanNode; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public abstract class CartesianProductDescriptor extends OperatorDescriptorDual { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupDescriptor.java index 0e3fb5577e84d..ce7e66c897b5c 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupDescriptor.java @@ -18,10 +18,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.operators.Ordering; @@ -38,6 +34,10 @@ import org.apache.flink.optimizer.util.Utils; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + public class CoGroupDescriptor extends OperatorDescriptorDual { private final Ordering ordering1; // ordering on the first input diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java index 5a981b63ae91b..f2f4bdbef3487 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java @@ -17,8 +17,6 @@ */ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.operators.Ordering; import org.apache.flink.api.common.operators.util.FieldList; @@ -34,6 +32,9 @@ import org.apache.flink.optimizer.util.Utils; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetFirstDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetFirstDescriptor.java index 8e7edeb2fb6ec..c5494e6e8a739 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetFirstDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetFirstDescriptor.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.dag.TwoInputNode; @@ -32,6 +29,9 @@ import org.apache.flink.optimizer.util.Utils; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetSecondDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetSecondDescriptor.java index 016eb79573810..a13eb3f3db1b3 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetSecondDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetSecondDescriptor.java @@ -19,14 +19,14 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.optimizer.dataproperties.LocalProperties; import org.apache.flink.optimizer.dataproperties.RequestedLocalProperties; import org.apache.flink.optimizer.util.Utils; +import java.util.Collections; +import java.util.List; + /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FilterDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FilterDescriptor.java index 81c823fb76a62..27cb8a7cf3a19 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FilterDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FilterDescriptor.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.optimizer.dag.SingleInputNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.LocalProperties; @@ -31,6 +28,9 @@ import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + public class FilterDescriptor extends OperatorDescriptorSingle { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FlatMapDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FlatMapDescriptor.java index b915e45cf2f2c..975b21c0bdca6 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FlatMapDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FlatMapDescriptor.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.optimizer.dag.SingleInputNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.LocalProperties; @@ -32,6 +29,9 @@ import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + public class FlatMapDescriptor extends OperatorDescriptorSingle { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceProperties.java index ebd09f2a56a61..908bb0f7aa9e4 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceProperties.java @@ -18,9 +18,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.operators.Ordering; @@ -35,6 +32,9 @@ import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + public final class GroupReduceProperties extends OperatorDescriptorSingle { private final Ordering ordering; // ordering that we need to use if an additional ordering is requested diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceWithCombineProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceWithCombineProperties.java index 888b670b55f30..85e8c8495726f 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceWithCombineProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceWithCombineProperties.java @@ -18,9 +18,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.operators.Ordering; @@ -40,9 +37,13 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.runtime.operators.util.LocalStrategy; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Collections; +import java.util.List; + public final class GroupReduceWithCombineProperties extends OperatorDescriptorSingle { private static final Logger LOG = LoggerFactory.getLogger(GroupReduceWithCombineProperties.class); diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildFirstProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildFirstProperties.java index fec72a95c6c35..701ec8d25198b 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildFirstProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildFirstProperties.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.dag.TwoInputNode; @@ -31,6 +28,9 @@ import org.apache.flink.optimizer.plan.DualInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildSecondProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildSecondProperties.java index f9d1e6c15a35b..a0eee8d8295f4 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildSecondProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildSecondProperties.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.dag.TwoInputNode; @@ -31,6 +28,9 @@ import org.apache.flink.optimizer.plan.DualInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + public final class HashJoinBuildSecondProperties extends AbstractJoinDescriptor { public HashJoinBuildSecondProperties(FieldList keys1, FieldList keys2) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapDescriptor.java index 9f14d2a18e99d..6be1d52568649 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapDescriptor.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.optimizer.dag.SingleInputNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.LocalProperties; @@ -31,6 +28,9 @@ import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + public class MapDescriptor extends OperatorDescriptorSingle { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapPartitionDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapPartitionDescriptor.java index 1489097dc6c6f..fb08bb16e745b 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapPartitionDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapPartitionDescriptor.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.optimizer.dag.SingleInputNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.LocalProperties; @@ -31,6 +28,9 @@ import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + public class MapPartitionDescriptor extends OperatorDescriptorSingle { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/NoOpDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/NoOpDescriptor.java index 7ae35c3673a01..2dd69a80313ba 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/NoOpDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/NoOpDescriptor.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.optimizer.dag.SingleInputNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.LocalProperties; @@ -31,6 +28,9 @@ import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + public class NoOpDescriptor extends OperatorDescriptorSingle { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorDual.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorDual.java index e5e43ca227c97..80869420ac729 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorDual.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorDual.java @@ -19,8 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.List; - import org.apache.flink.api.common.operators.Ordering; import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.optimizer.CompilerException; @@ -32,6 +30,8 @@ import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.DualInputPlanNode; +import java.util.List; + /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorSingle.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorSingle.java index ffa317caac5bd..0c1a0c572a674 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorSingle.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorSingle.java @@ -19,8 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.List; - import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.common.operators.util.FieldSet; import org.apache.flink.optimizer.dag.SingleInputNode; @@ -31,6 +29,8 @@ import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.SingleInputPlanNode; +import java.util.List; + /** * Abstract base class for Operator descriptions which instantiates the node and sets the driver * strategy and the sorting and grouping keys. Returns possible local and global properties and diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/PartialGroupProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/PartialGroupProperties.java index e4e6a7f1d10bc..4a6dfa0dad55f 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/PartialGroupProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/PartialGroupProperties.java @@ -18,9 +18,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.base.GroupReduceOperatorBase; import org.apache.flink.api.common.operators.util.FieldSet; import org.apache.flink.optimizer.dag.GroupReduceNode; @@ -34,6 +31,9 @@ import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + public final class PartialGroupProperties extends OperatorDescriptorSingle { public PartialGroupProperties(FieldSet keys) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/ReduceProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/ReduceProperties.java index d8e5a6c0d99df..afdf13e2d8966 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/ReduceProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/ReduceProperties.java @@ -18,9 +18,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.util.FieldSet; import org.apache.flink.optimizer.costs.Costs; @@ -38,9 +35,13 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.runtime.operators.util.LocalStrategy; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Collections; +import java.util.List; + public final class ReduceProperties extends OperatorDescriptorSingle { private static final Logger LOG = LoggerFactory.getLogger(ReduceProperties.class); diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/SolutionSetDeltaOperator.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/SolutionSetDeltaOperator.java index 1dcd87dc24332..c8ffaac3cd12c 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/SolutionSetDeltaOperator.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/SolutionSetDeltaOperator.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.optimizer.dag.SingleInputNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; @@ -32,6 +29,9 @@ import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/UtilSinkJoinOpDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/UtilSinkJoinOpDescriptor.java index c42cff25cdb6b..c0eff4133798e 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/UtilSinkJoinOpDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/UtilSinkJoinOpDescriptor.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer.operators; -import java.util.Collections; -import java.util.List; - import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.dag.SinkJoiner; import org.apache.flink.optimizer.dag.TwoInputNode; @@ -34,6 +31,9 @@ import org.apache.flink.optimizer.plan.SinkJoinerPlanNode; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Collections; +import java.util.List; + /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkIterationPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkIterationPlanNode.java index e79e2f3cb883b..a0add5ef5d829 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkIterationPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkIterationPlanNode.java @@ -19,11 +19,6 @@ package org.apache.flink.optimizer.plan; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; - -import java.util.HashMap; - import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.costs.Costs; @@ -32,6 +27,11 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.util.Visitor; +import java.util.HashMap; + +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; + public class BulkIterationPlanNode extends SingleInputPlanNode implements IterationPlanNode { private final BulkPartialSolutionPlanNode partialSolutionPlanNode; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkPartialSolutionPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkPartialSolutionPlanNode.java index df05b64cdc629..ae4558c2a182e 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkPartialSolutionPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkPartialSolutionPlanNode.java @@ -19,13 +19,6 @@ package org.apache.flink.optimizer.plan; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; - -import java.util.Collections; -import java.util.HashMap; - import org.apache.flink.optimizer.costs.Costs; import org.apache.flink.optimizer.dag.BulkPartialSolutionNode; import org.apache.flink.optimizer.dag.OptimizerNode; @@ -35,6 +28,13 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.util.Visitor; +import java.util.Collections; +import java.util.HashMap; + +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; + /** * Plan candidate node for partial solution of a bulk iteration. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/DualInputPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/DualInputPlanNode.java index 01c56dda039e8..04b9698cf7d97 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/DualInputPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/DualInputPlanNode.java @@ -19,14 +19,6 @@ package org.apache.flink.optimizer.plan; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.common.typeutils.TypeComparatorFactory; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; @@ -37,6 +29,14 @@ import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Visitor; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; + /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NAryUnionPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NAryUnionPlanNode.java index 3650eeac50af2..2ea845383e8c2 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NAryUnionPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NAryUnionPlanNode.java @@ -19,10 +19,6 @@ package org.apache.flink.optimizer.plan; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - import org.apache.flink.optimizer.costs.Costs; import org.apache.flink.optimizer.dag.BinaryUnionNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; @@ -31,6 +27,10 @@ import org.apache.flink.util.IterableIterator; import org.apache.flink.util.Visitor; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + /** * A union operation over multiple inputs (2 or more). */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/OptimizedPlan.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/OptimizedPlan.java index 311c2861e747c..4a0ac7b026dfe 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/OptimizedPlan.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/OptimizedPlan.java @@ -18,12 +18,12 @@ package org.apache.flink.optimizer.plan; -import java.util.Collection; - import org.apache.flink.api.common.Plan; import org.apache.flink.util.Visitable; import org.apache.flink.util.Visitor; +import java.util.Collection; + /** * The execution plan generated by the Optimizer. It contains {@link PlanNode}s * and {@link Channel}s that describe exactly how the program should be executed. diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SingleInputPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SingleInputPlanNode.java index b928be7f8a53d..d007677042ff2 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SingleInputPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SingleInputPlanNode.java @@ -19,15 +19,6 @@ package org.apache.flink.optimizer.plan; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.common.typeutils.TypeComparatorFactory; import org.apache.flink.optimizer.CompilerException; @@ -38,6 +29,15 @@ import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Visitor; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; + /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SinkJoinerPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SinkJoinerPlanNode.java index c93d8c2569734..b9edd046cbab1 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SinkJoinerPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SinkJoinerPlanNode.java @@ -18,13 +18,13 @@ package org.apache.flink.optimizer.plan; -import java.util.List; - import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.costs.Costs; import org.apache.flink.optimizer.dag.SinkJoiner; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.List; + /** * diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SolutionSetPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SolutionSetPlanNode.java index 63093dd92b8bd..7a5cf45744739 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SolutionSetPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SolutionSetPlanNode.java @@ -19,13 +19,6 @@ package org.apache.flink.optimizer.plan; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; - -import java.util.Collections; -import java.util.HashMap; - import org.apache.flink.optimizer.costs.Costs; import org.apache.flink.optimizer.dag.OptimizerNode; import org.apache.flink.optimizer.dag.SolutionSetNode; @@ -34,6 +27,13 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.util.Visitor; +import java.util.Collections; +import java.util.HashMap; + +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; + /** * Plan candidate node for partial solution of a bulk iteration. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SourcePlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SourcePlanNode.java index 937fe716bd99e..1e8b278036ded 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SourcePlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SourcePlanNode.java @@ -18,11 +18,6 @@ package org.apache.flink.optimizer.plan; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; - -import java.util.Collections; - import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.optimizer.dag.DataSourceNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; @@ -30,6 +25,11 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.util.Visitor; +import java.util.Collections; + +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; + /** * Plan candidate node for data flow sources that have no input and no special strategies. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/StreamingPlan.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/StreamingPlan.java index 880f2e3d5db41..9f191857e935c 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/StreamingPlan.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/StreamingPlan.java @@ -18,11 +18,11 @@ package org.apache.flink.optimizer.plan; +import org.apache.flink.runtime.jobgraph.JobGraph; + import java.io.File; import java.io.IOException; -import org.apache.flink.runtime.jobgraph.JobGraph; - /** * Abstract class representing Flink Streaming plans * diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetIterationPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetIterationPlanNode.java index 95adacec6476a..5470f7de406d7 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetIterationPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetIterationPlanNode.java @@ -18,12 +18,6 @@ package org.apache.flink.optimizer.plan; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; - -import java.util.HashMap; -import java.util.Map; - import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.common.typeutils.TypeComparatorFactory; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; @@ -34,6 +28,12 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.util.Visitor; +import java.util.HashMap; +import java.util.Map; + +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; + /** * A node in the execution, representing a workset iteration (delta iteration). */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetPlanNode.java index 8d044d6d3c173..aa63986f42f2e 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetPlanNode.java @@ -19,13 +19,6 @@ package org.apache.flink.optimizer.plan; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; -import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; - -import java.util.Collections; -import java.util.HashMap; - import org.apache.flink.optimizer.costs.Costs; import org.apache.flink.optimizer.dag.OptimizerNode; import org.apache.flink.optimizer.dag.WorksetNode; @@ -35,6 +28,13 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.util.Visitor; +import java.util.Collections; +import java.util.HashMap; + +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.FOUND_SOURCE_AND_DAM; +import static org.apache.flink.optimizer.plan.PlanNode.SourceAndDamReport.NOT_FOUND; + /** * Plan candidate node for partial solution of a bulk iteration. */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java index 16bb47b8a1117..6bd8dbd694151 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java @@ -18,7 +18,6 @@ package org.apache.flink.optimizer.plandump; -import org.apache.commons.lang3.StringEscapeUtils; import org.apache.flink.api.common.operators.CompilerHints; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.dag.BinaryUnionNode; @@ -42,6 +41,8 @@ import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.StringUtils; +import org.apache.commons.lang3.StringEscapeUtils; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JobGraphGenerator.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JobGraphGenerator.java index a407bfea06c79..4ceaa95dc03c8 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JobGraphGenerator.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JobGraphGenerator.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.plantranslate; -import com.fasterxml.jackson.core.JsonFactory; - import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.aggregators.AggregatorRegistry; import org.apache.flink.api.common.aggregators.AggregatorWithName; @@ -30,6 +28,8 @@ import org.apache.flink.api.common.distributions.DataDistribution; import org.apache.flink.api.common.operators.util.UserCodeWrapper; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; +import org.apache.flink.configuration.ConfigConstants; +import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.GlobalConfiguration; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.dag.TempMode; @@ -48,8 +48,6 @@ import org.apache.flink.optimizer.plan.SourcePlanNode; import org.apache.flink.optimizer.plan.WorksetIterationPlanNode; import org.apache.flink.optimizer.plan.WorksetPlanNode; -import org.apache.flink.configuration.ConfigConstants; -import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.util.Utils; import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.runtime.io.network.partition.ResultPartitionType; @@ -58,11 +56,11 @@ import org.apache.flink.runtime.iterative.task.IterationIntermediateTask; import org.apache.flink.runtime.iterative.task.IterationSynchronizationSinkTask; import org.apache.flink.runtime.iterative.task.IterationTailTask; -import org.apache.flink.runtime.jobgraph.JobEdge; -import org.apache.flink.runtime.jobgraph.JobVertex; import org.apache.flink.runtime.jobgraph.DistributionPattern; import org.apache.flink.runtime.jobgraph.InputFormatVertex; +import org.apache.flink.runtime.jobgraph.JobEdge; import org.apache.flink.runtime.jobgraph.JobGraph; +import org.apache.flink.runtime.jobgraph.JobVertex; import org.apache.flink.runtime.jobgraph.OutputFormatVertex; import org.apache.flink.runtime.jobmanager.scheduler.SlotSharingGroup; import org.apache.flink.runtime.operators.BatchTask; @@ -83,6 +81,8 @@ import org.apache.flink.util.StringUtils; import org.apache.flink.util.Visitor; +import com.fasterxml.jackson.core.JsonFactory; + import java.io.IOException; import java.util.ArrayList; import java.util.Collection; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JsonMapper.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JsonMapper.java index 1125c2961c8d4..81e1956c9cd23 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JsonMapper.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JsonMapper.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.plantranslate; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; import org.apache.flink.api.common.operators.CompilerHints; import org.apache.flink.optimizer.dag.OptimizerNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; @@ -29,6 +27,9 @@ import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.runtime.operators.util.LocalStrategy; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; + import java.io.IOException; import java.io.StringWriter; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/GenericFlatTypePostPass.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/GenericFlatTypePostPass.java index 2d8377e8ff7f5..e9b6a8fa8a4fd 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/GenericFlatTypePostPass.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/GenericFlatTypePostPass.java @@ -19,8 +19,6 @@ package org.apache.flink.optimizer.postpass; -import java.util.Map; - import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.common.typeutils.TypeComparatorFactory; @@ -46,6 +44,8 @@ import org.apache.flink.optimizer.plan.WorksetIterationPlanNode; import org.apache.flink.optimizer.plan.WorksetPlanNode; +import java.util.Map; + /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/JavaApiPostPass.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/JavaApiPostPass.java index 3180ab48aa19d..ff3030f74bf81 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/JavaApiPostPass.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/JavaApiPostPass.java @@ -18,10 +18,6 @@ package org.apache.flink.optimizer.postpass; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.operators.DualInputOperator; import org.apache.flink.api.common.operators.GenericDataSourceBase; @@ -62,6 +58,10 @@ import org.apache.flink.optimizer.util.NoOpUnaryUdfOp; import org.apache.flink.runtime.operators.DriverStrategy; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + /** * The post-optimizer plan traversal. This traversal fills in the API specific utilities (serializers and * comparators). diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/RangePartitionRewriter.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/RangePartitionRewriter.java index b1c5dae7c606b..1237b44360428 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/RangePartitionRewriter.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/RangePartitionRewriter.java @@ -30,32 +30,32 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparatorFactory; import org.apache.flink.api.java.functions.IdPartitioner; -import org.apache.flink.optimizer.costs.Costs; -import org.apache.flink.optimizer.dataproperties.GlobalProperties; -import org.apache.flink.optimizer.dataproperties.LocalProperties; -import org.apache.flink.optimizer.plan.IterationPlanNode; -import org.apache.flink.runtime.io.network.DataExchangeMode; -import org.apache.flink.runtime.operators.udf.AssignRangeIndex; -import org.apache.flink.runtime.operators.udf.RemoveRangeIndex; -import org.apache.flink.runtime.operators.udf.RangeBoundaryBuilder; import org.apache.flink.api.java.functions.SampleInCoordinator; import org.apache.flink.api.java.functions.SampleInPartition; import org.apache.flink.api.java.sampling.IntermediateSampleData; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TupleTypeInfo; import org.apache.flink.api.java.typeutils.TypeExtractor; +import org.apache.flink.optimizer.costs.Costs; import org.apache.flink.optimizer.dag.GroupReduceNode; import org.apache.flink.optimizer.dag.MapNode; import org.apache.flink.optimizer.dag.MapPartitionNode; import org.apache.flink.optimizer.dag.TempMode; +import org.apache.flink.optimizer.dataproperties.GlobalProperties; +import org.apache.flink.optimizer.dataproperties.LocalProperties; import org.apache.flink.optimizer.plan.Channel; +import org.apache.flink.optimizer.plan.IterationPlanNode; import org.apache.flink.optimizer.plan.NamedChannel; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.PlanNode; import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.util.Utils; +import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; +import org.apache.flink.runtime.operators.udf.AssignRangeIndex; +import org.apache.flink.runtime.operators.udf.RangeBoundaryBuilder; +import org.apache.flink.runtime.operators.udf.RemoveRangeIndex; import org.apache.flink.util.Visitor; import java.util.ArrayList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java index a2544eaf322a8..fa9035ae95798 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.util; -import java.util.List; - import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.RuntimeContext; import org.apache.flink.api.common.functions.util.NoOpFunction; @@ -28,6 +26,8 @@ import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; import org.apache.flink.api.common.typeinfo.TypeInformation; +import java.util.List; + public class NoOpBinaryUdfOp extends DualInputOperator { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java index f0de9ea9abfcb..824415489acde 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.util; -import java.util.List; - import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.RuntimeContext; import org.apache.flink.api.common.functions.util.NoOpFunction; @@ -28,6 +26,8 @@ import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; import org.apache.flink.api.common.typeinfo.TypeInformation; +import java.util.List; + public class NoOpUnaryUdfOp extends SingleInputOperator { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/Utils.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/Utils.java index 97dd9173ebca3..2d763455ecaab 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/Utils.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/Utils.java @@ -19,8 +19,6 @@ package org.apache.flink.optimizer.util; -import java.util.Arrays; - import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.operators.Operator; import org.apache.flink.api.common.operators.Order; @@ -37,6 +35,8 @@ import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.PlanNode; +import java.util.Arrays; + /** * Utility class that contains helper methods for optimizer. diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/AdditionalOperatorsTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/AdditionalOperatorsTest.java index b9b6d8a243b99..e69a7770c4f29 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/AdditionalOperatorsTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/AdditionalOperatorsTest.java @@ -18,9 +18,6 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; @@ -29,10 +26,14 @@ import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.DualInputPlanNode; import org.apache.flink.optimizer.plan.OptimizedPlan; -import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.optimizer.util.CompilerTestBase; +import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * Tests that validate optimizer choices when using operators that are requesting certain specific execution * strategies. diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/BranchingPlansCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/BranchingPlansCompilerTest.java index 2b3136a6d7f84..08293e6ad6023 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/BranchingPlansCompilerTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/BranchingPlansCompilerTest.java @@ -18,41 +18,44 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.*; - -import java.util.HashSet; -import java.util.Set; - +import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.CoGroupFunction; +import org.apache.flink.api.common.functions.MapFunction; +import org.apache.flink.api.common.functions.RichJoinFunction; import org.apache.flink.api.common.operators.Operator; +import org.apache.flink.api.common.operators.base.JoinOperatorBase.JoinHint; +import org.apache.flink.api.java.DataSet; +import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.io.TextOutputFormat; import org.apache.flink.api.java.operators.DeltaIteration; -import org.apache.flink.optimizer.testfunctions.DummyCoGroupFunction; -import org.apache.flink.optimizer.testfunctions.IdentityCoGrouper; -import org.apache.flink.optimizer.testfunctions.IdentityCrosser; -import org.apache.flink.optimizer.testfunctions.IdentityJoiner; -import org.apache.flink.optimizer.testfunctions.SelectOneReducer; -import org.apache.flink.optimizer.util.CompilerTestBase; -import org.apache.flink.util.Collector; -import org.junit.Assert; -import org.junit.Test; -import org.apache.flink.api.common.Plan; -import org.apache.flink.api.java.DataSet; -import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.operators.IterativeDataSet; -import org.apache.flink.api.common.functions.MapFunction; -import org.apache.flink.api.common.functions.RichJoinFunction; -import org.apache.flink.api.common.operators.base.JoinOperatorBase.JoinHint; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; +import org.apache.flink.optimizer.testfunctions.DummyCoGroupFunction; import org.apache.flink.optimizer.testfunctions.DummyFlatJoinFunction; +import org.apache.flink.optimizer.testfunctions.IdentityCoGrouper; +import org.apache.flink.optimizer.testfunctions.IdentityCrosser; import org.apache.flink.optimizer.testfunctions.IdentityGroupReducer; +import org.apache.flink.optimizer.testfunctions.IdentityJoiner; import org.apache.flink.optimizer.testfunctions.IdentityKeyExtractor; import org.apache.flink.optimizer.testfunctions.IdentityMapper; +import org.apache.flink.optimizer.testfunctions.SelectOneReducer; import org.apache.flink.optimizer.testfunctions.Top1GroupReducer; +import org.apache.flink.optimizer.util.CompilerTestBase; +import org.apache.flink.util.Collector; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.HashSet; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; @SuppressWarnings({"serial"}) public class BranchingPlansCompilerTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/BroadcastVariablePipelinebreakerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/BroadcastVariablePipelinebreakerTest.java index 0b15c1e1e26fd..4f75eb3473d25 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/BroadcastVariablePipelinebreakerTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/BroadcastVariablePipelinebreakerTest.java @@ -19,20 +19,22 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.*; - import org.apache.flink.api.common.Plan; -import org.apache.flink.api.java.io.DiscardingOutputFormat; -import org.apache.flink.optimizer.util.CompilerTestBase; -import org.apache.flink.runtime.io.network.DataExchangeMode; -import org.junit.Test; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.optimizer.dag.TempMode; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.testfunctions.IdentityMapper; +import org.apache.flink.optimizer.util.CompilerTestBase; +import org.apache.flink.runtime.io.network.DataExchangeMode; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; @SuppressWarnings("serial") public class BroadcastVariablePipelinebreakerTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/CachedMatchStrategyCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/CachedMatchStrategyCompilerTest.java index e79550813e7e2..43f788affeb15 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/CachedMatchStrategyCompilerTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/CachedMatchStrategyCompilerTest.java @@ -19,26 +19,27 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import org.apache.flink.api.java.io.DiscardingOutputFormat; -import org.apache.flink.optimizer.util.CompilerTestBase; -import org.junit.Test; import org.apache.flink.api.common.Plan; +import org.apache.flink.api.common.functions.RichJoinFunction; import org.apache.flink.api.common.operators.GenericDataSourceBase; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.operators.IterativeDataSet; -import org.apache.flink.api.common.functions.RichJoinFunction; import org.apache.flink.api.java.tuple.Tuple3; +import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.dag.TempMode; import org.apache.flink.optimizer.plan.DualInputPlanNode; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; -import org.apache.flink.configuration.Configuration; +import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.DriverStrategy; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * Tests that validate optimizer choice when using hash joins inside of iterations */ diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/CoGroupSolutionSetFirstTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/CoGroupSolutionSetFirstTest.java index f066b3624f96a..042c30e63a8bb 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/CoGroupSolutionSetFirstTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/CoGroupSolutionSetFirstTest.java @@ -18,26 +18,27 @@ package org.apache.flink.optimizer; +import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.RichCoGroupFunction; import org.apache.flink.api.common.functions.RichMapFunction; -import org.apache.flink.api.java.io.DiscardingOutputFormat; -import org.apache.flink.optimizer.util.CompilerTestBase; -import org.junit.Assert; -import org.junit.Test; -import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.DataSet; -import org.apache.flink.api.java.operators.DeltaIteration; import org.apache.flink.api.java.ExecutionEnvironment; +import org.apache.flink.api.java.io.DiscardingOutputFormat; +import org.apache.flink.api.java.operators.DeltaIteration; import org.apache.flink.api.java.tuple.Tuple1; import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.DualInputPlanNode; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.PlanNode; import org.apache.flink.optimizer.plan.WorksetIterationPlanNode; +import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Collector; import org.apache.flink.util.Visitor; +import org.junit.Assert; +import org.junit.Test; + @SuppressWarnings("serial") public class CoGroupSolutionSetFirstTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/DisjointDataFlowsTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/DisjointDataFlowsTest.java index 68953c09bdc6e..92be7f845c613 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/DisjointDataFlowsTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/DisjointDataFlowsTest.java @@ -18,16 +18,17 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.*; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Test; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class DisjointDataFlowsTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java index 89e0f21987e51..a4325051b4f87 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java @@ -32,6 +32,7 @@ import org.apache.flink.optimizer.plan.SourcePlanNode; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.DriverStrategy; + import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/FeedbackPropertiesMatchTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/FeedbackPropertiesMatchTest.java index 17f0241baf415..bf07ac36def0e 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/FeedbackPropertiesMatchTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/FeedbackPropertiesMatchTest.java @@ -19,9 +19,6 @@ package org.apache.flink.optimizer; -import static org.apache.flink.optimizer.plan.PlanNode.FeedbackPropertiesMeetRequirementsReport.*; -import static org.junit.Assert.*; - import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.common.operators.BinaryOperatorInformation; @@ -35,27 +32,36 @@ import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.common.operators.util.FieldSet; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; +import org.apache.flink.api.java.io.TextInputFormat; +import org.apache.flink.core.fs.Path; import org.apache.flink.optimizer.dag.DataSourceNode; -import org.apache.flink.optimizer.dag.MapNode; import org.apache.flink.optimizer.dag.JoinNode; +import org.apache.flink.optimizer.dag.MapNode; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.LocalProperties; import org.apache.flink.optimizer.dataproperties.RequestedGlobalProperties; import org.apache.flink.optimizer.dataproperties.RequestedLocalProperties; import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.DualInputPlanNode; +import org.apache.flink.optimizer.plan.PlanNode.FeedbackPropertiesMeetRequirementsReport; import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plan.SourcePlanNode; -import org.apache.flink.optimizer.plan.PlanNode.FeedbackPropertiesMeetRequirementsReport; import org.apache.flink.optimizer.testfunctions.DummyFlatJoinFunction; import org.apache.flink.optimizer.testfunctions.IdentityMapper; -import org.apache.flink.core.fs.Path; import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.runtime.operators.util.LocalStrategy; + import org.junit.Test; -import org.apache.flink.api.java.io.TextInputFormat; + +import static org.apache.flink.optimizer.plan.PlanNode.FeedbackPropertiesMeetRequirementsReport.MET; +import static org.apache.flink.optimizer.plan.PlanNode.FeedbackPropertiesMeetRequirementsReport.NOT_MET; +import static org.apache.flink.optimizer.plan.PlanNode.FeedbackPropertiesMeetRequirementsReport.NO_PARTIAL_SOLUTION; +import static org.apache.flink.optimizer.plan.PlanNode.FeedbackPropertiesMeetRequirementsReport.PENDING; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class FeedbackPropertiesMatchTest { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/GroupOrderTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/GroupOrderTest.java index 3eb57479b6825..1f4f05c4b7ccb 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/GroupOrderTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/GroupOrderTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.fail; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.operators.util.FieldList; @@ -35,12 +33,15 @@ import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.testfunctions.IdentityCoGrouper; import org.apache.flink.optimizer.testfunctions.IdentityGroupReducer; +import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.runtime.operators.util.LocalStrategy; -import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Assert; import org.junit.Test; +import static org.junit.Assert.fail; + /** * This test case has been created to validate that correct strategies are used if orders within groups are * requested. diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/HardPlansCompilationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/HardPlansCompilationTest.java index b83c8a437d6fd..fa686db1f40d8 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/HardPlansCompilationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/HardPlansCompilationTest.java @@ -28,6 +28,7 @@ import org.apache.flink.optimizer.testfunctions.IdentityGroupReducer; import org.apache.flink.optimizer.testfunctions.IdentityMapper; import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Test; /** diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/IterationsCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/IterationsCompilerTest.java index 76337e97ed1d9..29e1ebe42929b 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/IterationsCompilerTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/IterationsCompilerTest.java @@ -18,25 +18,26 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.*; - -import org.apache.flink.api.common.functions.*; -import org.apache.flink.optimizer.dag.TempMode; -import org.apache.flink.runtime.io.network.DataExchangeMode; -import org.junit.Test; - -import org.apache.flink.api.java.io.DiscardingOutputFormat; -import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.api.common.Plan; +import org.apache.flink.api.common.functions.CoGroupFunction; +import org.apache.flink.api.common.functions.FilterFunction; +import org.apache.flink.api.common.functions.JoinFunction; +import org.apache.flink.api.common.functions.MapFunction; +import org.apache.flink.api.common.functions.RichFlatMapFunction; +import org.apache.flink.api.common.functions.RichGroupReduceFunction; +import org.apache.flink.api.common.functions.RichJoinFunction; +import org.apache.flink.api.common.functions.RichMapFunction; +import org.apache.flink.api.common.operators.base.JoinOperatorBase.JoinHint; import org.apache.flink.api.java.DataSet; -import org.apache.flink.api.java.operators.DeltaIteration; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.operators.IterativeDataSet; import org.apache.flink.api.java.aggregation.Aggregations; -import org.apache.flink.api.common.operators.base.JoinOperatorBase.JoinHint; import org.apache.flink.api.java.functions.FunctionAnnotation.ForwardedFields; +import org.apache.flink.api.java.io.DiscardingOutputFormat; +import org.apache.flink.api.java.operators.DeltaIteration; +import org.apache.flink.api.java.operators.IterativeDataSet; import org.apache.flink.api.java.tuple.Tuple1; import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.optimizer.dag.TempMode; import org.apache.flink.optimizer.plan.BulkIterationPlanNode; import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.OptimizedPlan; @@ -45,11 +46,19 @@ import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; import org.apache.flink.optimizer.testfunctions.IdentityKeyExtractor; import org.apache.flink.optimizer.testfunctions.IdentityMapper; +import org.apache.flink.optimizer.util.CompilerTestBase; +import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Collector; +import org.junit.Test; + import java.util.Iterator; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @SuppressWarnings({"serial", "unchecked"}) public class IterationsCompilerTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/NestedIterationsTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/NestedIterationsTest.java index 3a5145187e4a9..bf322b9fd42b2 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/NestedIterationsTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/NestedIterationsTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.*; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; @@ -33,8 +31,12 @@ import org.apache.flink.optimizer.testfunctions.IdentityKeyExtractor; import org.apache.flink.optimizer.testfunctions.IdentityMapper; import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Test; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @SuppressWarnings({"serial", "unchecked"}) public class NestedIterationsTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/ParallelismChangeTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/ParallelismChangeTest.java index 5d21f8951b98f..f1b8e6da96446 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/ParallelismChangeTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/ParallelismChangeTest.java @@ -32,10 +32,11 @@ import org.apache.flink.optimizer.testfunctions.IdentityJoiner; import org.apache.flink.optimizer.testfunctions.IdentityMapper; import org.apache.flink.optimizer.util.CompilerTestBase; -import org.junit.Assert; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.runtime.operators.util.LocalStrategy; import org.apache.flink.util.Visitor; + +import org.junit.Assert; import org.junit.Test; /** diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitionPushdownTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitionPushdownTest.java index 365726d7b55c1..e3dc699a376ce 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitionPushdownTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitionPushdownTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.*; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.java.DataSet; @@ -29,10 +27,14 @@ import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plan.SinkPlanNode; -import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.optimizer.util.CompilerTestBase; +import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class PartitionPushdownTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitioningReusageTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitioningReusageTest.java index ac4c090340073..cf61949baa6ed 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitioningReusageTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitioningReusageTest.java @@ -35,6 +35,7 @@ import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.util.Collector; + import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PipelineBreakerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PipelineBreakerTest.java index 204014c171bc8..e2701fa8188cd 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PipelineBreakerTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PipelineBreakerTest.java @@ -18,29 +18,30 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.*; - import org.apache.flink.api.common.ExecutionMode; -import org.apache.flink.api.java.io.DiscardingOutputFormat; -import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.optimizer.dag.TempMode; -import org.apache.flink.optimizer.testfunctions.IdentityMapper; -import org.apache.flink.optimizer.testfunctions.SelectOneReducer; -import org.apache.flink.optimizer.util.CompilerTestBase; -import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.operators.IterativeDataSet; +import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.configuration.Configuration; +import org.apache.flink.optimizer.dag.TempMode; import org.apache.flink.optimizer.plan.BulkIterationPlanNode; import org.apache.flink.optimizer.plan.DualInputPlanNode; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plan.SinkPlanNode; -import org.apache.flink.configuration.Configuration; +import org.apache.flink.optimizer.testfunctions.IdentityMapper; +import org.apache.flink.optimizer.testfunctions.SelectOneReducer; +import org.apache.flink.optimizer.util.CompilerTestBase; +import org.apache.flink.runtime.io.network.DataExchangeMode; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * Tests in this class validate that the {@link ExecutionMode#PIPELINED} execution mode * properly sets batch data exchanges, to guard against deadlocks, but does not place diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PropertyDataSourceTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PropertyDataSourceTest.java index ca2f4102b7969..3182c412de52b 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PropertyDataSourceTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PropertyDataSourceTest.java @@ -37,6 +37,7 @@ import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.plan.SourcePlanNode; import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Assert; import org.junit.Test; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReduceAllTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReduceAllTest.java index 866e1730e4587..057a623b480db 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReduceAllTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReduceAllTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.fail; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; @@ -28,8 +26,11 @@ import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; import org.apache.flink.optimizer.testfunctions.IdentityGroupReducer; import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Test; +import static org.junit.Assert.fail; + /** * This test case has been created to validate a bug that occurred when * the ReduceOperator was used without a grouping key. diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReplicatingDataSourceTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReplicatingDataSourceTest.java index 992672c22070c..a47b4d02b690d 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReplicatingDataSourceTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReplicatingDataSourceTest.java @@ -33,14 +33,15 @@ import org.apache.flink.api.java.tuple.Tuple1; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TupleTypeInfo; +import org.apache.flink.core.fs.FileInputSplit; +import org.apache.flink.core.fs.Path; import org.apache.flink.optimizer.plan.DualInputPlanNode; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.SinkPlanNode; -import org.apache.flink.core.fs.FileInputSplit; -import org.apache.flink.core.fs.Path; -import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.optimizer.util.CompilerTestBase; +import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Collector; + import org.junit.Assert; import org.junit.Test; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/SemanticPropertiesAPIToPlanTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/SemanticPropertiesAPIToPlanTest.java index fe79704fa8066..73b2ef0152028 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/SemanticPropertiesAPIToPlanTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/SemanticPropertiesAPIToPlanTest.java @@ -38,9 +38,10 @@ import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.PlanNode; import org.apache.flink.optimizer.plan.SingleInputPlanNode; -import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.optimizer.util.CompilerTestBase; +import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Visitor; + import org.junit.Assert; import org.junit.Test; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/SortPartialReuseTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/SortPartialReuseTest.java index a94f845e37226..07d3035b543d0 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/SortPartialReuseTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/SortPartialReuseTest.java @@ -18,24 +18,26 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.*; - -import org.apache.flink.api.java.io.DiscardingOutputFormat; -import org.apache.flink.optimizer.util.CompilerTestBase; -import org.junit.Test; import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.testfunctions.IdentityGroupReducerCombinable; import org.apache.flink.optimizer.testfunctions.IdentityMapper; +import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.runtime.operators.util.LocalStrategy; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class SortPartialReuseTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionBetweenDynamicAndStaticPathTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionBetweenDynamicAndStaticPathTest.java index f041b2ab5d012..430774993c3b2 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionBetweenDynamicAndStaticPathTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionBetweenDynamicAndStaticPathTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.*; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; @@ -33,8 +31,14 @@ import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class UnionBetweenDynamicAndStaticPathTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionPropertyPropagationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionPropertyPropagationTest.java index fefc627b7b749..f9bb4ad2f1724 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionPropertyPropagationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionPropertyPropagationTest.java @@ -19,30 +19,31 @@ package org.apache.flink.optimizer; -import java.util.Iterator; - import org.apache.flink.api.common.Plan; +import org.apache.flink.api.common.functions.RichFlatMapFunction; import org.apache.flink.api.common.operators.base.FlatMapOperatorBase; import org.apache.flink.api.common.operators.base.GroupReduceOperatorBase; +import org.apache.flink.api.java.DataSet; +import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.aggregation.Aggregations; -import org.apache.flink.api.common.functions.RichFlatMapFunction; import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.optimizer.testfunctions.IdentityGroupReducer; -import org.apache.flink.runtime.operators.shipping.ShipStrategyType; -import org.apache.flink.optimizer.util.CompilerTestBase; -import org.apache.flink.util.Collector; -import org.apache.flink.util.Visitor; -import org.junit.Assert; -import org.junit.Test; -import org.apache.flink.api.java.DataSet; -import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.optimizer.plan.Channel; import org.apache.flink.optimizer.plan.NAryUnionPlanNode; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.PlanNode; import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; +import org.apache.flink.optimizer.testfunctions.IdentityGroupReducer; +import org.apache.flink.optimizer.util.CompilerTestBase; +import org.apache.flink.runtime.operators.shipping.ShipStrategyType; +import org.apache.flink.util.Collector; +import org.apache.flink.util.Visitor; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.Iterator; @SuppressWarnings({"serial"}) diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionReplacementTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionReplacementTest.java index be6804ba425ec..759378f3ca149 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionReplacementTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionReplacementTest.java @@ -18,13 +18,13 @@ package org.apache.flink.optimizer; +import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.operators.Ordering; import org.apache.flink.api.common.operators.base.JoinOperatorBase; import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.optimizer.dataproperties.PartitioningProperty; @@ -38,11 +38,14 @@ import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; @SuppressWarnings("serial") public class UnionReplacementTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationCornerCasesTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationCornerCasesTest.java index ccc9b13c1856c..0dbc9752b8bfc 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationCornerCasesTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationCornerCasesTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.*; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.java.DataSet; @@ -31,8 +29,12 @@ import org.apache.flink.optimizer.plan.WorksetIterationPlanNode; import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Test; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class WorksetIterationCornerCasesTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationsRecordApiCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationsRecordApiCompilerTest.java index 46b935729849f..2f3ae243f96a2 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationsRecordApiCompilerTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationsRecordApiCompilerTest.java @@ -19,10 +19,6 @@ package org.apache.flink.optimizer; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.java.DataSet; @@ -38,10 +34,15 @@ import org.apache.flink.optimizer.testfunctions.IdentityGroupReducer; import org.apache.flink.optimizer.testfunctions.IdentityJoiner; import org.apache.flink.optimizer.testfunctions.IdentityMapper; -import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.optimizer.util.CompilerTestBase; +import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Tests that validate optimizer choices when using operators that are requesting certain specific execution diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/costs/DefaultCostEstimatorTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/costs/DefaultCostEstimatorTest.java index af03eec897a19..228627794042a 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/costs/DefaultCostEstimatorTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/costs/DefaultCostEstimatorTest.java @@ -19,11 +19,12 @@ package org.apache.flink.optimizer.costs; -import static org.junit.Assert.*; - import org.apache.flink.optimizer.dag.EstimateProvider; + import org.junit.Test; +import static org.junit.Assert.assertTrue; + /** * Tests for the cost formulas in the {@link DefaultCostEstimator}. Most of the tests establish relative * relationships. diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/BinaryCustomPartitioningCompatibilityTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/BinaryCustomPartitioningCompatibilityTest.java index 9a609432ea7f9..4d917a9d783a1 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/BinaryCustomPartitioningCompatibilityTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/BinaryCustomPartitioningCompatibilityTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.custompartition; -import static org.junit.Assert.*; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.java.DataSet; @@ -35,8 +33,12 @@ import org.apache.flink.optimizer.testfunctions.DummyCoGroupFunction; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @SuppressWarnings({"serial","unchecked"}) public class BinaryCustomPartitioningCompatibilityTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CoGroupCustomPartitioningTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CoGroupCustomPartitioningTest.java index 14d2a960e36b5..4e4590c08a098 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CoGroupCustomPartitioningTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CoGroupCustomPartitioningTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.custompartition; -import static org.junit.Assert.*; - import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.Partitioner; @@ -38,8 +36,13 @@ import org.apache.flink.optimizer.testfunctions.IdentityMapper; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @SuppressWarnings({"serial", "unchecked"}) public class CoGroupCustomPartitioningTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CustomPartitioningGlobalOptimizationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CustomPartitioningGlobalOptimizationTest.java index bc2eb82e64c5a..7dfbfb9bc9f12 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CustomPartitioningGlobalOptimizationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CustomPartitioningGlobalOptimizationTest.java @@ -18,10 +18,6 @@ package org.apache.flink.optimizer.custompartition; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.java.DataSet; @@ -36,8 +32,13 @@ import org.apache.flink.optimizer.testfunctions.IdentityGroupReducerCombinable; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @SuppressWarnings({"serial", "unchecked"}) public class CustomPartitioningGlobalOptimizationTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CustomPartitioningTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CustomPartitioningTest.java index 1aca046d28864..274154b88e253 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CustomPartitioningTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CustomPartitioningTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.custompartition; -import static org.junit.Assert.*; - import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.Partitioner; @@ -34,8 +32,12 @@ import org.apache.flink.optimizer.testfunctions.IdentityPartitionerMapper; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @SuppressWarnings({"serial", "unchecked"}) public class CustomPartitioningTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingKeySelectorTranslationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingKeySelectorTranslationTest.java index b2bfc67365a49..4e28958cd7690 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingKeySelectorTranslationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingKeySelectorTranslationTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.custompartition; -import static org.junit.Assert.*; - import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.Partitioner; @@ -38,8 +36,12 @@ import org.apache.flink.optimizer.testfunctions.IdentityGroupReducerCombinable; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @SuppressWarnings({"serial", "unchecked"}) public class GroupingKeySelectorTranslationTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingPojoTranslationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingPojoTranslationTest.java index dc2b14767063c..a2e3e4bfb741e 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingPojoTranslationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingPojoTranslationTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.custompartition; -import static org.junit.Assert.*; - import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.Partitioner; @@ -34,8 +32,12 @@ import org.apache.flink.optimizer.testfunctions.IdentityGroupReducerCombinable; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class GroupingPojoTranslationTest extends CompilerTestBase { @@ -255,4 +257,4 @@ public int partition(Long key, int numPartitions) { return 0; } } -} \ No newline at end of file +} diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingTupleTranslationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingTupleTranslationTest.java index 6eb5ad5de214c..fe4f82218beec 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingTupleTranslationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/GroupingTupleTranslationTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.custompartition; -import static org.junit.Assert.*; - import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.Partitioner; @@ -37,8 +35,12 @@ import org.apache.flink.optimizer.testfunctions.IdentityGroupReducerCombinable; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @SuppressWarnings({"serial", "unchecked"}) public class GroupingTupleTranslationTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/JoinCustomPartitioningTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/JoinCustomPartitioningTest.java index 65b9756bc8d6f..fa081297bbebb 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/JoinCustomPartitioningTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/JoinCustomPartitioningTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.custompartition; -import static org.junit.Assert.*; - import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.Partitioner; @@ -39,8 +37,13 @@ import org.apache.flink.optimizer.testfunctions.IdentityMapper; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @SuppressWarnings({"serial", "unchecked"}) public class JoinCustomPartitioningTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/CoGroupNodeTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/CoGroupNodeTest.java index 96b6d03258574..40099da7e7768 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/CoGroupNodeTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/CoGroupNodeTest.java @@ -23,6 +23,7 @@ import org.apache.flink.api.common.operators.base.CoGroupOperatorBase; import org.apache.flink.api.common.operators.util.FieldSet; import org.apache.flink.configuration.Configuration; + import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/GroupCombineNodeTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/GroupCombineNodeTest.java index f3e124b045684..ebc6c312b0f12 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/GroupCombineNodeTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/GroupCombineNodeTest.java @@ -23,6 +23,7 @@ import org.apache.flink.api.common.operators.base.GroupCombineOperatorBase; import org.apache.flink.api.common.operators.util.FieldSet; import org.apache.flink.configuration.Configuration; + import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/GroupReduceNodeTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/GroupReduceNodeTest.java index da8a0b4586eda..61a10e34e71df 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/GroupReduceNodeTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/GroupReduceNodeTest.java @@ -23,6 +23,7 @@ import org.apache.flink.api.common.operators.base.GroupReduceOperatorBase; import org.apache.flink.api.common.operators.util.FieldSet; import org.apache.flink.configuration.Configuration; + import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/MapPartitionNodeTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/MapPartitionNodeTest.java index c9c6b5088a815..2a6971b090d40 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/MapPartitionNodeTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dag/MapPartitionNodeTest.java @@ -22,6 +22,7 @@ import org.apache.flink.api.common.operators.SingleInputSemanticProperties; import org.apache.flink.api.common.operators.base.MapPartitionOperatorBase; import org.apache.flink.api.common.operators.util.FieldSet; + import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeClosedBranchingTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeClosedBranchingTest.java index 5f6933634031e..7eee957e43905 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeClosedBranchingTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeClosedBranchingTest.java @@ -36,6 +36,7 @@ import org.apache.flink.optimizer.testfunctions.Top1GroupReducer; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.io.network.DataExchangeMode; + import org.junit.Test; import java.util.Collection; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeForwardTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeForwardTest.java index 13ec51af5a132..7b115b94ab583 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeForwardTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeForwardTest.java @@ -31,6 +31,7 @@ import org.apache.flink.optimizer.testfunctions.Top1GroupReducer; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.io.network.DataExchangeMode; + import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeOpenBranchingTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeOpenBranchingTest.java index 99f8c8165aa32..f9d898f575318 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeOpenBranchingTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeOpenBranchingTest.java @@ -31,6 +31,7 @@ import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.io.network.DataExchangeMode; + import org.junit.Test; import java.util.Collection; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/PipelineBreakingTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/PipelineBreakingTest.java index 1a14be57d530e..79326a0e99ebb 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/PipelineBreakingTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/PipelineBreakingTest.java @@ -39,12 +39,16 @@ import org.apache.flink.optimizer.traversals.BranchesVisitor; import org.apache.flink.optimizer.traversals.GraphCreatingVisitor; import org.apache.flink.optimizer.traversals.IdAndEstimatesVisitor; + import org.junit.Test; import java.util.Iterator; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * This test checks whether connections are correctly marked as pipelined breaking. diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/UnionClosedBranchingTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/UnionClosedBranchingTest.java index 77b150ae7cc7c..32fde4a1be1f6 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/UnionClosedBranchingTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/UnionClosedBranchingTest.java @@ -38,6 +38,7 @@ import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.jobgraph.JobVertex; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesFilteringTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesFilteringTest.java index 3e32905f45ad6..2a7d6a81c9ce8 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesFilteringTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesFilteringTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.dataproperties; -import static org.junit.Assert.*; - import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.operators.Ordering; @@ -34,11 +32,16 @@ import org.apache.flink.types.IntValue; import org.apache.flink.types.LongValue; import org.apache.flink.types.StringValue; + import org.junit.Assert; import org.junit.Test; import java.util.Set; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class GlobalPropertiesFilteringTest { private TupleTypeInfo> tupleInfo = diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesMatchingTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesMatchingTest.java index ddfa074797ea5..b499b05cbf262 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesMatchingTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesMatchingTest.java @@ -24,6 +24,7 @@ import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.common.operators.util.FieldSet; import org.apache.flink.api.java.tuple.Tuple2; + import org.junit.Test; import static org.junit.Assert.assertFalse; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesPushdownTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesPushdownTest.java index 0868720500667..69472e3192d7d 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesPushdownTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/GlobalPropertiesPushdownTest.java @@ -18,13 +18,16 @@ package org.apache.flink.optimizer.dataproperties; -import static org.junit.Assert.*; - import org.apache.flink.api.common.operators.SemanticProperties; import org.apache.flink.api.common.operators.SingleInputSemanticProperties; import org.apache.flink.api.common.operators.util.FieldSet; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class GlobalPropertiesPushdownTest { @Test diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/LocalPropertiesFilteringTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/LocalPropertiesFilteringTest.java index 1ff62ed6ffb0f..a986b5e506579 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/LocalPropertiesFilteringTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/LocalPropertiesFilteringTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.dataproperties; -import static org.junit.Assert.*; - import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.operators.Ordering; import org.apache.flink.api.common.operators.SingleInputSemanticProperties; @@ -32,8 +30,14 @@ import org.apache.flink.types.IntValue; import org.apache.flink.types.LongValue; import org.apache.flink.types.StringValue; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class LocalPropertiesFilteringTest { private TupleTypeInfo> tupleInfo = diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalPropertiesFilteringTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalPropertiesFilteringTest.java index 9f2c467da2b92..bd3018141f284 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalPropertiesFilteringTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalPropertiesFilteringTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.dataproperties; -import static org.junit.Assert.*; - import org.apache.flink.api.common.distributions.DataDistribution; import org.apache.flink.api.common.operators.DualInputSemanticProperties; import org.apache.flink.api.common.operators.Order; @@ -33,8 +31,14 @@ import org.apache.flink.types.ByteValue; import org.apache.flink.types.IntValue; import org.apache.flink.types.LongValue; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class RequestedGlobalPropertiesFilteringTest { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedLocalPropertiesFilteringTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedLocalPropertiesFilteringTest.java index 0cede0e05dbc8..1a49fd4fbe463 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedLocalPropertiesFilteringTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedLocalPropertiesFilteringTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.dataproperties; -import static org.junit.Assert.*; - import org.apache.flink.api.common.operators.DualInputSemanticProperties; import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.operators.Ordering; @@ -32,8 +30,14 @@ import org.apache.flink.types.ByteValue; import org.apache.flink.types.IntValue; import org.apache.flink.types.LongValue; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class RequestedLocalPropertiesFilteringTest { private TupleTypeInfo> tupleInfo = diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DeltaIterationDependenciesTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DeltaIterationDependenciesTest.java index 25b17f87814be..10d7b22fb76ab 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DeltaIterationDependenciesTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DeltaIterationDependenciesTest.java @@ -18,18 +18,18 @@ package org.apache.flink.optimizer.java; -import static org.junit.Assert.fail; - -import org.apache.flink.api.java.io.DiscardingOutputFormat; -import org.apache.flink.optimizer.util.CompilerTestBase; -import org.junit.Test; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.operators.DeltaIteration; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.optimizer.CompilerException; +import org.apache.flink.optimizer.util.CompilerTestBase; + +import org.junit.Test; + +import static org.junit.Assert.fail; @SuppressWarnings({"serial", "unchecked"}) diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DistinctAndGroupingOptimizerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DistinctAndGroupingOptimizerTest.java index e5b6ad52e0376..a118e130b9d03 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DistinctAndGroupingOptimizerTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DistinctAndGroupingOptimizerTest.java @@ -18,21 +18,23 @@ package org.apache.flink.optimizer.java; -import static org.junit.Assert.*; - -import org.apache.flink.api.java.io.DiscardingOutputFormat; -import org.apache.flink.optimizer.util.CompilerTestBase; -import org.junit.Test; import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.testfunctions.IdentityMapper; +import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class DistinctAndGroupingOptimizerTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/GroupReduceCompilationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/GroupReduceCompilationTest.java index 26a2faf442b94..5fa527ceccc7a 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/GroupReduceCompilationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/GroupReduceCompilationTest.java @@ -21,24 +21,26 @@ import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.GroupCombineFunction; import org.apache.flink.api.common.functions.GroupReduceFunction; -import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.common.functions.RichGroupReduceFunction; +import org.apache.flink.api.common.operators.util.FieldList; +import org.apache.flink.api.java.DataSet; +import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.operators.GroupReduceOperator; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.optimizer.util.CompilerTestBase; -import org.apache.flink.runtime.operators.DriverStrategy; -import org.apache.flink.util.Collector; -import org.junit.Test; -import org.apache.flink.api.java.DataSet; -import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.plan.SourcePlanNode; +import org.apache.flink.optimizer.util.CompilerTestBase; +import org.apache.flink.runtime.operators.DriverStrategy; +import org.apache.flink.util.Collector; + +import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; @SuppressWarnings("serial") public class GroupReduceCompilationTest extends CompilerTestBase implements java.io.Serializable { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/IterationCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/IterationCompilerTest.java index bcfb2ef134cf0..a863628484b76 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/IterationCompilerTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/IterationCompilerTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.java; -import static org.junit.Assert.*; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.java.DataSet; @@ -37,8 +35,12 @@ import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; import org.apache.flink.optimizer.testfunctions.IdentityMapper; import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Test; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class IterationCompilerTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/JoinTranslationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/JoinTranslationTest.java index de1508bcf5b04..52827c5063a1d 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/JoinTranslationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/JoinTranslationTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.java; -import static org.junit.Assert.*; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.operators.GenericDataSourceBase; import org.apache.flink.api.common.operators.Operator; @@ -36,8 +34,13 @@ import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Visitor; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class JoinTranslationTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/OpenIterationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/OpenIterationTest.java index e1e6b5f07786e..6ca4fa0779630 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/OpenIterationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/OpenIterationTest.java @@ -18,8 +18,6 @@ package org.apache.flink.optimizer.java; -import static org.junit.Assert.*; - import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.DataSet; @@ -30,8 +28,11 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.optimizer.testfunctions.IdentityMapper; import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Test; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class OpenIterationTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/PartitionOperatorTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/PartitionOperatorTest.java index ff4a3c823d1c9..ce88b9f824f01 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/PartitionOperatorTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/PartitionOperatorTest.java @@ -18,11 +18,6 @@ package org.apache.flink.optimizer.java; -import static org.junit.Assert.*; - -import java.util.Collections; -import java.util.List; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.FilterFunction; import org.apache.flink.api.common.functions.MapFunction; @@ -42,8 +37,15 @@ import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; +import java.util.Collections; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class PartitionOperatorTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/ReduceCompilationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/ReduceCompilationTest.java index f513155802c37..eca05622a7d32 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/ReduceCompilationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/ReduceCompilationTest.java @@ -19,23 +19,25 @@ package org.apache.flink.optimizer.java; import org.apache.flink.api.common.Plan; +import org.apache.flink.api.common.functions.RichReduceFunction; import org.apache.flink.api.common.operators.base.ReduceOperatorBase.CombineHint; import org.apache.flink.api.common.operators.util.FieldList; +import org.apache.flink.api.java.DataSet; +import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.functions.KeySelector; -import org.apache.flink.api.common.functions.RichReduceFunction; import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.optimizer.util.CompilerTestBase; -import org.junit.Test; -import org.apache.flink.api.java.DataSet; -import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.plan.SingleInputPlanNode; import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.plan.SourcePlanNode; +import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.DriverStrategy; -import static org.junit.Assert.*; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; @SuppressWarnings("serial") public class ReduceCompilationTest extends CompilerTestBase implements java.io.Serializable { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/WorksetIterationsJavaApiCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/WorksetIterationsJavaApiCompilerTest.java index 3d6d90bfc4106..0c9bfae099a05 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/WorksetIterationsJavaApiCompilerTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/WorksetIterationsJavaApiCompilerTest.java @@ -18,21 +18,17 @@ package org.apache.flink.optimizer.java; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.JoinFunction; +import org.apache.flink.api.common.functions.RichGroupReduceFunction; +import org.apache.flink.api.common.functions.RichJoinFunction; +import org.apache.flink.api.common.functions.RichMapFunction; import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.java.DataSet; +import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.operators.DeltaIteration; -import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.common.functions.RichGroupReduceFunction; -import org.apache.flink.api.common.functions.RichJoinFunction; -import org.apache.flink.api.common.functions.RichMapFunction; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.optimizer.plan.DualInputPlanNode; import org.apache.flink.optimizer.plan.OptimizedPlan; @@ -41,8 +37,13 @@ import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Collector; + import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Tests that validate optimizer choices when using operators that are requesting certain specific execution * strategies. diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupGlobalPropertiesCompatibilityTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupGlobalPropertiesCompatibilityTest.java index 76f48e9cc0cf8..4b348f105d6e3 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupGlobalPropertiesCompatibilityTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupGlobalPropertiesCompatibilityTest.java @@ -18,16 +18,19 @@ package org.apache.flink.optimizer.operators; -import static org.junit.Assert.*; - import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.operators.Ordering; import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.RequestedGlobalProperties; + import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class CoGroupGlobalPropertiesCompatibilityTest { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupOnConflictingPartitioningsTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupOnConflictingPartitioningsTest.java index b23bf359b11ee..66260b9742d7e 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupOnConflictingPartitioningsTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupOnConflictingPartitioningsTest.java @@ -18,20 +18,21 @@ package org.apache.flink.optimizer.operators; -import static org.junit.Assert.*; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.Optimizer; import org.apache.flink.optimizer.testfunctions.DummyCoGroupFunction; -import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Test; +import static org.junit.Assert.fail; + @SuppressWarnings({"serial", "unchecked"}) public class CoGroupOnConflictingPartitioningsTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupWithDistributionTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupWithDistributionTest.java index 2d37c7c734ca7..1252b49b96b01 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupWithDistributionTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/CoGroupWithDistributionTest.java @@ -25,13 +25,17 @@ import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.utils.DataSetUtils; -import org.apache.flink.optimizer.plan.*; +import org.apache.flink.optimizer.plan.Channel; +import org.apache.flink.optimizer.plan.DualInputPlanNode; +import org.apache.flink.optimizer.plan.OptimizedPlan; +import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Collector; + import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class CoGroupWithDistributionTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinGlobalPropertiesCompatibilityTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinGlobalPropertiesCompatibilityTest.java index 610cbd8ab7e5d..cffca2851cb1f 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinGlobalPropertiesCompatibilityTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinGlobalPropertiesCompatibilityTest.java @@ -18,16 +18,19 @@ package org.apache.flink.optimizer.operators; -import static org.junit.Assert.*; - import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.operators.Ordering; import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.optimizer.dataproperties.GlobalProperties; import org.apache.flink.optimizer.dataproperties.RequestedGlobalProperties; + import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @SuppressWarnings("serial") public class JoinGlobalPropertiesCompatibilityTest { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinOnConflictingPartitioningsTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinOnConflictingPartitioningsTest.java index a4e520b652145..9d6c7c71916c8 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinOnConflictingPartitioningsTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinOnConflictingPartitioningsTest.java @@ -18,19 +18,20 @@ package org.apache.flink.optimizer.operators; -import static org.junit.Assert.*; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.CompilerException; import org.apache.flink.optimizer.Optimizer; -import org.apache.flink.configuration.Configuration; import org.apache.flink.optimizer.util.CompilerTestBase; + import org.junit.Test; +import static org.junit.Assert.fail; + @SuppressWarnings({"serial", "unchecked"}) public class JoinOnConflictingPartitioningsTest extends CompilerTestBase { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinWithDistributionTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinWithDistributionTest.java index 0c579f6118a9f..04b41b041c45d 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinWithDistributionTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/operators/JoinWithDistributionTest.java @@ -25,9 +25,13 @@ import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.utils.DataSetUtils; -import org.apache.flink.optimizer.plan.*; +import org.apache.flink.optimizer.plan.Channel; +import org.apache.flink.optimizer.plan.DualInputPlanNode; +import org.apache.flink.optimizer.plan.OptimizedPlan; +import org.apache.flink.optimizer.plan.SinkPlanNode; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; + import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plan/ChannelTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plan/ChannelTest.java index 2c1574b75b0fd..3f28ff44514a9 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plan/ChannelTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plan/ChannelTest.java @@ -22,11 +22,12 @@ import org.apache.flink.api.common.operators.GenericDataSourceBase; import org.apache.flink.api.common.operators.OperatorInformation; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; -import org.apache.flink.optimizer.dag.DataSourceNode; +import org.apache.flink.api.java.io.TextInputFormat; import org.apache.flink.core.fs.Path; +import org.apache.flink.optimizer.dag.DataSourceNode; + import org.junit.Assert; import org.junit.Test; -import org.apache.flink.api.java.io.TextInputFormat; public class ChannelTest { diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plandump/NumberFormattingTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plandump/NumberFormattingTest.java index 366d10dd0a0c6..be657fa9b72e7 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plandump/NumberFormattingTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plandump/NumberFormattingTest.java @@ -19,10 +19,10 @@ package org.apache.flink.optimizer.plandump; -import static org.junit.Assert.assertEquals; - import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class NumberFormattingTest { @Test diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/JobGraphGeneratorTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/JobGraphGeneratorTest.java index d8ee80b89e7f5..4c55bda9811d7 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/JobGraphGeneratorTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/JobGraphGeneratorTest.java @@ -36,6 +36,7 @@ import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.jobgraph.JobVertex; + import org.junit.Test; import java.lang.reflect.Method; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/TempInIterationsTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/TempInIterationsTest.java index b000099e41025..3e8019fe24566 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/TempInIterationsTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/TempInIterationsTest.java @@ -28,9 +28,10 @@ import org.apache.flink.optimizer.Optimizer; import org.apache.flink.optimizer.plan.OptimizedPlan; import org.apache.flink.optimizer.testfunctions.DummyFlatJoinFunction; -import org.apache.flink.runtime.jobgraph.JobVertex; import org.apache.flink.runtime.jobgraph.JobGraph; +import org.apache.flink.runtime.jobgraph.JobVertex; import org.apache.flink.runtime.operators.util.TaskConfig; + import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/programs/ConnectedComponentsTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/programs/ConnectedComponentsTest.java index 3c350b1ad58c7..cabb0b59b9b88 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/programs/ConnectedComponentsTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/programs/ConnectedComponentsTest.java @@ -35,11 +35,11 @@ import org.apache.flink.optimizer.plan.SourcePlanNode; import org.apache.flink.optimizer.plan.WorksetIterationPlanNode; import org.apache.flink.optimizer.plantranslate.JobGraphGenerator; +import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.runtime.operators.util.LocalStrategy; -import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.util.Collector; import org.junit.Assert; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/CompilerTestBase.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/CompilerTestBase.java index b4c39a5ed49c7..f1c62089f1c6b 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/CompilerTestBase.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/CompilerTestBase.java @@ -18,12 +18,6 @@ package org.apache.flink.optimizer.util; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.Function; import org.apache.flink.api.common.io.FileInputFormat.FileBaseStatistics; @@ -40,8 +34,15 @@ import org.apache.flink.util.OperatingSystem; import org.apache.flink.util.TestLogger; import org.apache.flink.util.Visitor; + import org.junit.Before; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + /** * Base class for Optimizer tests. Offers utility methods to trigger optimization * of a program and to fetch the nodes in an optimizer plan that correspond diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/OperatorResolver.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/OperatorResolver.java index fe0a533ad5f20..05f267613ea64 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/OperatorResolver.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/OperatorResolver.java @@ -19,13 +19,6 @@ package org.apache.flink.optimizer.util; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.functions.RichFunction; import org.apache.flink.api.common.operators.Operator; @@ -33,6 +26,13 @@ import org.apache.flink.api.common.operators.base.DeltaIterationBase; import org.apache.flink.util.Visitor; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * Utility to get operator instances from plans via name. */ From 9d39229e223f5f76554659d6572ad7677e997c3b Mon Sep 17 00:00:00 2001 From: zentol Date: Sun, 28 May 2017 09:13:41 +0200 Subject: [PATCH 2/3] [FLINK-6730] Apply empty line before package declaration in flink-optimizer --- .../java/org/apache/flink/optimizer/dag/CoGroupRawNode.java | 1 + .../apache/flink/optimizer/operators/CoGroupRawDescriptor.java | 1 + .../operators/HashFullOuterJoinBuildFirstDescriptor.java | 1 + .../operators/HashFullOuterJoinBuildSecondDescriptor.java | 1 + .../operators/HashLeftOuterJoinBuildFirstDescriptor.java | 1 + .../operators/HashRightOuterJoinBuildSecondDescriptor.java | 1 + .../flink/optimizer/traversals/RangePartitionRewriter.java | 1 + .../org/apache/flink/optimizer/traversals/package-info.java | 3 ++- .../org/apache/flink/optimizer/DistinctCompilationTest.java | 1 + .../java/org/apache/flink/optimizer/ParallelismChangeTest.java | 1 + .../flink/optimizer/dataexchange/UnionClosedBranchingTest.java | 1 + 11 files changed, 12 insertions(+), 1 deletion(-) diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupRawNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupRawNode.java index f9543a8ed27c1..2f6eff2850751 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupRawNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/CoGroupRawNode.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.flink.optimizer.dag; import org.apache.flink.api.common.operators.Ordering; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java index f2f4bdbef3487..e2d47552754e3 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.Order; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashFullOuterJoinBuildFirstDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashFullOuterJoinBuildFirstDescriptor.java index 49852484b617a..efd6ec553f4e0 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashFullOuterJoinBuildFirstDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashFullOuterJoinBuildFirstDescriptor.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashFullOuterJoinBuildSecondDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashFullOuterJoinBuildSecondDescriptor.java index d605a19179af4..71e0af66fe1a2 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashFullOuterJoinBuildSecondDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashFullOuterJoinBuildSecondDescriptor.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashLeftOuterJoinBuildFirstDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashLeftOuterJoinBuildFirstDescriptor.java index ab4e106591183..1f260eff626cb 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashLeftOuterJoinBuildFirstDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashLeftOuterJoinBuildFirstDescriptor.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashRightOuterJoinBuildSecondDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashRightOuterJoinBuildSecondDescriptor.java index 7bb8f1e972e8c..d7441ed779135 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashRightOuterJoinBuildSecondDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashRightOuterJoinBuildSecondDescriptor.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/RangePartitionRewriter.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/RangePartitionRewriter.java index 1237b44360428..a7b197355d2c4 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/RangePartitionRewriter.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/RangePartitionRewriter.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.flink.optimizer.traversals; import org.apache.flink.api.common.InvalidProgramException; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/package-info.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/package-info.java index cd8766c5f7e18..eda91f14f1735 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/package-info.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/package-info.java @@ -24,4 +24,5 @@ * The traversals are mostly implemented as a {@link org.apache.flink.util.Visitor} that * traversed the program flow. */ -package org.apache.flink.optimizer.traversals; \ No newline at end of file + +package org.apache.flink.optimizer.traversals; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java index a4325051b4f87..d7db6a7e6307c 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.flink.optimizer; import org.apache.flink.api.common.Plan; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/ParallelismChangeTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/ParallelismChangeTest.java index f1b8e6da96446..d9f3a04d76550 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/ParallelismChangeTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/ParallelismChangeTest.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.flink.optimizer; import org.apache.flink.api.common.Plan; diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/UnionClosedBranchingTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/UnionClosedBranchingTest.java index 32fde4a1be1f6..0f7a2da11d8be 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/UnionClosedBranchingTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/UnionClosedBranchingTest.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.flink.optimizer.dataexchange; import org.apache.flink.api.common.ExecutionMode; From 3254805a390d0a7c7b43fae067b5fb2ffd3ed809 Mon Sep 17 00:00:00 2001 From: zentol Date: Sun, 28 May 2017 09:32:26 +0200 Subject: [PATCH 3/3] [FLINK-6730] Remove multiple empty lines in flink-optimizer --- .../org/apache/flink/optimizer/Optimizer.java | 3 --- .../flink/optimizer/costs/CostEstimator.java | 1 - .../apache/flink/optimizer/costs/Costs.java | 2 -- .../optimizer/costs/DefaultCostEstimator.java | 4 +--- .../flink/optimizer/dag/BinaryUnionNode.java | 1 - .../optimizer/dag/BulkIterationNode.java | 1 - .../dag/BulkPartialSolutionNode.java | 3 +-- .../flink/optimizer/dag/DagConnection.java | 1 - .../flink/optimizer/dag/MapPartitionNode.java | 1 - .../apache/flink/optimizer/dag/NoOpNode.java | 1 - .../flink/optimizer/dag/OptimizerNode.java | 11 +++------- .../flink/optimizer/dag/PartitionNode.java | 1 - .../flink/optimizer/dag/ReduceNode.java | 2 -- .../flink/optimizer/dag/SingleInputNode.java | 3 --- .../flink/optimizer/dag/SolutionSetNode.java | 4 +--- .../optimizer/dag/SortPartitionNode.java | 1 - .../apache/flink/optimizer/dag/TempMode.java | 6 ++---- .../flink/optimizer/dag/TwoInputNode.java | 2 -- .../optimizer/dag/UnaryOperatorNode.java | 1 - .../optimizer/dag/WorksetIterationNode.java | 3 +-- .../flink/optimizer/dag/WorksetNode.java | 4 +--- .../dataproperties/GlobalProperties.java | 1 - .../dataproperties/LocalProperties.java | 1 - .../RequestedGlobalProperties.java | 1 - .../RequestedLocalProperties.java | 1 - .../operators/AbstractJoinDescriptor.java | 3 +-- .../operators/AbstractOperatorDescriptor.java | 1 - .../operators/AllGroupCombineProperties.java | 2 -- .../operators/AllGroupReduceProperties.java | 4 +--- .../operators/BinaryUnionOpDescriptor.java | 1 - .../operators/CartesianProductDescriptor.java | 8 ++----- .../operators/CoGroupDescriptor.java | 3 +-- ...CoGroupWithSolutionSetFirstDescriptor.java | 1 - ...oGroupWithSolutionSetSecondDescriptor.java | 1 - .../CrossBlockOuterFirstDescriptor.java | 1 - .../CrossBlockOuterSecondDescriptor.java | 1 - .../CrossStreamOuterFirstDescriptor.java | 1 - .../CrossStreamOuterSecondDescriptor.java | 1 - .../optimizer/operators/FilterDescriptor.java | 2 -- .../operators/FlatMapDescriptor.java | 2 -- .../operators/GroupReduceProperties.java | 3 +-- .../GroupReduceWithCombineProperties.java | 3 +-- .../HashJoinBuildFirstProperties.java | 1 - .../HashJoinBuildSecondProperties.java | 1 - ...ashLeftOuterJoinBuildSecondDescriptor.java | 1 - ...ashRightOuterJoinBuildFirstDescriptor.java | 1 - .../optimizer/operators/MapDescriptor.java | 2 -- .../operators/MapPartitionDescriptor.java | 2 -- .../optimizer/operators/NoOpDescriptor.java | 6 ------ .../operators/OperatorDescriptorDual.java | 1 - .../operators/OperatorDescriptorSingle.java | 5 +---- .../operators/SolutionSetDeltaOperator.java | 1 - .../operators/UtilSinkJoinOpDescriptor.java | 1 - .../optimizer/plan/BulkIterationPlanNode.java | 3 --- .../plan/BulkPartialSolutionPlanNode.java | 4 +--- .../apache/flink/optimizer/plan/Channel.java | 2 -- .../optimizer/plan/DualInputPlanNode.java | 4 ---- .../optimizer/plan/NAryUnionPlanNode.java | 1 - .../flink/optimizer/plan/NamedChannel.java | 1 - .../apache/flink/optimizer/plan/PlanNode.java | 6 +----- .../optimizer/plan/SingleInputPlanNode.java | 4 ---- .../optimizer/plan/SinkJoinerPlanNode.java | 1 - .../optimizer/plan/SolutionSetPlanNode.java | 8 +------ .../flink/optimizer/plan/SourcePlanNode.java | 4 ---- .../plan/WorksetIterationPlanNode.java | 1 - .../flink/optimizer/plan/WorksetPlanNode.java | 8 +------ .../plandump/DumpableConnection.java | 1 - .../plandump/PlanJSONDumpGenerator.java | 7 ++----- .../plantranslate/JobGraphGenerator.java | 16 +++++--------- .../optimizer/plantranslate/JsonMapper.java | 7 ++----- .../optimizer/postpass/AbstractSchema.java | 3 +-- .../ConflictingFieldTypeInfoException.java | 5 +---- .../postpass/GenericFlatTypePostPass.java | 4 +--- .../optimizer/postpass/JavaApiPostPass.java | 5 +---- .../optimizer/postpass/OptimizerPostPass.java | 1 - .../traversals/GraphCreatingVisitor.java | 2 -- .../flink/optimizer/util/NoOpBinaryUdfOp.java | 1 - .../flink/optimizer/util/NoOpUnaryUdfOp.java | 1 - .../apache/flink/optimizer/util/Utils.java | 2 -- .../optimizer/BranchingPlansCompilerTest.java | 16 ++++---------- .../BroadcastVariablePipelinebreakerTest.java | 1 - .../CachedMatchStrategyCompilerTest.java | 4 +--- .../optimizer/DistinctCompilationTest.java | 1 - .../FeedbackPropertiesMatchTest.java | 17 +++++---------- .../optimizer/IterationsCompilerTest.java | 3 +-- .../flink/optimizer/NestedIterationsTest.java | 6 ++---- .../optimizer/PartitioningReusageTest.java | 5 ----- .../flink/optimizer/PipelineBreakerTest.java | 18 ++++++---------- .../optimizer/PropertyDataSourceTest.java | 9 -------- .../optimizer/ReplicatingDataSourceTest.java | 3 --- .../UnionBetweenDynamicAndStaticPathTest.java | 3 +-- .../UnionPropertyPropagationTest.java | 2 -- ...orksetIterationsRecordApiCompilerTest.java | 8 ++----- .../costs/DefaultCostEstimatorTest.java | 7 ++----- .../CoGroupCustomPartitioningTest.java | 3 +-- .../JoinCustomPartitioningTest.java | 3 +-- .../DataExchangeModeClosedBranchingTest.java | 1 - .../DataExchangeModeForwardTest.java | 1 - ...equestedGlobalPropertiesFilteringTest.java | 1 - .../java/DeltaIterationDependenciesTest.java | 1 - .../java/GroupReduceCompilationTest.java | 6 ++---- .../optimizer/java/IterationCompilerTest.java | 6 ++---- .../optimizer/java/JoinTranslationTest.java | 7 ++----- .../optimizer/java/PartitionOperatorTest.java | 1 - .../optimizer/java/ReduceCompilationTest.java | 3 +-- .../WorksetIterationsJavaApiCompilerTest.java | 21 +++++++------------ .../flink/optimizer/plan/ChannelTest.java | 4 +--- .../plandump/NumberFormattingTest.java | 4 +--- .../plantranslate/TempInIterationsTest.java | 1 - .../programs/ConnectedComponentsTest.java | 6 ++---- .../testfunctions/DummyFlatJoinFunction.java | 1 - .../testfunctions/IdentityCrosser.java | 1 - .../testfunctions/IdentityGroupReducer.java | 1 - .../IdentityGroupReducerCombinable.java | 1 - .../testfunctions/IdentityJoiner.java | 1 - .../testfunctions/IdentityMapper.java | 1 - .../testfunctions/Top1GroupReducer.java | 1 - .../optimizer/util/CompilerTestBase.java | 2 -- .../optimizer/util/OperatorResolver.java | 4 +--- 119 files changed, 80 insertions(+), 327 deletions(-) diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/Optimizer.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/Optimizer.java index f2906768a6c85..6db77e2a4224b 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/Optimizer.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/Optimizer.java @@ -202,7 +202,6 @@ public class Optimizer { */ public static final String HINT_LOCAL_STRATEGY_MERGE = "LOCAL_STRATEGY_MERGE"; - /** * Value for the local strategy compiler hint that enforces a hash based local strategy. * For example, a Match operator will use a hybrid-hash-join strategy to find pairs of @@ -292,7 +291,6 @@ public class Optimizer { */ private int defaultParallelism; - // ------------------------------------------------------------------------ // Constructor & Setup // ------------------------------------------------------------------------ @@ -537,7 +535,6 @@ public static List createPreOptimizedPlan(Plan program) { return graphCreator.getSinks(); } - // ------------------------------------------------------------------------ // Miscellaneous // ------------------------------------------------------------------------ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/CostEstimator.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/CostEstimator.java index 2b01c6e6a524e..149133bc0eb43 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/CostEstimator.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/CostEstimator.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.costs; import org.apache.flink.optimizer.CompilerException; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/Costs.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/Costs.java index 7c854bf7e5751..4394cf624a72e 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/Costs.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/Costs.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.costs; /** @@ -394,7 +393,6 @@ public void divideBy(int factor) { this.heuristicCpuCost = this.heuristicCpuCost < 0 ? -1 : this.heuristicCpuCost / factor; } - // -------------------------------------------------------------------------------------------- /** diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/DefaultCostEstimator.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/DefaultCostEstimator.java index 543f33091c853..01b4ea4cf916c 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/DefaultCostEstimator.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/DefaultCostEstimator.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.costs; import org.apache.flink.optimizer.dag.EstimateProvider; @@ -49,8 +48,7 @@ public class DefaultCostEstimator extends CostEstimator { private static final float HASHING_CPU_FACTOR = 4; private static final float SORTING_CPU_FACTOR = 9; - - + // -------------------------------------------------------------------------------------------- // Shipping Strategy Cost // -------------------------------------------------------------------------------------------- diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BinaryUnionNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BinaryUnionNode.java index 4b1a8f7b6bedd..1641b4dca12ab 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BinaryUnionNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BinaryUnionNode.java @@ -268,7 +268,6 @@ else if (c1.getShipStrategy() == ShipStrategyType.FORWARD && c2.getShipStrategy( } } - instantiate(operator, c1, c2, broadcastPlanChannels, outputPlans, estimator, igps, igps, noLocalProps, noLocalProps); } } diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkIterationNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkIterationNode.java index bf3c4ed18597b..57c6d666179d1 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkIterationNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkIterationNode.java @@ -114,7 +114,6 @@ public void setPartialSolution(BulkPartialSolutionNode partialSolution) { this.partialSolution = partialSolution; } - /** * Gets the nextPartialSolution from this BulkIterationNode. * diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkPartialSolutionNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkPartialSolutionNode.java index b04b1f72b085f..11d4b29e6b9f1 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkPartialSolutionNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/BulkPartialSolutionNode.java @@ -35,8 +35,7 @@ public class BulkPartialSolutionNode extends AbstractPartialSolutionNode { private final BulkIterationNode iterationNode; - - + public BulkPartialSolutionNode(PartialSolutionPlaceHolder psph, BulkIterationNode iterationNode) { super(psph); this.iterationNode = iterationNode; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DagConnection.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DagConnection.java index 1f98a117ea0ac..164692bd533a7 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DagConnection.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DagConnection.java @@ -240,7 +240,6 @@ public float getEstimatedAvgWidthPerOutputRecord() { // -------------------------------------------------------------------------------------------- - public TempMode getMaterializationMode() { return this.materializationMode; } diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapPartitionNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapPartitionNode.java index 08ec53b64ff67..2e2b33d8d1e4f 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapPartitionNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/MapPartitionNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.dag; import org.apache.flink.api.common.operators.SemanticProperties; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/NoOpNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/NoOpNode.java index 76467cf170c63..29b380ff357f4 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/NoOpNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/NoOpNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.dag; import org.apache.flink.api.common.operators.util.FieldSet; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/OptimizerNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/OptimizerNode.java index f054be74cf883..0892513d6db94 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/OptimizerNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/OptimizerNode.java @@ -218,8 +218,7 @@ public void setBroadcastInputs(Map, OptimizerNode> operatorToNode, E * no matter if there have been more branches to different paths in the meantime. */ public abstract void computeUnclosedBranchStack(); - - + protected List computeUnclosedBranchStackForBroadcastInputs( List branchesSoFar) { @@ -791,8 +790,7 @@ protected void prunePlanAlternativesWithCommonBranching(List plans) { final PlanNode[][] toKeep = new PlanNode[gps.length][]; final PlanNode[] cheapestForGlobal = new PlanNode[gps.length]; - - + PlanNode cheapest = null; // the overall cheapest plan // go over all plans from the list @@ -863,8 +861,7 @@ protected void prunePlanAlternativesWithCommonBranching(List plans) { } } } - - + // -------------------------------------------------------------------------------------------- // Handling of branches // -------------------------------------------------------------------------------------------- @@ -881,7 +878,6 @@ public List getOpenBranches() { return this.openBranches; } - protected List getBranchesForParent(DagConnection toParent) { if (this.outgoingConnections.size() == 1) { // return our own stack of open branches, because nothing is added @@ -921,7 +917,6 @@ else if (this.outgoingConnections.size() > 1) { } } - protected void removeClosedBranches(List openList) { if (openList == null || openList.isEmpty() || this.closedBranchingNodes == null || this.closedBranchingNodes.isEmpty()) { return; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/PartitionNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/PartitionNode.java index 873cc23c14a84..7425849ddbf60 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/PartitionNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/PartitionNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.dag; import org.apache.flink.api.common.distributions.DataDistribution; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/ReduceNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/ReduceNode.java index d08bbb6eca240..b9e407e56154d 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/ReduceNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/ReduceNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.dag; import org.apache.flink.api.common.operators.base.ReduceOperatorBase; @@ -37,7 +36,6 @@ public class ReduceNode extends SingleInputNode { private final List possibleProperties; private ReduceNode preReduceUtilityNode; - public ReduceNode(ReduceOperatorBase operator) { super(operator); diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java index 8b3b4044c6007..45c27b8f29b08 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.dag; import org.apache.flink.api.common.ExecutionMode; @@ -142,7 +141,6 @@ public OptimizerNode getPredecessorNode() { public List getIncomingConnections() { return Collections.singletonList(this.inConn); } - @Override public SemanticProperties getSemanticProperties() { @@ -241,7 +239,6 @@ public void computeInterestingPropertiesForInputs(CostEstimator estimator) { conn.setInterestingProperties(new InterestingProperties()); } } - @Override public List getAlternativePlans(CostEstimator estimator) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SolutionSetNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SolutionSetNode.java index 299c6388bf40c..b2cb8b1e75cba 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SolutionSetNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SolutionSetNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.dag; import org.apache.flink.api.common.operators.base.DeltaIterationBase.SolutionSetPlaceHolder; @@ -36,8 +35,7 @@ public class SolutionSetNode extends AbstractPartialSolutionNode { private final WorksetIterationNode iterationNode; - - + public SolutionSetNode(SolutionSetPlaceHolder psph, WorksetIterationNode iterationNode) { super(psph); this.iterationNode = iterationNode; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SortPartitionNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SortPartitionNode.java index 8037533f29335..1087e19116117 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SortPartitionNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SortPartitionNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.dag; import org.apache.flink.api.common.operators.Ordering; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TempMode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TempMode.java index 0d1dfc92bd310..91b06b641b839 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TempMode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TempMode.java @@ -35,8 +35,7 @@ public enum TempMode { private final boolean cached; private final boolean breaksPipeline; - - + private TempMode(boolean cached, boolean breaksPipeline) { this.cached = cached; this.breaksPipeline = breaksPipeline; @@ -69,8 +68,7 @@ public TempMode makeCached() { return this; } } - - + public TempMode makeNonCached() { if (this == CACHED) { return NONE; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java index dba06838ecceb..699583801d7bc 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.dag; import org.apache.flink.api.common.ExecutionMode; @@ -155,7 +154,6 @@ public List getIncomingConnections() { return inputs; } - @Override public void setInput(Map, OptimizerNode> contractToNode, ExecutionMode defaultExecutionMode) { // see if there is a hint that dictates which shipping strategy to use for BOTH inputs diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/UnaryOperatorNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/UnaryOperatorNode.java index 0efdc0a88d850..5e8eff0ff27f3 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/UnaryOperatorNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/UnaryOperatorNode.java @@ -29,7 +29,6 @@ import java.util.Arrays; import java.util.List; - public class UnaryOperatorNode extends SingleInputNode { private final List operators; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetIterationNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetIterationNode.java index db35ce2e26f48..fe55de3c82627 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetIterationNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetIterationNode.java @@ -65,8 +65,7 @@ public class WorksetIterationNode extends TwoInputNode implements IterationNode { private static final int DEFAULT_COST_WEIGHT = 20; - - + private final FieldList solutionSetKeyFields; private final GlobalProperties partitionedProperties; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetNode.java index 42fc3d52893b1..b64da84ded225 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/WorksetNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.dag; import org.apache.flink.api.common.operators.base.DeltaIterationBase.WorksetPlaceHolder; @@ -36,8 +35,7 @@ public class WorksetNode extends AbstractPartialSolutionNode { private final WorksetIterationNode iterationNode; - - + public WorksetNode(WorksetPlaceHolder psph, WorksetIterationNode iterationNode) { super(psph); this.iterationNode = iterationNode; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/GlobalProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/GlobalProperties.java index a00fb3c3416f3..48de774fdfe62 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/GlobalProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/GlobalProperties.java @@ -381,7 +381,6 @@ public GlobalProperties filterBySemanticProperties(SemanticProperties props, int return gp; } - public void parameterizeChannel(Channel channel, boolean globalDopChange, ExecutionMode exchangeMode, boolean breakPipeline) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/LocalProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/LocalProperties.java index 9e4a5c50cca46..9c87f140b2fd6 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/LocalProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/LocalProperties.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.dataproperties; import org.apache.flink.api.common.operators.Ordering; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalProperties.java index 3646d74e5b0d2..a63a631422a01 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalProperties.java @@ -83,7 +83,6 @@ public void setHashPartitioned(FieldSet partitionedFields) { this.partitioningFields = partitionedFields; this.ordering = null; } - public void setRangePartitioned(Ordering ordering) { this.setRangePartitioned(ordering, null); diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedLocalProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedLocalProperties.java index b0ed33634a92f..21cd88d270d21 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedLocalProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dataproperties/RequestedLocalProperties.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.dataproperties; import org.apache.flink.api.common.operators.Ordering; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractJoinDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractJoinDescriptor.java index ded82ed5939c1..f46ba24a6776e 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractJoinDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractJoinDescriptor.java @@ -88,8 +88,7 @@ protected List createPossibleGlobalProperties() { return Collections.singletonList(new GlobalPropertiesPair(partitioned_left, partitioned_right)); } - - + RequestedGlobalProperties partitioned1 = new RequestedGlobalProperties(); if (customPartitioner == null) { partitioned1.setAnyPartitioning(this.keys1); diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractOperatorDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractOperatorDescriptor.java index 81255560947e7..5f24f080010ef 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractOperatorDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AbstractOperatorDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.runtime.operators.DriverStrategy; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupCombineProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupCombineProperties.java index 9ee56b003755b..b116c2ce07e33 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupCombineProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupCombineProperties.java @@ -53,7 +53,6 @@ protected List createPossibleLocalProperties() { return Collections.singletonList(new RequestedLocalProperties()); } - @Override public GlobalProperties computeGlobalProperties(GlobalProperties gProps) { if (gProps.getUniqueFieldCombination() != null && gProps.getUniqueFieldCombination().size() > 0 && @@ -65,7 +64,6 @@ public GlobalProperties computeGlobalProperties(GlobalProperties gProps) { return gProps; } - @Override public LocalProperties computeLocalProperties(LocalProperties lProps) { return lProps.clearUniqueFieldSets(); diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupReduceProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupReduceProperties.java index df76257ed6ff1..2a8e8fe312a40 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupReduceProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/AllGroupReduceProperties.java @@ -52,8 +52,7 @@ protected List createPossibleGlobalProperties() { protected List createPossibleLocalProperties() { return Collections.singletonList(new RequestedLocalProperties()); } - - + @Override public GlobalProperties computeGlobalProperties(GlobalProperties gProps) { if (gProps.getUniqueFieldCombination() != null && gProps.getUniqueFieldCombination().size() > 0 && @@ -64,7 +63,6 @@ public GlobalProperties computeGlobalProperties(GlobalProperties gProps) { gProps.clearUniqueFieldCombinations(); return gProps; } - @Override public LocalProperties computeLocalProperties(LocalProperties lProps) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/BinaryUnionOpDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/BinaryUnionOpDescriptor.java index 266fa5c53b864..263855e33074c 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/BinaryUnionOpDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/BinaryUnionOpDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.optimizer.dag.BinaryUnionNode; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java index c8fe48841252d..aa9d0e2d50c83 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.optimizer.dag.TwoInputNode; @@ -32,13 +31,11 @@ import java.util.Collections; import java.util.List; - public abstract class CartesianProductDescriptor extends OperatorDescriptorDual { private final boolean allowBroadcastFirst; private final boolean allowBroadcastSecond; - - + protected CartesianProductDescriptor(boolean allowBroadcastFirst, boolean allowBroadcastSecond) { if (!(allowBroadcastFirst | allowBroadcastSecond)) { throw new IllegalArgumentException(); @@ -47,8 +44,7 @@ protected CartesianProductDescriptor(boolean allowBroadcastFirst, boolean allowB this.allowBroadcastFirst = allowBroadcastFirst; this.allowBroadcastSecond = allowBroadcastSecond; } - - + @Override protected List createPossibleGlobalProperties() { ArrayList pairs = new ArrayList(); diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupDescriptor.java index ce7e66c897b5c..e35643d1547d3 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupDescriptor.java @@ -44,8 +44,7 @@ public class CoGroupDescriptor extends OperatorDescriptorDual { private final Ordering ordering2; // ordering on the second input private Partitioner customPartitioner; - - + public CoGroupDescriptor(FieldList keys1, FieldList keys2) { this(keys1, keys2, null, null); } diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetFirstDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetFirstDescriptor.java index c5494e6e8a739..895e186abc0bc 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetFirstDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetFirstDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetSecondDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetSecondDescriptor.java index a13eb3f3db1b3..d7aca93ca68cb 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetSecondDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupWithSolutionSetSecondDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossBlockOuterFirstDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossBlockOuterFirstDescriptor.java index 4a467dc8ff22f..ab38d7f1bb2a6 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossBlockOuterFirstDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossBlockOuterFirstDescriptor.java @@ -21,7 +21,6 @@ import org.apache.flink.optimizer.dataproperties.LocalProperties; import org.apache.flink.runtime.operators.DriverStrategy; - public class CrossBlockOuterFirstDescriptor extends CartesianProductDescriptor { public CrossBlockOuterFirstDescriptor() { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossBlockOuterSecondDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossBlockOuterSecondDescriptor.java index 212e048703731..024176f3389e6 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossBlockOuterSecondDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossBlockOuterSecondDescriptor.java @@ -21,7 +21,6 @@ import org.apache.flink.optimizer.dataproperties.LocalProperties; import org.apache.flink.runtime.operators.DriverStrategy; - public class CrossBlockOuterSecondDescriptor extends CartesianProductDescriptor { public CrossBlockOuterSecondDescriptor() { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossStreamOuterFirstDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossStreamOuterFirstDescriptor.java index 9c7bd63051b67..0581493b58080 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossStreamOuterFirstDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossStreamOuterFirstDescriptor.java @@ -21,7 +21,6 @@ import org.apache.flink.optimizer.dataproperties.LocalProperties; import org.apache.flink.runtime.operators.DriverStrategy; - public class CrossStreamOuterFirstDescriptor extends CartesianProductDescriptor { public CrossStreamOuterFirstDescriptor() { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossStreamOuterSecondDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossStreamOuterSecondDescriptor.java index 3fabad67cd848..c04ac0c409c30 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossStreamOuterSecondDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CrossStreamOuterSecondDescriptor.java @@ -21,7 +21,6 @@ import org.apache.flink.optimizer.dataproperties.LocalProperties; import org.apache.flink.runtime.operators.DriverStrategy; - public class CrossStreamOuterSecondDescriptor extends CartesianProductDescriptor { public CrossStreamOuterSecondDescriptor() { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FilterDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FilterDescriptor.java index 27cb8a7cf3a19..b861dcabdb113 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FilterDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FilterDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.optimizer.dag.SingleInputNode; @@ -31,7 +30,6 @@ import java.util.Collections; import java.util.List; - public class FilterDescriptor extends OperatorDescriptorSingle { @Override diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FlatMapDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FlatMapDescriptor.java index 975b21c0bdca6..fb97f6c536f18 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FlatMapDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/FlatMapDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.optimizer.dag.SingleInputNode; @@ -32,7 +31,6 @@ import java.util.Collections; import java.util.List; - public class FlatMapDescriptor extends OperatorDescriptorSingle { @Override diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceProperties.java index 908bb0f7aa9e4..4e6448718b396 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceProperties.java @@ -40,8 +40,7 @@ public final class GroupReduceProperties extends OperatorDescriptorSingle { private final Ordering ordering; // ordering that we need to use if an additional ordering is requested private final Partitioner customPartitioner; - - + public GroupReduceProperties(FieldSet keys) { this(keys, null, null); } diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceWithCombineProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceWithCombineProperties.java index 85e8c8495726f..239471b9992c9 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceWithCombineProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/GroupReduceWithCombineProperties.java @@ -50,8 +50,7 @@ public final class GroupReduceWithCombineProperties extends OperatorDescriptorSi private final Ordering ordering; // ordering that we need to use if an additional ordering is requested private final Partitioner customPartitioner; - - + public GroupReduceWithCombineProperties(FieldSet groupKeys) { this(groupKeys, null, null); } diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildFirstProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildFirstProperties.java index 701ec8d25198b..c371d8f6a2463 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildFirstProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildFirstProperties.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildSecondProperties.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildSecondProperties.java index a0eee8d8295f4..792c6884552a0 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildSecondProperties.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashJoinBuildSecondProperties.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashLeftOuterJoinBuildSecondDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashLeftOuterJoinBuildSecondDescriptor.java index 8ed7969a87196..465e6be0aa768 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashLeftOuterJoinBuildSecondDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashLeftOuterJoinBuildSecondDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashRightOuterJoinBuildFirstDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashRightOuterJoinBuildFirstDescriptor.java index 5ddba1ce99c76..2bb82d240900f 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashRightOuterJoinBuildFirstDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/HashRightOuterJoinBuildFirstDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapDescriptor.java index 6be1d52568649..77adb973ef807 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.optimizer.dag.SingleInputNode; @@ -31,7 +30,6 @@ import java.util.Collections; import java.util.List; - public class MapDescriptor extends OperatorDescriptorSingle { @Override diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapPartitionDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapPartitionDescriptor.java index fb08bb16e745b..83c897e750d13 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapPartitionDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/MapPartitionDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.optimizer.dag.SingleInputNode; @@ -31,7 +30,6 @@ import java.util.Collections; import java.util.List; - public class MapPartitionDescriptor extends OperatorDescriptorSingle { @Override diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/NoOpDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/NoOpDescriptor.java index 2dd69a80313ba..ac280c254e97f 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/NoOpDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/NoOpDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.optimizer.dag.SingleInputNode; @@ -31,7 +30,6 @@ import java.util.Collections; import java.util.List; - public class NoOpDescriptor extends OperatorDescriptorSingle { @Override @@ -44,24 +42,20 @@ public SingleInputPlanNode instantiate(Channel in, SingleInputNode node) { return new SingleInputPlanNode(node, "Pipe", in, DriverStrategy.UNARY_NO_OP); } - @Override protected List createPossibleGlobalProperties() { return Collections.singletonList(new RequestedGlobalProperties()); } - @Override protected List createPossibleLocalProperties() { return Collections.singletonList(new RequestedLocalProperties()); } - @Override public GlobalProperties computeGlobalProperties(GlobalProperties gProps) { return gProps; } - @Override public LocalProperties computeLocalProperties(LocalProperties lProps) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorDual.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorDual.java index 80869420ac729..acf301dadabb8 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorDual.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorDual.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.Ordering; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorSingle.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorSingle.java index 0c1a0c572a674..3076e568f2ba3 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorSingle.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/OperatorDescriptorSingle.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; @@ -44,8 +43,7 @@ public abstract class OperatorDescriptorSingle implements AbstractOperatorDescri private List globalProps; private List localProps; - - + protected OperatorDescriptorSingle() { this(null); } @@ -55,7 +53,6 @@ protected OperatorDescriptorSingle(FieldSet keys) { this.keyList = keys == null ? null : keys.toFieldList(); } - public List getPossibleGlobalProperties() { if (this.globalProps == null) { this.globalProps = createPossibleGlobalProperties(); diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/SolutionSetDeltaOperator.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/SolutionSetDeltaOperator.java index c8ffaac3cd12c..cfa5b5aa98244 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/SolutionSetDeltaOperator.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/SolutionSetDeltaOperator.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.api.common.operators.util.FieldList; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/UtilSinkJoinOpDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/UtilSinkJoinOpDescriptor.java index c0eff4133798e..49dd8a175aa29 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/UtilSinkJoinOpDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/UtilSinkJoinOpDescriptor.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.operators; import org.apache.flink.optimizer.CompilerException; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkIterationPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkIterationPlanNode.java index a0add5ef5d829..6833eea8a95fe 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkIterationPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkIterationPlanNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.plan; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; @@ -85,7 +84,6 @@ public PlanNode getRootOfTerminationCriterion() { // -------------------------------------------------------------------------------------------- - public TypeSerializerFactory getSerializerForIterationChannel() { return serializerForIterationChannel; } @@ -110,7 +108,6 @@ public void setCosts(Costs nodeCosts) { public int getMemoryConsumerWeight() { return 1; } - @Override public SourceAndDamReport hasDamOnPathDownTo(PlanNode source) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkPartialSolutionPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkPartialSolutionPlanNode.java index ae4558c2a182e..3d94d15115800 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkPartialSolutionPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/BulkPartialSolutionPlanNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.plan; import org.apache.flink.optimizer.costs.Costs; @@ -47,8 +46,7 @@ public class BulkPartialSolutionPlanNode extends PlanNode { private Channel initialInput; public Object postPassHelper; - - + public BulkPartialSolutionPlanNode(BulkPartialSolutionNode template, String nodeName, GlobalProperties gProps, LocalProperties lProps, Channel initialInput) diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/Channel.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/Channel.java index df3a853a0afa9..3fd6e25f8298d 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/Channel.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/Channel.java @@ -375,7 +375,6 @@ public int getCostWeight() { // -------------------------------------------------------------------------------------------- // Statistic Estimates // -------------------------------------------------------------------------------------------- - @Override public long getEstimatedOutputSize() { @@ -397,7 +396,6 @@ public float getEstimatedAvgWidthPerOutputRecord() { // -------------------------------------------------------------------------------------------- // Data Property Handling // -------------------------------------------------------------------------------------------- - public RequestedGlobalProperties getRequiredGlobalProps() { return requiredGlobalProps; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/DualInputPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/DualInputPlanNode.java index 04b9698cf7d97..74e06a7dbce21 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/DualInputPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/DualInputPlanNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.plan; import org.apache.flink.api.common.operators.util.FieldList; @@ -155,7 +154,6 @@ public Channel getInput2() { } // -------------------------------------------------------------------------------------------- - @Override public void accept(Visitor visitor) { @@ -170,7 +168,6 @@ public void accept(Visitor visitor) { visitor.postVisit(this); } } - @Override public Iterable getPredecessors() { @@ -195,7 +192,6 @@ public Iterable getInputs() { return Arrays.asList(this.input1, this.input2); } - @Override public SourceAndDamReport hasDamOnPathDownTo(PlanNode source) { if (source == this) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NAryUnionPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NAryUnionPlanNode.java index 2ea845383e8c2..f1d90b235b496 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NAryUnionPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NAryUnionPlanNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.plan; import org.apache.flink.optimizer.costs.Costs; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NamedChannel.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NamedChannel.java index da97e61c57560..e296d7570b0f0 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NamedChannel.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/NamedChannel.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.plan; import org.apache.flink.optimizer.dag.TempMode; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/PlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/PlanNode.java index 723c532c7d9ba..92ce760996690 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/PlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/PlanNode.java @@ -263,7 +263,6 @@ public Costs getCumulativeCostsShare() { } } - /** * Sets the basic cost for this node to the given value, and sets the cumulative costs * to those costs plus the cost shares of all inputs (regular and broadcast). @@ -518,7 +517,6 @@ else if (inputState == FeedbackPropertiesMeetRequirementsReport.NOT_MET) { } // -------------------------------------------------------------------------------------------- - @Override public String toString() { @@ -558,9 +556,7 @@ public Iterable> getDumpableInputs() { public static enum SourceAndDamReport { NOT_FOUND, FOUND_SOURCE, FOUND_SOURCE_AND_DAM } - - - + public static enum FeedbackPropertiesMeetRequirementsReport { /** Indicates that the path is irrelevant */ NO_PARTIAL_SOLUTION, diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SingleInputPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SingleInputPlanNode.java index d007677042ff2..a66068937d9b0 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SingleInputPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SingleInputPlanNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.plan; import org.apache.flink.api.common.operators.util.FieldList; @@ -191,7 +190,6 @@ public void setComparator(TypeComparatorFactory comparator, int id) { } // -------------------------------------------------------------------------------------------- - @Override public void accept(Visitor visitor) { @@ -206,7 +204,6 @@ public void accept(Visitor visitor) { } } - @Override public Iterable getPredecessors() { if (getBroadcastInputs() == null || getBroadcastInputs().isEmpty()) { @@ -224,7 +221,6 @@ public Iterable getPredecessors() { } } - @Override public Iterable getInputs() { return Collections.singleton(this.input); diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SinkJoinerPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SinkJoinerPlanNode.java index b9edd046cbab1..db0347766e167 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SinkJoinerPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SinkJoinerPlanNode.java @@ -25,7 +25,6 @@ import java.util.List; - /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SolutionSetPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SolutionSetPlanNode.java index 7a5cf45744739..faa5f57a2dda8 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SolutionSetPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SolutionSetPlanNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.plan; import org.apache.flink.optimizer.costs.Costs; @@ -46,8 +45,7 @@ public class SolutionSetPlanNode extends PlanNode { private final Channel initialInput; public Object postPassHelper; - - + public SolutionSetPlanNode(SolutionSetNode template, String nodeName, GlobalProperties gProps, LocalProperties lProps, Channel initialInput) @@ -86,7 +84,6 @@ public void setContainingIterationNode(WorksetIterationPlanNode containingIterat } // -------------------------------------------------------------------------------------------- - @Override public void accept(Visitor visitor) { @@ -95,19 +92,16 @@ public void accept(Visitor visitor) { } } - @Override public Iterable getPredecessors() { return Collections.emptyList(); } - @Override public Iterable getInputs() { return Collections.emptyList(); } - @Override public SourceAndDamReport hasDamOnPathDownTo(PlanNode source) { if (source == this) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SourcePlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SourcePlanNode.java index 1e8b278036ded..dd1ea5c7f7278 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SourcePlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/SourcePlanNode.java @@ -79,7 +79,6 @@ public void setSerializer(TypeSerializerFactory serializer) { } // -------------------------------------------------------------------------------------------- - @Override public void accept(Visitor visitor) { @@ -88,19 +87,16 @@ public void accept(Visitor visitor) { } } - @Override public Iterable getPredecessors() { return Collections.emptyList(); } - @Override public Iterable getInputs() { return Collections.emptyList(); } - @Override public SourceAndDamReport hasDamOnPathDownTo(PlanNode source) { if (source == this) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetIterationPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetIterationPlanNode.java index 5470f7de406d7..07aaf0badf15a 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetIterationPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetIterationPlanNode.java @@ -202,7 +202,6 @@ public void acceptForStepFunction(Visitor visitor) { @Override protected void mergeBranchPlanMaps(Map branchPlan1, Map branchPlan2) {} - protected void mergeBranchPlanMaps() { Map branchPlan1 = input1.getSource().branchPlan; Map branchPlan2 = input2.getSource().branchPlan; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetPlanNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetPlanNode.java index aa63986f42f2e..afceb5042d4d0 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetPlanNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/WorksetPlanNode.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.plan; import org.apache.flink.optimizer.costs.Costs; @@ -47,8 +46,7 @@ public class WorksetPlanNode extends PlanNode { private final Channel initialInput; public Object postPassHelper; - - + public WorksetPlanNode(WorksetNode template, String nodeName, GlobalProperties gProps, LocalProperties lProps, Channel initialInput) @@ -87,7 +85,6 @@ public void setContainingIterationNode(WorksetIterationPlanNode containingIterat } // -------------------------------------------------------------------------------------------- - @Override public void accept(Visitor visitor) { @@ -96,19 +93,16 @@ public void accept(Visitor visitor) { } } - @Override public Iterable getPredecessors() { return Collections.emptyList(); } - @Override public Iterable getInputs() { return Collections.emptyList(); } - @Override public SourceAndDamReport hasDamOnPathDownTo(PlanNode source) { if (source == this) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/DumpableConnection.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/DumpableConnection.java index 3f8cb4629fa33..d8bf21a9da0ec 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/DumpableConnection.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/DumpableConnection.java @@ -20,7 +20,6 @@ import org.apache.flink.runtime.operators.shipping.ShipStrategyType; - /** * */ diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java index 6bd8dbd694151..11a86db560fd2 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java @@ -56,7 +56,6 @@ import java.util.Locale; import java.util.Map; - public class PlanJSONDumpGenerator { private Map, Integer> nodeIds; // resolves pact nodes to ids @@ -74,8 +73,7 @@ public void setEncodeForHTML(boolean encodeForHTML) { public boolean isEncodeForHTML() { return encodeForHTML; } - - + public void dumpPactPlanAsJSON(List nodes, PrintWriter writer) { @SuppressWarnings("unchecked") List> n = (List>) (List) nodes; @@ -256,8 +254,7 @@ else if (n instanceof BinaryUnionNode) { contents = StringEscapeUtils.escapeHtml4(contents); contents = contents.replace("\\", "\"); } - - + String name = n.getOperatorName(); if (name.equals("Reduce") && (node instanceof SingleInputPlanNode) && ((SingleInputPlanNode) node).getDriverStrategy() == DriverStrategy.SORTED_GROUP_COMBINE) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JobGraphGenerator.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JobGraphGenerator.java index 4ceaa95dc03c8..c0f2da2839af5 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JobGraphGenerator.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JobGraphGenerator.java @@ -479,8 +479,7 @@ public void postVisit(PlanNode node) { } final JobVertex targetVertex = this.vertices.get(node); - - + // --------- Main Path: Translation of channels ---------- // // There are two paths of translation: One for chained tasks (or merged tasks in general), @@ -557,8 +556,7 @@ else if (node instanceof BulkPartialSolutionPlanNode || } // -------- Here, we translate non-chained tasks ------------- - - + if (this.currentIteration != null) { JobVertex head = this.iterations.get(this.currentIteration).getHeadTask(); // Exclude static code paths from the co-location constraint, because otherwise @@ -567,8 +565,7 @@ else if (node instanceof BulkPartialSolutionPlanNode || targetVertex.setStrictlyCoLocatedWith(head); } } - - + // create the config that will contain all the description of the inputs final TaskConfig targetVertexConfig = new TaskConfig(targetVertex.getConfiguration()); @@ -1334,15 +1331,13 @@ private void finalizeBulkIteration(IterationDescriptor descr) { tailConfig.setOutputSerializer(bulkNode.getSerializerForIterationChannel()); } - - + // create the fake output task for termination criterion, if needed final TaskConfig tailConfigOfTerminationCriterion; // If we have a termination criterion and it is not an intermediate node if(rootOfTerminationCriterion != null && rootOfTerminationCriterion.getOutgoingChannels().isEmpty()) { JobVertex rootOfTerminationCriterionVertex = this.vertices.get(rootOfTerminationCriterion); - - + if (rootOfTerminationCriterionVertex == null) { // last op is chained final TaskInChain taskInChain = this.chainedTasks.get(rootOfTerminationCriterion); @@ -1708,7 +1703,6 @@ private static final class TaskInChain { this.taskName = taskName; } - public PlanNode getPlanNode() { return planNode; } diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JsonMapper.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JsonMapper.java index 81e1956c9cd23..25d9558207ba1 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JsonMapper.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JsonMapper.java @@ -259,7 +259,6 @@ public static String getOptimizerPropertiesJson(JsonFactory jsonFactory, PlanNod gen.writeEndArray(); } - // compiler hints if (optNode.getOperator().getCompilerHints() != null) { CompilerHints hints = optNode.getOperator().getCompilerHints(); @@ -283,8 +282,7 @@ public static String getOptimizerPropertiesJson(JsonFactory jsonFactory, PlanNod gen.writeEndArray(); } - - + gen.writeEndObject(); gen.close(); @@ -294,8 +292,7 @@ public static String getOptimizerPropertiesJson(JsonFactory jsonFactory, PlanNod return "{}"; } } - - + private static void addProperty(JsonGenerator gen, String name, String value) throws IOException { gen.writeStartObject(); gen.writeStringField("name", name); diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/AbstractSchema.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/AbstractSchema.java index f2b736cfced4a..2ffdefa7f43b7 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/AbstractSchema.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/AbstractSchema.java @@ -23,8 +23,7 @@ public abstract class AbstractSchema implements Iterable> { private int numConnectionsThatContributed; - - + public int getNumConnectionsThatContributed() { return this.numConnectionsThatContributed; } diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/ConflictingFieldTypeInfoException.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/ConflictingFieldTypeInfoException.java index 56d914c45ffdb..97956775d3f64 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/ConflictingFieldTypeInfoException.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/ConflictingFieldTypeInfoException.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.postpass; public final class ConflictingFieldTypeInfoException extends Exception { @@ -27,15 +26,13 @@ public final class ConflictingFieldTypeInfoException extends Exception { private final Object previousType, newType; - public ConflictingFieldTypeInfoException(int fieldNumber, Object previousType, Object newType) { super("Conflicting type info for field " + fieldNumber + ": Old='" + previousType + "', new='" + newType + "'."); this.fieldNumber = fieldNumber; this.previousType = previousType; this.newType = newType; } - - + public int getFieldNumber() { return fieldNumber; } diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/GenericFlatTypePostPass.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/GenericFlatTypePostPass.java index e9b6a8fa8a4fd..1c6254c55727c 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/GenericFlatTypePostPass.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/GenericFlatTypePostPass.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.postpass; import org.apache.flink.api.common.operators.SemanticProperties; @@ -52,8 +51,7 @@ public abstract class GenericFlatTypePostPass> implements OptimizerPostPass { private boolean propagateParentSchemaDown = true; - - + public boolean isPropagateParentSchemaDown() { return propagateParentSchemaDown; } diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/JavaApiPostPass.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/JavaApiPostPass.java index ff3030f74bf81..df0b0d8208cf9 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/JavaApiPostPass.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/JavaApiPostPass.java @@ -81,7 +81,6 @@ public void postPass(OptimizedPlan plan) { traverse(sink); } } - protected void traverse(PlanNode node) { if (!alreadyDone.add(node)) { @@ -236,7 +235,6 @@ private void traverseChannel(Channel channel) { TypeInformation type = javaOp.getOperatorInfo().getOutputType(); - if(javaOp instanceof GroupReduceOperatorBase && (source.getDriverStrategy() == DriverStrategy.SORTED_GROUP_COMBINE || source.getDriverStrategy() == DriverStrategy.ALL_GROUP_REDUCE_COMBINE)) { GroupReduceOperatorBase groupNode = (GroupReduceOperatorBase) javaOp; @@ -266,8 +264,7 @@ else if(javaOp instanceof PlanUnwrappingReduceGroupOperator && // descend to the channel's source traverse(channel.getSource()); } - - + @SuppressWarnings("unchecked") private static TypeInformation getTypeInfoFromSource(SourcePlanNode node) { Operator op = node.getOptimizerNode().getOperator(); diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/OptimizerPostPass.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/OptimizerPostPass.java index ba0b7c7f57730..9814f1cf987fd 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/OptimizerPostPass.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/postpass/OptimizerPostPass.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.postpass; import org.apache.flink.optimizer.plan.OptimizedPlan; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/GraphCreatingVisitor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/GraphCreatingVisitor.java index 92217b58cf19d..5c51fa9480e52 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/GraphCreatingVisitor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/traversals/GraphCreatingVisitor.java @@ -94,7 +94,6 @@ public class GraphCreatingVisitor implements Visitor> { private final boolean forceParallelism; - public GraphCreatingVisitor(int defaultParallelism, ExecutionMode defaultDataExchangeMode) { this(null, false, defaultParallelism, defaultDataExchangeMode, null); } @@ -291,7 +290,6 @@ public void postVisit(Operator c) { throw new CompilerException("Error: The step functions result does not depend on the partial solution."); } - OptimizerNode terminationCriterion = null; if (iter.getTerminationCriterion() != null) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java index fa9035ae95798..ecae5c2e6797e 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java @@ -28,7 +28,6 @@ import java.util.List; - public class NoOpBinaryUdfOp extends DualInputOperator { public NoOpBinaryUdfOp(TypeInformation type) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java index 824415489acde..2a70c3d833bf6 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java @@ -28,7 +28,6 @@ import java.util.List; - public class NoOpUnaryUdfOp extends SingleInputOperator { @SuppressWarnings("rawtypes") diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/Utils.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/Utils.java index 2d763455ecaab..f6c55fcfdddc1 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/Utils.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/Utils.java @@ -16,7 +16,6 @@ * limitations under the License. */ - package org.apache.flink.optimizer.util; import org.apache.flink.api.common.ExecutionConfig; @@ -37,7 +36,6 @@ import java.util.Arrays; - /** * Utility class that contains helper methods for optimizer. */ diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/BranchingPlansCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/BranchingPlansCompilerTest.java index 08293e6ad6023..2b5e58a5162ec 100644 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/BranchingPlansCompilerTest.java +++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/BranchingPlansCompilerTest.java @@ -59,8 +59,7 @@ @SuppressWarnings({"serial"}) public class BranchingPlansCompilerTest extends CompilerTestBase { - - + @Test public void testCostComputationWithMultipleDataSinks() { final int SINKS = 5; @@ -90,7 +89,6 @@ public void testCostComputationWithMultipleDataSinks() { } } - /** * * 
@@ -143,7 +141,6 @@ public void testBranchingWithMultipleDataSinks2() {
 			fail(e.getMessage());
 		}
 	}
-	
 
 	/**
 	 * 
@@ -215,7 +212,6 @@ public Tuple2 map(Tuple2 value) {
 			DataSet> joined10 = mapped.join(joined9).where(0).equalTo(0)
 					.with(new DummyFlatJoinFunction>());
 
-
 			joined5.coGroup(joined10)
 					.where(1).equalTo(1)
 					.with(new DummyCoGroupFunction, Tuple2>())
@@ -368,7 +364,6 @@ public void testBranchEachContractType() {
 			Assert.fail(e.getMessage());
 		}
 	}
-	
 
 	@Test
 	public void testBranchingUnion() {
@@ -765,11 +760,9 @@ public void testBCVariableClosure() {
 		DataSet reduced = input
 				.map(new IdentityMapper())
 				.reduceGroup(new Top1GroupReducer());
-		
-		
+
 		DataSet initialSolution = input.map(new IdentityMapper()).withBroadcastSet(reduced, "bc");
-		
-		
+
 		IterativeDataSet iteration = initialSolution.iterate(100);
 		
 		iteration.closeWith(iteration.map(new IdentityMapper()).withBroadcastSet(reduced, "red"))
@@ -827,8 +820,7 @@ public void testMultipleIterationsWithClosueBCVars() {
 		IterativeDataSet iteration1 = input.iterate(100);
 		IterativeDataSet iteration2 = input.iterate(20);
 		IterativeDataSet iteration3 = input.iterate(17);
-		
-		
+
 		iteration1.closeWith(iteration1.map(new IdentityMapper()))
 				.output(new DiscardingOutputFormat());
 		iteration2.closeWith(iteration2.reduceGroup(new Top1GroupReducer()))
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/BroadcastVariablePipelinebreakerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/BroadcastVariablePipelinebreakerTest.java
index 4f75eb3473d25..51ee15fc7d098 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/BroadcastVariablePipelinebreakerTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/BroadcastVariablePipelinebreakerTest.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer;
 
 import org.apache.flink.api.common.Plan;
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/CachedMatchStrategyCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/CachedMatchStrategyCompilerTest.java
index 43f788affeb15..757eee8e05701 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/CachedMatchStrategyCompilerTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/CachedMatchStrategyCompilerTest.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer;
 
 import org.apache.flink.api.common.Plan;
@@ -182,8 +181,7 @@ else if(s.getName().equals("smallFile")) {
 					this.setSourceStatistics(s, 100, 100);
 				}
 			}
-			
-			
+
 			OptimizedPlan oPlan = compileNoStats(plan);
 	
 			OptimizerPlanNodeResolver resolver = getOptimizerPlanNodeResolver(oPlan);
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java
index d7db6a7e6307c..65c2ac0177fc1 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/DistinctCompilationTest.java
@@ -39,7 +39,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-
 @SuppressWarnings("serial")
 public class DistinctCompilationTest extends CompilerTestBase implements java.io.Serializable {
 
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/FeedbackPropertiesMatchTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/FeedbackPropertiesMatchTest.java
index bf07ac36def0e..52b4e9574ea70 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/FeedbackPropertiesMatchTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/FeedbackPropertiesMatchTest.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer;
 
 import org.apache.flink.api.common.functions.FlatJoinFunction;
@@ -63,7 +62,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-
 public class FeedbackPropertiesMatchTest {
 
 	@Test
@@ -686,8 +684,7 @@ public void testSingleInputOperatorsWithReCreation() {
 				
 				toMap2.setShipStrategy(ShipStrategyType.FORWARD, DataExchangeMode.PIPELINED);
 				toMap2.setLocalStrategy(LocalStrategy.NONE);
-				
-				
+
 				toMap1.setRequiredGlobalProps(null);
 				toMap1.setRequiredLocalProps(null);
 				
@@ -712,8 +709,7 @@ public void testSingleInputOperatorsWithReCreation() {
 				
 				toMap2.setShipStrategy(ShipStrategyType.PARTITION_HASH, new FieldList(2, 5), DataExchangeMode.PIPELINED);
 				toMap2.setLocalStrategy(LocalStrategy.NONE);
-				
-				
+
 				toMap1.setRequiredGlobalProps(reqGp);
 				toMap1.setRequiredLocalProps(null);
 				
@@ -763,8 +759,7 @@ public void testSingleInputOperatorsWithReCreation() {
 				
 				toMap2.setShipStrategy(ShipStrategyType.FORWARD, DataExchangeMode.PIPELINED);
 				toMap2.setLocalStrategy(LocalStrategy.SORT, new FieldList(5, 7), new boolean[] {false, false});
-				
-				
+
 				toMap1.setRequiredGlobalProps(null);
 				toMap1.setRequiredLocalProps(reqLp);
 				
@@ -996,8 +991,7 @@ public void testTwoOperatorsOneIndependent() {
 				FeedbackPropertiesMeetRequirementsReport report = join.checkPartialSolutionPropertiesMet(target, gp, lp);
 				assertTrue(report != null && report != NO_PARTIAL_SOLUTION && report != NOT_MET);
 			}
-			
-			
+
 			// produced properties match relevant input
 			{
 				GlobalProperties gp = new GlobalProperties();
@@ -1405,8 +1399,7 @@ public void testTwoOperatorsBothDependent() {
 				
 				RequestedGlobalProperties rgp = new RequestedGlobalProperties();
 				rgp.setHashPartitioned(new FieldList(3));
-				
-				
+
 				toJoin1.setShipStrategy(ShipStrategyType.FORWARD, DataExchangeMode.PIPELINED);
 				toJoin1.setLocalStrategy(LocalStrategy.SORT, new FieldList(3), new boolean[] { false });
 				
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/IterationsCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/IterationsCompilerTest.java
index 29e1ebe42929b..4ad1db72d16f5 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/IterationsCompilerTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/IterationsCompilerTest.java
@@ -472,8 +472,7 @@ public static DataSet> doSimpleBulkIteration(DataSet> doDeltaIteration(DataSet> vertices, DataSet> edges) {
 
 		DeltaIteration, Tuple2> depIteration = vertices.iterateDelta(vertices, 100, 0);
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/NestedIterationsTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/NestedIterationsTest.java
index bf322b9fd42b2..59fd89be3b0bc 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/NestedIterationsTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/NestedIterationsTest.java
@@ -119,8 +119,7 @@ public void testBulkIterationInClosure() {
 			IterativeDataSet firstIteration = data1.iterate(100);
 			
 			DataSet firstResult = firstIteration.closeWith(firstIteration.map(new IdentityMapper()));
-			
-			
+
 			IterativeDataSet mainIteration = data2.map(new IdentityMapper()).iterate(100);
 			
 			DataSet joined = mainIteration.join(firstResult)
@@ -158,8 +157,7 @@ public void testDeltaIterationInClosure() {
 			DataSet> inFirst = firstIteration.getWorkset().map(new IdentityMapper>());
 			
 			DataSet> firstResult = firstIteration.closeWith(inFirst, inFirst).map(new IdentityMapper>());
-			
-			
+
 			DeltaIteration, Tuple2> mainIteration = data2.iterateDelta(data2, 100, 0);
 			
 			DataSet> joined = mainIteration.getWorkset().join(firstResult).where(0).equalTo(0)
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitioningReusageTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitioningReusageTest.java
index cf61949baa6ed..41912ec20c241 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitioningReusageTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PartitioningReusageTest.java
@@ -224,7 +224,6 @@ public void reuseBothPartitioningJoin1() {
 		checkValidJoinInputProperties(join);
 	}
 
-
 	@Test
 	public void reuseBothPartitioningJoin2() {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
@@ -375,7 +374,6 @@ public void reuseBothPartitioningJoin7() {
 		checkValidJoinInputProperties(join);
 	}
 
-
 	@Test
 	public void noPreviousPartitioningCoGroup1() {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
@@ -553,7 +551,6 @@ public void reuseBothPartitioningCoGroup1() {
 		checkValidCoGroupInputProperties(coGroup);
 	}
 
-
 	@Test
 	public void reuseBothPartitioningCoGroup2() {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
@@ -699,7 +696,6 @@ public void reuseBothPartitioningCoGroup7() {
 	}
 
 
-
 	private void checkValidJoinInputProperties(DualInputPlanNode join) {
 
 		GlobalProperties inProps1 = join.getInput1().getGlobalProperties();
@@ -817,7 +813,6 @@ private int getPosInFieldList(int field, FieldList list) {
 	}
 
 
-
 	public static class MockMapper implements MapFunction, Tuple3> {
 		@Override
 		public Tuple3 map(Tuple3 value) throws Exception {
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PipelineBreakerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PipelineBreakerTest.java
index e2701fa8188cd..f35bdc6e90e15 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PipelineBreakerTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PipelineBreakerTest.java
@@ -64,8 +64,7 @@ public void testPipelineBreakerWithBroadcastVariable() {
 											.withBroadcastSet(source, "bc");
 			
 			result.output(new DiscardingOutputFormat());
-			
-			
+
 			Plan p = env.createProgramPlan();
 			OptimizedPlan op = compileNoStats(p);
 			
@@ -150,8 +149,7 @@ public void testPipelineBreakerBroadcastedPartialSolution() {
 			
 			DataSet initialSource = env.generateSequence(1, 10);
 			IterativeDataSet iteration = initialSource.iterate(100);
-			
-			
+
 			DataSet sourceWithMapper = env.generateSequence(1, 10).map(new IdentityMapper());
 			
 			DataSet bcInput1 = sourceWithMapper
@@ -162,8 +160,7 @@ public void testPipelineBreakerBroadcastedPartialSolution() {
 					.map(new IdentityMapper())
 							.withBroadcastSet(iteration, "bc2")
 							.withBroadcastSet(bcInput1, "bc1");
-							
-			
+
 			iteration.closeWith(result).output(new DiscardingOutputFormat());
 			
 			Plan p = env.createProgramPlan();
@@ -222,8 +219,7 @@ public void testPipelineBreakerWithCross() {
 					.map(new IdentityMapper())
 					.cross(initialSource).withParameters(conf)
 					.output(new DiscardingOutputFormat>());
-				
-				
+
 				Plan p = env.createProgramPlan();
 				OptimizedPlan op = compileNoStats(p);
 				
@@ -249,8 +245,7 @@ public void testPipelineBreakerWithCross() {
 					.map(new IdentityMapper())
 					.cross(initialSource).withParameters(conf)
 					.output(new DiscardingOutputFormat>());
-				
-				
+
 				Plan p = env.createProgramPlan();
 				OptimizedPlan op = compileNoStats(p);
 				
@@ -276,8 +271,7 @@ public void testPipelineBreakerWithCross() {
 					.map(new IdentityMapper())
 					.cross(initialSource).withParameters(conf)
 					.output(new DiscardingOutputFormat>());
-				
-				
+
 				Plan p = env.createProgramPlan();
 				OptimizedPlan op = compileNoStats(p);
 				
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PropertyDataSourceTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PropertyDataSourceTest.java
index 3182c412de52b..37a2e6d541a88 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/PropertyDataSourceTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/PropertyDataSourceTest.java
@@ -350,7 +350,6 @@ public void checkSinglePartitionedGroupedSource2() {
 
 	}
 
-
 	@Test
 	public void checkSinglePartitionedGroupedSource3() {
 
@@ -452,7 +451,6 @@ public void checkSinglePartitionedGroupedSource5() {
 
 	}
 
-
 	@Test
 	public void checkSinglePartitionedGroupedSource6() {
 
@@ -486,7 +484,6 @@ public void checkSinglePartitionedGroupedSource6() {
 
 	}
 
-
 	@Test
 	public void checkSinglePartitionedGroupedSource7() {
 
@@ -553,7 +550,6 @@ public void checkSinglePartitionedGroupedSource8() {
 
 	}
 
-
 	@Test
 	public void checkSinglePartitionedOrderedSource1() {
 
@@ -622,7 +618,6 @@ public void checkSinglePartitionedOrderedSource2() {
 
 	}
 
-
 	@Test
 	public void checkSinglePartitionedOrderedSource3() {
 
@@ -724,7 +719,6 @@ public void checkSinglePartitionedOrderedSource5() {
 
 	}
 
-
 	@Test
 	public void checkSinglePartitionedOrderedSource6() {
 
@@ -791,7 +785,6 @@ public void checkSinglePartitionedOrderedSource7() {
 
 	}
 
-
 	@Test
 	public void checkCoPartitionedSources1() {
 
@@ -888,7 +881,6 @@ public void checkCoPartitionedSources2() {
 		Assert.assertTrue(!gprops1.getCustomPartitioner().equals(gprops2.getCustomPartitioner()));
 	}
 
-
 	public static class SomePojo {
 		public double doubleField;
 		public int intField;
@@ -897,4 +889,3 @@ public static class SomePojo {
 
 }
 
-
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReplicatingDataSourceTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReplicatingDataSourceTest.java
index a47b4d02b690d..ac0eab769bdda 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReplicatingDataSourceTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/ReplicatingDataSourceTest.java
@@ -460,7 +460,6 @@ public void checkJoinWithReplicatedSourceInputBehindRebalance() {
 		OptimizedPlan oPlan = compileNoStats(plan);
 	}
 
-
 	public static class IdMap implements MapFunction {
 
 		@Override
@@ -503,7 +502,5 @@ public T reduce(T value1, T value2) throws Exception {
 		}
 	}
 
-
 }
 
-
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionBetweenDynamicAndStaticPathTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionBetweenDynamicAndStaticPathTest.java
index 430774993c3b2..5ef3b6946d670 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionBetweenDynamicAndStaticPathTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionBetweenDynamicAndStaticPathTest.java
@@ -109,8 +109,7 @@ public void testUnionStaticSecond() {
 			
 			iterResult.output(new DiscardingOutputFormat());
 			iterResult.output(new DiscardingOutputFormat());
-			
-			
+
 			Plan p = env.createProgramPlan();
 			OptimizedPlan op = compileNoStats(p);
 			
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionPropertyPropagationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionPropertyPropagationTest.java
index f9bb4ad2f1724..11fd0cbf58243 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionPropertyPropagationTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/UnionPropertyPropagationTest.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer;
 
 import org.apache.flink.api.common.Plan;
@@ -45,7 +44,6 @@
 
 import java.util.Iterator;
 
-
 @SuppressWarnings({"serial"})
 public class UnionPropertyPropagationTest extends CompilerTestBase {
 
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationsRecordApiCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationsRecordApiCompilerTest.java
index 2f3ae243f96a2..6e18263be82c5 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationsRecordApiCompilerTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/WorksetIterationsRecordApiCompilerTest.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer;
 
 import org.apache.flink.api.common.Plan;
@@ -43,7 +42,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-
 /**
 * Tests that validate optimizer choices when using operators that are requesting certain specific execution
 * strategies.
@@ -140,8 +138,7 @@ public void testRecordApiWithDeferredSoltionSetUpdateWithNonPreservingJoin() {
 		// verify reducer
 		assertEquals(ShipStrategyType.PARTITION_HASH, worksetReducer.getInput().getShipStrategy());
 		assertEquals(list0, worksetReducer.getKeys(0));
-		
-		
+
 		// verify solution delta
 		assertEquals(2, joinWithSolutionSetNode.getOutgoingChannels().size());
 		assertEquals(ShipStrategyType.PARTITION_HASH, joinWithSolutionSetNode.getOutgoingChannels().get(0).getShipStrategy());
@@ -184,8 +181,7 @@ public void testRecordApiWithDirectSoltionSetUpdate() {
 		// verify reducer
 		assertEquals(ShipStrategyType.FORWARD, worksetReducer.getInput().getShipStrategy());
 		assertEquals(list0, worksetReducer.getKeys(0));
-		
-		
+
 		// verify solution delta
 		assertEquals(1, joinWithSolutionSetNode.getOutgoingChannels().size());
 		assertEquals(ShipStrategyType.FORWARD, joinWithSolutionSetNode.getOutgoingChannels().get(0).getShipStrategy());
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/costs/DefaultCostEstimatorTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/costs/DefaultCostEstimatorTest.java
index 228627794042a..fa94008e02d07 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/costs/DefaultCostEstimatorTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/costs/DefaultCostEstimatorTest.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer.costs;
 
 import org.apache.flink.optimizer.dag.EstimateProvider;
@@ -266,8 +265,7 @@ public void testJoinCostFormulasPlain() {
 		costEstimator.addLocalSortCost(BIG_ESTIMATES, mergeBothLarge);
 		costEstimator.addLocalSortCost(BIG_ESTIMATES, mergeBothLarge);
 		costEstimator.addLocalMergeCost(BIG_ESTIMATES, BIG_ESTIMATES, mergeBothLarge, 1);
-		
-		
+
 		assertTrue(mergeBothSmall.compareTo(mergeSmallFirst) < 0);
 		assertTrue(mergeBothSmall.compareTo(mergeSmallSecond) < 0);
 		assertTrue(mergeSmallFirst.compareTo(mergeSmallSecond) == 0);
@@ -377,8 +375,7 @@ public void testHashJoinCostFormulasWithCaches() {
 		// a weight of one makes the caching the same as the non-cached variant
 		assertTrue(hashLargeSmall1.compareTo(hashLargeSmallCached1) == 0);
 	}
-	
-	
+
 	// --------------------------------------------------------------------------------------------
 	//  Estimate providers
 	// --------------------------------------------------------------------------------------------
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CoGroupCustomPartitioningTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CoGroupCustomPartitioningTest.java
index 4e4590c08a098..f87af31cf0d49 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CoGroupCustomPartitioningTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/CoGroupCustomPartitioningTest.java
@@ -244,8 +244,7 @@ public void testIncompatibleHashAndCustomPartitioning() {
 					public int partition(Long key, int numPartitions) { return 0; }
 				}, 0)
 				.map(new IdentityMapper>()).withForwardedFields("0", "1", "2");
-				
-			
+
 			DataSet> grouped = partitioned
 				.distinct(0, 1)
 				.groupBy(1)
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/JoinCustomPartitioningTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/JoinCustomPartitioningTest.java
index fa081297bbebb..4ac15e350780a 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/JoinCustomPartitioningTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/custompartition/JoinCustomPartitioningTest.java
@@ -241,8 +241,7 @@ public void testIncompatibleHashAndCustomPartitioning() {
 					public int partition(Long key, int numPartitions) { return 0; }
 				}, 0)
 				.map(new IdentityMapper>()).withForwardedFields("0", "1", "2");
-				
-			
+
 			DataSet> grouped = partitioned
 				.distinct(0, 1)
 				.groupBy(1)
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeClosedBranchingTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeClosedBranchingTest.java
index 7eee957e43905..3f07b641f5343 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeClosedBranchingTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeClosedBranchingTest.java
@@ -190,7 +190,6 @@ public boolean filter(Tuple2 value) throws Exception {
 					.with(new DummyCoGroupFunction, Tuple2>())
 					.output(new DiscardingOutputFormat, Tuple2>>()).name("cgSink");
 
-
 			OptimizedPlan optPlan = compileNoStats(env.createProgramPlan());
 
 			SinkPlanNode reduceSink = findSink(optPlan.getDataSinks(), "reduceSink");
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeForwardTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeForwardTest.java
index 7b115b94ab583..b5ae9dbd964f8 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeForwardTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataexchange/DataExchangeModeForwardTest.java
@@ -48,7 +48,6 @@
 @SuppressWarnings("serial")
 public class DataExchangeModeForwardTest extends CompilerTestBase {
 
-
 	@Test
 	public void testPipelinedForced() {
 		// PIPELINED_FORCED should result in pipelining all the way
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalPropertiesFilteringTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalPropertiesFilteringTest.java
index bd3018141f284..e91635f2d27e9 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalPropertiesFilteringTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/dataproperties/RequestedGlobalPropertiesFilteringTest.java
@@ -39,7 +39,6 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-
 public class RequestedGlobalPropertiesFilteringTest {
 
 	private TupleTypeInfo> tupleInfo =
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DeltaIterationDependenciesTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DeltaIterationDependenciesTest.java
index 10d7b22fb76ab..ce596c6e19031 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DeltaIterationDependenciesTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/DeltaIterationDependenciesTest.java
@@ -31,7 +31,6 @@
 
 import static org.junit.Assert.fail;
 
-
 @SuppressWarnings({"serial", "unchecked"})
 public class DeltaIterationDependenciesTest extends CompilerTestBase {
 
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/GroupReduceCompilationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/GroupReduceCompilationTest.java
index 5fa527ceccc7a..206719cae0e0a 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/GroupReduceCompilationTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/GroupReduceCompilationTest.java
@@ -62,8 +62,7 @@ public void reduce(Iterable values, Collector out) {}
 			OptimizedPlan op = compileNoStats(p);
 			
 			OptimizerPlanNodeResolver resolver = getOptimizerPlanNodeResolver(op);
-			
-			
+
 			// the all-reduce has no combiner, when the parallelism of the input is one
 			
 			SourcePlanNode sourceNode = resolver.getNode("source");
@@ -135,8 +134,7 @@ public void testAllReduceWithCombiner() {
 			fail(e.getClass().getSimpleName() + " in test: " + e.getMessage());
 		}
 	}
-	
-	
+
 	@Test
 	public void testGroupedReduceWithFieldPositionKeyNonCombinable() {
 		try {
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/IterationCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/IterationCompilerTest.java
index a863628484b76..78008adf3e599 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/IterationCompilerTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/IterationCompilerTest.java
@@ -75,8 +75,7 @@ public void testEmptyWorksetIteration() {
 						@Override
 						public Tuple2 map(Long value){ return null; }
 					});
-					
-					
+
 			DeltaIteration, Tuple2> iter = input.iterateDelta(input, 100, 0);
 			iter.closeWith(iter.getWorkset(), iter.getWorkset())
 				.output(new DiscardingOutputFormat>());
@@ -142,8 +141,7 @@ public void testWorksetIterationWithUnionRoot() {
 						@Override
 						public Tuple2 map(Long value){ return null; }
 					});
-					
-					
+
 			DeltaIteration, Tuple2> iter = input.iterateDelta(input, 100, 0);
 			iter.closeWith(
 					iter.getWorkset().map(new IdentityMapper>())
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/JoinTranslationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/JoinTranslationTest.java
index 52827c5063a1d..8e9b769f3c542 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/JoinTranslationTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/JoinTranslationTest.java
@@ -128,8 +128,7 @@ public void testOptimizerChoosesTest() {
 			fail(e.getClass().getSimpleName() + ": " + e.getMessage());
 		}
 	}
-	
-	
+
 	private DualInputPlanNode createPlanAndGetJoinNode(JoinHint hint) {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 		
@@ -160,9 +159,7 @@ public void postVisit(Operator visitable) {}
 		
 		return (DualInputPlanNode) ((SinkPlanNode) op.getDataSinks().iterator().next()).getInput().getSource();
 	}
-	
-	
-	
+
 	private static final class IdentityKeySelector implements KeySelector {
 		
 		@Override
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/PartitionOperatorTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/PartitionOperatorTest.java
index ce88b9f824f01..496eaeb6a13d1 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/PartitionOperatorTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/PartitionOperatorTest.java
@@ -151,7 +151,6 @@ public boolean filter(Tuple2 value) throws Exception {
 				})
 				.output(new DiscardingOutputFormat>());
 
-
 			Plan p = env.createProgramPlan();
 			OptimizedPlan op = compileNoStats(p);
 
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/ReduceCompilationTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/ReduceCompilationTest.java
index eca05622a7d32..2abdd4ea5613f 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/ReduceCompilationTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/ReduceCompilationTest.java
@@ -63,8 +63,7 @@ public Double reduce(Double value1, Double value2){
 			OptimizedPlan op = compileNoStats(p);
 			
 			OptimizerPlanNodeResolver resolver = getOptimizerPlanNodeResolver(op);
-			
-			
+
 			// the all-reduce has no combiner, when the parallelism of the input is one
 			
 			SourcePlanNode sourceNode = resolver.getNode("source");
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/WorksetIterationsJavaApiCompilerTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/WorksetIterationsJavaApiCompilerTest.java
index 0c9bfae099a05..5ccc3bb461b4b 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/WorksetIterationsJavaApiCompilerTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/java/WorksetIterationsJavaApiCompilerTest.java
@@ -82,8 +82,7 @@ public void testJavaApiWithDeferredSoltionSetUpdateWithMapper() {
 			assertEquals(ShipStrategyType.PARTITION_HASH, joinWithSolutionSetNode.getInput1().getShipStrategy());
 			assertEquals(ShipStrategyType.FORWARD, joinWithSolutionSetNode.getInput2().getShipStrategy());
 			assertEquals(new FieldList(1, 0), joinWithSolutionSetNode.getKeysForInput1());
-			
-			
+
 			// verify reducer
 			assertEquals(ShipStrategyType.PARTITION_HASH, worksetReducer.getInput().getShipStrategy());
 			assertEquals(new FieldList(1, 2), worksetReducer.getKeys(0));
@@ -154,8 +153,7 @@ public void testJavaApiWithDirectSoltionSetUpdate() {
 			Plan plan = getJavaTestPlan(true, false);
 			
 			OptimizedPlan oPlan = compileNoStats(plan);
-	
-			
+
 			OptimizerPlanNodeResolver resolver = getOptimizerPlanNodeResolver(oPlan);
 			DualInputPlanNode joinWithInvariantNode = resolver.getNode(JOIN_WITH_INVARIANT_NAME);
 			DualInputPlanNode joinWithSolutionSetNode = resolver.getNode(JOIN_WITH_SOLUTION_SET);
@@ -178,8 +176,7 @@ public void testJavaApiWithDirectSoltionSetUpdate() {
 			// verify reducer
 			assertEquals(ShipStrategyType.FORWARD, worksetReducer.getInput().getShipStrategy());
 			assertEquals(new FieldList(1, 2), worksetReducer.getKeys(0));
-			
-			
+
 			// verify solution delta
 			assertEquals(1, joinWithSolutionSetNode.getOutgoingChannels().size());
 			assertEquals(ShipStrategyType.FORWARD, joinWithSolutionSetNode.getOutgoingChannels().get(0).getShipStrategy());
@@ -192,8 +189,7 @@ public void testJavaApiWithDirectSoltionSetUpdate() {
 			fail("Test errored: " + e.getMessage());
 		}
 	}
-	
-	
+
 	@Test
 	public void testRejectPlanIfSolutionSetKeysAndJoinKeysDontMatch() {
 		try {
@@ -208,8 +204,7 @@ public void testRejectPlanIfSolutionSetKeysAndJoinKeysDontMatch() {
 			DataSet> invariantInput = env.fromElements(new Tuple3(1L, 2L, 3L)).name("Invariant Input");
 			
 			DeltaIteration, Tuple3> iter = solutionSetInput.iterateDelta(worksetInput, 100, 1, 2);
-			
-			
+
 			DataSet> result = 
 			
 			iter.getWorkset().join(invariantInput)
@@ -257,8 +252,7 @@ private Plan getJavaTestPlan(boolean joinPreservesSolutionSet, boolean mapBefore
 		DataSet> invariantInput = env.fromElements(new Tuple3(1L, 2L, 3L)).name("Invariant Input");
 		
 		DeltaIteration, Tuple3> iter = solutionSetInput.iterateDelta(worksetInput, 100, 1, 2);
-		
-		
+
 		DataSet> joinedWithSolutionSet = 
 		
 		iter.getWorkset().join(invariantInput)
@@ -288,8 +282,7 @@ public void reduce(Iterable> values, Collector1","2->2","0->0");
-		
-		
+
 		DataSet> nextSolutionSet = mapBeforeSolutionDelta ?
 				joinedWithSolutionSet.map(new RichMapFunction,Tuple3>() { public Tuple3 map(Tuple3 value) { return value; } })
 					.name(SOLUTION_DELTA_MAPPER_NAME).withForwardedFields("0->0","1->1","2->2") :
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plan/ChannelTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plan/ChannelTest.java
index 3f28ff44514a9..da0a35ea19b77 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plan/ChannelTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plan/ChannelTest.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer.plan;
 
 import org.apache.flink.api.common.operators.GenericDataSourceBase;
@@ -73,8 +72,7 @@ public void testGetEstimatesWithReplicationFactor() {
 		Assert.assertEquals(SIZE * REPLICATION, channel.getEstimatedOutputSize());
 		Assert.assertEquals(NUM_RECORD * REPLICATION, channel.getEstimatedNumRecords());
 	}
-	
-	
+
 //	private static final OptimizerNode getSingleInputNode() {
 //		return new MapNode(new MapOperatorBase>(
 //				new IdentityMapper(),
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plandump/NumberFormattingTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plandump/NumberFormattingTest.java
index be657fa9b72e7..72ca91f5823cc 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plandump/NumberFormattingTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plandump/NumberFormattingTest.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer.plandump;
 
 import org.junit.Test;
@@ -48,6 +47,5 @@ public void testFormatNumberNoDigit() {
 
 		assertEquals("1.44 M", PlanJSONDumpGenerator.formatNumber(1435126.0));
 	}
-	
-	
+
 }
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/TempInIterationsTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/TempInIterationsTest.java
index 3e8019fe24566..818f503f72908 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/TempInIterationsTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/plantranslate/TempInIterationsTest.java
@@ -58,7 +58,6 @@ public void testTempInIterationTest() throws Exception {
 		iteration.closeWith(update, update)
 				.output(new DiscardingOutputFormat>());
 
-
 		Plan plan = env.createProgramPlan();
 		OptimizedPlan oPlan = (new Optimizer(new Configuration())).compile(plan);
 
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/programs/ConnectedComponentsTest.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/programs/ConnectedComponentsTest.java
index cabb0b59b9b88..dc00c7119aee3 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/programs/ConnectedComponentsTest.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/programs/ConnectedComponentsTest.java
@@ -60,8 +60,7 @@ public class ConnectedComponentsTest extends CompilerTestBase {
 	private static final String SINK = "Result";
 	
 	private final FieldList set0 = new FieldList(0);
-	
-	
+
 	@Test
 	public void testWorksetConnectedComponents() {
 		Plan plan = getConnectedComponentsPlan(DEFAULT_PARALLELISM, 100, false);
@@ -214,8 +213,7 @@ public void testWorksetConnectedComponentsWithSolutionSetAsFirstInput() {
 		JobGraphGenerator jgg = new JobGraphGenerator();
 		jgg.compileJobGraph(optPlan);
 	}
-	
-	
+
 	private static Plan getConnectedComponentsPlan(int parallelism, int iterations, boolean solutionSetFirst) {
 
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/DummyFlatJoinFunction.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/DummyFlatJoinFunction.java
index 6be8a24a5e38e..0feceb30e53da 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/DummyFlatJoinFunction.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/DummyFlatJoinFunction.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer.testfunctions;
 
 import org.apache.flink.api.common.functions.RichFlatJoinFunction;
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityCrosser.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityCrosser.java
index 54b2785f4b1e9..661db24a1b1bd 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityCrosser.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityCrosser.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer.testfunctions;
 
 import org.apache.flink.api.common.functions.CrossFunction;
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityGroupReducer.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityGroupReducer.java
index 033677116aed7..7b180ed6754fc 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityGroupReducer.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityGroupReducer.java
@@ -18,7 +18,6 @@
 
 package org.apache.flink.optimizer.testfunctions;
 
-
 import org.apache.flink.api.common.functions.GroupReduceFunction;
 import org.apache.flink.util.Collector;
 
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityGroupReducerCombinable.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityGroupReducerCombinable.java
index e1dbdd5a122df..c44be9cd8465a 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityGroupReducerCombinable.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityGroupReducerCombinable.java
@@ -18,7 +18,6 @@
 
 package org.apache.flink.optimizer.testfunctions;
 
-
 import org.apache.flink.api.common.functions.GroupCombineFunction;
 import org.apache.flink.api.common.functions.GroupReduceFunction;
 import org.apache.flink.util.Collector;
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityJoiner.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityJoiner.java
index faca2cecae12b..7f0d02bc15a19 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityJoiner.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityJoiner.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer.testfunctions;
 
 import org.apache.flink.api.common.functions.JoinFunction;
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityMapper.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityMapper.java
index 025b4d8e523d1..ec56ffe200b2f 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityMapper.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/IdentityMapper.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer.testfunctions;
 
 import org.apache.flink.api.common.functions.RichMapFunction;
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/Top1GroupReducer.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/Top1GroupReducer.java
index 7213a2513edf4..3b09d271fbef5 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/Top1GroupReducer.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/Top1GroupReducer.java
@@ -22,7 +22,6 @@
 import org.apache.flink.api.common.functions.GroupReduceFunction;
 import org.apache.flink.util.Collector;
 
-
 public class Top1GroupReducer
 	implements GroupReduceFunction, GroupCombineFunction {
 
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/CompilerTestBase.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/CompilerTestBase.java
index f1c62089f1c6b..34738f38137cf 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/CompilerTestBase.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/CompilerTestBase.java
@@ -109,7 +109,6 @@ public void setSourceStatistics(GenericDataSourceBase source, FileBaseStat
 		source.setStatisticsKey(key);
 	}
 
-
 	public static OptimizerPlanNodeResolver getOptimizerPlanNodeResolver(OptimizedPlan plan) {
 		return new OptimizerPlanNodeResolver(plan);
 	}
@@ -163,7 +162,6 @@ public OptimizerPlanNodeResolver(OptimizedPlan p) {
 			this.map = map;
 		}
 
-
 		@SuppressWarnings("unchecked")
 		public  T getNode(String name) {
 			List nodes = this.map.get(name);
diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/OperatorResolver.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/OperatorResolver.java
index 05f267613ea64..7c2e027914d6c 100644
--- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/OperatorResolver.java
+++ b/flink-optimizer/src/test/java/org/apache/flink/optimizer/util/OperatorResolver.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.optimizer.util;
 
 import org.apache.flink.api.common.Plan;
@@ -48,8 +47,7 @@ public OperatorResolver(Plan p) {
 		p.accept(this);
 		this.seen = null;
 	}
-	
-	
+
 	@SuppressWarnings("unchecked")
 	public > T getNode(String name) {
 		List> nodes = this.map.get(name);