You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/07/16 16:48:07 UTC
[02/11] git commit: Merge pull request #2 from apache/master
Merge pull request #2 from apache/master
update from apache/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/33715a2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/33715a2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/33715a2b
Branch: refs/heads/master
Commit: 33715a2b4613742dfb3294a097874312d4e6c3b6
Parents: d080e04 c621a6c
Author: Li Jiahong <Gv...@users.noreply.github.com>
Authored: Thu Apr 3 15:46:40 2014 +0800
Committer: Li Jiahong <Gv...@users.noreply.github.com>
Committed: Thu Apr 3 15:46:40 2014 +0800
----------------------------------------------------------------------
CHANGELOG.md | 5 +
NOTICE | 6 +-
README.markdown | 5 +-
examples/storm-starter/README.markdown | 118 ++++++
.../multilang/resources/splitsentence.py | 24 ++
.../multilang/resources/splitsentence.rb | 26 ++
.../storm-starter/multilang/resources/storm.py | 221 +++++++++++
.../storm-starter/multilang/resources/storm.rb | 200 ++++++++++
examples/storm-starter/pom.xml | 161 ++++++++
.../src/clj/storm/starter/clj/word_count.clj | 95 +++++
.../jvm/storm/starter/BasicDRPCTopology.java | 78 ++++
.../jvm/storm/starter/ExclamationTopology.java | 87 +++++
.../src/jvm/storm/starter/ManualDRPC.java | 68 ++++
.../jvm/storm/starter/PrintSampleStream.java | 54 +++
.../src/jvm/storm/starter/ReachTopology.java | 196 ++++++++++
.../src/jvm/storm/starter/RollingTopWords.java | 78 ++++
.../jvm/storm/starter/SingleJoinExample.java | 64 ++++
.../storm/starter/TransactionalGlobalCount.java | 173 +++++++++
.../jvm/storm/starter/TransactionalWords.java | 246 +++++++++++++
.../jvm/storm/starter/WordCountTopology.java | 107 ++++++
.../storm/starter/bolt/AbstractRankerBolt.java | 110 ++++++
.../starter/bolt/IntermediateRankingsBolt.java | 58 +++
.../src/jvm/storm/starter/bolt/PrinterBolt.java | 37 ++
.../storm/starter/bolt/RollingCountBolt.java | 142 +++++++
.../jvm/storm/starter/bolt/SingleJoinBolt.java | 114 ++++++
.../storm/starter/bolt/TotalRankingsBolt.java | 59 +++
.../starter/spout/RandomSentenceSpout.java | 64 ++++
.../storm/starter/spout/TwitterSampleSpout.java | 122 ++++++
.../tools/NthLastModifiedTimeTracker.java | 70 ++++
.../src/jvm/storm/starter/tools/Rankable.java | 32 ++
.../starter/tools/RankableObjectWithFields.java | 148 ++++++++
.../src/jvm/storm/starter/tools/Rankings.java | 156 ++++++++
.../starter/tools/SlidingWindowCounter.java | 119 ++++++
.../storm/starter/tools/SlotBasedCounter.java | 118 ++++++
.../jvm/storm/starter/trident/TridentReach.java | 156 ++++++++
.../storm/starter/trident/TridentWordCount.java | 85 +++++
.../src/jvm/storm/starter/util/StormRunner.java | 39 ++
.../jvm/storm/starter/util/TupleHelpers.java | 33 ++
.../bolt/IntermediateRankingsBoltTest.java | 146 ++++++++
.../starter/bolt/RollingCountBoltTest.java | 113 ++++++
.../starter/bolt/TotalRankingsBoltTest.java | 147 ++++++++
.../storm/starter/tools/MockTupleHelpers.java | 40 ++
.../tools/NthLastModifiedTimeTrackerTest.java | 125 +++++++
.../tools/RankableObjectWithFieldsTest.java | 252 +++++++++++++
.../jvm/storm/starter/tools/RankingsTest.java | 368 +++++++++++++++++++
.../starter/tools/SlidingWindowCounterTest.java | 106 ++++++
.../starter/tools/SlotBasedCounterTest.java | 181 +++++++++
pom.xml | 45 ++-
storm-core/pom.xml | 3 +
storm-core/src/clj/backtype/storm/timer.clj | 2 +-
storm-core/src/clj/backtype/storm/util.clj | 3 +
storm-core/src/clj/backtype/storm/zookeeper.clj | 4 +-
.../src/jvm/backtype/storm/StormSubmitter.java | 4 +-
.../backtype/storm/messaging/netty/Client.java | 11 +-
.../src/jvm/backtype/storm/utils/Utils.java | 26 +-
.../jvm/storm/trident/state/map/OpaqueMap.java | 6 +-
.../trident/state/map/RemovableMapState.java | 8 +
.../storm/trident/testing/MemoryMapState.java | 27 +-
.../test/clj/backtype/storm/utils_test.clj | 11 +
.../test/clj/storm/trident/state_test.clj | 33 +-
storm-dist/binary/NOTICE | 9 +-
storm-dist/binary/src/main/assembly/binary.xml | 12 +
62 files changed, 5313 insertions(+), 43 deletions(-)
----------------------------------------------------------------------