Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E0146200CC5 for ; Tue, 11 Jul 2017 23:44:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DE4701674EC; Tue, 11 Jul 2017 21:44:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2FCE11674E7 for ; Tue, 11 Jul 2017 23:44:11 +0200 (CEST) Received: (qmail 71336 invoked by uid 500); 11 Jul 2017 21:44:10 -0000 Mailing-List: contact commits-help@beam.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.apache.org Delivered-To: mailing list commits@beam.apache.org Received: (qmail 71327 invoked by uid 99); 11 Jul 2017 21:44:10 -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; Tue, 11 Jul 2017 21:44:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2FDE9E9471; Tue, 11 Jul 2017 21:44:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kenn@apache.org To: commits@beam.apache.org Date: Tue, 11 Jul 2017 21:44:10 -0000 Message-Id: <2c930cdebd014074bba3df4778c10892@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] beam git commit: Remove dead (and wrong) viewFromProto overload archived-at: Tue, 11 Jul 2017 21:44:12 -0000 Repository: beam Updated Branches: refs/heads/master a22f1a05a -> 011e2796d 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/aaffe15e Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/aaffe15e Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/aaffe15e Branch: refs/heads/master Commit: aaffe15ee891b5656e448eac4bd3a7ff72eee315 Parents: 138641f Author: Kenneth Knowles Authored: Tue Jul 11 10:09:12 2017 -0700 Committer: Kenneth Knowles Committed: Tue Jul 11 14:11:39 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/aaffe15e/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/aaffe15e/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()));