Repository: beam Updated Branches: refs/heads/master 0fa1d90c5 -> 690e1e27c
Fix typo in proto: widow -> window. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/55873197 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/55873197 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/55873197 Branch: refs/heads/master Commit: 558731978ae8e62c59130314de9db57d253ba10f Parents: 0fa1d90 Author: Robert Bradshaw <[email protected]> Authored: Tue Mar 7 17:36:41 2017 -0800 Committer: Robert Bradshaw <[email protected]> Committed: Tue Mar 7 17:36:41 2017 -0800 ---------------------------------------------------------------------- .../runners/core/triggers/TriggerStateMachines.java | 4 ++-- .../core/triggers/TriggerStateMachinesTest.java | 6 +++--- .../runner-api/src/main/proto/beam_runner_api.proto | 2 +- .../beam/sdk/transforms/windowing/Triggers.java | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/55873197/runners/core-java/src/main/java/org/apache/beam/runners/core/triggers/TriggerStateMachines.java ---------------------------------------------------------------------- diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/triggers/TriggerStateMachines.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/triggers/TriggerStateMachines.java index 1088435..a6b38ec 100644 --- a/runners/core-java/src/main/java/org/apache/beam/runners/core/triggers/TriggerStateMachines.java +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/triggers/TriggerStateMachines.java @@ -37,8 +37,8 @@ public class TriggerStateMachines { case AFTER_ANY: return AfterFirstStateMachine.of( stateMachinesForTriggers(trigger.getAfterAny().getSubtriggersList())); - case AFTER_END_OF_WIDOW: - return stateMachineForAfterEndOfWindow(trigger.getAfterEndOfWidow()); + case AFTER_END_OF_WINDOW: + return stateMachineForAfterEndOfWindow(trigger.getAfterEndOfWindow()); case ELEMENT_COUNT: return AfterPaneStateMachine.elementCountAtLeast( trigger.getElementCount().getElementCount()); http://git-wip-us.apache.org/repos/asf/beam/blob/55873197/runners/core-java/src/test/java/org/apache/beam/runners/core/triggers/TriggerStateMachinesTest.java ---------------------------------------------------------------------- diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/triggers/TriggerStateMachinesTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/triggers/TriggerStateMachinesTest.java index 497a3c2..7ff3478 100644 --- a/runners/core-java/src/test/java/org/apache/beam/runners/core/triggers/TriggerStateMachinesTest.java +++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/triggers/TriggerStateMachinesTest.java @@ -84,7 +84,7 @@ public class TriggerStateMachinesTest { public void testStateMachineForAfterWatermark() { RunnerApi.Trigger trigger = RunnerApi.Trigger.newBuilder() - .setAfterEndOfWidow(RunnerApi.Trigger.AfterEndOfWindow.getDefaultInstance()) + .setAfterEndOfWindow(RunnerApi.Trigger.AfterEndOfWindow.getDefaultInstance()) .build(); AfterWatermarkStateMachine.FromEndOfWindow machine = (AfterWatermarkStateMachine.FromEndOfWindow) @@ -197,7 +197,7 @@ public class TriggerStateMachinesTest { public void testAfterWatermarkEarlyTranslation() { RunnerApi.Trigger trigger = RunnerApi.Trigger.newBuilder() - .setAfterEndOfWidow( + .setAfterEndOfWindow( RunnerApi.Trigger.AfterEndOfWindow.newBuilder().setEarlyFirings(subtrigger1)) .build(); AfterWatermarkStateMachine.AfterWatermarkEarlyAndLate machine = @@ -213,7 +213,7 @@ public class TriggerStateMachinesTest { public void testAfterWatermarkEarlyLateTranslation() { RunnerApi.Trigger trigger = RunnerApi.Trigger.newBuilder() - .setAfterEndOfWidow( + .setAfterEndOfWindow( RunnerApi.Trigger.AfterEndOfWindow.newBuilder() .setEarlyFirings(subtrigger1) .setLateFirings(subtrigger2)) http://git-wip-us.apache.org/repos/asf/beam/blob/55873197/sdks/common/runner-api/src/main/proto/beam_runner_api.proto ---------------------------------------------------------------------- diff --git a/sdks/common/runner-api/src/main/proto/beam_runner_api.proto b/sdks/common/runner-api/src/main/proto/beam_runner_api.proto index 44ead56..3de03e7 100644 --- a/sdks/common/runner-api/src/main/proto/beam_runner_api.proto +++ b/sdks/common/runner-api/src/main/proto/beam_runner_api.proto @@ -528,7 +528,7 @@ message Trigger { AfterAll after_all = 1; AfterAny after_any = 2; AfterEach after_each = 3; - AfterEndOfWindow after_end_of_widow = 4; + AfterEndOfWindow after_end_of_window = 4; AfterProcessingTime after_processing_time = 5; AfterSynchronizedProcessingTime after_synchronized_processing_time = 6; Always always = 12; http://git-wip-us.apache.org/repos/asf/beam/blob/55873197/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Triggers.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Triggers.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Triggers.java index d788ca2..ec82114 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Triggers.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Triggers.java @@ -86,7 +86,7 @@ public class Triggers implements Serializable { private RunnerApi.Trigger convertSpecific(AfterWatermark.FromEndOfWindow v) { return RunnerApi.Trigger.newBuilder() - .setAfterEndOfWidow(RunnerApi.Trigger.AfterEndOfWindow.newBuilder()) + .setAfterEndOfWindow(RunnerApi.Trigger.AfterEndOfWindow.newBuilder()) .build(); } @@ -158,7 +158,7 @@ public class Triggers implements Serializable { builder.setLateFirings(toProto(v.getLateTrigger())); } - return RunnerApi.Trigger.newBuilder().setAfterEndOfWidow(builder).build(); + return RunnerApi.Trigger.newBuilder().setAfterEndOfWindow(builder).build(); } private RunnerApi.Trigger convertSpecific(AfterEach v) { @@ -231,8 +231,8 @@ public class Triggers implements Serializable { case AFTER_EACH: return AfterEach.inOrder( protosToTriggers(triggerProto.getAfterEach().getSubtriggersList())); - case AFTER_END_OF_WIDOW: - RunnerApi.Trigger.AfterEndOfWindow eowProto = triggerProto.getAfterEndOfWidow(); + case AFTER_END_OF_WINDOW: + RunnerApi.Trigger.AfterEndOfWindow eowProto = triggerProto.getAfterEndOfWindow(); if (!eowProto.hasEarlyFirings() && !eowProto.hasLateFirings()) { return AfterWatermark.pastEndOfWindow(); @@ -240,18 +240,18 @@ public class Triggers implements Serializable { // It either has early or late firings or both; our typing in Java makes this a smidge // annoying - if (triggerProto.getAfterEndOfWidow().hasEarlyFirings()) { + if (triggerProto.getAfterEndOfWindow().hasEarlyFirings()) { AfterWatermarkEarlyAndLate trigger = AfterWatermark.pastEndOfWindow() .withEarlyFirings( (OnceTrigger) - fromProto(triggerProto.getAfterEndOfWidow().getEarlyFirings())); + fromProto(triggerProto.getAfterEndOfWindow().getEarlyFirings())); - if (triggerProto.getAfterEndOfWidow().hasLateFirings()) { + if (triggerProto.getAfterEndOfWindow().hasLateFirings()) { trigger = trigger.withLateFirings( (OnceTrigger) - fromProto(triggerProto.getAfterEndOfWidow().getLateFirings())); + fromProto(triggerProto.getAfterEndOfWindow().getLateFirings())); } return trigger; } else {
