Use PCollectionViews.toAdditionalInputs in ParDoMultiOverrideFactory
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/42382766 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/42382766 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/42382766 Branch: refs/heads/gearpump-runner Commit: 423827665ae5923cd7fccc654bd9a5e1efed7876 Parents: a66bcd6 Author: Kenneth Knowles <k...@google.com> Authored: Tue Jun 27 14:39:06 2017 -0700 Committer: Kenneth Knowles <k...@google.com> Committed: Tue Jun 27 21:08:10 2017 -0700 ---------------------------------------------------------------------- .../runners/direct/ParDoMultiOverrideFactory.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/42382766/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoMultiOverrideFactory.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoMultiOverrideFactory.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoMultiOverrideFactory.java index 9a26283..2904bc1 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoMultiOverrideFactory.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoMultiOverrideFactory.java @@ -19,7 +19,6 @@ package org.apache.beam.runners.direct; import static com.google.common.base.Preconditions.checkState; -import com.google.common.collect.ImmutableMap; import java.util.List; import java.util.Map; import org.apache.beam.runners.core.KeyedWorkItem; @@ -50,6 +49,7 @@ import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.beam.sdk.values.PCollectionView; +import org.apache.beam.sdk.values.PCollectionViews; import org.apache.beam.sdk.values.PValue; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.TupleTagList; @@ -123,11 +123,7 @@ class ParDoMultiOverrideFactory<InputT, OutputT> @Override public Map<TupleTag<?>, PValue> getAdditionalInputs() { - ImmutableMap.Builder<TupleTag<?>, PValue> additionalInputs = ImmutableMap.builder(); - for (PCollectionView<?> sideInput : sideInputs) { - additionalInputs.put(sideInput.getTagInternal(), sideInput.getPCollection()); - } - return additionalInputs.build(); + return PCollectionViews.toAdditionalInputs(sideInputs); } @Override @@ -231,11 +227,7 @@ class ParDoMultiOverrideFactory<InputT, OutputT> @Override public Map<TupleTag<?>, PValue> getAdditionalInputs() { - ImmutableMap.Builder<TupleTag<?>, PValue> additionalInputs = ImmutableMap.builder(); - for (PCollectionView<?> sideInput : sideInputs) { - additionalInputs.put(sideInput.getTagInternal(), sideInput.getPCollection()); - } - return additionalInputs.build(); + return PCollectionViews.toAdditionalInputs(sideInputs); } @Override