Merge branch 'disruptor' of https://github.com/abhishekagarwal87/storm into STORM-1272
STORM-1272: port backtype.storm.disruptor to java Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7245be6d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7245be6d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7245be6d Branch: refs/heads/master Commit: 7245be6d174cb55ed60efeb14962483e0d446e48 Parents: 12ceb09 6696e3f Author: Robert (Bobby) Evans <[email protected]> Authored: Fri Feb 12 14:09:26 2016 -0600 Committer: Robert (Bobby) Evans <[email protected]> Committed: Fri Feb 12 14:09:26 2016 -0600 ---------------------------------------------------------------------- .../clj/org/apache/storm/daemon/executor.clj | 62 +++++++------- .../src/clj/org/apache/storm/daemon/worker.clj | 54 ++++++------ .../src/clj/org/apache/storm/disruptor.clj | 89 -------------------- .../org/apache/storm/utils/DisruptorQueue.java | 15 ++-- 4 files changed, 70 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/7245be6d/storm-core/src/clj/org/apache/storm/daemon/worker.clj ---------------------------------------------------------------------- diff --cc storm-core/src/clj/org/apache/storm/daemon/worker.clj index fe8cfae,1f530ac..83ae9be --- a/storm-core/src/clj/org/apache/storm/daemon/worker.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/worker.clj @@@ -19,8 -19,9 +19,8 @@@ (:require [clj-time.core :as time]) (:require [clj-time.coerce :as coerce]) (:require [org.apache.storm.daemon [executor :as executor]]) - (:require [org.apache.storm [disruptor :as disruptor] [cluster :as cluster]]) + (:require [org.apache.storm [cluster :as cluster]]) (:require [clojure.set :as set]) - (:require [org.apache.storm.messaging.loader :as msg-loader]) (:import [java.util.concurrent Executors] [org.apache.storm.hooks IWorkerHook BaseWorkerHook] [uk.org.lidalia.sysoutslf4j.context SysOutOverSLF4J]) @@@ -27,10 -29,9 +28,9 @@@ (:import [java.util ArrayList HashMap] [java.util.concurrent.locks ReentrantReadWriteLock]) (:import [org.apache.commons.io FileUtils]) - (:import [org.apache.storm.utils Utils ConfigUtils TransferDrainer ThriftTopologyUtils WorkerBackpressureThread DisruptorQueue Time]) (:import [org.apache.storm.grouping LoadMapping]) (:import [org.apache.storm.messaging TransportFactory]) - (:import [org.apache.storm.messaging TaskMessage IContext IConnection ConnectionWithStatus ConnectionWithStatus$Status]) + (:import [org.apache.storm.messaging TaskMessage IContext IConnection ConnectionWithStatus ConnectionWithStatus$Status DeserializingConnectionCallback]) (:import [org.apache.storm.daemon Shutdownable]) (:import [org.apache.storm.serialization KryoTupleSerializer]) (:import [org.apache.storm.generated StormTopology])
