Build trigger state machine from Runner API Trigger proto directly Remove printouts of stage progress in tests.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/bd41d9a3 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/bd41d9a3 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/bd41d9a3 Branch: refs/heads/master Commit: bd41d9a323b23bf2956a34b9f42eaba4857caed7 Parents: c08e7d8 Author: Sela <[email protected]> Authored: Sat Feb 25 01:21:28 2017 +0200 Committer: Sela <[email protected]> Committed: Wed Mar 1 00:18:06 2017 +0200 ---------------------------------------------------------------------- runners/spark/pom.xml | 2 ++ .../spark/stateful/SparkGroupAlsoByWindowViaWindowSet.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/bd41d9a3/runners/spark/pom.xml ---------------------------------------------------------------------- diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml index 1669833..f926bf5 100644 --- a/runners/spark/pom.xml +++ b/runners/spark/pom.xml @@ -97,6 +97,7 @@ </beamTestPipelineOptions> <beam.spark.test.reuseSparkContext>true</beam.spark.test.reuseSparkContext> <spark.ui.enabled>false</spark.ui.enabled> + <spark.ui.showConsoleProgress>false</spark.ui.showConsoleProgress> </systemPropertyVariables> </configuration> </execution> @@ -339,6 +340,7 @@ <systemPropertyVariables> <beam.spark.test.reuseSparkContext>true</beam.spark.test.reuseSparkContext> <spark.ui.enabled>false</spark.ui.enabled> + <spark.ui.showConsoleProgress>false</spark.ui.showConsoleProgress> </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/beam/blob/bd41d9a3/runners/spark/src/main/java/org/apache/beam/runners/spark/stateful/SparkGroupAlsoByWindowViaWindowSet.java ---------------------------------------------------------------------- diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/stateful/SparkGroupAlsoByWindowViaWindowSet.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/stateful/SparkGroupAlsoByWindowViaWindowSet.java index 5589d82..24b8508 100644 --- a/runners/spark/src/main/java/org/apache/beam/runners/spark/stateful/SparkGroupAlsoByWindowViaWindowSet.java +++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/stateful/SparkGroupAlsoByWindowViaWindowSet.java @@ -47,6 +47,7 @@ import org.apache.beam.sdk.transforms.Combine; import org.apache.beam.sdk.transforms.Sum; import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.transforms.windowing.PaneInfo; +import org.apache.beam.sdk.transforms.windowing.Triggers; import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.util.WindowedValue.FullWindowedValueCoder; import org.apache.beam.sdk.util.WindowingStrategy; @@ -231,7 +232,7 @@ public class SparkGroupAlsoByWindowViaWindowSet { windowingStrategy, ExecutableTriggerStateMachine.create( TriggerStateMachines.stateMachineForTrigger( - windowingStrategy.getTrigger())), + Triggers.toProto(windowingStrategy.getTrigger()))), stateInternals, timerInternals, outputHolder,
