Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AA6C717A87 for ; Wed, 28 Jan 2015 01:42:00 +0000 (UTC) Received: (qmail 52938 invoked by uid 500); 28 Jan 2015 01:42:01 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 52908 invoked by uid 500); 28 Jan 2015 01:42:01 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 52899 invoked by uid 99); 28 Jan 2015 01:42:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jan 2015 01:42:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 01D60E0404; Wed, 28 Jan 2015 01:42:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fhueske@apache.org To: commits@flink.apache.org Date: Wed, 28 Jan 2015 01:42:00 -0000 Message-Id: <03fb5840e1c24510ba44d4cee7863d67@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] flink git commit: [Typo] Delete DiscardingOuputFormat Repository: flink Updated Branches: refs/heads/master 805ea6943 -> 06c2c35a2 [Typo] Delete DiscardingOuputFormat This closes #343 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/9671c2f7 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/9671c2f7 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/9671c2f7 Branch: refs/heads/master Commit: 9671c2f734bfa30ab8049ed4f26e90cfe7e195a7 Parents: 805ea69 Author: Robert Metzger Authored: Mon Jan 26 18:52:27 2015 +0100 Committer: Fabian Hueske Committed: Wed Jan 28 02:25:23 2015 +0100 ---------------------------------------------------------------------- .../avro/testjar/AvroExternalJarProgram.java | 4 +- .../ExecutionPlanAfterExecutionTest.java | 6 +-- .../api/java/io/DiscardingOuputFormat.java | 42 -------------------- .../CollectionExecutionAccumulatorsTest.java | 4 +- .../flink/api/java/MultipleInvokationsTest.java | 4 +- .../flink/api/java/operators/NamesTest.java | 8 ++-- .../runtime/jobgraph/JobTaskVertexTest.java | 4 +- .../StaticlyNestedIterationsITCase.java | 4 +- .../test/misc/DisjointDataflowsITCase.java | 6 +-- ...nIncompleteDynamicPathConsumptionITCase.java | 4 +- ...onIncompleteStaticPathConsumptionITCase.java | 4 +- .../test/operators/CoGroupGroupSortITCase.java | 4 +- 12 files changed, 26 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java ---------------------------------------------------------------------- diff --git a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java index 25e2e0c..1174786 100644 --- a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java +++ b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java @@ -41,11 +41,11 @@ import org.apache.avro.reflect.ReflectData; import org.apache.avro.reflect.ReflectDatumWriter; import org.apache.flink.api.common.functions.RichMapFunction; 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.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.io.AvroInputFormat; -import org.apache.flink.api.java.io.DiscardingOuputFormat; import org.apache.flink.core.fs.Path; public class AvroExternalJarProgram { @@ -213,7 +213,7 @@ public class AvroExternalJarProgram { DataSet> result = input.map(new NameExtractor()).groupBy(0).reduce(new NameGrouper()); - result.output(new DiscardingOuputFormat>()); + result.output(new DiscardingOutputFormat>()); env.execute(); } } http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-clients/src/test/java/org/apache/flink/client/program/ExecutionPlanAfterExecutionTest.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/test/java/org/apache/flink/client/program/ExecutionPlanAfterExecutionTest.java b/flink-clients/src/test/java/org/apache/flink/client/program/ExecutionPlanAfterExecutionTest.java index 2dd5148..53129bb 100644 --- a/flink-clients/src/test/java/org/apache/flink/client/program/ExecutionPlanAfterExecutionTest.java +++ b/flink-clients/src/test/java/org/apache/flink/client/program/ExecutionPlanAfterExecutionTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.LocalEnvironment; -import org.apache.flink.api.java.io.DiscardingOuputFormat; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.junit.Test; import static org.junit.Assert.*; @@ -39,7 +39,7 @@ public class ExecutionPlanAfterExecutionTest implements java.io.Serializable { DataSet result = baseSet.map(new MapFunction() { @Override public Integer map(Integer value) throws Exception { return value * 2; } }); - result.output(new DiscardingOuputFormat()); + result.output(new DiscardingOutputFormat()); try { env.getExecutionPlan(); @@ -58,7 +58,7 @@ public class ExecutionPlanAfterExecutionTest implements java.io.Serializable { DataSet result = baseSet.map(new MapFunction() { @Override public Integer map(Integer value) throws Exception { return value * 2; } }); - result.output(new DiscardingOuputFormat()); + result.output(new DiscardingOutputFormat()); try { env.getExecutionPlan(); http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-java/src/main/java/org/apache/flink/api/java/io/DiscardingOuputFormat.java ---------------------------------------------------------------------- diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/DiscardingOuputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/DiscardingOuputFormat.java deleted file mode 100644 index 0bcad1c..0000000 --- a/flink-java/src/main/java/org/apache/flink/api/java/io/DiscardingOuputFormat.java +++ /dev/null @@ -1,42 +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.api.java.io; - -import org.apache.flink.api.common.io.OutputFormat; -import org.apache.flink.configuration.Configuration; - -/** - * An output format that discards all data. - */ -public class DiscardingOuputFormat implements OutputFormat { - - private static final long serialVersionUID = 1L; - - @Override - public void configure(Configuration parameters) {} - - @Override - public void open(int taskNumber, int numTasks) {} - - @Override - public void writeRecord(T record) {} - - @Override - public void close() {} -} http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java ---------------------------------------------------------------------- diff --git a/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java b/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java index f836692..5a94563 100644 --- a/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java +++ b/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.accumulators.IntCounter; import org.apache.flink.api.common.functions.RichMapFunction; import org.apache.flink.api.java.CollectionEnvironment; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.io.DiscardingOuputFormat; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.configuration.Configuration; import org.junit.Test; @@ -42,7 +42,7 @@ public class CollectionExecutionAccumulatorsTest { env.generateSequence(1, NUM_ELEMENTS) .map(new CountingMapper()) - .output(new DiscardingOuputFormat()); + .output(new DiscardingOutputFormat()); JobExecutionResult result = env.execute(); http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-java/src/test/java/org/apache/flink/api/java/MultipleInvokationsTest.java ---------------------------------------------------------------------- diff --git a/flink-java/src/test/java/org/apache/flink/api/java/MultipleInvokationsTest.java b/flink-java/src/test/java/org/apache/flink/api/java/MultipleInvokationsTest.java index 53b1867..3638f70 100644 --- a/flink-java/src/test/java/org/apache/flink/api/java/MultipleInvokationsTest.java +++ b/flink-java/src/test/java/org/apache/flink/api/java/MultipleInvokationsTest.java @@ -23,8 +23,8 @@ import static org.junit.Assert.*; import org.apache.flink.api.common.Plan; import org.apache.flink.api.common.operators.GenericDataSinkBase; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.junit.Test; -import org.apache.flink.api.java.io.DiscardingOuputFormat; public class MultipleInvokationsTest { @@ -37,7 +37,7 @@ public class MultipleInvokationsTest { DataSet data = env.fromElements("Some", "test", "data").name("source1"); data.print().name("print1"); - data.output(new DiscardingOuputFormat()).name("output1"); + data.output(new DiscardingOutputFormat()).name("output1"); { Plan p = env.createProgramPlan(); http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-java/src/test/java/org/apache/flink/api/java/operators/NamesTest.java ---------------------------------------------------------------------- diff --git a/flink-java/src/test/java/org/apache/flink/api/java/operators/NamesTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operators/NamesTest.java index 2164c79..b8663ce 100644 --- a/flink-java/src/test/java/org/apache/flink/api/java/operators/NamesTest.java +++ b/flink-java/src/test/java/org/apache/flink/api/java/operators/NamesTest.java @@ -29,7 +29,7 @@ import org.apache.flink.api.common.operators.Operator; import org.apache.flink.api.common.operators.base.JoinOperatorBase; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.io.DiscardingOuputFormat; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.operators.translation.JavaPlan; import org.apache.flink.api.java.operators.translation.PlanFilterOperator; import org.apache.flink.api.java.tuple.Tuple1; @@ -59,7 +59,7 @@ public class NamesTest implements Serializable { public boolean filter(String value) throws Exception { return value.equals("a"); } - }).output(new DiscardingOuputFormat()); + }).output(new DiscardingOutputFormat()); JavaPlan plan = env.createProgramPlan(); testForName("Filter at testDefaultName(NamesTest.java:55)", plan); } @@ -75,7 +75,7 @@ public class NamesTest implements Serializable { public boolean filter(String value) throws Exception { return value.equals("a"); } - }).name("GivenName").output(new DiscardingOuputFormat()); + }).name("GivenName").output(new DiscardingOutputFormat()); JavaPlan plan = env.createProgramPlan(); testForName("GivenName", plan); } @@ -97,7 +97,7 @@ public class NamesTest implements Serializable { // } }) - .output(new DiscardingOuputFormat()); + .output(new DiscardingOutputFormat()); JavaPlan plan = env.createProgramPlan(); plan.accept(new Visitor>() { @Override http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-runtime/src/test/java/org/apache/flink/runtime/jobgraph/JobTaskVertexTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobgraph/JobTaskVertexTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobgraph/JobTaskVertexTest.java index 4d23b36..1de1e84 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobgraph/JobTaskVertexTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobgraph/JobTaskVertexTest.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.io.InitializeOnMaster; import org.apache.flink.api.common.io.InputFormat; import org.apache.flink.api.common.io.OutputFormat; import org.apache.flink.api.common.operators.util.UserCodeObjectWrapper; -import org.apache.flink.api.java.io.DiscardingOuputFormat; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; import org.apache.flink.runtime.operators.util.TaskConfig; @@ -133,7 +133,7 @@ public class JobTaskVertexTest { // -------------------------------------------------------------------------------------------- - private static final class TestingOutputFormat extends DiscardingOuputFormat implements InitializeOnMaster { + private static final class TestingOutputFormat extends DiscardingOutputFormat implements InitializeOnMaster { @Override public void initializeGlobal(int parallelism) throws IOException { throw new TestException(); http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-tests/src/test/java/org/apache/flink/test/iterative/StaticlyNestedIterationsITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/StaticlyNestedIterationsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/StaticlyNestedIterationsITCase.java index 975e4aa..766a422 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/iterative/StaticlyNestedIterationsITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/StaticlyNestedIterationsITCase.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.functions.MapFunction; 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.DiscardingOuputFormat; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.operators.IterativeDataSet; import org.apache.flink.test.util.JavaProgramTestBase; @@ -50,7 +50,7 @@ public class StaticlyNestedIterationsITCase extends JavaProgramTestBase { DataSet mainResult = mainIteration.closeWith(joined); - mainResult.output(new DiscardingOuputFormat()); + mainResult.output(new DiscardingOutputFormat()); env.execute(); } http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-tests/src/test/java/org/apache/flink/test/misc/DisjointDataflowsITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/misc/DisjointDataflowsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/misc/DisjointDataflowsITCase.java index f4d3d0b..6f4baa3 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/misc/DisjointDataflowsITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/misc/DisjointDataflowsITCase.java @@ -19,7 +19,7 @@ package org.apache.flink.test.misc; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.io.DiscardingOuputFormat; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.test.util.JavaProgramTestBase; public class DisjointDataflowsITCase extends JavaProgramTestBase { @@ -29,8 +29,8 @@ public class DisjointDataflowsITCase extends JavaProgramTestBase { ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment(); // generate two different flows - env.generateSequence(1, 10).output(new DiscardingOuputFormat()); - env.generateSequence(1, 10).output(new DiscardingOuputFormat()); + env.generateSequence(1, 10).output(new DiscardingOutputFormat()); + env.generateSequence(1, 10).output(new DiscardingOutputFormat()); env.execute(); } http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-tests/src/test/java/org/apache/flink/test/misc/IterationIncompleteDynamicPathConsumptionITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/misc/IterationIncompleteDynamicPathConsumptionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/misc/IterationIncompleteDynamicPathConsumptionITCase.java index e924a88..8fa9a91 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/misc/IterationIncompleteDynamicPathConsumptionITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/misc/IterationIncompleteDynamicPathConsumptionITCase.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.JoinFunction; 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.DiscardingOuputFormat; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.operators.IterativeDataSet; import org.apache.flink.test.util.JavaProgramTestBase; @@ -57,7 +57,7 @@ public class IterationIncompleteDynamicPathConsumptionITCase extends JavaProgram DataSet result = currentPaths.closeWith(newPaths); - result.output(new DiscardingOuputFormat()); + result.output(new DiscardingOutputFormat()); env.execute(); } http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-tests/src/test/java/org/apache/flink/test/misc/IterationIncompleteStaticPathConsumptionITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/misc/IterationIncompleteStaticPathConsumptionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/misc/IterationIncompleteStaticPathConsumptionITCase.java index 4e0274e..24cba20 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/misc/IterationIncompleteStaticPathConsumptionITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/misc/IterationIncompleteStaticPathConsumptionITCase.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.JoinFunction; 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.DiscardingOuputFormat; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.operators.IterativeDataSet; import org.apache.flink.test.util.JavaProgramTestBase; @@ -57,7 +57,7 @@ public class IterationIncompleteStaticPathConsumptionITCase extends JavaProgramT DataSet result = currentPaths.closeWith(newPaths); - result.output(new DiscardingOuputFormat()); + result.output(new DiscardingOutputFormat()); env.execute(); } http://git-wip-us.apache.org/repos/asf/flink/blob/9671c2f7/flink-tests/src/test/java/org/apache/flink/test/operators/CoGroupGroupSortITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/operators/CoGroupGroupSortITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/CoGroupGroupSortITCase.java index 77bfc6b..5b78a51 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/operators/CoGroupGroupSortITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/operators/CoGroupGroupSortITCase.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.CoGroupFunction; import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import org.apache.flink.api.java.io.DiscardingOuputFormat; +import org.apache.flink.api.java.io.DiscardingOutputFormat; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.test.util.JavaProgramTestBase; import org.apache.flink.types.NullValue; @@ -68,7 +68,7 @@ public class CoGroupGroupSortITCase extends JavaProgramTestBase { .sortSecondGroup("c", Order.ASCENDING).sortSecondGroup("a", Order.DESCENDING) .with(new ValidatingCoGroup()) - .output(new DiscardingOuputFormat()); + .output(new DiscardingOutputFormat()); env.execute(); }