You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/08/08 08:17:40 UTC
[4/5] storm git commit: Merge branch 'STORM-1277'
Merge branch 'STORM-1277'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c7d450f3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c7d450f3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c7d450f3
Branch: refs/heads/master
Commit: c7d450f3fa871ff35452ac72b011e86c34446264
Parents: 44068c4 a5e19d9
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Aug 8 17:14:48 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Aug 8 17:14:48 2016 +0900
----------------------------------------------------------------------
.../src/clj/org/apache/storm/daemon/common.clj | 18 +-
.../clj/org/apache/storm/daemon/executor.clj | 839 -------------------
.../org/apache/storm/daemon/local_executor.clj | 42 +
.../src/clj/org/apache/storm/daemon/worker.clj | 70 +-
storm-core/src/clj/org/apache/storm/testing.clj | 16 +-
.../src/jvm/org/apache/storm/Constants.java | 24 +-
.../org/apache/storm/daemon/StormCommon.java | 175 ++--
.../src/jvm/org/apache/storm/daemon/Task.java | 76 +-
.../jvm/org/apache/storm/executor/Executor.java | 576 +++++++++++++
.../apache/storm/executor/ExecutorShutdown.java | 111 +++
.../apache/storm/executor/ExecutorTransfer.java | 87 ++
.../apache/storm/executor/IRunningExecutor.java | 31 +
.../org/apache/storm/executor/TupleInfo.java | 90 ++
.../storm/executor/bolt/BoltExecutor.java | 138 +++
.../executor/bolt/BoltOutputCollectorImpl.java | 171 ++++
.../storm/executor/error/IReportError.java | 22 +
.../storm/executor/error/ReportError.java | 76 ++
.../storm/executor/error/ReportErrorAndDie.java | 47 ++
.../storm/executor/spout/SpoutExecutor.java | 255 ++++++
.../spout/SpoutOutputCollectorImpl.java | 147 ++++
.../apache/storm/stats/BoltExecutorStats.java | 1 +
.../jvm/org/apache/storm/stats/CommonStats.java | 5 +-
.../apache/storm/stats/SpoutExecutorStats.java | 1 +
.../org/apache/storm/task/TopologyContext.java | 32 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 29 +
.../storm/utils/WorkerBackpressureThread.java | 11 +-
.../org/apache/storm/integration_test.clj | 11 +-
.../test/clj/org/apache/storm/grouping_test.clj | 2 +-
28 files changed, 2077 insertions(+), 1026 deletions(-)
----------------------------------------------------------------------