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/d4fa33e3 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/d4fa33e3 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/d4fa33e3 Branch: refs/heads/DSL_SQL Commit: d4fa33e346185395577aa3ce537bfd4a1eb8b4f7 Parents: a7cad60 Author: Thomas Groh <[email protected]> Authored: Wed Jul 5 14:16:50 2017 -0700 Committer: Tyler Akidau <[email protected]> Committed: Wed Jul 12 20:00:59 2017 -0700 ---------------------------------------------------------------------- .../apache/beam/runners/dataflow/DataflowPipelineTranslator.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/d4fa33e3/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);
