You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2017/07/21 19:14:13 UTC

[1/2] beam git commit: Use dehydration-insensitive APIs in ParDoEvaluatorFactory

Repository: beam
Updated Branches:
  refs/heads/master 8bd647596 -> 4b355844a


Use dehydration-insensitive APIs in ParDoEvaluatorFactory


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/fa3a5abb
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/fa3a5abb
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/fa3a5abb

Branch: refs/heads/master
Commit: fa3a5abbc94db629feae8d7d73a31e7dda06bf76
Parents: b6f126d
Author: Kenneth Knowles <kl...@google.com>
Authored: Wed Jun 7 14:35:09 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Fri Jul 21 11:38:23 2017 -0700

----------------------------------------------------------------------
 .../runners/direct/ParDoEvaluatorFactory.java     | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/fa3a5abb/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java
index 516f798..408a7df 100644
--- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java
+++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java
@@ -23,6 +23,7 @@ import com.google.common.cache.LoadingCache;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.beam.runners.core.construction.ParDoTranslation;
 import org.apache.beam.runners.direct.DirectExecutionContext.DirectStepContext;
 import org.apache.beam.sdk.runners.AppliedPTransform;
 import org.apache.beam.sdk.transforms.DoFn;
@@ -63,15 +64,8 @@ final class ParDoEvaluatorFactory<InputT, OutputT> implements TransformEvaluator
   public <T> TransformEvaluator<T> forApplication(
       AppliedPTransform<?, ?, ?> application, CommittedBundle<?> inputBundle) throws Exception {
 
-    @SuppressWarnings("unchecked")
-    AppliedPTransform<PCollection<InputT>, PCollectionTuple, ParDo.MultiOutput<InputT, OutputT>>
-        parDoApplication =
-            (AppliedPTransform<
-                    PCollection<InputT>, PCollectionTuple, ParDo.MultiOutput<InputT, OutputT>>)
-                application;
-
-    ParDo.MultiOutput<InputT, OutputT> transform = parDoApplication.getTransform();
-    final DoFn<InputT, OutputT> doFn = transform.getFn();
+    final DoFn<InputT, OutputT> doFn =
+        (DoFn<InputT, OutputT>) ParDoTranslation.getDoFn(application);
 
     @SuppressWarnings({"unchecked", "rawtypes"})
     TransformEvaluator<T> evaluator =
@@ -81,9 +75,9 @@ final class ParDoEvaluatorFactory<InputT, OutputT> implements TransformEvaluator
                 (PCollection<InputT>) inputBundle.getPCollection(),
                 inputBundle.getKey(),
                 doFn,
-                transform.getSideInputs(),
-                transform.getMainOutputTag(),
-                transform.getAdditionalOutputTags().getAll());
+                ParDoTranslation.getSideInputs(application),
+                (TupleTag<OutputT>) ParDoTranslation.getMainOutputTag(application),
+                ParDoTranslation.getAdditionalOutputTags(application).getAll());
     return evaluator;
   }
 


[2/2] beam git commit: This closes #3610: Use dehydration-insensitive APIs in ParDoEvaluatorFactory

Posted by ke...@apache.org.
This closes #3610: Use dehydration-insensitive APIs in ParDoEvaluatorFactory


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/4b355844
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/4b355844
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/4b355844

Branch: refs/heads/master
Commit: 4b355844a4920bc9faba75f7cd61008bedebaf29
Parents: 8bd6475 fa3a5ab
Author: Kenneth Knowles <kl...@google.com>
Authored: Fri Jul 21 11:50:48 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Fri Jul 21 11:50:48 2017 -0700

----------------------------------------------------------------------
 .../runners/direct/ParDoEvaluatorFactory.java     | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------