You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2017/04/19 00:52:15 UTC
[3/8] beam git commit: Remove deprecated/unused code from Pipeline
Remove deprecated/unused code from Pipeline
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/403a7369
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/403a7369
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/403a7369
Branch: refs/heads/master
Commit: 403a7369f84ea074f987d8c491f883ce2205afe7
Parents: ad95862
Author: Dan Halperin <dh...@google.com>
Authored: Mon Apr 17 23:40:08 2017 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Apr 18 16:22:50 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/Pipeline.java | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/403a7369/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java
index 1ff4c30..e3b9309 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java
@@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkState;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.SetMultimap;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
@@ -30,7 +29,6 @@ import java.util.Set;
import org.apache.beam.sdk.coders.CoderRegistry;
import org.apache.beam.sdk.io.Read;
import org.apache.beam.sdk.options.PipelineOptions;
-import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.runners.PTransformOverride;
import org.apache.beam.sdk.runners.PTransformOverrideFactory;
import org.apache.beam.sdk.runners.PTransformOverrideFactory.PTransformReplacement;
@@ -383,13 +381,7 @@ public class Pipeline {
* <p>Typically invoked by {@link PipelineRunner} subclasses.
*/
public void traverseTopologically(PipelineVisitor visitor) {
- // Ensure all nodes are fully specified before visiting the pipeline
- Set<PValue> visitedValues =
- // Visit all the transforms, which should implicitly visit all the values.
- transforms.visit(visitor);
- checkState(
- visitedValues.containsAll(values),
- "internal error: should have visited all the values after visiting all the transforms");
+ transforms.visit(visitor);
}
/**
@@ -424,18 +416,9 @@ public class Pipeline {
private final PipelineRunner<?> runner;
private final PipelineOptions options;
private final TransformHierarchy transforms = new TransformHierarchy(this);
- private Collection<PValue> values = new ArrayList<>();
private Set<String> usedFullNames = new HashSet<>();
private CoderRegistry coderRegistry;
- /**
- * @deprecated replaced by {@link #Pipeline(PipelineRunner, PipelineOptions)}
- */
- @Deprecated
- protected Pipeline(PipelineRunner<?> runner) {
- this(runner, PipelineOptionsFactory.create());
- }
-
protected Pipeline(PipelineRunner<?> runner, PipelineOptions options) {
this.runner = runner;
this.options = options;