You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by am...@apache.org on 2017/01/07 09:07:29 UTC

[1/2] beam git commit: [BEAM-1250] Remove leaf when materializing PCollection to avoid re-evaluation.

Repository: beam
Updated Branches:
  refs/heads/master 418c597c4 -> 70dd54625


[BEAM-1250] Remove leaf when materializing PCollection to avoid re-evaluation.


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

Branch: refs/heads/master
Commit: 8d3d381cfea717939f2f925f07118b27b02ec1c2
Parents: 418c597
Author: Sela <an...@paypal.com>
Authored: Sat Jan 7 00:03:34 2017 +0200
Committer: Sela <an...@paypal.com>
Committed: Sat Jan 7 10:41:27 2017 +0200

----------------------------------------------------------------------
 .../beam/runners/spark/translation/EvaluationContext.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/8d3d381c/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/EvaluationContext.java
----------------------------------------------------------------------
diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/EvaluationContext.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/EvaluationContext.java
index a412e31..ec5ad3d 100644
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/EvaluationContext.java
+++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/EvaluationContext.java
@@ -194,16 +194,15 @@ public class EvaluationContext {
    * @param <T>         Type of elements contained in collection.
    * @return Natively types result associated with collection.
    */
-  public <T> Iterable<T> get(PCollection<T> pcollection) {
-    @SuppressWarnings("unchecked")
-    BoundedDataset<T> boundedDataset = (BoundedDataset<T>) datasets.get(pcollection);
-    Iterable<WindowedValue<T>> windowedValues = boundedDataset.getValues(pcollection);
+  <T> Iterable<T> get(PCollection<T> pcollection) {
+    Iterable<WindowedValue<T>> windowedValues = getWindowedValues(pcollection);
     return Iterables.transform(windowedValues, WindowingHelpers.<T>unwindowValueFunction());
   }
 
   <T> Iterable<WindowedValue<T>> getWindowedValues(PCollection<T> pcollection) {
     @SuppressWarnings("unchecked")
     BoundedDataset<T> boundedDataset = (BoundedDataset<T>) datasets.get(pcollection);
+    leaves.remove(boundedDataset);
     return boundedDataset.getValues(pcollection);
   }
 


[2/2] beam git commit: This closes #1747

Posted by am...@apache.org.
This closes #1747


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

Branch: refs/heads/master
Commit: 70dd54625be54de443ad57dfa9342c97e19be928
Parents: 418c597 8d3d381
Author: Sela <an...@paypal.com>
Authored: Sat Jan 7 10:42:01 2017 +0200
Committer: Sela <an...@paypal.com>
Committed: Sat Jan 7 10:42:01 2017 +0200

----------------------------------------------------------------------
 .../beam/runners/spark/translation/EvaluationContext.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------