You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/07/06 17:20:20 UTC
[14/50] [abbrv] incubator-beam git commit: Move remnants of Dataflow
runner from SDK to its module
Move remnants of Dataflow runner from SDK to its module
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/5472c97e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/5472c97e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/5472c97e
Branch: refs/heads/runners-spark2
Commit: 5472c97e91e94bed2320b69675e7bed689b3bf68
Parents: a53450b
Author: Kenneth Knowles <kl...@google.com>
Authored: Thu Jun 23 15:59:23 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Wed Jul 6 10:18:50 2016 -0700
----------------------------------------------------------------------
.../DataflowPipelineTranslatorTest.java | 1 -
.../dataflow/RecordingPipelineVisitor.java | 46 +++++++++++++++++++
.../sdk/runners/RecordingPipelineVisitor.java | 47 --------------------
.../beam/sdk/runners/TransformTreeTest.java | 2 +-
4 files changed, 47 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/5472c97e/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslatorTest.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslatorTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslatorTest.java
index e04a1fc..48c757f 100644
--- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslatorTest.java
+++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslatorTest.java
@@ -47,7 +47,6 @@ import org.apache.beam.sdk.coders.VarIntCoder;
import org.apache.beam.sdk.coders.VoidCoder;
import org.apache.beam.sdk.io.TextIO;
import org.apache.beam.sdk.options.PipelineOptionsFactory;
-import org.apache.beam.sdk.runners.RecordingPipelineVisitor;
import org.apache.beam.sdk.transforms.Count;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.DoFn;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/5472c97e/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/RecordingPipelineVisitor.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/RecordingPipelineVisitor.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/RecordingPipelineVisitor.java
new file mode 100644
index 0000000..8ebc4bd
--- /dev/null
+++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/RecordingPipelineVisitor.java
@@ -0,0 +1,46 @@
+/*
+ * 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.beam.runners.dataflow;
+
+import org.apache.beam.sdk.Pipeline;
+import org.apache.beam.sdk.runners.TransformTreeNode;
+import org.apache.beam.sdk.transforms.PTransform;
+import org.apache.beam.sdk.values.PValue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Provides a simple {@link org.apache.beam.sdk.Pipeline.PipelineVisitor}
+ * that records the transformation tree.
+ */
+class RecordingPipelineVisitor extends Pipeline.PipelineVisitor.Defaults {
+
+ public final List<PTransform<?, ?>> transforms = new ArrayList<>();
+ public final List<PValue> values = new ArrayList<>();
+
+ @Override
+ public void visitPrimitiveTransform(TransformTreeNode node) {
+ transforms.add(node.getTransform());
+ }
+
+ @Override
+ public void visitValue(PValue value, TransformTreeNode producer) {
+ values.add(value);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/5472c97e/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/RecordingPipelineVisitor.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/RecordingPipelineVisitor.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/RecordingPipelineVisitor.java
deleted file mode 100644
index d64738f..0000000
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/RecordingPipelineVisitor.java
+++ /dev/null
@@ -1,47 +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.beam.sdk.runners;
-
-import org.apache.beam.sdk.Pipeline;
-import org.apache.beam.sdk.transforms.PTransform;
-import org.apache.beam.sdk.values.PValue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Provides a simple {@link org.apache.beam.sdk.Pipeline.PipelineVisitor}
- * that records the transformation tree.
- *
- * <p>Provided for internal unit tests.
- */
-public class RecordingPipelineVisitor extends Pipeline.PipelineVisitor.Defaults {
-
- public final List<PTransform<?, ?>> transforms = new ArrayList<>();
- public final List<PValue> values = new ArrayList<>();
-
- @Override
- public void visitPrimitiveTransform(TransformTreeNode node) {
- transforms.add(node.getTransform());
- }
-
- @Override
- public void visitValue(PValue value, TransformTreeNode producer) {
- values.add(value);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/5472c97e/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformTreeTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformTreeTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformTreeTest.java
index 08c3996..9009a77 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformTreeTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformTreeTest.java
@@ -177,7 +177,7 @@ public class TransformTreeTest {
p.apply(new InvalidCompositeTransform());
- p.traverseTopologically(new RecordingPipelineVisitor());
+ p.traverseTopologically(new Pipeline.PipelineVisitor.Defaults() {});
fail("traversal should have failed with an IllegalStateException");
}