From 9ed9ea6ffdc4f16c1babd1300fe662f2b31d5106 Mon Sep 17 00:00:00 2001 From: zhangminglei Date: Thu, 29 Jun 2017 11:49:30 +0800 Subject: [PATCH] [FLINK-6789] [optimizer] Remove duplicated test utility reducer in optimizer This closes #4216. --- .../GroupingKeySelectorTranslationTest.java | 4 +-- .../GroupingPojoTranslationTest.java | 6 ++-- .../GroupingTupleTranslationTest.java | 4 +-- .../optimizer/testfunctions/DummyReducer.java | 31 ------------------- 4 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/DummyReducer.java 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 b2bfc67365a..40e72524a27 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 @@ -34,7 +34,7 @@ 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.DummyReducer; +import org.apache.flink.optimizer.testfunctions.SelectOneReducer; import org.apache.flink.optimizer.testfunctions.IdentityGroupReducerCombinable; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; @@ -53,7 +53,7 @@ public class GroupingKeySelectorTranslationTest extends CompilerTestBase { data.groupBy(new TestKeySelector>()) .withPartitioner(new TestPartitionerInt()) - .reduce(new DummyReducer>()) + .reduce(new SelectOneReducer>()) .output(new DiscardingOutputFormat>()); Plan p = env.createProgramPlan(); 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 dc2b1476706..52bf9dd4f4a 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 @@ -30,7 +30,7 @@ import org.apache.flink.api.java.io.DiscardingOutputFormat; 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.DummyReducer; +import org.apache.flink.optimizer.testfunctions.SelectOneReducer; import org.apache.flink.optimizer.testfunctions.IdentityGroupReducerCombinable; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; @@ -48,7 +48,7 @@ public class GroupingPojoTranslationTest extends CompilerTestBase { .rebalance().setParallelism(4); data.groupBy("a").withPartitioner(new TestPartitionerInt()) - .reduce(new DummyReducer()) + .reduce(new SelectOneReducer()) .output(new DiscardingOutputFormat()); Plan p = env.createProgramPlan(); @@ -255,4 +255,4 @@ public class GroupingPojoTranslationTest extends CompilerTestBase { 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 6eb5ad5de21..88b15994a5b 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 @@ -33,7 +33,7 @@ import org.apache.flink.api.java.tuple.Tuple4; 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.DummyReducer; +import org.apache.flink.optimizer.testfunctions.SelectOneReducer; import org.apache.flink.optimizer.testfunctions.IdentityGroupReducerCombinable; import org.apache.flink.optimizer.util.CompilerTestBase; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; @@ -80,7 +80,7 @@ public class GroupingTupleTranslationTest extends CompilerTestBase { .rebalance().setParallelism(4); data.groupBy(0).withPartitioner(new TestPartitionerInt()) - .reduce(new DummyReducer>()) + .reduce(new SelectOneReducer>()) .output(new DiscardingOutputFormat>()); Plan p = env.createProgramPlan(); diff --git a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/DummyReducer.java b/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/DummyReducer.java deleted file mode 100644 index 44d369528e1..00000000000 --- a/flink-optimizer/src/test/java/org/apache/flink/optimizer/testfunctions/DummyReducer.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.flink.optimizer.testfunctions; - -import org.apache.flink.api.common.functions.RichReduceFunction; - -public class DummyReducer extends RichReduceFunction { - - private static final long serialVersionUID = 1L; - - @Override - public T reduce(T a, T b) { - return a; - } -} -- GitLab