You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by tg...@apache.org on 2017/04/21 17:55:21 UTC
[1/2] beam git commit: This closes #2630
Repository: beam
Updated Branches:
refs/heads/master ea0f37db7 -> f3806f64f
This closes #2630
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/f3806f64
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/f3806f64
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/f3806f64
Branch: refs/heads/master
Commit: f3806f64f2f80d9ff04f161bb60bbfe6c663dd05
Parents: ea0f37d e308938
Author: Thomas Groh <tg...@google.com>
Authored: Fri Apr 21 10:55:16 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Fri Apr 21 10:55:16 2017 -0700
----------------------------------------------------------------------
.../beam/sdk/transforms/windowing/GlobalWindow.java | 8 ++++++++
.../beam/sdk/transforms/windowing/IntervalWindow.java | 11 +++++++++++
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
[2/2] beam git commit: Improve GlobalWindow, IntervalWindow Coders
Posted by tg...@apache.org.
Improve GlobalWindow, IntervalWindow Coders
Implement consistentWithEquals and verifyDeterministic on both of these
coders.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/e3089387
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/e3089387
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/e3089387
Branch: refs/heads/master
Commit: e30893874e09bbef37bd88f8ebba0fb6edca78cd
Parents: ea0f37d
Author: Thomas Groh <tg...@google.com>
Authored: Fri Apr 21 08:49:23 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Fri Apr 21 10:55:16 2017 -0700
----------------------------------------------------------------------
.../beam/sdk/transforms/windowing/GlobalWindow.java | 8 ++++++++
.../beam/sdk/transforms/windowing/IntervalWindow.java | 11 +++++++++++
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/e3089387/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindow.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindow.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindow.java
index 337886d..ad6a9fd 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindow.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindow.java
@@ -74,6 +74,14 @@ public class GlobalWindow extends BoundedWindow {
}
@Override
+ public void verifyDeterministic() {}
+
+ @Override
+ public boolean consistentWithEquals() {
+ return true;
+ }
+
+ @Override
protected CloudObject initializeCloudObject() {
return CloudObject.forClassName("kind:global_window");
}
http://git-wip-us.apache.org/repos/asf/beam/blob/e3089387/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/IntervalWindow.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/IntervalWindow.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/IntervalWindow.java
index c0ad2c0..eff4d99 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/IntervalWindow.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/IntervalWindow.java
@@ -195,6 +195,17 @@ public class IntervalWindow extends BoundedWindow
}
@Override
+ public void verifyDeterministic() throws NonDeterministicException {
+ instantCoder.verifyDeterministic();
+ durationCoder.verifyDeterministic();
+ }
+
+ @Override
+ public boolean consistentWithEquals() {
+ return instantCoder.consistentWithEquals() && durationCoder.consistentWithEquals();
+ }
+
+ @Override
protected CloudObject initializeCloudObject() {
return CloudObject.forClassName("kind:interval_window");
}