You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/07/06 17:20:49 UTC
[43/50] [abbrv] incubator-beam git commit: Fix timestamps in
GroupAlsoByWindowsProperties
Fix timestamps in GroupAlsoByWindowsProperties
Some of the timestamps were not adjusted when
BEAM-145 was fixed to respect the WindowFn's
timestamps.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/151ff5f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/151ff5f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/151ff5f7
Branch: refs/heads/runners-spark2
Commit: 151ff5f7119a4d81b4cb3d6c0e81f05ad5801090
Parents: acec0a5
Author: Kenneth Knowles <kl...@google.com>
Authored: Fri Jul 1 09:53:37 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Wed Jul 6 10:18:53 2016 -0700
----------------------------------------------------------------------
.../apache/beam/sdk/util/GroupAlsoByWindowsProperties.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/151ff5f7/runners/core-java/src/test/java/org/apache/beam/sdk/util/GroupAlsoByWindowsProperties.java
----------------------------------------------------------------------
diff --git a/runners/core-java/src/test/java/org/apache/beam/sdk/util/GroupAlsoByWindowsProperties.java b/runners/core-java/src/test/java/org/apache/beam/sdk/util/GroupAlsoByWindowsProperties.java
index f653f49..fe2a495 100644
--- a/runners/core-java/src/test/java/org/apache/beam/sdk/util/GroupAlsoByWindowsProperties.java
+++ b/runners/core-java/src/test/java/org/apache/beam/sdk/util/GroupAlsoByWindowsProperties.java
@@ -165,11 +165,13 @@ public class GroupAlsoByWindowsProperties {
TimestampedValue<KV<String, Iterable<String>>> item1 =
Iterables.getOnlyElement(result.peekOutputElementsInWindow(window(0, 20)));
assertThat(item1.getValue().getValue(), containsInAnyOrder("v1", "v2"));
+ // Timestamp adjusted by WindowFn to exceed the end of the prior sliding window
assertThat(item1.getTimestamp(), equalTo(new Instant(10)));
TimestampedValue<KV<String, Iterable<String>>> item2 =
Iterables.getOnlyElement(result.peekOutputElementsInWindow(window(10, 30)));
assertThat(item2.getValue().getValue(), contains("v2"));
+ // Timestamp adjusted by WindowFn to exceed the end of the prior sliding window
assertThat(item2.getTimestamp(), equalTo(new Instant(20)));
}
@@ -218,13 +220,15 @@ public class GroupAlsoByWindowsProperties {
Iterables.getOnlyElement(result.peekOutputElementsInWindow(window(0, 20)));
assertThat(item1.getValue().getKey(), equalTo("k"));
assertThat(item1.getValue().getValue(), equalTo(combineFn.apply(ImmutableList.of(1L, 2L, 4L))));
- assertThat(item1.getTimestamp(), equalTo(new Instant(5L)));
+ // Timestamp adjusted by WindowFn to exceed the end of the prior sliding window
+ assertThat(item1.getTimestamp(), equalTo(new Instant(10L)));
TimestampedValue<KV<String, Long>> item2 =
Iterables.getOnlyElement(result.peekOutputElementsInWindow(window(10, 30)));
assertThat(item2.getValue().getKey(), equalTo("k"));
assertThat(item2.getValue().getValue(), equalTo(combineFn.apply(ImmutableList.of(2L, 4L))));
- assertThat(item2.getTimestamp(), equalTo(new Instant(15L)));
+ // Timestamp adjusted by WindowFn to exceed the end of the prior sliding window
+ assertThat(item2.getTimestamp(), equalTo(new Instant(20L)));
}
/**