You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ki...@apache.org on 2015/10/28 15:56:43 UTC
[7/8] storm git commit: Merge branch 'disruptor-upgrade' of
https://github.com/revans2/incubator-storm
Merge branch 'disruptor-upgrade' of https://github.com/revans2/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1a9e1f96
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1a9e1f96
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1a9e1f96
Branch: refs/heads/master
Commit: 1a9e1f969f7733431bc79dcdf2852f2e3a8f7554
Parents: ee9e4ff 1be78e7
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Wed Oct 28 14:35:14 2015 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Wed Oct 28 14:35:14 2015 +0000
----------------------------------------------------------------------
conf/defaults.yaml | 1 -
.../storm/starter/FastWordCountTopology.java | 193 +++++++++++++++++++
.../jvm/storm/starter/InOrderDeliveryTest.java | 175 +++++++++++++++++
pom.xml | 4 +-
storm-core/pom.xml | 2 +-
.../src/clj/backtype/storm/daemon/executor.clj | 3 +-
.../src/clj/backtype/storm/daemon/worker.clj | 6 +-
storm-core/src/clj/backtype/storm/disruptor.clj | 32 +--
storm-core/src/jvm/backtype/storm/Config.java | 13 +-
.../backtype/storm/utils/DisruptorQueue.java | 96 +++++----
.../jvm/backtype/storm/utils/MutableObject.java | 6 +-
.../utils/DisruptorQueueBackpressureTest.java | 8 +-
.../storm/utils/DisruptorQueueTest.java | 65 ++++++-
13 files changed, 503 insertions(+), 101 deletions(-)
----------------------------------------------------------------------