Merge branch 'master' of github.com:apache/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a48e9535 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a48e9535 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a48e9535 Branch: refs/heads/master Commit: a48e9535fd8bcd6de195a70af6102535b60d56d6 Parents: 0100898 31db7dc Author: xiaojian.fxj <[email protected]> Authored: Mon Mar 28 13:37:42 2016 +0800 Committer: xiaojian.fxj <[email protected]> Committed: Mon Mar 28 13:37:42 2016 +0800 ---------------------------------------------------------------------- CHANGELOG.md | 5 + docs/Documentation.md | 50 --- docs/Kestrel-and-Storm.md | 2 +- docs/README.md | 50 +++ docs/index.md | 17 +- docs/storm-cassandra.md | 255 +++++++++++++ docs/storm-elasticsearch.md | 105 +++++ docs/storm-mongodb.md | 199 ++++++++++ docs/storm-mqtt.md | 379 +++++++++++++++++++ docs/windows-users-guide.md | 21 + examples/storm-starter/pom.xml | 13 +- .../TridentHBaseWindowingStoreTopology.java | 93 +++++ .../TridentWindowingInmemoryStoreTopology.java | 98 +++++ .../main/java/org/apache/storm/flux/Flux.java | 22 +- .../storm/hbase/bolt/AbstractHBaseBolt.java | 1 - .../org/apache/storm/hbase/bolt/HBaseBolt.java | 18 +- .../trident/windowing/HBaseWindowsStore.java | 273 +++++++++++++ .../windowing/HBaseWindowsStoreFactory.java | 55 +++ pom.xml | 6 +- storm-core/pom.xml | 2 +- storm-core/src/jvm/org/apache/storm/Config.java | 8 + .../serialization/BlowfishTupleSerializer.java | 24 +- .../jvm/org/apache/storm/trident/Stream.java | 207 ++++++++-- .../apache/storm/trident/TridentTopology.java | 4 + .../storm/trident/fluent/UniqueIdGen.java | 14 +- .../storm/trident/operation/builtin/Debug.java | 4 +- .../windowing/AbstractTridentWindowManager.java | 238 ++++++++++++ .../windowing/ITridentWindowManager.java | 59 +++ .../windowing/InMemoryTridentWindowManager.java | 72 ++++ .../trident/windowing/InMemoryWindowsStore.java | 200 ++++++++++ .../windowing/InMemoryWindowsStoreFactory.java | 46 +++ .../StoreBasedTridentWindowManager.java | 217 +++++++++++ .../trident/windowing/TridentBatchTuple.java | 42 ++ .../windowing/WindowTridentProcessor.java | 265 +++++++++++++ .../storm/trident/windowing/WindowsState.java | 52 +++ .../trident/windowing/WindowsStateFactory.java | 40 ++ .../trident/windowing/WindowsStateUpdater.java | 81 ++++ .../storm/trident/windowing/WindowsStore.java | 78 ++++ .../trident/windowing/WindowsStoreFactory.java | 35 ++ .../windowing/config/BaseWindowConfig.java | 48 +++ .../windowing/config/SlidingCountWindow.java | 43 +++ .../windowing/config/SlidingDurationWindow.java | 44 +++ .../windowing/config/TumblingCountWindow.java | 43 +++ .../config/TumblingDurationWindow.java | 42 ++ .../trident/windowing/config/WindowConfig.java | 57 +++ .../windowing/strategy/BaseWindowStrategy.java | 32 ++ .../strategy/SlidingCountWindowStrategy.java | 59 +++ .../strategy/SlidingDurationWindowStrategy.java | 60 +++ .../strategy/TumblingCountWindowStrategy.java | 60 +++ .../TumblingDurationWindowStrategy.java | 60 +++ .../windowing/strategy/WindowStrategy.java | 45 +++ .../apache/storm/windowing/TriggerHandler.java | 2 +- .../storm/trident/TridentWindowingTest.java | 105 +++++ 53 files changed, 3910 insertions(+), 140 deletions(-) ----------------------------------------------------------------------
