Merge commit 'refs/pull/534/head' of github.com:apache/apex-malhar
Project: http://git-wip-us.apache.org/repos/asf/apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-malhar/commit/f22b269a Tree: http://git-wip-us.apache.org/repos/asf/apex-malhar/tree/f22b269a Diff: http://git-wip-us.apache.org/repos/asf/apex-malhar/diff/f22b269a Branch: refs/heads/master Commit: f22b269a993ec184ca6f09b43319c68a7bf91ba5 Parents: 88295ae 1290c72 Author: David Yan <[email protected]> Authored: Wed Jan 25 23:03:32 2017 -0800 Committer: David Yan <[email protected]> Committed: Wed Jan 25 23:03:32 2017 -0800 ---------------------------------------------------------------------- .../lib/window/ImplicitWatermarkGenerator.java | 49 ++++++++++++ .../window/impl/AbstractWindowedOperator.java | 27 ++++++- .../impl/FixedDiffEventTimeWatermarkGen.java | 83 ++++++++++++++++++++ .../FixedDiffProcessingTimeWatermarkGen.java | 76 ++++++++++++++++++ .../malhar/lib/window/WindowedOperatorTest.java | 34 ++++++++ 5 files changed, 267 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
