Merge branch 'STORM-2811-1.x' of https://github.com/srdo/storm into STORM-2811-1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a5ed0f91 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a5ed0f91 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a5ed0f91 Branch: refs/heads/1.x-branch Commit: a5ed0f918af8aba055258ce783f54eb21586deab Parents: c632424 bbd582b Author: Jungtaek Lim <[email protected]> Authored: Tue Nov 14 08:02:01 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Tue Nov 14 08:02:01 2017 +0900 ---------------------------------------------------------------------- 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 - .../test/java/org/apache/storm/st/DemoTest.java | 1 + .../st/tests/window/SlidingWindowTest.java | 45 +++++---- .../st/tests/window/TumblingWindowTest.java | 3 +- .../apache/storm/st/wrapper/StormCluster.java | 2 +- .../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 ++++++++- 25 files changed, 189 insertions(+), 188 deletions(-) ----------------------------------------------------------------------
