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/05 23:42:32 UTC
[1/2] beam git commit: Disallow Combiner Lifting for multi-window
WindowFns
Repository: beam
Updated Branches:
refs/heads/master ea9f7fbdd -> e8fdd373c
Disallow Combiner Lifting for multi-window WindowFns
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/29c2bca4
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/29c2bca4
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/29c2bca4
Branch: refs/heads/master
Commit: 29c2bca4649317f2ebb1c89f92bf97fbb27602ca
Parents: 39c80f6
Author: Thomas Groh <tg...@google.com>
Authored: Wed Jul 5 14:16:50 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Wed Jul 5 14:16:50 2017 -0700
----------------------------------------------------------------------
.../apache/beam/runners/dataflow/DataflowPipelineTranslator.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/29c2bca4/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
index 28fd1bb..f1783de 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
@@ -793,6 +793,7 @@ public class DataflowPipelineTranslator {
context.getPipelineOptions().as(StreamingOptions.class).isStreaming();
boolean disallowCombinerLifting =
!windowingStrategy.getWindowFn().isNonMerging()
+ || !windowingStrategy.getWindowFn().assignsToOneWindow()
|| (isStreaming && !transform.fewKeys())
// TODO: Allow combiner lifting on the non-default trigger, as appropriate.
|| !(windowingStrategy.getTrigger() instanceof DefaultTrigger);
[2/2] beam git commit: This closes #3496: Disallow Combiner Lifting
for multi-window WindowFns
Posted by ke...@apache.org.
This closes #3496: Disallow Combiner Lifting for multi-window WindowFns
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/e8fdd373
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/e8fdd373
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/e8fdd373
Branch: refs/heads/master
Commit: e8fdd373c7b86652fda94ff76ef7246357e6288c
Parents: ea9f7fb 29c2bca
Author: Kenneth Knowles <kl...@google.com>
Authored: Wed Jul 5 16:41:16 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Wed Jul 5 16:41:16 2017 -0700
----------------------------------------------------------------------
.../apache/beam/runners/dataflow/DataflowPipelineTranslator.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------