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 1F316200CD8 for ; Wed, 28 Jun 2017 06:34:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1D7A0160BDC; Wed, 28 Jun 2017 04:34:28 +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 5628D160BFC for ; Wed, 28 Jun 2017 06:34:27 +0200 (CEST) Received: (qmail 81403 invoked by uid 500); 28 Jun 2017 04:34:26 -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 80992 invoked by uid 99); 28 Jun 2017 04:34:26 -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 Jun 2017 04:34:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C58B2EEE1A; Wed, 28 Jun 2017 04:34:25 +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: Wed, 28 Jun 2017 04:34:29 -0000 Message-Id: <41724f78dbb24141a55536a8585631ad@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] beam git commit: Use PCollectionViews.toAdditionalInputs in Combine archived-at: Wed, 28 Jun 2017 04:34:28 -0000 Use PCollectionViews.toAdditionalInputs in Combine Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/27674f07 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/27674f07 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/27674f07 Branch: refs/heads/master Commit: 27674f07cf8363bb6b3c051a990caa5d61b8cd5c Parents: ed476dd Author: Kenneth Knowles Authored: Tue Jun 27 14:44:50 2017 -0700 Committer: Kenneth Knowles Committed: Tue Jun 27 21:08:11 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/beam/sdk/transforms/Combine.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/27674f07/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java index 6a90bcf..d7effb5 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java @@ -20,7 +20,6 @@ package org.apache.beam.sdk.transforms; import static com.google.common.base.Preconditions.checkState; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import java.io.IOException; import java.io.InputStream; @@ -1122,11 +1121,7 @@ public class Combine { */ @Override public Map, PValue> getAdditionalInputs() { - ImmutableMap.Builder, PValue> additionalInputs = ImmutableMap.builder(); - for (PCollectionView sideInput : sideInputs) { - additionalInputs.put(sideInput.getTagInternal(), sideInput.getPCollection()); - } - return additionalInputs.build(); + return PCollectionViews.toAdditionalInputs(sideInputs); } /** @@ -1578,11 +1573,7 @@ public class Combine { */ @Override public Map, PValue> getAdditionalInputs() { - ImmutableMap.Builder, PValue> additionalInputs = ImmutableMap.builder(); - for (PCollectionView sideInput : sideInputs) { - additionalInputs.put(sideInput.getTagInternal(), sideInput.getPCollection()); - } - return additionalInputs.build(); + return PCollectionViews.toAdditionalInputs(sideInputs); } @Override