Merge branch 'STORM-2525-1.x' of https://github.com/srdo/storm into asfgit-1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7e177122 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7e177122 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7e177122 Branch: refs/heads/1.x-branch Commit: 7e1771220969c68e20c4905d9c6afdfbf7a72bc8 Parents: c632424 4d49287 Author: Stig Rohde Døssing <[email protected]> Authored: Mon Nov 13 19:23:37 2017 +0100 Committer: Stig Rohde Døssing <[email protected]> Committed: Mon Nov 13 19:23:37 2017 +0100 ---------------------------------------------------------------------- integration-test/config/Vagrantfile | 8 +- integration-test/config/cluster.xml | 101 ------------------- integration-test/config/install-storm.sh | 1 - integration-test/config/install-zookeeper.sh | 1 + integration-test/pom.xml | 5 + integration-test/run-it.sh | 7 +- .../topology/window/SlidingTimeCorrectness.java | 4 +- .../window/SlidingWindowCorrectness.java | 2 - .../window/TumblingTimeCorrectness.java | 4 +- .../window/TumblingWindowCorrectness.java | 2 - .../st/tests/window/SlidingWindowTest.java | 44 ++++---- .../org/apache/storm/st/wrapper/TopoWrap.java | 81 +++++++-------- pom.xml | 19 ++++ storm-core/pom.xml | 7 +- .../storm/topology/WindowedBoltExecutor.java | 6 +- .../apache/storm/windowing/EvictionContext.java | 2 +- .../apache/storm/windowing/EvictionPolicy.java | 2 +- .../storm/windowing/TimeEvictionPolicy.java | 2 +- .../windowing/WatermarkCountEvictionPolicy.java | 11 +- .../windowing/WatermarkTimeEvictionPolicy.java | 10 +- .../apache/storm/windowing/WindowManager.java | 3 + .../storm/windowing/WindowManagerTest.java | 48 ++++++++- 22 files changed, 184 insertions(+), 186 deletions(-) ----------------------------------------------------------------------
