You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by bc...@apache.org on 2016/05/11 16:31:09 UTC
[2/9] incubator-beam git commit: Exclude default
Window.allowedLateness display data
Exclude default Window.allowedLateness display data
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/d9355c28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/d9355c28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/d9355c28
Branch: refs/heads/master
Commit: d9355c286fd7f3e6f7069b34172c32554b57bac8
Parents: ea8019e
Author: Scott Wegner <sw...@google.com>
Authored: Fri May 6 16:03:12 2016 -0700
Committer: bchambers <bc...@google.com>
Committed: Tue May 10 16:21:27 2016 -0700
----------------------------------------------------------------------
.../org/apache/beam/sdk/transforms/windowing/Window.java | 9 +++++++--
.../apache/beam/sdk/transforms/windowing/WindowTest.java | 6 ++++--
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d9355c28/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java
index e9b3437..b9dd451 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java
@@ -601,8 +601,13 @@ public class Window {
super.populateDisplayData(builder);
builder
.add(DisplayData.item("windowFn", windowFn.getClass()))
- .include(windowFn)
- .addIfNotNull(DisplayData.item("allowedLateness", allowedLateness));
+ .include(windowFn);
+
+ if (allowedLateness != null) {
+ builder.addIfNotDefault(DisplayData.item("allowedLateness", allowedLateness),
+ Duration.millis(BoundedWindow.TIMESTAMP_MAX_VALUE.getMillis()));
+
+ }
if (trigger != null && !(trigger instanceof DefaultTrigger)) {
builder.add(DisplayData.item("trigger", trigger.toString()));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d9355c28/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
index 8ad590d..885f549 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
@@ -285,11 +285,13 @@ public class WindowTest implements Serializable {
}
@Test
- public void testDisplayDataExcludesDefaultTrigger() {
+ public void testDisplayDataExcludesDefaults() {
Window.Bound<?> window = Window.into(new GlobalWindows())
- .triggering(DefaultTrigger.of());
+ .triggering(DefaultTrigger.of())
+ .withAllowedLateness(Duration.millis(BoundedWindow.TIMESTAMP_MAX_VALUE.getMillis()));
DisplayData data = DisplayData.from(window);
assertThat(data, not(hasDisplayItem(hasKey("trigger"))));
+ assertThat(data, not(hasDisplayItem(hasKey("allowedLateness"))));
}
}