Remove dead (and wrong) viewFromProto overload
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/2e42ae41
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/2e42ae41
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/2e42ae41
Branch: refs/heads/DSL_SQL
Commit: 2e42ae41babcf42db5df8320f0823d6040f559cb
Parents: f1defd1
Author: Kenneth Knowles <kl...@google.com>
Authored: Tue Jul 11 10:09:12 2017 -0700
Committer: Tyler Akidau <ta...@apache.org>
Committed: Wed Jul 12 20:01:02 2017 -0700
----------------------------------------------------------------------
.../core/construction/ParDoTranslation.java | 21 --------------------
.../core/construction/ParDoTranslationTest.java | 2 +-
2 files changed, 1 insertion(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/2e42ae41/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ParDoTranslation.java
----------------------------------------------------------------------
diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ParDoTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ParDoTranslation.java
index 90c9aad..03f29ff 100644
--- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ParDoTranslation.java
+++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ParDoTranslation.java
@@ -41,7 +41,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.beam.runners.core.construction.PTransformTranslation.TransformPayloadTranslator;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.IterableCoder;
import org.apache.beam.sdk.common.runner.v1.RunnerApi;
@@ -509,26 +508,6 @@ public class ParDoTranslation {
return builder.build();
}
- public static PCollectionView<?> viewFromProto(
- Pipeline pipeline,
- SideInput sideInput,
- String localName,
- RunnerApi.PTransform parDoTransform,
- Components components)
- throws IOException {
-
- String pCollectionId = parDoTransform.getInputsOrThrow(localName);
-
- // This may be a PCollection defined in another language, but we should be
- // able to rehydrate it enough to stick it in a side input. The coder may not
- // be grokkable in Java.
- PCollection<?> pCollection =
- PCollectionTranslation.fromProto(
- pipeline, components.getPcollectionsOrThrow(pCollectionId), components);
-
- return viewFromProto(sideInput, localName, pCollection, parDoTransform, components);
- }
-
/**
* Create a {@link PCollectionView} from a side input spec and an already-deserialized {@link
* PCollection} that should be wired up.
http://git-wip-us.apache.org/repos/asf/beam/blob/2e42ae41/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ParDoTranslationTest.java
----------------------------------------------------------------------
diff --git a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ParDoTranslationTest.java b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ParDoTranslationTest.java
index 6fdf9d6..a87a16d 100644
--- a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ParDoTranslationTest.java
+++ b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ParDoTranslationTest.java
@@ -162,9 +162,9 @@ public class ParDoTranslationTest {
SideInput sideInput = parDoPayload.getSideInputsOrThrow(view.getTagInternal().getId());
PCollectionView<?> restoredView =
ParDoTranslation.viewFromProto(
- rehydratedPipeline,
sideInput,
view.getTagInternal().getId(),
+ view.getPCollection(),
protoTransform,
protoComponents);
assertThat(restoredView.getTagInternal(), equalTo(view.getTagInternal()));