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 2016/04/13 04:51:07 UTC

[1/2] incubator-beam git commit: Remove unused MergingTriggerContext#getFinishedMergingWindows method

Repository: incubator-beam
Updated Branches:
  refs/heads/master b640ba88c -> bc483c810


Remove unused MergingTriggerContext#getFinishedMergingWindows method


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

Branch: refs/heads/master
Commit: 1c448bd2d14d445b83eba4c45a2ba4e124c8b9cb
Parents: 46c82ac
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon Apr 11 15:20:34 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Apr 12 13:34:52 2016 -0700

----------------------------------------------------------------------
 .../cloud/dataflow/sdk/transforms/windowing/Trigger.java |  3 ---
 .../cloud/dataflow/sdk/util/TriggerContextFactory.java   | 11 -----------
 2 files changed, 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1c448bd2/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
index fde8ca4..1eaf9e8 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
@@ -171,9 +171,6 @@ public abstract class Trigger implements Serializable, TriggerBuilder {
 
     /** Return true if the trigger is finished in all windows being merged. */
     public abstract boolean finishedInAllMergingWindows();
-
-    /** Return the merging windows in which the trigger is finished. */
-    public abstract Iterable<? extends BoundedWindow> getFinishedMergingWindows();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1c448bd2/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerContextFactory.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerContextFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerContextFactory.java
index 5e2dc5e..ce19162 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerContextFactory.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerContextFactory.java
@@ -33,7 +33,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
 
 import org.joda.time.Instant;
 
@@ -249,16 +248,6 @@ public class TriggerContextFactory<W extends BoundedWindow> {
       }
       return true;
     }
-
-    @Override
-    public Iterable<? extends BoundedWindow> getFinishedMergingWindows() {
-      return Maps.filterValues(finishedSets, new Predicate<FinishedTriggers>() {
-        @Override
-        public boolean apply(FinishedTriggers finishedSet) {
-          return finishedSet.isFinished(trigger);
-        }
-      }).keySet();
-    }
   }
 
   private class StateAccessorImpl implements StateAccessor<Object> {


[2/2] incubator-beam git commit: This closes #172

Posted by ke...@apache.org.
This closes #172


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

Branch: refs/heads/master
Commit: bc483c810b6e2fefee0429a571720506969c6202
Parents: b640ba8 1c448bd
Author: Kenneth Knowles <kl...@google.com>
Authored: Tue Apr 12 19:50:56 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Apr 12 19:50:56 2016 -0700

----------------------------------------------------------------------
 .../cloud/dataflow/sdk/transforms/windowing/Trigger.java |  3 ---
 .../cloud/dataflow/sdk/util/TriggerContextFactory.java   | 11 -----------
 2 files changed, 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bc483c81/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
----------------------------------------------------------------------