You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/01/13 18:22:27 UTC

[01/11] storm git commit: solr bolt should handle tick tuples

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 3a5c101f3 -> 68ac3af18


solr bolt should handle tick tuples


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/db03e4a7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/db03e4a7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/db03e4a7

Branch: refs/heads/1.x-branch
Commit: db03e4a768bd9b93395285b97b65d309a0442d5c
Parents: b7ba063
Author: Xin Wang <be...@163.com>
Authored: Fri Dec 25 18:20:42 2015 +0800
Committer: vesense <be...@163.com>
Committed: Tue Dec 29 12:35:17 2015 +0800

----------------------------------------------------------------------
 .../apache/storm/solr/bolt/SolrUpdateBolt.java  | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/db03e4a7/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
index 4a9599e..814d3b2 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
@@ -23,6 +23,8 @@ import backtype.storm.task.TopologyContext;
 import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichBolt;
 import backtype.storm.tuple.Tuple;
+import backtype.storm.utils.TupleUtils;
+
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -41,7 +43,7 @@ import java.util.List;
 import java.util.Map;
 
 public class SolrUpdateBolt extends BaseRichBolt {
-    private static final Logger logger = LoggerFactory.getLogger(SolrUpdateBolt.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SolrUpdateBolt.class);
 
     private final SolrConfig solrConfig;
     private final SolrMapper solrMapper;
@@ -59,7 +61,7 @@ public class SolrUpdateBolt extends BaseRichBolt {
         this.solrConfig = solrConfig;
         this.solrMapper = solrMapper;
         this.commitStgy = commitStgy;
-        logger.debug("Created {} with the following configuration: " +
+        LOG.debug("Created {} with the following configuration: " +
                     "[SolrConfig = {}], [SolrMapper = {}], [CommitStgy = {}]",
                     this.getClass().getSimpleName(), solrConfig, solrMapper, commitStgy);
     }
@@ -92,11 +94,19 @@ public class SolrUpdateBolt extends BaseRichBolt {
         if (commitStgy == null) {
             collector.ack(tuple);
         } else {
-            toCommitTuples.add(tuple);
-            commitStgy.update();
-            if (commitStgy.commit()) {
+            if (TupleUtils.isTick(tuple)) {
+                LOG.debug("TICK! forcing solr client commit");
+                collector.ack(tuple);
+                commitStgy.commit();
                 solrClient.commit(solrMapper.getCollection());
                 ackCommittedTuples();
+            } else {
+                toCommitTuples.add(tuple);
+                commitStgy.update();
+                if (commitStgy.commit()) {
+                    solrClient.commit(solrMapper.getCollection());
+                    ackCommittedTuples();
+                }
             }
         }
     }


[03/11] storm git commit: move tickTupleInterval setting to SolrConfig

Posted by pt...@apache.org.
move tickTupleInterval setting to SolrConfig


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f659ef0e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f659ef0e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f659ef0e

Branch: refs/heads/1.x-branch
Commit: f659ef0e8f7f582d685dca3dabebf73c9f97546c
Parents: cea4436
Author: Xin Wang <be...@163.com>
Authored: Fri Jan 8 12:27:59 2016 +0800
Committer: vesense <be...@163.com>
Committed: Fri Jan 8 12:32:38 2016 +0800

----------------------------------------------------------------------
 .../apache/storm/solr/bolt/SolrUpdateBolt.java  | 20 +++++---------------
 .../apache/storm/solr/config/SolrConfig.java    | 10 ++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/f659ef0e/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
index adb2b92..0c20d6c 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -74,8 +73,9 @@ public class SolrUpdateBolt extends BaseRichBolt {
         this.collector = collector;
         this.solrClient = new CloudSolrClient(solrConfig.getZkHostString());
         this.toCommitTuples = new ArrayList<>(capacity());
+        this.tickTupleInterval = solrConfig.getTickTupleInterval();
 
-        //set default tickTupleInterval if interval is zero
+        //set default tickTupleInterval
         if (stormConf.containsKey("topology.message.timeout.secs") && tickTupleInterval == 0) {
             Integer topologyTimeout = Utils.getInt(stormConf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS));
             tickTupleInterval = (int)(Math.floor(topologyTimeout / 2));
@@ -108,17 +108,12 @@ public class SolrUpdateBolt extends BaseRichBolt {
         if (commitStgy == null) {
             collector.ack(tuple);
         } else {
-            boolean forceCommit = false;
-            if (TupleUtils.isTick(tuple)) {
-                LOG.debug("TICK! forcing solr client commit");
-                collector.ack(tuple);
-                forceCommit = true;
-            } else {
+            final boolean isTickTuple = TupleUtils.isTick(tuple);
+            if (!isTickTuple) {
                 toCommitTuples.add(tuple);
                 commitStgy.update();
             }
-
-            if (forceCommit || commitStgy.commit()) {
+            if (isTickTuple || commitStgy.commit()) {
                 solrClient.commit(solrMapper.getCollection());
                 ackCommittedTuples();
             }
@@ -155,11 +150,6 @@ public class SolrUpdateBolt extends BaseRichBolt {
         return queuedTuples;
     }
 
-    public SolrUpdateBolt withTickIntervalSecs(int tickTupleInterval) {
-        this.tickTupleInterval = tickTupleInterval;
-        return this;
-    }
-
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = super.getComponentConfiguration();

http://git-wip-us.apache.org/repos/asf/storm/blob/f659ef0e/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java b/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
index 009430c..f895912 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
@@ -28,6 +28,7 @@ import java.io.Serializable;
  */
 public class SolrConfig implements Serializable {
     private String zkHostString;
+    private int tickTupleInterval;
 
     /**
      * @param zkHostString Zookeeper host string as defined in the {@link CloudSolrClient} constructor
@@ -39,4 +40,13 @@ public class SolrConfig implements Serializable {
     public String getZkHostString() {
         return zkHostString;
     }
+
+    public int getTickTupleInterval() {
+        return tickTupleInterval;
+    }
+
+    public void setTickTupleInterval(int tickTupleInterval) {
+        this.tickTupleInterval = tickTupleInterval;
+    }
+    
 }


[06/11] storm git commit: resolve conflicts

Posted by pt...@apache.org.
resolve conflicts


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bf45b96e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bf45b96e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bf45b96e

Branch: refs/heads/1.x-branch
Commit: bf45b96e496551e9319eae26cde985965afea5cf
Parents: f659ef0
Author: Xin Wang <be...@163.com>
Authored: Sat Jan 9 22:00:19 2016 +0800
Committer: vesense <be...@163.com>
Committed: Wed Jan 13 13:39:00 2016 +0800

----------------------------------------------------------------------
 .../apache/storm/solr/bolt/SolrUpdateBolt.java  | 27 +++-----
 .../apache/storm/solr/config/SolrConfig.java    | 17 +++--
 .../jvm/backtype/storm/utils/TupleUtils.java    | 35 -----------
 .../jvm/org/apache/storm/utils/TupleUtils.java  | 65 ++++++++++++++++++++
 4 files changed, 86 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/bf45b96e/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
index 0c20d6c..8d4affd 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
@@ -53,7 +53,7 @@ public class SolrUpdateBolt extends BaseRichBolt {
     private SolrClient solrClient;
     private OutputCollector collector;
     private List<Tuple> toCommitTuples;
-    private Integer tickTupleInterval = 0;
+    private int tickTupleInterval;
 
     public SolrUpdateBolt(SolrConfig solrConfig, SolrMapper solrMapper) {
         this(solrConfig, solrMapper, null);
@@ -73,15 +73,17 @@ public class SolrUpdateBolt extends BaseRichBolt {
         this.collector = collector;
         this.solrClient = new CloudSolrClient(solrConfig.getZkHostString());
         this.toCommitTuples = new ArrayList<>(capacity());
-        this.tickTupleInterval = solrConfig.getTickTupleInterval();
 
-        //set default tickTupleInterval
-        if (stormConf.containsKey("topology.message.timeout.secs") && tickTupleInterval == 0) {
+        setTickTupleInterval(stormConf);   
+    }
+
+    private void setTickTupleInterval(Map stormConf) {
+        this.tickTupleInterval = solrConfig.getTickTupleInterval();
+        if(stormConf.containsKey(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS)  && tickTupleInterval == 0) {
             Integer topologyTimeout = Utils.getInt(stormConf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS));
             tickTupleInterval = (int)(Math.floor(topologyTimeout / 2));
             LOG.debug("Setting tick tuple interval to [{}] based on topology timeout", tickTupleInterval);
         }
-
     }
 
     private int capacity() {
@@ -94,7 +96,7 @@ public class SolrUpdateBolt extends BaseRichBolt {
     @Override
     public void execute(Tuple tuple) {
         try {
-            if (!TupleUtils.isTick(tuple)) {//Don't add tick tuples to the SolrRequest
+            if (!TupleUtils.isTick(tuple)) {    // Don't add tick tuples to the SolrRequest
                 SolrRequest request = solrMapper.toSolrRequest(tuple);
                 solrClient.request(request, solrMapper.getCollection());
             }
@@ -109,7 +111,7 @@ public class SolrUpdateBolt extends BaseRichBolt {
             collector.ack(tuple);
         } else {
             final boolean isTickTuple = TupleUtils.isTick(tuple);
-            if (!isTickTuple) {
+            if (!isTickTuple) {    // Don't ack tick tuples
                 toCommitTuples.add(tuple);
                 commitStgy.update();
             }
@@ -152,16 +154,7 @@ public class SolrUpdateBolt extends BaseRichBolt {
 
     @Override
     public Map<String, Object> getComponentConfiguration() {
-        Map<String, Object> conf = super.getComponentConfiguration();
-        if (conf == null)
-            conf = new Config();
-
-        if (tickTupleInterval > 0) {
-            LOG.info("Enabling tick tuple with interval [{}]", tickTupleInterval);
-            conf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, tickTupleInterval);
-        }
-
-        return conf;
+        return TupleUtils.putTickFreqencyIntoComponentConfig(super.getComponentConfiguration(), tickTupleInterval);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/storm/blob/bf45b96e/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java b/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
index f895912..1803a96 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
@@ -27,14 +27,23 @@ import java.io.Serializable;
  * the bolts should be put in this class.
  */
 public class SolrConfig implements Serializable {
-    private String zkHostString;
-    private int tickTupleInterval;
+    private final String zkHostString;
+    private final int tickTupleInterval;
 
     /**
      * @param zkHostString Zookeeper host string as defined in the {@link CloudSolrClient} constructor
      * */
     public SolrConfig(String zkHostString) {
+       this(zkHostString, 0);
+    }
+
+    /**
+     * @param zkHostString Zookeeper host string as defined in the {@link CloudSolrClient} constructor
+     * @param tickTupleInterval interval for tick tuples
+     * */
+    public SolrConfig(String zkHostString, int tickTupleInterval) {
         this.zkHostString = zkHostString;
+        this.tickTupleInterval = tickTupleInterval;
     }
 
     public String getZkHostString() {
@@ -45,8 +54,4 @@ public class SolrConfig implements Serializable {
         return tickTupleInterval;
     }
 
-    public void setTickTupleInterval(int tickTupleInterval) {
-        this.tickTupleInterval = tickTupleInterval;
-    }
-    
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/bf45b96e/storm-core/src/jvm/backtype/storm/utils/TupleUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/TupleUtils.java b/storm-core/src/jvm/backtype/storm/utils/TupleUtils.java
deleted file mode 100644
index f9fb2c0..0000000
--- a/storm-core/src/jvm/backtype/storm/utils/TupleUtils.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package backtype.storm.utils;
-
-import backtype.storm.Constants;
-import backtype.storm.tuple.Tuple;
-
-public final class TupleUtils {
-
-  private TupleUtils() {
-    // No instantiation
-  }
-
-  public static boolean isTick(Tuple tuple) {
-    return tuple != null
-           && Constants.SYSTEM_COMPONENT_ID  .equals(tuple.getSourceComponent())
-           && Constants.SYSTEM_TICK_STREAM_ID.equals(tuple.getSourceStreamId());
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/storm/blob/bf45b96e/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java b/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
new file mode 100644
index 0000000..338d1c2
--- /dev/null
+++ b/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.storm.utils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import backtype.storm.Config;
+import backtype.storm.Constants;
+import backtype.storm.tuple.Tuple;
+
+public final class TupleUtils {
+    private static final Logger LOG = LoggerFactory.getLogger(TupleUtils.class);
+
+    private TupleUtils() {
+      // No instantiation
+    }
+
+    public static boolean isTick(Tuple tuple) {
+      return tuple != null
+             && Constants.SYSTEM_COMPONENT_ID.equals(tuple.getSourceComponent())
+             && Constants.SYSTEM_TICK_STREAM_ID.equals(tuple.getSourceStreamId());
+    }
+
+    public static <T> int listHashCode(List<T> alist) {
+      if (alist == null) {
+          return 1;
+      } else {
+          return Arrays.deepHashCode(alist.toArray());
+      }
+    }
+
+    public static Map<String, Object> putTickFreqencyIntoComponentConfig(Map<String, Object> conf, int tickFreqSecs) {
+      if (conf == null) {
+          conf = new Config();
+      }
+
+      if (tickFreqSecs > 0) {
+          LOG.info("Enabling tick tuple with interval [{}]", tickFreqSecs);
+          conf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, tickFreqSecs);
+      }
+
+      return conf;
+    }
+
+}


[08/11] storm git commit: Merge remote-tracking branch 'apache/master' into STORM-1419

Posted by pt...@apache.org.
Merge remote-tracking branch 'apache/master' into STORM-1419

# Conflicts:

#	external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
#	storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/023cebd0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/023cebd0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/023cebd0

Branch: refs/heads/1.x-branch
Commit: 023cebd062e002577e7a4ed38ef795060040f812
Parents: bf45b96 2289d36
Author: vesense <be...@163.com>
Authored: Wed Jan 13 13:51:08 2016 +0800
Committer: vesense <be...@163.com>
Committed: Wed Jan 13 13:51:08 2016 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |    44 +-
 DEVELOPER.md                                    |    12 +-
 README.markdown                                 |     3 +
 SECURITY.md                                     |    14 +-
 bin/storm-config.cmd                            |     4 +-
 bin/storm.cmd                                   |    38 +-
 bin/storm.py                                    |    97 +-
 conf/defaults.yaml                              |    47 +-
 conf/storm.yaml.example                         |     2 +-
 dev-tools/report/report.py                      |    15 +-
 dev-tools/travis/travis-install.sh              |     1 -
 dev-tools/travis/travis-script.sh               |     2 +-
 docs/documentation/FAQ.md                       |     4 +
 docs/documentation/Kestrel-and-Storm.md         |     4 +-
 docs/documentation/State-checkpointing.md       |   147 +
 docs/documentation/dynamic-worker-profiling.md  |     6 +-
 .../images/dynamic_profiling_debugging_1.png    |   Bin 93635 -> 56876 bytes
 .../images/dynamic_profiling_debugging_2.png    |   Bin 138120 -> 99164 bytes
 .../images/dynamic_profiling_debugging_4.png    |   Bin 0 -> 121994 bytes
 examples/storm-starter/README.markdown          |    28 +-
 .../multilang/resources/randomsentence.js       |     2 +-
 examples/storm-starter/pom.xml                  |    27 +-
 .../org/apache/storm/starter/clj/word_count.clj |    95 +
 .../src/clj/storm/starter/clj/word_count.clj    |    95 -
 .../apache/storm/starter/BasicDRPCTopology.java |    78 +
 .../starter/BlobStoreAPIWordCountTopology.java  |   304 +
 .../storm/starter/ExclamationTopology.java      |    87 +
 .../storm/starter/FastWordCountTopology.java    |   198 +
 .../storm/starter/InOrderDeliveryTest.java      |   175 +
 .../org/apache/storm/starter/ManualDRPC.java    |    68 +
 .../storm/starter/MultipleLoggerTopology.java   |   105 +
 .../apache/storm/starter/PrintSampleStream.java |    58 +
 .../org/apache/storm/starter/ReachTopology.java |   196 +
 .../starter/ResourceAwareExampleTopology.java   |   106 +
 .../apache/storm/starter/RollingTopWords.java   |   130 +
 .../apache/storm/starter/SingleJoinExample.java |    64 +
 .../storm/starter/SkewedRollingTopWords.java    |   132 +
 .../storm/starter/SlidingTupleTsTopology.java   |    62 +
 .../storm/starter/SlidingWindowTopology.java    |   108 +
 .../storm/starter/ThroughputVsLatency.java      |   432 +
 .../storm/starter/TransactionalGlobalCount.java |   174 +
 .../storm/starter/TransactionalWords.java       |   246 +
 .../apache/storm/starter/WordCountTopology.java |   106 +
 .../storm/starter/WordCountTopologyNode.java    |   121 +
 .../storm/starter/bolt/AbstractRankerBolt.java  |   110 +
 .../starter/bolt/IntermediateRankingsBolt.java  |    58 +
 .../apache/storm/starter/bolt/PrinterBolt.java  |    37 +
 .../storm/starter/bolt/RollingCountAggBolt.java |    77 +
 .../storm/starter/bolt/RollingCountBolt.java    |   142 +
 .../storm/starter/bolt/SingleJoinBolt.java      |   114 +
 .../starter/bolt/SlidingWindowSumBolt.java      |    80 +
 .../storm/starter/bolt/TotalRankingsBolt.java   |    59 +
 .../storm/starter/spout/RandomIntegerSpout.java |    55 +
 .../starter/spout/RandomSentenceSpout.java      |    64 +
 .../storm/starter/spout/TwitterSampleSpout.java |   164 +
 .../tools/NthLastModifiedTimeTracker.java       |    70 +
 .../apache/storm/starter/tools/Rankable.java    |    32 +
 .../starter/tools/RankableObjectWithFields.java |   148 +
 .../apache/storm/starter/tools/Rankings.java    |   156 +
 .../starter/tools/SlidingWindowCounter.java     |   119 +
 .../storm/starter/tools/SlotBasedCounter.java   |   118 +
 .../starter/trident/TridentKafkaWordCount.java  |   229 +
 .../storm/starter/trident/TridentReach.java     |   156 +
 .../storm/starter/trident/TridentWordCount.java |    85 +
 .../apache/storm/starter/util/StormRunner.java  |    48 +
 .../jvm/storm/starter/BasicDRPCTopology.java    |    78 -
 .../jvm/storm/starter/ExclamationTopology.java  |    87 -
 .../storm/starter/FastWordCountTopology.java    |   198 -
 .../jvm/storm/starter/InOrderDeliveryTest.java  |   175 -
 .../src/jvm/storm/starter/ManualDRPC.java       |    68 -
 .../storm/starter/MultipleLoggerTopology.java   |   105 -
 .../jvm/storm/starter/PrintSampleStream.java    |    58 -
 .../src/jvm/storm/starter/ReachTopology.java    |   196 -
 .../starter/ResourceAwareExampleTopology.java   |   106 -
 .../src/jvm/storm/starter/RollingTopWords.java  |   130 -
 .../jvm/storm/starter/SingleJoinExample.java    |    64 -
 .../storm/starter/SkewedRollingTopWords.java    |   132 -
 .../storm/starter/SlidingTupleTsTopology.java   |    62 -
 .../storm/starter/SlidingWindowTopology.java    |   108 -
 .../src/jvm/storm/starter/StatefulTopology.java |   144 +
 .../jvm/storm/starter/ThroughputVsLatency.java  |   432 -
 .../storm/starter/TransactionalGlobalCount.java |   174 -
 .../jvm/storm/starter/TransactionalWords.java   |   246 -
 .../jvm/storm/starter/WordCountTopology.java    |   107 -
 .../storm/starter/WordCountTopologyNode.java    |   121 -
 .../storm/starter/bolt/AbstractRankerBolt.java  |   110 -
 .../starter/bolt/IntermediateRankingsBolt.java  |    58 -
 .../src/jvm/storm/starter/bolt/PrinterBolt.java |    37 -
 .../storm/starter/bolt/RollingCountAggBolt.java |    77 -
 .../storm/starter/bolt/RollingCountBolt.java    |   142 -
 .../jvm/storm/starter/bolt/SingleJoinBolt.java  |   114 -
 .../starter/bolt/SlidingWindowSumBolt.java      |    80 -
 .../storm/starter/bolt/TotalRankingsBolt.java   |    59 -
 .../storm/starter/spout/RandomIntegerSpout.java |    55 -
 .../starter/spout/RandomSentenceSpout.java      |    64 -
 .../storm/starter/spout/TwitterSampleSpout.java |   164 -
 .../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 -
 .../starter/trident/TridentKafkaWordCount.java  |   229 -
 .../jvm/storm/starter/trident/TridentReach.java |   156 -
 .../storm/starter/trident/TridentWordCount.java |    85 -
 .../src/jvm/storm/starter/util/StormRunner.java |    48 -
 .../bolt/IntermediateRankingsBoltTest.java      |   146 +
 .../starter/bolt/RollingCountBoltTest.java      |   113 +
 .../starter/bolt/TotalRankingsBoltTest.java     |   147 +
 .../tools/NthLastModifiedTimeTrackerTest.java   |   125 +
 .../tools/RankableObjectWithFieldsTest.java     |   252 +
 .../storm/starter/tools/RankingsTest.java       |   368 +
 .../starter/tools/SlidingWindowCounterTest.java |   106 +
 .../starter/tools/SlotBasedCounterTest.java     |   181 +
 .../bolt/IntermediateRankingsBoltTest.java      |   146 -
 .../starter/bolt/RollingCountBoltTest.java      |   113 -
 .../starter/bolt/TotalRankingsBoltTest.java     |   147 -
 .../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 -
 external/flux/README.md                         |    50 +-
 external/flux/flux-core/pom.xml                 |     2 +-
 .../main/java/org/apache/storm/flux/Flux.java   |    14 +-
 .../java/org/apache/storm/flux/FluxBuilder.java |    16 +-
 .../apache/storm/flux/api/TopologySource.java   |     2 +-
 .../storm/flux/model/ExecutionContext.java      |     6 +-
 .../org/apache/storm/flux/model/ObjectDef.java  |     2 +-
 .../apache/storm/flux/model/TopologyDef.java    |     2 +-
 .../java/org/apache/storm/flux/TCKTest.java     |     4 +-
 .../apache/storm/flux/test/SimpleTopology.java  |     4 +-
 .../storm/flux/test/SimpleTopologySource.java   |     4 +-
 .../test/SimpleTopologyWithConfigParam.java     |     6 +-
 .../org/apache/storm/flux/test/TestBolt.java    |     8 +-
 .../storm/flux/test/TridentTopologySource.java  |    24 +-
 .../src/test/resources/configs/bad_hbase.yaml   |    10 +-
 .../resources/configs/config-methods-test.yaml  |     2 +-
 .../resources/configs/diamond-topology.yaml     |     2 +-
 .../src/test/resources/configs/hdfs_test.yaml   |     2 +-
 .../src/test/resources/configs/kafka_test.yaml  |    14 +-
 .../src/test/resources/configs/shell_test.yaml  |     2 +-
 .../test/resources/configs/simple_hbase.yaml    |    10 +-
 .../resources/configs/substitution-test.yaml    |     2 +-
 .../src/test/resources/configs/tck.yaml         |     6 +-
 external/flux/flux-examples/pom.xml             |     2 +-
 .../storm/flux/examples/TestPrintBolt.java      |    10 +-
 .../storm/flux/examples/TestWindowBolt.java     |    14 +-
 .../apache/storm/flux/examples/WordCounter.java |    18 +-
 .../src/main/resources/kafka_spout.yaml         |    14 +-
 .../src/main/resources/multilang.yaml           |     2 +-
 .../src/main/resources/simple_hbase.yaml        |     6 +-
 .../src/main/resources/simple_hdfs.yaml         |     4 +-
 .../src/main/resources/simple_windowing.yaml    |     6 +-
 .../src/main/resources/simple_wordcount.yaml    |     4 +-
 external/flux/flux-wrappers/pom.xml             |     2 +-
 .../flux/wrappers/bolts/FluxShellBolt.java      |     8 +-
 .../storm/flux/wrappers/bolts/LogInfoBolt.java  |     8 +-
 .../flux/wrappers/spouts/FluxShellSpout.java    |     8 +-
 .../main/resources/resources/randomsentence.js  |     2 +-
 external/flux/pom.xml                           |     2 +-
 external/sql/README.md                          |     6 +-
 external/sql/pom.xml                            |     2 +-
 external/sql/storm-sql-core/pom.xml             |     2 +-
 .../src/jvm/org/apache/storm/sql/StormSql.java  |     4 +-
 .../jvm/org/apache/storm/sql/StormSqlImpl.java  |     6 +-
 .../org/apache/storm/sql/StormSqlRunner.java    |     6 +-
 .../backends/standalone/PlanCompiler.java       |     2 +-
 .../compiler/backends/trident/PlanCompiler.java |    18 +-
 .../backends/trident/RelNodeCompiler.java       |     2 +-
 .../test/org/apache/storm/sql/TestStormSql.java |    12 +-
 .../storm/sql/compiler/TestExprSemantic.java    |     2 +-
 .../backends/standalone/TestPlanCompiler.java   |     2 +-
 .../backends/trident/TestPlanCompiler.java      |    16 +-
 external/sql/storm-sql-kafka/pom.xml            |     2 +-
 .../org/apache/storm/sql/kafka/JsonScheme.java  |     8 +-
 .../sql/kafka/KafkaDataSourcesProvider.java     |    26 +-
 .../storm/sql/kafka/TestJsonRepresentation.java |     2 +-
 .../sql/kafka/TestKafkaDataSourcesProvider.java |     4 +-
 external/sql/storm-sql-runtime/pom.xml          |     2 +-
 .../sql/runtime/AbstractChannelHandler.java     |     2 +-
 .../sql/runtime/AbstractValuesProcessor.java    |     2 +-
 .../storm/sql/runtime/ChannelContext.java       |     2 +-
 .../storm/sql/runtime/ChannelHandler.java       |     2 +-
 .../org/apache/storm/sql/runtime/Channels.java  |     2 +-
 .../sql/runtime/ISqlTridentDataSource.java      |     6 +-
 .../trident/AbstractTridentProcessor.java       |     4 +-
 .../test/org/apache/storm/sql/TestUtils.java    |    20 +-
 external/storm-cassandra/README.md              |    70 +-
 external/storm-cassandra/pom.xml                |     9 +-
 .../AbstractExecutionResultHandler.java         |     4 +-
 .../cassandra/BaseExecutionResultHandler.java   |     4 +-
 .../cassandra/DynamicStatementBuilder.java      |    99 +-
 .../storm/cassandra/ExecutionResultHandler.java |     4 +-
 .../storm/cassandra/Murmur3StreamGrouping.java  |    14 +-
 .../storm/cassandra/bolt/BaseCassandraBolt.java |    20 +-
 .../bolt/BatchCassandraWriterBolt.java          |    10 +-
 .../cassandra/bolt/CassandraWriterBolt.java     |     2 +-
 .../cassandra/bolt/GroupingBatchBuilder.java    |     2 +-
 .../bolt/PairBatchStatementTuples.java          |     2 +-
 .../cassandra/bolt/PairStatementTuple.java      |     2 +-
 .../storm/cassandra/client/CassandraConf.java   |     2 +-
 .../cassandra/executor/AsyncResultHandler.java  |     2 +-
 .../executor/ExecutionResultCollector.java      |     8 +-
 .../executor/impl/BatchAsyncResultHandler.java  |     4 +-
 .../executor/impl/SingleAsyncResultHandler.java |     4 +-
 .../query/BaseCQLStatementTupleMapper.java      |    51 +
 .../query/BatchStatementTupleMapper.java        |    57 -
 .../cassandra/query/CQLClauseTupleMapper.java   |    36 -
 .../query/CQLResultSetValuesMapper.java         |     4 +-
 .../cassandra/query/CQLStatementBuilder.java    |     4 +-
 .../query/CQLStatementTupleMapper.java          |    29 +-
 .../cassandra/query/CQLTableTupleMapper.java    |    39 -
 .../cassandra/query/CQLValuesTupleMapper.java   |    74 -
 .../apache/storm/cassandra/query/Column.java    |    74 +
 .../storm/cassandra/query/ContextQuery.java     |     2 +-
 .../apache/storm/cassandra/query/CqlMapper.java |    86 +
 .../query/SimpleCQLStatementTupleMapper.java    |    51 -
 .../builder/BoundCQLStatementMapperBuilder.java |   106 +
 .../SimpleCQLStatementMapperBuilder.java        |    92 +
 .../impl/BatchCQLStatementTupleMapper.java      |    58 +
 .../impl/BoundCQLStatementTupleMapper.java      |   106 +
 .../query/impl/BoundStatementMapperBuilder.java |   109 -
 .../query/impl/InsertStatementBuilder.java      |   153 -
 .../query/impl/PreparedStatementBinder.java     |   143 +
 .../query/impl/RoutingKeyGenerator.java         |    52 +
 .../query/impl/SimpleCQLStatementMapper.java    |    88 +
 .../query/impl/UpdateStatementBuilder.java      |   118 -
 .../cassandra/query/selector/FieldSelector.java |    10 +-
 .../cassandra/trident/state/CassandraQuery.java |     8 +-
 .../cassandra/trident/state/CassandraState.java |    10 +-
 .../trident/state/CassandraStateFactory.java    |     6 +-
 .../trident/state/CassandraStateUpdater.java    |     6 +-
 .../state/TridentResultSetValuesMapper.java     |     6 +-
 .../cassandra/DynamicStatementBuilderTest.java  |   141 -
 .../apache/storm/cassandra/WeatherSpout.java    |    14 +-
 .../storm/cassandra/bolt/BaseTopologyTest.java  |    60 -
 .../bolt/BatchCassandraWriterBoltTest.java      |    66 -
 .../cassandra/bolt/CassandraWriterBoltTest.java |    67 -
 .../cassandra/trident/TridentTopologyTest.java  |   125 -
 .../cassandra/trident/WeatherBatchSpout.java    |     8 +-
 external/storm-elasticsearch/pom.xml            |     2 +-
 .../elasticsearch/ElasticsearchGetRequest.java  |     2 +-
 .../elasticsearch/EsLookupResultOutput.java     |     4 +-
 .../elasticsearch/bolt/AbstractEsBolt.java      |    10 +-
 .../storm/elasticsearch/bolt/EsIndexBolt.java   |     8 +-
 .../storm/elasticsearch/bolt/EsLookupBolt.java  |     6 +-
 .../elasticsearch/bolt/EsPercolateBolt.java     |    12 +-
 .../common/DefaultEsTupleMapper.java            |     2 +-
 .../elasticsearch/common/EsTupleMapper.java     |     2 +-
 .../storm/elasticsearch/trident/EsState.java    |     6 +-
 .../elasticsearch/trident/EsStateFactory.java   |     6 +-
 .../storm/elasticsearch/trident/EsUpdater.java  |     6 +-
 .../bolt/AbstractEsBoltIntegrationTest.java     |     2 +-
 .../elasticsearch/bolt/AbstractEsBoltTest.java  |     4 +-
 .../elasticsearch/bolt/EsIndexBoltTest.java     |     4 +-
 .../elasticsearch/bolt/EsIndexTopology.java     |    18 +-
 .../bolt/EsLookupBoltIntegrationTest.java       |    10 +-
 .../elasticsearch/bolt/EsLookupBoltTest.java    |     8 +-
 .../elasticsearch/bolt/EsPercolateBoltTest.java |     6 +-
 .../storm/elasticsearch/common/EsTestUtil.java  |    16 +-
 .../trident/TridentEsTopology.java              |    22 +-
 external/storm-eventhubs/pom.xml                |     4 +-
 .../eventhubs/bolt/DefaultEventDataFormat.java  |     2 +-
 .../storm/eventhubs/bolt/EventHubBolt.java      |    10 +-
 .../storm/eventhubs/bolt/IEventDataFormat.java  |     2 +-
 .../storm/eventhubs/samples/EventCount.java     |    12 +-
 .../storm/eventhubs/samples/EventHubLoop.java   |     4 +-
 .../samples/OpaqueTridentEventCount.java        |    14 +-
 .../samples/TransactionalTridentEventCount.java |    18 +-
 .../eventhubs/samples/bolt/GlobalCountBolt.java |    14 +-
 .../samples/bolt/PartialCountBolt.java          |    14 +-
 .../storm/eventhubs/spout/EventDataScheme.java  |     2 +-
 .../eventhubs/spout/EventHubReceiverImpl.java   |     6 +-
 .../storm/eventhubs/spout/EventHubSpout.java    |    12 +-
 .../storm/eventhubs/spout/IEventDataScheme.java |     2 +-
 .../storm/eventhubs/trident/Coordinator.java    |     4 +-
 .../trident/OpaqueTridentEventHubEmitter.java   |     6 +-
 .../trident/OpaqueTridentEventHubSpout.java     |     6 +-
 .../storm/eventhubs/trident/Partition.java      |     2 +-
 .../TransactionalTridentEventHubEmitter.java    |     8 +-
 .../TransactionalTridentEventHubSpout.java      |     6 +-
 .../spout/EventHubSpoutCallerMock.java          |     4 +-
 .../spout/SpoutOutputCollectorMock.java         |     2 +-
 .../eventhubs/trident/TridentCollectorMock.java |     2 +-
 external/storm-hbase/pom.xml                    |     2 +-
 .../storm/hbase/bolt/AbstractHBaseBolt.java     |     8 +-
 .../org/apache/storm/hbase/bolt/HBaseBolt.java  |    11 +-
 .../storm/hbase/bolt/HBaseLookupBolt.java       |    13 +-
 .../storm/hbase/bolt/mapper/HBaseMapper.java    |     4 +-
 .../hbase/bolt/mapper/HBaseValueMapper.java     |     6 +-
 .../hbase/bolt/mapper/SimpleHBaseMapper.java    |     4 +-
 .../apache/storm/hbase/security/AutoHBase.java  |     8 +-
 .../storm/hbase/security/HBaseSecurityUtil.java |     2 +-
 .../mapper/SimpleTridentHBaseMapper.java        |     6 +-
 .../trident/mapper/TridentHBaseMapper.java      |     6 +-
 .../hbase/trident/state/HBaseMapState.java      |    10 +-
 .../storm/hbase/trident/state/HBaseQuery.java   |     8 +-
 .../storm/hbase/trident/state/HBaseState.java   |    12 +-
 .../hbase/trident/state/HBaseStateFactory.java  |     6 +-
 .../storm/hbase/trident/state/HBaseUpdater.java |     6 +-
 .../storm/hbase/topology/LookupWordCount.java   |    10 +-
 .../hbase/topology/PersistentWordCount.java     |    10 +-
 .../storm/hbase/topology/TotalWordCounter.java  |    16 +-
 .../hbase/topology/WordCountValueMapper.java    |     8 +-
 .../storm/hbase/topology/WordCounter.java       |    16 +-
 .../apache/storm/hbase/topology/WordSpout.java  |    12 +-
 .../storm/hbase/trident/PrintFunction.java      |     6 +-
 .../storm/hbase/trident/WordCountTrident.java   |    22 +-
 external/storm-hdfs/README.md                   |     2 +-
 external/storm-hdfs/pom.xml                     |    25 +-
 .../storm/hdfs/blobstore/HdfsBlobStore.java     |    32 +-
 .../storm/hdfs/blobstore/HdfsBlobStoreFile.java |     4 +-
 .../storm/hdfs/blobstore/HdfsBlobStoreImpl.java |     6 +-
 .../hdfs/blobstore/HdfsClientBlobStore.java     |    18 +-
 .../storm/hdfs/bolt/AbstractHdfsBolt.java       |    31 +-
 .../storm/hdfs/bolt/AvroGenericRecordBolt.java  |    10 +-
 .../org/apache/storm/hdfs/bolt/HdfsBolt.java    |     6 +-
 .../storm/hdfs/bolt/SequenceFileBolt.java       |     6 +-
 .../hdfs/bolt/format/DefaultFileNameFormat.java |     2 +-
 .../hdfs/bolt/format/DefaultSequenceFormat.java |     2 +-
 .../hdfs/bolt/format/DelimitedRecordFormat.java |     4 +-
 .../storm/hdfs/bolt/format/FileNameFormat.java  |     2 +-
 .../storm/hdfs/bolt/format/RecordFormat.java    |     2 +-
 .../storm/hdfs/bolt/format/SequenceFormat.java  |     2 +-
 .../hdfs/bolt/rotation/FileRotationPolicy.java  |     2 +-
 .../bolt/rotation/FileSizeRotationPolicy.java   |     2 +-
 .../hdfs/bolt/rotation/NoRotationPolicy.java    |     2 +-
 .../hdfs/bolt/rotation/TimedRotationPolicy.java |     2 +-
 .../storm/hdfs/bolt/sync/CountSyncPolicy.java   |     2 +-
 .../apache/storm/hdfs/bolt/sync/SyncPolicy.java |     2 +-
 .../storm/hdfs/common/security/AutoHDFS.java    |     8 +-
 .../hdfs/common/security/HdfsSecurityUtil.java  |     4 +-
 .../apache/storm/hdfs/trident/HdfsState.java    |    12 +-
 .../storm/hdfs/trident/HdfsStateFactory.java    |     6 +-
 .../apache/storm/hdfs/trident/HdfsUpdater.java  |     6 +-
 .../trident/format/DefaultSequenceFormat.java   |     2 +-
 .../trident/format/DelimitedRecordFormat.java   |     4 +-
 .../storm/hdfs/trident/format/RecordFormat.java |     2 +-
 .../hdfs/trident/format/SequenceFormat.java     |     2 +-
 .../trident/rotation/FileRotationPolicy.java    |     2 +-
 .../rotation/FileSizeRotationPolicy.java        |     2 +-
 .../hdfs/trident/rotation/NoRotationPolicy.java |     2 +-
 .../trident/rotation/TimedRotationPolicy.java   |     2 +-
 .../hdfs/trident/sync/CountSyncPolicy.java      |     2 +-
 .../storm/hdfs/trident/sync/SyncPolicy.java     |     2 +-
 .../storm/hdfs/blobstore/BlobStoreTest.java     |    32 +-
 .../hdfs/blobstore/HdfsBlobStoreImplTest.java   |     6 +-
 .../hdfs/bolt/AvroGenericRecordBoltTest.java    |    18 +-
 .../storm/hdfs/bolt/HdfsFileTopology.java       |    26 +-
 .../storm/hdfs/bolt/SequenceFileTopology.java   |    26 +-
 .../apache/storm/hdfs/bolt/TestHdfsBolt.java    |    20 +-
 .../storm/hdfs/bolt/TestSequenceFileBolt.java   |    20 +-
 .../storm/hdfs/trident/FixedBatchSpout.java     |    12 +-
 .../storm/hdfs/trident/HdfsStateTest.java       |     8 +-
 .../storm/hdfs/trident/TridentFileTopology.java |    26 +-
 .../hdfs/trident/TridentSequenceTopology.java   |    26 +-
 external/storm-hive/pom.xml                     |     2 +-
 .../org/apache/storm/hive/bolt/HiveBolt.java    |    25 +-
 .../bolt/mapper/DelimitedRecordHiveMapper.java  |     6 +-
 .../storm/hive/bolt/mapper/HiveMapper.java      |     6 +-
 .../hive/bolt/mapper/JsonRecordHiveMapper.java  |     6 +-
 .../apache/storm/hive/common/HiveOptions.java   |     7 +-
 .../apache/storm/hive/common/HiveWriter.java    |     2 +-
 .../apache/storm/hive/trident/HiveState.java    |    10 +-
 .../storm/hive/trident/HiveStateFactory.java    |     6 +-
 .../apache/storm/hive/trident/HiveUpdater.java  |     6 +-
 .../apache/storm/hive/bolt/HiveTopology.java    |    20 +-
 .../hive/bolt/HiveTopologyPartitioned.java      |    22 +-
 .../apache/storm/hive/bolt/TestHiveBolt.java    |    22 +-
 .../storm/hive/common/TestHiveWriter.java       |    14 +-
 .../storm/hive/trident/TridentHiveTopology.java |    26 +-
 external/storm-jdbc/pom.xml                     |     6 +-
 .../storm/jdbc/bolt/AbstractJdbcBolt.java       |     8 +-
 .../apache/storm/jdbc/bolt/JdbcInsertBolt.java  |     8 +-
 .../apache/storm/jdbc/bolt/JdbcLookupBolt.java  |     6 +-
 .../storm/jdbc/common/ConnectionProvider.java   |     1 -
 .../jdbc/common/HikariCPConnectionProvider.java |     2 +-
 .../storm/jdbc/mapper/JdbcLookupMapper.java     |     6 +-
 .../apache/storm/jdbc/mapper/JdbcMapper.java    |     2 +-
 .../jdbc/mapper/SimpleJdbcLookupMapper.java     |     8 +-
 .../storm/jdbc/mapper/SimpleJdbcMapper.java     |     2 +-
 .../storm/jdbc/trident/state/JdbcQuery.java     |     8 +-
 .../storm/jdbc/trident/state/JdbcState.java     |    12 +-
 .../jdbc/trident/state/JdbcStateFactory.java    |     6 +-
 .../storm/jdbc/trident/state/JdbcUpdater.java   |     6 +-
 .../storm/jdbc/bolt/JdbcLookupBoltTest.java     |     2 +-
 .../org/apache/storm/jdbc/spout/UserSpout.java  |    12 +-
 .../jdbc/topology/AbstractUserTopology.java     |    10 +-
 .../jdbc/topology/UserPersistanceTopology.java  |     4 +-
 .../UserPersistanceTridentTopology.java         |    10 +-
 external/storm-kafka/README.md                  |    10 +-
 external/storm-kafka/pom.xml                    |     2 +-
 .../src/jvm/org/apache/storm/kafka/Broker.java  |    86 +
 .../jvm/org/apache/storm/kafka/BrokerHosts.java |    25 +
 .../storm/kafka/ByteBufferSerializer.java       |    41 +
 .../storm/kafka/DynamicBrokersReader.java       |   213 +
 .../kafka/DynamicPartitionConnections.java      |    98 +
 .../ExponentialBackoffMsgRetryManager.java      |   184 +
 .../storm/kafka/FailedFetchException.java       |    29 +
 .../storm/kafka/FailedMsgRetryManager.java      |    29 +
 .../org/apache/storm/kafka/IntSerializer.java   |    42 +
 .../jvm/org/apache/storm/kafka/KafkaConfig.java |    53 +
 .../jvm/org/apache/storm/kafka/KafkaError.java  |    43 +
 .../jvm/org/apache/storm/kafka/KafkaSpout.java  |   198 +
 .../jvm/org/apache/storm/kafka/KafkaUtils.java  |   275 +
 .../org/apache/storm/kafka/KeyValueScheme.java  |    27 +
 .../kafka/KeyValueSchemeAsMultiScheme.java      |    38 +
 .../storm/kafka/MessageMetadataScheme.java      |    27 +
 .../MessageMetadataSchemeAsMultiScheme.java     |    41 +
 .../jvm/org/apache/storm/kafka/Partition.java   |    87 +
 .../storm/kafka/PartitionCoordinator.java       |    28 +
 .../apache/storm/kafka/PartitionManager.java    |   316 +
 .../jvm/org/apache/storm/kafka/SpoutConfig.java |    46 +
 .../apache/storm/kafka/StaticCoordinator.java   |    52 +
 .../jvm/org/apache/storm/kafka/StaticHosts.java |    38 +
 .../storm/kafka/StaticPartitionConnections.java |    52 +
 .../storm/kafka/StringKeyValueScheme.java       |    38 +
 .../kafka/StringMessageAndMetadataScheme.java   |    43 +
 .../storm/kafka/StringMultiSchemeWithTopic.java |    48 +
 .../org/apache/storm/kafka/StringScheme.java    |    50 +
 .../kafka/TopicOffsetOutOfRangeException.java   |    25 +
 .../org/apache/storm/kafka/ZkCoordinator.java   |   113 +
 .../src/jvm/org/apache/storm/kafka/ZkHosts.java |    36 +
 .../src/jvm/org/apache/storm/kafka/ZkState.java |   116 +
 .../org/apache/storm/kafka/bolt/KafkaBolt.java  |   178 +
 .../FieldNameBasedTupleToKafkaMapper.java       |    48 +
 .../kafka/bolt/mapper/TupleToKafkaMapper.java   |    32 +
 .../bolt/selector/DefaultTopicSelector.java     |    34 +
 .../kafka/bolt/selector/KafkaTopicSelector.java |    26 +
 .../apache/storm/kafka/trident/Coordinator.java |    51 +
 .../storm/kafka/trident/DefaultCoordinator.java |    31 +
 .../trident/GlobalPartitionInformation.java     |   112 +
 .../storm/kafka/trident/IBatchCoordinator.java  |    26 +
 .../storm/kafka/trident/IBrokerReader.java      |    30 +
 .../apache/storm/kafka/trident/MaxMetric.java   |    40 +
 .../kafka/trident/OpaqueTridentKafkaSpout.java  |    60 +
 .../storm/kafka/trident/StaticBrokerReader.java |    49 +
 .../trident/TransactionalTridentKafkaSpout.java |    58 +
 .../storm/kafka/trident/TridentKafkaConfig.java |    37 +
 .../kafka/trident/TridentKafkaEmitter.java      |   287 +
 .../storm/kafka/trident/TridentKafkaState.java  |   102 +
 .../kafka/trident/TridentKafkaStateFactory.java |    63 +
 .../kafka/trident/TridentKafkaUpdater.java      |    31 +
 .../storm/kafka/trident/ZkBrokerReader.java     |    84 +
 .../FieldNameBasedTupleToKafkaMapper.java       |    41 +
 .../mapper/TridentTupleToKafkaMapper.java       |    28 +
 .../trident/selector/DefaultTopicSelector.java  |    34 +
 .../trident/selector/KafkaTopicSelector.java    |    26 +
 .../storm-kafka/src/jvm/storm/kafka/Broker.java |    86 -
 .../src/jvm/storm/kafka/BrokerHosts.java        |    25 -
 .../jvm/storm/kafka/ByteBufferSerializer.java   |    41 -
 .../jvm/storm/kafka/DynamicBrokersReader.java   |   213 -
 .../kafka/DynamicPartitionConnections.java      |    98 -
 .../ExponentialBackoffMsgRetryManager.java      |   184 -
 .../jvm/storm/kafka/FailedFetchException.java   |    29 -
 .../jvm/storm/kafka/FailedMsgRetryManager.java  |    29 -
 .../src/jvm/storm/kafka/IntSerializer.java      |    42 -
 .../src/jvm/storm/kafka/KafkaConfig.java        |    53 -
 .../src/jvm/storm/kafka/KafkaError.java         |    43 -
 .../src/jvm/storm/kafka/KafkaSpout.java         |   207 -
 .../src/jvm/storm/kafka/KafkaUtils.java         |   275 -
 .../src/jvm/storm/kafka/KeyValueScheme.java     |    27 -
 .../kafka/KeyValueSchemeAsMultiScheme.java      |    38 -
 .../jvm/storm/kafka/MessageMetadataScheme.java  |    27 -
 .../MessageMetadataSchemeAsMultiScheme.java     |    41 -
 .../src/jvm/storm/kafka/Partition.java          |    87 -
 .../jvm/storm/kafka/PartitionCoordinator.java   |    28 -
 .../src/jvm/storm/kafka/PartitionManager.java   |   316 -
 .../src/jvm/storm/kafka/SpoutConfig.java        |    47 -
 .../src/jvm/storm/kafka/StaticCoordinator.java  |    52 -
 .../src/jvm/storm/kafka/StaticHosts.java        |    38 -
 .../storm/kafka/StaticPartitionConnections.java |    52 -
 .../jvm/storm/kafka/StringKeyValueScheme.java   |    38 -
 .../kafka/StringMessageAndMetadataScheme.java   |    43 -
 .../storm/kafka/StringMultiSchemeWithTopic.java |    48 -
 .../src/jvm/storm/kafka/StringScheme.java       |    50 -
 .../kafka/TopicOffsetOutOfRangeException.java   |    25 -
 .../src/jvm/storm/kafka/ZkCoordinator.java      |   113 -
 .../src/jvm/storm/kafka/ZkHosts.java            |    36 -
 .../src/jvm/storm/kafka/ZkState.java            |   116 -
 .../src/jvm/storm/kafka/bolt/KafkaBolt.java     |   178 -
 .../FieldNameBasedTupleToKafkaMapper.java       |    48 -
 .../kafka/bolt/mapper/TupleToKafkaMapper.java   |    32 -
 .../bolt/selector/DefaultTopicSelector.java     |    34 -
 .../kafka/bolt/selector/KafkaTopicSelector.java |    26 -
 .../jvm/storm/kafka/trident/Coordinator.java    |    51 -
 .../storm/kafka/trident/DefaultCoordinator.java |    31 -
 .../trident/GlobalPartitionInformation.java     |   112 -
 .../storm/kafka/trident/IBatchCoordinator.java  |    26 -
 .../jvm/storm/kafka/trident/IBrokerReader.java  |    30 -
 .../src/jvm/storm/kafka/trident/MaxMetric.java  |    40 -
 .../kafka/trident/OpaqueTridentKafkaSpout.java  |    60 -
 .../storm/kafka/trident/StaticBrokerReader.java |    49 -
 .../trident/TransactionalTridentKafkaSpout.java |    58 -
 .../storm/kafka/trident/TridentKafkaConfig.java |    37 -
 .../kafka/trident/TridentKafkaEmitter.java      |   287 -
 .../storm/kafka/trident/TridentKafkaState.java  |   102 -
 .../kafka/trident/TridentKafkaStateFactory.java |    63 -
 .../kafka/trident/TridentKafkaUpdater.java      |    31 -
 .../jvm/storm/kafka/trident/ZkBrokerReader.java |    84 -
 .../FieldNameBasedTupleToKafkaMapper.java       |    41 -
 .../mapper/TridentTupleToKafkaMapper.java       |    28 -
 .../trident/selector/DefaultTopicSelector.java  |    34 -
 .../trident/selector/KafkaTopicSelector.java    |    26 -
 .../storm/kafka/DynamicBrokersReaderTest.java   |   252 +
 .../ExponentialBackoffMsgRetryManagerTest.java  |   235 +
 .../org/apache/storm/kafka/KafkaErrorTest.java  |    56 +
 .../org/apache/storm/kafka/KafkaTestBroker.java |    92 +
 .../org/apache/storm/kafka/KafkaUtilsTest.java  |   295 +
 .../storm/kafka/StringKeyValueSchemeTest.java   |    62 +
 .../apache/storm/kafka/TestStringScheme.java    |    40 +
 .../test/org/apache/storm/kafka/TestUtils.java  |   101 +
 .../apache/storm/kafka/TridentKafkaTest.java    |    81 +
 .../storm/kafka/TridentKafkaTopology.java       |    91 +
 .../apache/storm/kafka/ZkCoordinatorTest.java   |   148 +
 .../apache/storm/kafka/bolt/KafkaBoltTest.java  |   341 +
 .../storm/kafka/DynamicBrokersReaderTest.java   |   252 -
 .../ExponentialBackoffMsgRetryManagerTest.java  |   235 -
 .../src/test/storm/kafka/KafkaErrorTest.java    |    56 -
 .../src/test/storm/kafka/KafkaTestBroker.java   |    92 -
 .../src/test/storm/kafka/KafkaUtilsTest.java    |   295 -
 .../storm/kafka/StringKeyValueSchemeTest.java   |    62 -
 .../src/test/storm/kafka/TestStringScheme.java  |    40 -
 .../src/test/storm/kafka/TestUtils.java         |   101 -
 .../src/test/storm/kafka/TridentKafkaTest.java  |    81 -
 .../test/storm/kafka/TridentKafkaTopology.java  |    91 -
 .../src/test/storm/kafka/ZkCoordinatorTest.java |   148 -
 .../test/storm/kafka/bolt/KafkaBoltTest.java    |   294 -
 external/storm-metrics/pom.xml                  |     2 +-
 .../metrics/hdrhistogram/HistogramMetric.java   |     2 +-
 .../apache/storm/metrics/sigar/CPUMetric.java   |     2 +-
 external/storm-redis/pom.xml                    |    23 +-
 .../storm/redis/bolt/AbstractRedisBolt.java     |     6 +-
 .../storm/redis/bolt/RedisLookupBolt.java       |     6 +-
 .../apache/storm/redis/bolt/RedisStoreBolt.java |     4 +-
 .../redis/common/config/JedisPoolConfig.java    |    14 +
 .../redis/common/mapper/RedisLookupMapper.java  |     6 +-
 .../storm/redis/common/mapper/TupleMapper.java  |     2 +-
 .../storm/redis/state/RedisKeyValueState.java   |   306 +
 .../redis/state/RedisKeyValueStateProvider.java |   120 +
 .../trident/state/AbstractRedisMapState.java    |    12 +-
 .../state/AbstractRedisStateQuerier.java        |    10 +-
 .../state/AbstractRedisStateUpdater.java        |     8 +-
 .../storm/redis/trident/state/Options.java      |     2 +-
 .../trident/state/RedisClusterMapState.java     |    28 +-
 .../redis/trident/state/RedisClusterState.java  |     6 +-
 .../redis/trident/state/RedisMapState.java      |    28 +-
 .../storm/redis/trident/state/RedisState.java   |     6 +-
 .../redis/state/DefaultStateSerializerTest.java |    56 +
 .../state/RedisKeyValueStateProviderTest.java   |    62 +
 .../redis/state/RedisKeyValueStateTest.java     |   154 +
 .../storm/redis/topology/LookupWordCount.java   |    24 +-
 .../redis/topology/PersistentWordCount.java     |    16 +-
 .../storm/redis/topology/WordCounter.java       |    18 +-
 .../apache/storm/redis/topology/WordSpout.java  |    12 +-
 .../storm/redis/trident/PrintFunction.java      |     6 +-
 .../redis/trident/WordCountLookupMapper.java    |    10 +-
 .../redis/trident/WordCountStoreMapper.java     |     4 +-
 .../redis/trident/WordCountTridentRedis.java    |    20 +-
 .../trident/WordCountTridentRedisCluster.java   |    20 +-
 .../WordCountTridentRedisClusterMap.java        |    26 +-
 .../redis/trident/WordCountTridentRedisMap.java |    26 +-
 external/storm-solr/pom.xml                     |     2 +-
 .../apache/storm/solr/bolt/SolrUpdateBolt.java  |     8 +
 .../storm/solr/mapper/SolrFieldsMapper.java     |     2 +-
 .../storm/solr/mapper/SolrJsonMapper.java       |     2 +-
 .../apache/storm/solr/mapper/SolrMapper.java    |     4 +-
 .../apache/storm/solr/trident/SolrState.java    |     6 +-
 .../storm/solr/trident/SolrStateFactory.java    |     6 +-
 .../apache/storm/solr/trident/SolrUpdater.java  |     6 +-
 .../storm/solr/spout/SolrFieldsSpout.java       |    12 +-
 .../apache/storm/solr/spout/SolrJsonSpout.java  |    12 +-
 .../storm/solr/topology/SolrFieldsTopology.java |     4 +-
 .../storm/solr/topology/SolrJsonTopology.java   |     4 +-
 .../storm/solr/topology/SolrTopology.java       |     8 +-
 .../solr/trident/SolrFieldsTridentTopology.java |    10 +-
 .../solr/trident/SolrJsonTridentTopology.java   |    10 +-
 log4j2/cluster.xml                              |     6 +-
 pom.xml                                         |    11 +-
 .../maven-shade-clojure-transformer/pom.xml     |     2 +-
 storm-buildtools/storm-maven-plugins/pom.xml    |     2 +-
 storm-core/pom.xml                              |    77 +-
 .../src/clj/backtype/storm/LocalCluster.clj     |   106 -
 storm-core/src/clj/backtype/storm/LocalDRPC.clj |    56 -
 .../src/clj/backtype/storm/MockAutoCred.clj     |    58 -
 storm-core/src/clj/backtype/storm/blobstore.clj |    28 -
 storm-core/src/clj/backtype/storm/clojure.clj   |   201 -
 storm-core/src/clj/backtype/storm/cluster.clj   |   691 -
 .../cluster_state/zookeeper_state_factory.clj   |   161 -
 .../src/clj/backtype/storm/command/activate.clj |    24 -
 .../clj/backtype/storm/command/blobstore.clj    |   162 -
 .../clj/backtype/storm/command/config_value.clj |    24 -
 .../clj/backtype/storm/command/deactivate.clj   |    24 -
 .../backtype/storm/command/dev_zookeeper.clj    |    26 -
 .../clj/backtype/storm/command/get_errors.clj   |    52 -
 .../clj/backtype/storm/command/healthcheck.clj  |    88 -
 .../clj/backtype/storm/command/heartbeats.clj   |    52 -
 .../backtype/storm/command/kill_topology.clj    |    29 -
 .../clj/backtype/storm/command/kill_workers.clj |    33 -
 .../src/clj/backtype/storm/command/list.clj     |    38 -
 .../src/clj/backtype/storm/command/monitor.clj  |    37 -
 .../clj/backtype/storm/command/rebalance.clj    |    46 -
 .../backtype/storm/command/set_log_level.clj    |    75 -
 .../backtype/storm/command/shell_submission.clj |    33 -
 .../storm/command/upload_credentials.clj        |    35 -
 storm-core/src/clj/backtype/storm/config.clj    |   332 -
 storm-core/src/clj/backtype/storm/converter.clj |   277 -
 .../src/clj/backtype/storm/daemon/acker.clj     |   107 -
 .../backtype/storm/daemon/builtin_metrics.clj   |    98 -
 .../src/clj/backtype/storm/daemon/common.clj    |   402 -
 .../src/clj/backtype/storm/daemon/drpc.clj      |   274 -
 .../src/clj/backtype/storm/daemon/executor.clj  |   851 -
 .../src/clj/backtype/storm/daemon/logviewer.clj |  1190 -
 .../src/clj/backtype/storm/daemon/nimbus.clj    |  2248 -
 .../clj/backtype/storm/daemon/supervisor.clj    |  1217 -
 .../src/clj/backtype/storm/daemon/task.clj      |   189 -
 .../src/clj/backtype/storm/daemon/worker.clj    |   762 -
 storm-core/src/clj/backtype/storm/disruptor.clj |    89 -
 storm-core/src/clj/backtype/storm/event.clj     |    71 -
 .../src/clj/backtype/storm/local_state.clj      |   131 -
 storm-core/src/clj/backtype/storm/log.clj       |    56 -
 .../src/clj/backtype/storm/messaging/loader.clj |    34 -
 .../src/clj/backtype/storm/messaging/local.clj  |    23 -
 .../src/clj/backtype/storm/metric/testing.clj   |    68 -
 .../clj/backtype/storm/process_simulator.clj    |    51 -
 .../storm/scheduler/DefaultScheduler.clj        |    77 -
 .../backtype/storm/scheduler/EvenScheduler.clj  |    81 -
 .../storm/scheduler/IsolationScheduler.clj      |   219 -
 storm-core/src/clj/backtype/storm/stats.clj     |  1521 -
 storm-core/src/clj/backtype/storm/testing.clj   |   701 -
 storm-core/src/clj/backtype/storm/testing4j.clj |   184 -
 storm-core/src/clj/backtype/storm/thrift.clj    |   284 -
 storm-core/src/clj/backtype/storm/timer.clj     |   128 -
 storm-core/src/clj/backtype/storm/tuple.clj     |    24 -
 storm-core/src/clj/backtype/storm/ui/core.clj   |  1292 -
 .../src/clj/backtype/storm/ui/helpers.clj       |   240 -
 storm-core/src/clj/backtype/storm/util.clj      |  1118 -
 storm-core/src/clj/backtype/storm/zookeeper.clj |   308 -
 .../src/clj/org/apache/storm/LocalCluster.clj   |   106 +
 .../src/clj/org/apache/storm/LocalDRPC.clj      |    56 +
 .../src/clj/org/apache/storm/MockAutoCred.clj   |    58 +
 .../src/clj/org/apache/storm/blobstore.clj      |    28 +
 storm-core/src/clj/org/apache/storm/clojure.clj |   201 +
 storm-core/src/clj/org/apache/storm/cluster.clj |   691 +
 .../cluster_state/zookeeper_state_factory.clj   |   161 +
 .../clj/org/apache/storm/command/activate.clj   |    24 +
 .../clj/org/apache/storm/command/blobstore.clj  |   162 +
 .../org/apache/storm/command/config_value.clj   |    24 +
 .../clj/org/apache/storm/command/deactivate.clj |    24 +
 .../org/apache/storm/command/dev_zookeeper.clj  |    26 +
 .../clj/org/apache/storm/command/get_errors.clj |    52 +
 .../org/apache/storm/command/healthcheck.clj    |    88 +
 .../clj/org/apache/storm/command/heartbeats.clj |    52 +
 .../org/apache/storm/command/kill_topology.clj  |    29 +
 .../org/apache/storm/command/kill_workers.clj   |    33 +
 .../src/clj/org/apache/storm/command/list.clj   |    38 +
 .../clj/org/apache/storm/command/monitor.clj    |    37 +
 .../clj/org/apache/storm/command/rebalance.clj  |    46 +
 .../org/apache/storm/command/set_log_level.clj  |    75 +
 .../apache/storm/command/shell_submission.clj   |    33 +
 .../apache/storm/command/upload_credentials.clj |    35 +
 storm-core/src/clj/org/apache/storm/config.clj  |   331 +
 .../src/clj/org/apache/storm/converter.clj      |   277 +
 .../src/clj/org/apache/storm/daemon/acker.clj   |   107 +
 .../org/apache/storm/daemon/builtin_metrics.clj |    98 +
 .../src/clj/org/apache/storm/daemon/common.clj  |   402 +
 .../src/clj/org/apache/storm/daemon/drpc.clj    |   274 +
 .../clj/org/apache/storm/daemon/executor.clj    |   857 +
 .../clj/org/apache/storm/daemon/logviewer.clj   |  1199 +
 .../src/clj/org/apache/storm/daemon/nimbus.clj  |  2259 +
 .../clj/org/apache/storm/daemon/supervisor.clj  |  1219 +
 .../src/clj/org/apache/storm/daemon/task.clj    |   189 +
 .../src/clj/org/apache/storm/daemon/worker.clj  |   763 +
 .../src/clj/org/apache/storm/disruptor.clj      |    89 +
 storm-core/src/clj/org/apache/storm/event.clj   |    71 +
 .../src/clj/org/apache/storm/local_state.clj    |   131 +
 storm-core/src/clj/org/apache/storm/log.clj     |    56 +
 .../clj/org/apache/storm/messaging/loader.clj   |    34 +
 .../clj/org/apache/storm/messaging/local.clj    |    23 +
 .../src/clj/org/apache/storm/metric/testing.clj |    68 +
 .../org/apache/storm/pacemaker/pacemaker.clj    |     6 +-
 .../storm/pacemaker/pacemaker_state_factory.clj |    12 +-
 .../clj/org/apache/storm/process_simulator.clj  |    51 +
 .../apache/storm/scheduler/DefaultScheduler.clj |    77 +
 .../apache/storm/scheduler/EvenScheduler.clj    |    81 +
 .../storm/scheduler/IsolationScheduler.clj      |   219 +
 storm-core/src/clj/org/apache/storm/stats.clj   |  1521 +
 storm-core/src/clj/org/apache/storm/testing.clj |   701 +
 .../src/clj/org/apache/storm/testing4j.clj      |   184 +
 storm-core/src/clj/org/apache/storm/thrift.clj  |   284 +
 storm-core/src/clj/org/apache/storm/timer.clj   |   128 +
 .../clj/org/apache/storm/trident/testing.clj    |    79 +
 storm-core/src/clj/org/apache/storm/ui/core.clj |  1273 +
 .../src/clj/org/apache/storm/ui/helpers.clj     |   240 +
 storm-core/src/clj/org/apache/storm/util.clj    |  1118 +
 .../src/clj/org/apache/storm/zookeeper.clj      |   308 +
 storm-core/src/clj/storm/trident/testing.clj    |    79 -
 storm-core/src/genthrift.sh                     |     6 +-
 storm-core/src/jvm/backtype/storm/Config.java   |  2281 -
 .../src/jvm/backtype/storm/Constants.java       |    36 -
 .../backtype/storm/ICredentialsListener.java    |    32 -
 .../src/jvm/backtype/storm/ILocalCluster.java   |    49 -
 .../src/jvm/backtype/storm/ILocalDRPC.java      |    27 -
 .../src/jvm/backtype/storm/ISubmitterHook.java  |    31 -
 .../src/jvm/backtype/storm/LogWriter.java       |    83 -
 .../src/jvm/backtype/storm/StormSubmitter.java  |   496 -
 .../storm/blobstore/AtomicOutputStream.java     |    32 -
 .../storm/blobstore/BlobKeySequenceInfo.java    |    40 -
 .../jvm/backtype/storm/blobstore/BlobStore.java |   447 -
 .../storm/blobstore/BlobStoreAclHandler.java    |   399 -
 .../backtype/storm/blobstore/BlobStoreFile.java |    50 -
 .../storm/blobstore/BlobStoreUtils.java         |   257 -
 .../storm/blobstore/BlobSynchronizer.java       |   124 -
 .../storm/blobstore/ClientBlobStore.java        |   184 -
 .../storm/blobstore/FileBlobStoreImpl.java      |   248 -
 .../storm/blobstore/InputStreamWithMeta.java    |    26 -
 .../jvm/backtype/storm/blobstore/KeyFilter.java |    22 -
 .../storm/blobstore/KeySequenceNumber.java      |   229 -
 .../storm/blobstore/LocalFsBlobStore.java       |   311 -
 .../storm/blobstore/LocalFsBlobStoreFile.java   |   159 -
 .../storm/blobstore/NimbusBlobStore.java        |   420 -
 .../jvm/backtype/storm/clojure/ClojureBolt.java |   119 -
 .../backtype/storm/clojure/ClojureSpout.java    |   153 -
 .../backtype/storm/clojure/RichShellBolt.java   |    51 -
 .../backtype/storm/clojure/RichShellSpout.java  |    51 -
 .../backtype/storm/cluster/ClusterState.java    |   217 -
 .../storm/cluster/ClusterStateContext.java      |    41 -
 .../storm/cluster/ClusterStateFactory.java      |    28 -
 .../storm/cluster/ClusterStateListener.java     |    22 -
 .../backtype/storm/cluster/ConnectionState.java |    24 -
 .../jvm/backtype/storm/cluster/DaemonType.java  |    27 -
 .../storm/coordination/BatchBoltExecutor.java   |   108 -
 .../coordination/BatchOutputCollector.java      |    46 -
 .../coordination/BatchOutputCollectorImpl.java  |    53 -
 .../coordination/BatchSubtopologyBuilder.java   |   447 -
 .../storm/coordination/CoordinatedBolt.java     |   382 -
 .../backtype/storm/coordination/IBatchBolt.java |    30 -
 .../jvm/backtype/storm/daemon/Shutdownable.java |    22 -
 .../storm/drpc/DRPCInvocationsClient.java       |   113 -
 .../src/jvm/backtype/storm/drpc/DRPCSpout.java  |   261 -
 .../src/jvm/backtype/storm/drpc/JoinResult.java |    75 -
 .../jvm/backtype/storm/drpc/KeyedFairBolt.java  |    93 -
 .../storm/drpc/LinearDRPCInputDeclarer.java     |    52 -
 .../storm/drpc/LinearDRPCTopologyBuilder.java   |   393 -
 .../jvm/backtype/storm/drpc/PrepareRequest.java |    59 -
 .../jvm/backtype/storm/drpc/ReturnResults.java  |   124 -
 .../backtype/storm/generated/AccessControl.java |   627 -
 .../storm/generated/AccessControlType.java      |    62 -
 .../storm/generated/AlreadyAliveException.java  |   406 -
 .../backtype/storm/generated/Assignment.java    |  1159 -
 .../storm/generated/AuthorizationException.java |   406 -
 .../storm/generated/BeginDownloadResult.java    |   608 -
 .../src/jvm/backtype/storm/generated/Bolt.java  |   514 -
 .../storm/generated/BoltAggregateStats.java     |   704 -
 .../jvm/backtype/storm/generated/BoltStats.java |  1390 -
 .../storm/generated/ClusterSummary.java         |   879 -
 .../storm/generated/ClusterWorkerHeartbeat.java |   768 -
 .../storm/generated/CommonAggregateStats.java   |   902 -
 .../generated/ComponentAggregateStats.java      |   752 -
 .../storm/generated/ComponentCommon.java        |   852 -
 .../storm/generated/ComponentObject.java        |   462 -
 .../storm/generated/ComponentPageInfo.java      |  2194 -
 .../backtype/storm/generated/ComponentType.java |    62 -
 .../backtype/storm/generated/Credentials.java   |   458 -
 .../storm/generated/DRPCExecutionException.java |   406 -
 .../backtype/storm/generated/DRPCRequest.java   |   507 -
 .../backtype/storm/generated/DebugOptions.java  |   506 -
 .../storm/generated/DistributedRPC.java         |  1328 -
 .../generated/DistributedRPCInvocations.java    |  2935 --
 .../jvm/backtype/storm/generated/ErrorInfo.java |   714 -
 .../storm/generated/ExecutorAggregateStats.java |   526 -
 .../backtype/storm/generated/ExecutorInfo.java  |   499 -
 .../storm/generated/ExecutorSpecificStats.java  |   387 -
 .../backtype/storm/generated/ExecutorStats.java |   915 -
 .../storm/generated/ExecutorSummary.java        |   922 -
 .../storm/generated/GetInfoOptions.java         |   422 -
 .../storm/generated/GlobalStreamId.java         |   507 -
 .../jvm/backtype/storm/generated/Grouping.java  |   800 -
 .../generated/HBAuthorizationException.java     |   406 -
 .../storm/generated/HBExecutionException.java   |   406 -
 .../jvm/backtype/storm/generated/HBMessage.java |   636 -
 .../backtype/storm/generated/HBMessageData.java |   640 -
 .../jvm/backtype/storm/generated/HBNodes.java   |   461 -
 .../jvm/backtype/storm/generated/HBPulse.java   |   522 -
 .../jvm/backtype/storm/generated/HBRecords.java |   466 -
 .../storm/generated/HBServerMessageType.java    |   113 -
 .../generated/InvalidTopologyException.java     |   406 -
 .../backtype/storm/generated/JavaObject.java    |   561 -
 .../backtype/storm/generated/JavaObjectArg.java |   631 -
 .../generated/KeyAlreadyExistsException.java    |   406 -
 .../storm/generated/KeyNotFoundException.java   |   406 -
 .../backtype/storm/generated/KillOptions.java   |   407 -
 .../storm/generated/LSApprovedWorkers.java      |   458 -
 .../generated/LSSupervisorAssignments.java      |   471 -
 .../storm/generated/LSSupervisorId.java         |   406 -
 .../backtype/storm/generated/LSTopoHistory.java |   805 -
 .../storm/generated/LSTopoHistoryList.java      |   460 -
 .../storm/generated/LSWorkerHeartbeat.java      |   755 -
 .../storm/generated/ListBlobsResult.java        |   556 -
 .../storm/generated/LocalAssignment.java        |   676 -
 .../storm/generated/LocalStateData.java         |   471 -
 .../jvm/backtype/storm/generated/LogConfig.java |   475 -
 .../jvm/backtype/storm/generated/LogLevel.java  |   836 -
 .../storm/generated/LogLevelAction.java         |    65 -
 .../jvm/backtype/storm/generated/Nimbus.java    | 44114 -----------------
 .../backtype/storm/generated/NimbusSummary.java |   796 -
 .../jvm/backtype/storm/generated/NodeInfo.java  |   556 -
 .../storm/generated/NotAliveException.java      |   406 -
 .../backtype/storm/generated/NullStruct.java    |   300 -
 .../storm/generated/NumErrorsChoice.java        |    65 -
 .../backtype/storm/generated/ProfileAction.java |    74 -
 .../storm/generated/ProfileRequest.java         |   631 -
 .../storm/generated/ReadableBlobMeta.java       |   510 -
 .../storm/generated/RebalanceOptions.java       |   664 -
 .../storm/generated/SettableBlobMeta.java       |   567 -
 .../storm/generated/ShellComponent.java         |   516 -
 .../storm/generated/SpecificAggregateStats.java |   387 -
 .../storm/generated/SpoutAggregateStats.java    |   407 -
 .../jvm/backtype/storm/generated/SpoutSpec.java |   514 -
 .../backtype/storm/generated/SpoutStats.java    |   917 -
 .../storm/generated/StateSpoutSpec.java         |   514 -
 .../jvm/backtype/storm/generated/StormBase.java |  1382 -
 .../backtype/storm/generated/StormTopology.java |   962 -
 .../backtype/storm/generated/StreamInfo.java    |   554 -
 .../backtype/storm/generated/SubmitOptions.java |   533 -
 .../storm/generated/SupervisorInfo.java         |  1446 -
 .../storm/generated/SupervisorSummary.java      |  1265 -
 .../storm/generated/ThriftSerializedObject.java |   516 -
 .../storm/generated/TopologyActionOptions.java  |   387 -
 .../storm/generated/TopologyHistoryInfo.java    |   461 -
 .../backtype/storm/generated/TopologyInfo.java  |  2144 -
 .../storm/generated/TopologyInitialStatus.java  |    62 -
 .../storm/generated/TopologyPageInfo.java       |  2597 -
 .../backtype/storm/generated/TopologyStats.java |  1094 -
 .../storm/generated/TopologyStatus.java         |    68 -
 .../storm/generated/TopologySummary.java        |  1901 -
 .../storm/generated/WorkerResources.java        |   605 -
 .../storm/grouping/CustomStreamGrouping.java    |    43 -
 .../src/jvm/backtype/storm/grouping/Load.java   |    77 -
 .../grouping/LoadAwareCustomStreamGrouping.java |    24 -
 .../grouping/LoadAwareShuffleGrouping.java      |    76 -
 .../backtype/storm/grouping/LoadMapping.java    |    64 -
 .../storm/grouping/PartialKeyGrouping.java      |   106 -
 .../storm/grouping/ShuffleGrouping.java         |    65 -
 .../jvm/backtype/storm/hooks/BaseTaskHook.java  |    61 -
 .../backtype/storm/hooks/BaseWorkerHook.java    |    51 -
 .../src/jvm/backtype/storm/hooks/ITaskHook.java |    38 -
 .../jvm/backtype/storm/hooks/IWorkerHook.java   |    44 -
 .../backtype/storm/hooks/info/BoltAckInfo.java  |    32 -
 .../storm/hooks/info/BoltExecuteInfo.java       |    32 -
 .../backtype/storm/hooks/info/BoltFailInfo.java |    32 -
 .../jvm/backtype/storm/hooks/info/EmitInfo.java |    35 -
 .../backtype/storm/hooks/info/SpoutAckInfo.java |    30 -
 .../storm/hooks/info/SpoutFailInfo.java         |    30 -
 .../backtype/storm/localizer/LocalResource.java |    44 -
 .../storm/localizer/LocalizedResource.java      |   130 -
 .../LocalizedResourceRetentionSet.java          |   140 -
 .../storm/localizer/LocalizedResourceSet.java   |   101 -
 .../jvm/backtype/storm/localizer/Localizer.java |   695 -
 .../storm/logging/ThriftAccessLogger.java       |    27 -
 .../logging/filters/AccessLoggingFilter.java    |    52 -
 .../storm/messaging/AddressedTuple.java         |    46 -
 .../storm/messaging/ConnectionWithStatus.java   |    49 -
 .../DeserializingConnectionCallback.java        |    60 -
 .../backtype/storm/messaging/IConnection.java   |    63 -
 .../storm/messaging/IConnectionCallback.java    |    31 -
 .../jvm/backtype/storm/messaging/IContext.java  |    59 -
 .../backtype/storm/messaging/TaskMessage.java   |    53 -
 .../storm/messaging/TransportFactory.java       |    57 -
 .../backtype/storm/messaging/local/Context.java |   164 -
 .../backtype/storm/messaging/netty/Client.java  |   578 -
 .../backtype/storm/messaging/netty/Context.java |   113 -
 .../storm/messaging/netty/ControlMessage.java   |    75 -
 .../messaging/netty/INettySerializable.java     |    26 -
 .../storm/messaging/netty/ISaslClient.java      |    28 -
 .../storm/messaging/netty/ISaslServer.java      |    26 -
 .../backtype/storm/messaging/netty/IServer.java |    26 -
 .../netty/KerberosSaslClientHandler.java        |   152 -
 .../netty/KerberosSaslNettyClient.java          |   203 -
 .../netty/KerberosSaslNettyClientState.java     |    31 -
 .../netty/KerberosSaslNettyServer.java          |   210 -
 .../netty/KerberosSaslNettyServerState.java     |    30 -
 .../netty/KerberosSaslServerHandler.java        |   133 -
 .../storm/messaging/netty/MessageBatch.java     |   118 -
 .../storm/messaging/netty/MessageBuffer.java    |    58 -
 .../storm/messaging/netty/MessageDecoder.java   |   144 -
 .../storm/messaging/netty/MessageEncoder.java   |    43 -
 .../netty/NettyRenameThreadFactory.java         |    56 -
 .../netty/NettyUncaughtExceptionHandler.java    |    35 -
 .../storm/messaging/netty/SaslMessageToken.java |   114 -
 .../storm/messaging/netty/SaslNettyClient.java  |   154 -
 .../messaging/netty/SaslNettyClientState.java   |    31 -
 .../storm/messaging/netty/SaslNettyServer.java  |   157 -
 .../messaging/netty/SaslNettyServerState.java   |    30 -
 .../messaging/netty/SaslStormClientHandler.java |   158 -
 .../netty/SaslStormServerAuthorizeHandler.java  |    83 -
 .../messaging/netty/SaslStormServerHandler.java |   153 -
 .../storm/messaging/netty/SaslUtils.java        |    68 -
 .../backtype/storm/messaging/netty/Server.java  |   273 -
 .../netty/StormClientErrorHandler.java          |    41 -
 .../messaging/netty/StormClientHandler.java     |    91 -
 .../netty/StormClientPipelineFactory.java       |    56 -
 .../messaging/netty/StormServerHandler.java     |    74 -
 .../netty/StormServerPipelineFactory.java       |    57 -
 .../backtype/storm/metric/EventLoggerBolt.java  |    67 -
 .../storm/metric/FileBasedEventLogger.java      |   132 -
 .../metric/HttpForwardingMetricsConsumer.java   |    85 -
 .../metric/HttpForwardingMetricsServer.java     |   118 -
 .../jvm/backtype/storm/metric/IEventLogger.java |    70 -
 .../storm/metric/LoggingMetricsConsumer.java    |    76 -
 .../storm/metric/MetricsConsumerBolt.java       |    63 -
 .../jvm/backtype/storm/metric/SystemBolt.java   |   165 -
 .../storm/metric/api/AssignableMetric.java      |    34 -
 .../storm/metric/api/CombinedMetric.java        |    38 -
 .../backtype/storm/metric/api/CountMetric.java  |    39 -
 .../backtype/storm/metric/api/ICombiner.java    |    23 -
 .../jvm/backtype/storm/metric/api/IMetric.java  |    22 -
 .../storm/metric/api/IMetricsConsumer.java      |    60 -
 .../jvm/backtype/storm/metric/api/IReducer.java |    24 -
 .../storm/metric/api/IStatefulObject.java       |    22 -
 .../backtype/storm/metric/api/MeanReducer.java  |    53 -
 .../storm/metric/api/MultiCountMetric.java      |    45 -
 .../storm/metric/api/MultiReducedMetric.java    |    50 -
 .../storm/metric/api/ReducedMetric.java         |    38 -
 .../backtype/storm/metric/api/StateMetric.java  |    31 -
 .../metric/api/rpc/AssignableShellMetric.java   |    30 -
 .../metric/api/rpc/CombinedShellMetric.java     |    31 -
 .../storm/metric/api/rpc/CountShellMetric.java  |    37 -
 .../storm/metric/api/rpc/IShellMetric.java      |    31 -
 .../metric/api/rpc/ReducedShellMetric.java      |    32 -
 .../metric/internal/CountStatAndMetric.java     |   211 -
 .../metric/internal/LatencyStatAndMetric.java   |   262 -
 .../storm/metric/internal/MetricStatTimer.java  |    27 -
 .../internal/MultiCountStatAndMetric.java       |   112 -
 .../internal/MultiLatencyStatAndMetric.java     |   109 -
 .../storm/metric/internal/RateTracker.java      |   165 -
 .../jvm/backtype/storm/multilang/BoltMsg.java   |    79 -
 .../backtype/storm/multilang/ISerializer.java   |    82 -
 .../storm/multilang/JsonSerializer.java         |   202 -
 .../storm/multilang/NoOutputException.java      |    40 -
 .../jvm/backtype/storm/multilang/ShellMsg.java  |   184 -
 .../jvm/backtype/storm/multilang/SpoutMsg.java  |    50 -
 .../AbstractDNSToSwitchMapping.java             |    96 -
 .../networktopography/DNSToSwitchMapping.java   |    49 -
 .../DefaultRackDNSToSwitchMapping.java          |    52 -
 .../storm/nimbus/DefaultTopologyValidator.java  |    31 -
 .../backtype/storm/nimbus/ILeaderElector.java   |    73 -
 .../nimbus/ITopologyActionNotifierPlugin.java   |    43 -
 .../storm/nimbus/ITopologyValidator.java        |    28 -
 .../jvm/backtype/storm/nimbus/NimbusInfo.java   |   116 -
 .../backtype/storm/planner/CompoundSpout.java   |    25 -
 .../backtype/storm/planner/CompoundTask.java    |    25 -
 .../jvm/backtype/storm/planner/TaskBundle.java  |    33 -
 .../jvm/backtype/storm/scheduler/Cluster.java   |   661 -
 .../storm/scheduler/ExecutorDetails.java        |    54 -
 .../jvm/backtype/storm/scheduler/INimbus.java   |    49 -
 .../backtype/storm/scheduler/IScheduler.java    |    40 -
 .../backtype/storm/scheduler/ISupervisor.java   |    45 -
 .../storm/scheduler/SchedulerAssignment.java    |    58 -
 .../scheduler/SchedulerAssignmentImpl.java      |   105 -
 .../storm/scheduler/SupervisorDetails.java      |   132 -
 .../backtype/storm/scheduler/Topologies.java    |    84 -
 .../storm/scheduler/TopologyDetails.java        |   515 -
 .../backtype/storm/scheduler/WorkerSlot.java    |    77 -
 .../scheduler/multitenant/DefaultPool.java      |   219 -
 .../storm/scheduler/multitenant/FreePool.java   |   125 -
 .../scheduler/multitenant/IsolatedPool.java     |   363 -
 .../multitenant/MultitenantScheduler.java       |    98 -
 .../storm/scheduler/multitenant/Node.java       |   340 -
 .../storm/scheduler/multitenant/NodePool.java   |   296 -
 .../storm/scheduler/resource/Component.java     |    54 -
 .../storm/scheduler/resource/RAS_Node.java      |   528 -
 .../storm/scheduler/resource/RAS_Nodes.java     |   160 -
 .../resource/ResourceAwareScheduler.java        |   414 -
 .../storm/scheduler/resource/ResourceUtils.java |   184 -
 .../scheduler/resource/SchedulingResult.java    |   116 -
 .../scheduler/resource/SchedulingStatus.java    |    40 -
 .../backtype/storm/scheduler/resource/User.java |   346 -
 .../eviction/DefaultEvictionStrategy.java       |   126 -
 .../strategies/eviction/IEvictionStrategy.java  |    47 -
 .../DefaultSchedulingPriorityStrategy.java      |    81 -
 .../priority/ISchedulingPriorityStrategy.java   |    41 -
 .../DefaultResourceAwareStrategy.java           |   488 -
 .../strategies/scheduling/IStrategy.java        |    50 -
 .../storm/security/INimbusCredentialPlugin.java |    47 -
 .../backtype/storm/security/auth/AuthUtils.java |   348 -
 .../auth/DefaultHttpCredentialsPlugin.java      |    94 -
 .../security/auth/DefaultPrincipalToLocal.java  |    42 -
 .../storm/security/auth/IAuthorizer.java        |    53 -
 .../storm/security/auth/IAutoCredentials.java   |    55 -
 .../security/auth/ICredentialsRenewer.java      |    40 -
 .../auth/IGroupMappingServiceProvider.java      |    42 -
 .../security/auth/IHttpCredentialsPlugin.java   |    48 -
 .../storm/security/auth/IPrincipalToLocal.java  |    41 -
 .../storm/security/auth/ITransportPlugin.java   |    57 -
 .../security/auth/KerberosPrincipalToLocal.java |    45 -
 .../storm/security/auth/NimbusPrincipal.java    |    29 -
 .../storm/security/auth/ReqContext.java         |   143 -
 .../security/auth/SaslTransportPlugin.java      |   174 -
 .../security/auth/ShellBasedGroupsMapping.java  |    94 -
 .../security/auth/SimpleTransportPlugin.java    |   161 -
 .../security/auth/SingleUserPrincipal.java      |    53 -
 .../storm/security/auth/TBackoffConnect.java    |    76 -
 .../storm/security/auth/ThriftClient.java       |   114 -
 .../security/auth/ThriftConnectionType.java     |    77 -
 .../storm/security/auth/ThriftServer.java       |    78 -
 .../auth/authorizer/DRPCAuthorizerBase.java     |    63 -
 .../authorizer/DRPCSimpleACLAuthorizer.java     |   174 -
 .../auth/authorizer/DenyAuthorizer.java         |    47 -
 .../authorizer/ImpersonationAuthorizer.java     |   172 -
 .../auth/authorizer/NoopAuthorizer.java         |    47 -
 .../auth/authorizer/SimpleACLAuthorizer.java    |   167 -
 .../authorizer/SimpleWhitelistAuthorizer.java   |    60 -
 .../auth/digest/ClientCallbackHandler.java      |   108 -
 .../auth/digest/DigestSaslTransportPlugin.java  |    68 -
 .../auth/digest/ServerCallbackHandler.java      |   130 -
 .../storm/security/auth/kerberos/AutoTGT.java   |   277 -
 .../auth/kerberos/AutoTGTKrb5LoginModule.java   |   108 -
 .../kerberos/AutoTGTKrb5LoginModuleTest.java    |    44 -
 .../auth/kerberos/ClientCallbackHandler.java    |   104 -
 .../kerberos/KerberosSaslTransportPlugin.java   |   210 -
 .../security/auth/kerberos/NoOpTTrasport.java   |    54 -
 .../auth/kerberos/ServerCallbackHandler.java    |    96 -
 .../auth/kerberos/jaas_kerberos_cluster.conf    |    49 -
 .../auth/kerberos/jaas_kerberos_launcher.conf   |    31 -
 .../serialization/BlowfishTupleSerializer.java  |    92 -
 .../storm/serialization/DefaultKryoFactory.java |    64 -
 .../DefaultSerializationDelegate.java           |    58 -
 .../GzipBridgeSerializationDelegate.java        |    65 -
 .../GzipBridgeThriftSerializationDelegate.java  |    64 -
 .../GzipSerializationDelegate.java              |    64 -
 .../GzipThriftSerializationDelegate.java        |    56 -
 .../storm/serialization/IKryoDecorator.java     |    23 -
 .../storm/serialization/IKryoFactory.java       |    40 -
 .../storm/serialization/ITupleDeserializer.java |    24 -
 .../storm/serialization/ITupleSerializer.java   |    26 -
 .../serialization/KryoTupleDeserializer.java    |    56 -
 .../serialization/KryoTupleSerializer.java      |    60 -
 .../serialization/KryoValuesDeserializer.java   |    50 -
 .../serialization/KryoValuesSerializer.java     |    58 -
 .../serialization/SerializableSerializer.java   |    61 -
 .../serialization/SerializationDelegate.java    |    35 -
 .../serialization/SerializationFactory.java     |   223 -
 .../ThriftSerializationDelegate.java            |    52 -
 .../types/ArrayListSerializer.java              |    32 -
 .../serialization/types/HashMapSerializer.java  |    32 -
 .../serialization/types/HashSetSerializer.java  |    32 -
 .../types/ListDelegateSerializer.java           |    32 -
 .../storm/spout/IMultiSchemableSpout.java       |    23 -
 .../backtype/storm/spout/ISchemableSpout.java   |    24 -
 .../src/jvm/backtype/storm/spout/ISpout.java    |   105 -
 .../storm/spout/ISpoutOutputCollector.java      |    32 -
 .../storm/spout/ISpoutWaitStrategy.java         |    34 -
 .../jvm/backtype/storm/spout/MultiScheme.java   |    29 -
 .../storm/spout/NothingEmptyEmitStrategy.java   |    31 -
 .../backtype/storm/spout/RawMultiScheme.java    |    39 -
 .../src/jvm/backtype/storm/spout/RawScheme.java |    37 -
 .../src/jvm/backtype/storm/spout/Scheme.java    |    29 -
 .../storm/spout/SchemeAsMultiScheme.java        |    42 -
 .../jvm/backtype/storm/spout/ShellSpout.java    |   280 -
 .../storm/spout/SleepSpoutWaitStrategy.java     |    41 -
 .../storm/spout/SpoutOutputCollector.java       |   139 -
 .../jvm/backtype/storm/state/IStateSpout.java   |    29 -
 .../storm/state/IStateSpoutOutputCollector.java |    22 -
 .../backtype/storm/state/ISubscribedState.java  |    25 -
 .../state/ISynchronizeOutputCollector.java      |    24 -
 .../storm/state/StateSpoutOutputCollector.java  |    28 -
 .../storm/state/SynchronizeOutputCollector.java |    30 -
 .../storm/task/GeneralTopologyContext.java      |   199 -
 .../src/jvm/backtype/storm/task/IBolt.java      |    84 -
 .../jvm/backtype/storm/task/IErrorReporter.java |    22 -
 .../backtype/storm/task/IMetricsContext.java    |    31 -
 .../backtype/storm/task/IOutputCollector.java   |    32 -
 .../backtype/storm/task/OutputCollector.java    |   225 -
 .../src/jvm/backtype/storm/task/ShellBolt.java  |   406 -
 .../backtype/storm/task/TopologyContext.java    |   389 -
 .../storm/task/WorkerTopologyContext.java       |   106 -
 .../backtype/storm/testing/AckFailDelegate.java |    25 -
 .../storm/testing/AckFailMapTracker.java        |    52 -
 .../jvm/backtype/storm/testing/AckTracker.java  |    52 -
 .../AlternateRackDNSToSwitchMapping.java        |    65 -
 .../backtype/storm/testing/BatchNumberList.java |    72 -
 .../storm/testing/BatchProcessWord.java         |    39 -
 .../backtype/storm/testing/BatchRepeatA.java    |    48 -
 .../jvm/backtype/storm/testing/BoltTracker.java |    42 -
 .../storm/testing/CompleteTopologyParam.java    |    87 -
 .../storm/testing/CountingBatchBolt.java        |    55 -
 .../storm/testing/CountingCommitBolt.java       |    57 -
 .../jvm/backtype/storm/testing/FeederSpout.java |   100 -
 .../jvm/backtype/storm/testing/FixedTuple.java  |    42 -
 .../backtype/storm/testing/FixedTupleSpout.java |   179 -
 .../testing/ForwardingMetricsConsumer.java      |   100 -
 .../backtype/storm/testing/IdentityBolt.java    |    42 -
 .../backtype/storm/testing/IntegrationTest.java |    38 -
 .../storm/testing/KeyedCountingBatchBolt.java   |    61 -
 .../testing/KeyedCountingCommitterBolt.java     |    24 -
 .../storm/testing/KeyedSummingBatchBolt.java    |    61 -
 .../storm/testing/MemoryTransactionalSpout.java |   180 -
 .../testing/MemoryTransactionalSpoutMeta.java   |    38 -
 .../backtype/storm/testing/MkClusterParam.java  |    57 -
 .../backtype/storm/testing/MkTupleParam.java    |    51 -
 .../backtype/storm/testing/MockedSources.java   |    60 -
 .../jvm/backtype/storm/testing/NGrouping.java   |    50 -
 .../storm/testing/NonRichBoltTracker.java       |    51 -
 .../testing/OpaqueMemoryTransactionalSpout.java |   186 -
 .../storm/testing/PrepareBatchBolt.java         |    52 -
 .../storm/testing/PythonShellMetricsBolt.java   |    49 -
 .../storm/testing/PythonShellMetricsSpout.java  |    52 -
 .../testing/SingleUserSimpleTransport.java      |    37 -
 .../backtype/storm/testing/SpoutTracker.java    |   111 -
 .../storm/testing/TestAggregatesCounter.java    |    63 -
 .../backtype/storm/testing/TestConfBolt.java    |    62 -
 .../storm/testing/TestEventLogSpout.java        |   139 -
 .../storm/testing/TestEventOrderCheckBolt.java  |    76 -
 .../backtype/storm/testing/TestGlobalCount.java |    60 -
 .../src/jvm/backtype/storm/testing/TestJob.java |    43 -
 .../storm/testing/TestKryoDecorator.java        |    31 -
 .../backtype/storm/testing/TestPlannerBolt.java |    45 -
 .../storm/testing/TestPlannerSpout.java         |    85 -
 .../backtype/storm/testing/TestSerObject.java   |    37 -
 .../storm/testing/TestWordBytesCounter.java     |    27 -
 .../backtype/storm/testing/TestWordCounter.java |    65 -
 .../backtype/storm/testing/TestWordSpout.java   |    86 -
 .../backtype/storm/testing/TrackedTopology.java |    34 -
 .../storm/testing/TupleCaptureBolt.java         |    83 -
 .../topology/BaseConfigurationDeclarer.java     |    83 -
 .../storm/topology/BasicBoltExecutor.java       |    67 -
 .../storm/topology/BasicOutputCollector.java    |    62 -
 .../backtype/storm/topology/BoltDeclarer.java   |    26 -
 .../ComponentConfigurationDeclarer.java         |    32 -
 .../storm/topology/FailedException.java         |    36 -
 .../jvm/backtype/storm/topology/IBasicBolt.java |    33 -
 .../storm/topology/IBasicOutputCollector.java   |    27 -
 .../jvm/backtype/storm/topology/IComponent.java |    44 -
 .../jvm/backtype/storm/topology/IRichBolt.java  |    29 -
 .../jvm/backtype/storm/topology/IRichSpout.java |    29 -
 .../storm/topology/IRichStateSpout.java         |    25 -
 .../backtype/storm/topology/IWindowedBolt.java  |    40 -
 .../backtype/storm/topology/InputDeclarer.java  |   184 -
 .../storm/topology/OutputFieldsDeclarer.java    |    32 -
 .../storm/topology/OutputFieldsGetter.java      |    53 -
 .../storm/topology/ReportedFailedException.java |    36 -
 .../backtype/storm/topology/SpoutDeclarer.java  |    22 -
 .../storm/topology/TopologyBuilder.java         |   412 -
 .../storm/topology/WindowedBoltExecutor.java    |   308 -
 .../storm/topology/base/BaseBasicBolt.java      |    33 -
 .../storm/topology/base/BaseBatchBolt.java      |    24 -
 .../storm/topology/base/BaseComponent.java      |    28 -
 ...BaseOpaquePartitionedTransactionalSpout.java |    25 -
 .../base/BasePartitionedTransactionalSpout.java |    25 -
 .../storm/topology/base/BaseRichBolt.java       |    26 -
 .../storm/topology/base/BaseRichSpout.java      |    46 -
 .../topology/base/BaseTransactionalBolt.java    |    24 -
 .../topology/base/BaseTransactionalSpout.java   |    24 -
 .../storm/topology/base/BaseWindowedBolt.java   |   212 -
 .../storm/transactional/ICommitter.java         |    26 -
 .../ICommitterTransactionalSpout.java           |    31 -
 .../transactional/ITransactionalSpout.java      |    94 -
 .../storm/transactional/TransactionAttempt.java |    61 -
 .../TransactionalSpoutBatchExecutor.java        |    96 -
 .../TransactionalSpoutCoordinator.java          |   217 -
 .../TransactionalTopologyBuilder.java           |   521 -
 .../IOpaquePartitionedTransactionalSpout.java   |    56 -
 .../IPartitionedTransactionalSpout.java         |    69 -
 ...uePartitionedTransactionalSpoutExecutor.java |   160 -
 .../PartitionedTransactionalSpoutExecutor.java  |   142 -
 .../state/RotatingTransactionalState.java       |   149 -
 .../state/TestTransactionalState.java           |    47 -
 .../transactional/state/TransactionalState.java |   173 -
 .../backtype/storm/tuple/AddressedTuple.java    |    48 -
 .../src/jvm/backtype/storm/tuple/Fields.java    |   117 -
 .../src/jvm/backtype/storm/tuple/ITuple.java    |   214 -
 .../src/jvm/backtype/storm/tuple/MessageId.java |    94 -
 .../src/jvm/backtype/storm/tuple/Tuple.java     |    68 -
 .../src/jvm/backtype/storm/tuple/TupleImpl.java |   356 -
 .../src/jvm/backtype/storm/tuple/Values.java    |    37 -
 .../storm/ui/InvalidRequestException.java       |    37 -
 .../storm/utils/BufferFileInputStream.java      |    54 -
 .../backtype/storm/utils/BufferInputStream.java |    53 -
 .../backtype/storm/utils/CRC32OutputStream.java |    44 -
 .../backtype/storm/utils/ClojureTimerTask.java  |    35 -
 .../src/jvm/backtype/storm/utils/Container.java |    24 -
 .../jvm/backtype/storm/utils/DRPCClient.java    |    64 -
 .../utils/DisruptorBackpressureCallback.java    |    27 -
 .../backtype/storm/utils/DisruptorQueue.java    |   544 -
 .../storm/utils/ExtendedThreadPoolExecutor.java |    67 -
 .../storm/utils/IndifferentAccessMap.java       |   177 -
 .../backtype/storm/utils/InprocMessaging.java   |    59 -
 .../storm/utils/KeyedRoundRobinQueue.java       |    68 -
 .../jvm/backtype/storm/utils/ListDelegate.java  |   156 -
 .../jvm/backtype/storm/utils/LocalState.java    |   189 -
 .../src/jvm/backtype/storm/utils/Monitor.java   |   252 -
 .../jvm/backtype/storm/utils/MutableInt.java    |    43 -
 .../jvm/backtype/storm/utils/MutableLong.java   |    43 -
 .../jvm/backtype/storm/utils/MutableObject.java |    38 -
 .../jvm/backtype/storm/utils/NimbusClient.java  |   118 -
 .../utils/NimbusLeaderNotFoundException.java    |    41 -
 .../storm/utils/RegisteredGlobalState.java      |    62 -
 .../jvm/backtype/storm/utils/RotatingMap.java   |   128 -
 .../backtype/storm/utils/ServiceRegistry.java   |    47 -
 .../storm/utils/ShellBoltMessageQueue.java      |   121 -
 .../jvm/backtype/storm/utils/ShellProcess.java  |   210 -
 .../jvm/backtype/storm/utils/ShellUtils.java    |   505 -
 .../StormBoundedExponentialBackoffRetry.java    |    76 -
 .../src/jvm/backtype/storm/utils/TestUtils.java |    34 -
 .../storm/utils/ThriftTopologyUtils.java        |    66 -
 .../src/jvm/backtype/storm/utils/Time.java      |   119 -
 .../jvm/backtype/storm/utils/TimeCacheMap.java  |   125 -
 .../backtype/storm/utils/TransferDrainer.java   |   132 -
 .../src/jvm/backtype/storm/utils/Utils.java     |  1320 -
 .../jvm/backtype/storm/utils/VersionInfo.java   |   131 -
 .../backtype/storm/utils/VersionedStore.java    |   187 -
 .../storm/utils/WindowedTimeThrottler.java      |    51 -
 .../storm/utils/WorkerBackpressureCallback.java |    26 -
 .../storm/utils/WorkerBackpressureThread.java   |    59 -
 .../jvm/backtype/storm/utils/WritableUtils.java |   375 -
 .../backtype/storm/utils/ZookeeperAuthInfo.java |    53 -
 .../storm/utils/ZookeeperServerCnxnFactory.java |    84 -
 .../storm/validation/ConfigValidation.java      |   700 -
 .../validation/ConfigValidationAnnotations.java |   218 -
 .../storm/validation/ConfigValidationUtils.java |   175 -
 .../storm/windowing/CountEvictionPolicy.java    |    75 -
 .../storm/windowing/CountTriggerPolicy.java     |    68 -
 .../src/jvm/backtype/storm/windowing/Event.java |    49 -
 .../jvm/backtype/storm/windowing/EventImpl.java |    51 -
 .../storm/windowing/EvictionPolicy.java         |    74 -
 .../storm/windowing/TimeEvictionPolicy.java     |    71 -
 .../storm/windowing/TimeTriggerPolicy.java      |   128 -
 .../storm/windowing/TriggerHandler.java         |    31 -
 .../backtype/storm/windowing/TriggerPolicy.java |    42 -
 .../backtype/storm/windowing/TupleWindow.java   |    26 -
 .../storm/windowing/TupleWindowImpl.java        |    61 -
 .../storm/windowing/WaterMarkEvent.java         |    38 -
 .../windowing/WaterMarkEventGenerator.java      |   116 -
 .../windowing/WatermarkCountEvictionPolicy.java |    65 -
 .../windowing/WatermarkCountTriggerPolicy.java  |    83 -
 .../windowing/WatermarkTimeEvictionPolicy.java  |    77 -
 .../windowing/WatermarkTimeTriggerPolicy.java   |   109 -
 .../jvm/backtype/storm/windowing/Window.java    |    48 -
 .../windowing/WindowLifecycleListener.java      |    42 -
 .../backtype/storm/windowing/WindowManager.java |   289 -
 storm-core/src/jvm/org/apache/storm/Config.java |  2360 +
 .../src/jvm/org/apache/storm/Constants.java     |    36 +
 .../org/apache/storm/ICredentialsListener.java  |    32 +
 .../src/jvm/org/apache/storm/ILocalCluster.java |    49 +
 .../src/jvm/org/apache/storm/ILocalDRPC.java    |    27 +
 .../jvm/org/apache/storm/ISubmitterHook.java    |    31 +
 .../src/jvm/org/apache/storm/LogWriter.java     |    83 +
 .../jvm/org/apache/storm/StormSubmitter.java    |   496 +
 .../storm/blobstore/AtomicOutputStream.java     |    32 +
 .../storm/blobstore/BlobKeySequenceInfo.java    |    40 +
 .../org/apache/storm/blobstore/BlobStore.java   |   447 +
 .../storm/blobstore/BlobStoreAclHandler.java    |   399 +
 .../apache/storm/blobstore/BlobStoreFile.java   |    50 +
 .../apache/storm/blobstore/BlobStoreUtils.java  |   257 +
 .../storm/blobstore/BlobSynchronizer.java       |   124 +
 .../apache/storm/blobstore/ClientBlobStore.java |   184 +
 .../storm/blobstore/FileBlobStoreImpl.java      |   248 +
 .../storm/blobstore/InputStreamWithMeta.java    |    26 +
 .../org/apache/storm/blobstore/KeyFilter.java   |    22 +
 .../storm/blobstore/KeySequenceNumber.java      |   229 +
 .../storm/blobstore/LocalFsBlobStore.java       |   311 +
 .../storm/blobstore/LocalFsBlobStoreFile.java   |   159 +
 .../apache/storm/blobstore/NimbusBlobStore.java |   420 +
 .../org/apache/storm/clojure/ClojureBolt.java   |   119 +
 .../org/apache/storm/clojure/ClojureSpout.java  |   153 +
 .../org/apache/storm/clojure/RichShellBolt.java |    51 +
 .../apache/storm/clojure/RichShellSpout.java    |    51 +
 .../org/apache/storm/cluster/ClusterState.java  |   217 +
 .../storm/cluster/ClusterStateContext.java      |    41 +
 .../storm/cluster/ClusterStateFactory.java      |    28 +
 .../storm/cluster/ClusterStateListener.java     |    22 +
 .../apache/storm/cluster/ConnectionState.java   |    24 +
 .../org/apache/storm/cluster/DaemonType.java    |    27 +
 .../storm/coordination/BatchBoltExecutor.java   |   108 +
 .../coordination/BatchOutputCollector.java      |    46 +
 .../coordination/BatchOutputCollectorImpl.java  |    53 +
 .../coordination/BatchSubtopologyBuilder.java   |   447 +
 .../storm/coordination/CoordinatedBolt.java     |   382 +
 .../apache/storm/coordination/IBatchBolt.java   |    30 +
 .../daemon/ClientJarTransformerRunner.java      |    41 +
 .../apache/storm/daemon/DirectoryCleaner.java   |   177 +
 .../org/apache/storm/daemon/JarTransformer.java |    31 +
 .../org/apache/storm/daemon/Shutdownable.java   |    22 +
 .../storm/drpc/DRPCInvocationsClient.java       |   113 +
 .../jvm/org/apache/storm/drpc/DRPCSpout.java    |   261 +
 .../jvm/org/apache/storm/drpc/JoinResult.java   |    75 +
 .../org/apache/storm/drpc/KeyedFairBolt.java    |    93 +
 .../storm/drpc/LinearDRPCInputDeclarer.java     |    52 +
 .../storm/drpc/LinearDRPCTopologyBuilder.java   |   393 +
 .../org/apache/storm/drpc/PrepareRequest.java   |    59 +
 .../org/apache/storm/drpc/ReturnResults.java    |   124 +
 .../apache/storm/generated/AccessControl.java   |   627 +
 .../storm/generated/AccessControlType.java      |    62 +
 .../storm/generated/AlreadyAliveException.java  |   406 +
 .../org/apache/storm/generated/Assignment.java  |  1159 +
 .../storm/generated/AuthorizationException.java |   406 +
 .../storm/generated/BeginDownloadResult.java    |   608 +
 .../jvm/org/apache/storm/generated/Bolt.java    |   514 +
 .../storm/generated/BoltAggregateStats.java     |   704 +
 .../org/apache/storm/generated/BoltStats.java   |  1390 +
 .../apache/storm/generated/ClusterSummary.java  |   879 +
 .../storm/generated/ClusterWorkerHeartbeat.java |   768 +
 .../storm/generated/CommonAggregateStats.java   |   902 +
 .../generated/ComponentAggregateStats.java      |   752 +
 .../apache/storm/generated/ComponentCommon.java |   852 +
 .../apache/storm/generated/ComponentObject.java |   462 +
 .../storm/generated/ComponentPageInfo.java      |  2194 +
 .../apache/storm/generated/ComponentType.java   |    62 +
 .../org/apache/storm/generated/Credentials.java |   458 +
 .../storm/generated/DRPCExecutionException.java |   406 +
 .../org/apache/storm/generated/DRPCRequest.java |   507 +
 .../apache/storm/generated/DebugOptions.java    |   506 +
 .../apache/storm/generated/DistributedRPC.java  |  1328 +
 .../generated/DistributedRPCInvocations.java    |  2935 ++
 .../org/apache/storm/generated/ErrorInfo.java   |   714 +
 .../storm/generated/ExecutorAggregateStats.java |   526 +
 .../apache/storm/generated/ExecutorInfo.java    |   499 +
 .../storm/generated/ExecutorSpecificStats.java  |   387 +
 .../apache/storm/generated/ExecutorStats.java   |   915 +
 .../apache/storm/generated/ExecutorSummary.java |   922 +
 .../apache/storm/generated/GetInfoOptions.java  |   422 +
 .../apache/storm/generated/GlobalStreamId.java  |   507 +
 .../org/apache/storm/generated/Grouping.java    |   800 +
 .../generated/HBAuthorizationException.java     |   406 +
 .../storm/generated/HBExecutionException.java   |   406 +
 .../org/apache/storm/generated/HBMessage.java   |   636 +
 .../apache/storm/generated/HBMessageData.java   |   640 +
 .../jvm/org/apache/storm/generated/HBNodes.java |   461 +
 .../jvm/org/apache/storm/generated/HBPulse.java |   522 +
 .../org/apache/storm/generated/HBRecords.java   |   466 +
 .../storm/generated/HBServerMessageType.java    |   113 +
 .../generated/InvalidTopologyException.java     |   406 +
 .../org/apache/storm/generated/JavaObject.java  |   561 +
 .../apache/storm/generated/JavaObjectArg.java   |   631 +
 .../generated/KeyAlreadyExistsException.java    |   406 +
 .../storm/generated/KeyNotFoundException.java   |   406 +
 .../org/apache/storm/generated/KillOptions.java |   407 +
 .../storm/generated/LSApprovedWorkers.java      |   458 +
 .../generated/LSSupervisorAssignments.java      |   471 +
 .../apache/storm/generated/LSSupervisorId.java  |   406 +
 .../apache/storm/generated/LSTopoHistory.java   |   805 +
 .../storm/generated/LSTopoHistoryList.java      |   460 +
 .../storm/generated/LSWorkerHeartbeat.java      |   755 +
 .../apache/storm/generated/ListBlobsResult.java |   556 +
 .../apache/storm/generated/LocalAssignment.java |   676 +
 .../apache/storm/generated/LocalStateData.java  |   471 +
 .../org/apache/storm/generated/LogConfig.java   |   475 +
 .../org/apache/storm/generated/LogLevel.java    |   836 +
 .../apache/storm/generated/LogLevelAction.java  |    65 +
 .../jvm/org/apache/storm/generated/Nimbus.java  | 44114 +++++++++++++++++
 .../apache/storm/generated/NimbusSummary.java   |   796 +
 .../org/apache/storm/generated/NodeInfo.java    |   556 +
 .../storm/generated/NotAliveException.java      |   406 +
 .../org/apache/storm/generated/NullStruct.java  |   300 +
 .../apache/storm/generated/NumErrorsChoice.java |    65 +
 .../apache/storm/generated/ProfileAction.java   |    74 +
 .../apache/storm/generated/ProfileRequest.java  |   631 +
 .../storm/generated/ReadableBlobMeta.java       |   510 +
 .../storm/generated/RebalanceOptions.java       |   664 +
 .../storm/generated/SettableBlobMeta.java       |   567 +
 .../apache/storm/generated/ShellComponent.java  |   516 +
 .../storm/generated/SpecificAggregateStats.java |   387 +
 .../storm/generated/SpoutAggregateStats.java    |   407 +
 .../org/apache/storm/generated/SpoutSpec.java   |   514 +
 .../org/apache/storm/generated/SpoutStats.java  |   917 +
 .../apache/storm/generated/StateSpoutSpec.java  |   514 +
 .../org/apache/storm/generated/StormBase.java   |  1382 +
 .../apache/storm/generated/StormTopology.java   |   962 +
 .../org/apache/storm/generated/StreamInfo.java  |   554 +
 .../apache/storm/generated/SubmitOptions.java   |   533 +
 .../apache/storm/generated/SupervisorInfo.java  |  1446 +
 .../storm/generated/SupervisorSummary.java      |  1265 +
 .../storm/generated/ThriftSerializedObject.java |   516 +
 .../storm/generated/TopologyActionOptions.java  |   387 +
 .../storm/generated/TopologyHistoryInfo.java    |   461 +
 .../apache/storm/generated/TopologyInfo.java    |  2144 +
 .../storm/generated/TopologyInitialStatus.java  |    62 +
 .../storm/generated/TopologyPageInfo.java       |  2597 +
 .../apache/storm/generated/TopologyStats.java   |  1094 +
 .../apache/storm/generated/TopologyStatus.java  |    68 +
 .../apache/storm/generated/TopologySummary.java |  1901 +
 .../apache/storm/generated/WorkerResources.java |   605 +
 .../storm/grouping/CustomStreamGrouping.java    |    43 +
 .../src/jvm/org/apache/storm/grouping/Load.java |    77 +
 .../grouping/LoadAwareCustomStreamGrouping.java |    24 +
 .../grouping/LoadAwareShuffleGrouping.java      |    76 +
 .../org/apache/storm/grouping/LoadMapping.java  |    64 +
 .../storm/grouping/PartialKeyGrouping.java      |   106 +
 .../apache/storm/grouping/ShuffleGrouping.java  |    65 +
 .../org/apache/storm/hooks/BaseTaskHook.java    |    61 +
 .../org/apache/storm/hooks/BaseWorkerHook.java  |    51 +
 .../jvm/org/apache/storm/hooks/ITaskHook.java   |    38 +
 .../jvm/org/apache/storm/hooks/IWorkerHook.java |    44 +
 .../apache/storm/hooks/info/BoltAckInfo.java    |    32 +
 .../storm/hooks/info/BoltExecuteInfo.java       |    32 +
 .../apache/storm/hooks/info/BoltFailInfo.java   |    32 +
 .../org/apache/storm/hooks/info/EmitInfo.java   |    35 +
 .../apache/storm/hooks/info/SpoutAckInfo.java   |    30 +
 .../apache/storm/hooks/info/SpoutFailInfo.java  |    30 +
 .../apache/storm/localizer/LocalResource.java   |    44 +
 .../storm/localizer/LocalizedResource.java      |   130 +
 .../LocalizedResourceRetentionSet.java          |   140 +
 .../storm/localizer/LocalizedResourceSet.java   |   101 +
 .../org/apache/storm/localizer/Localizer.java   |   695 +
 .../storm/logging/ThriftAccessLogger.java       |    27 +
 .../logging/filters/AccessLoggingFilter.java    |    52 +
 .../storm/messaging/ConnectionWithStatus.java   |    49 +
 .../DeserializingConnectionCallback.java        |    60 +
 .../org/apache/storm/messaging/IConnection.java |    63 +
 .../storm/messaging/IConnectionCallback.java    |    31 +
 .../org/apache/storm/messaging/IContext.java    |    59 +
 .../org/apache/storm/messaging/TaskMessage.java |    53 +
 .../storm/messaging/TransportFactory.java       |    57 +
 .../apache/storm/messaging/local/Context.java   |   164 +
 .../apache/storm/messaging/netty/Client.java    |   578 +
 .../apache/storm/messaging/netty/Context.java   |   113 +
 .../storm/messaging/netty/ControlMessage.java   |    75 +
 .../messaging/netty/INettySerializable.java     |    26 +
 .../storm/messaging/netty/ISaslClient.java      |    28 +
 .../storm/messaging/netty/ISaslServer.java      |    26 +
 .../apache/storm/messaging/netty/IServer.java   |    26 +
 .../netty/KerberosSaslClientHandler.java        |   152 +
 .../netty/KerberosSaslNettyClient.java          |   203 +
 .../netty/KerberosSaslNettyClientState.java     |    31 +
 .../netty/KerberosSaslNettyServer.java          |   210 +
 .../netty/KerberosSaslNettyServerState.java     |    30 +
 .../netty/KerberosSaslServerHandler.java        |   133 +
 .../storm/messaging/netty/MessageBatch.java     |   118 +
 .../storm/messaging/netty/MessageBuffer.java    |    58 +
 .../storm/messaging/netty/MessageDecoder.java   |   144 +
 .../storm/messaging/netty/MessageEncoder.java   |    43 +
 .../netty/NettyRenameThreadFactory.java         |    56 +
 .../netty/NettyUncaughtExceptionHandler.java    |    35 +
 .../storm/messaging/netty/SaslMessageToken.java |   114 +
 .../storm/messaging/netty/SaslNettyClient.java  |   154 +
 .../messaging/netty/SaslNettyClientState.java   |    31 +
 .../storm/messaging/netty/SaslNettyServer.java  |   157 +
 .../messaging/netty/SaslNettyServerState.java   |    30 +
 .../messaging/netty/SaslStormClientHandler.java |   158 +
 .../netty/SaslStormServerAuthorizeHandler.java  |    83 +
 .../messaging/netty/SaslStormServerHandler.java |   153 +
 .../apache/storm/messaging/netty/SaslUtils.java |    68 +
 .../apache/storm/messaging/netty/Server.java    |   273 +
 .../messaging/netty/StormClientHandler.java     |    91 +
 .../netty/StormClientPipelineFactory.java       |    56 +
 .../messaging/netty/StormServerHandler.java     |    74 +
 .../netty/StormServerPipelineFactory.java       |    57 +
 .../apache/storm/metric/EventLoggerBolt.java    |    67 +
 .../storm/metric/FileBasedEventLogger.java      |   132 +
 .../metric/HttpForwardingMetricsConsumer.java   |    85 +
 .../metric/HttpForwardingMetricsServer.java     |   118 +
 .../org/apache/storm/metric/IEventLogger.java   |    70 +
 .../storm/metric/LoggingMetricsConsumer.java    |    76 +
 .../storm/metric/MetricsConsumerBolt.java       |    63 +
 .../jvm/org/apache/storm/metric/SystemBolt.java |   165 +
 .../storm/metric/api/AssignableMetric.java      |    34 +
 .../apache/storm/metric/api/CombinedMetric.java |    38 +
 .../apache/storm/metric/api/CountMetric.java    |    39 +
 .../org/apache/storm/metric/api/ICombiner.java  |    23 +
 .../org/apache/storm/metric/api/IMetric.java    |    22 +
 .../storm/metric/api/IMetricsConsumer.java      |    60 +
 .../org/apache/storm/metric/api/IReducer.java   |    24 +
 .../storm/metric/api/IStatefulObject.java       |    22 +
 .../apache/storm/metric/api/MeanReducer.java    |    53 +
 .../storm/metric/api/MultiCountMetric.java      |    45 +
 .../storm/metric/api/MultiReducedMetric.java    |    50 +
 .../apache/storm/metric/api/ReducedMetric.java  |    38 +
 .../apache/storm/metric/api/StateMetric.java    |    31 +
 .../metric/api/rpc/AssignableShellMetric.java   |    30 +
 .../metric/api/rpc/CombinedShellMetric.java     |    31 +
 .../storm/metric/api/rpc/CountShellMetric.java  |    37 +
 .../storm/metric/api/rpc/IShellMetric.java      |    31 +
 .../metric/api/rpc/ReducedShellMetric.java      |    32 +
 .../metric/internal/CountStatAndMetric.java     |   211 +
 .../metric/internal/LatencyStatAndMetric.java   |   262 +
 .../storm/metric/internal/MetricStatTimer.java  |    27 +
 .../internal/MultiCountStatAndMetric.java       |   112 +
 .../internal/MultiLatencyStatAndMetric.java     |   109 +
 .../storm/metric/internal/RateTracker.java      |   165 +
 .../jvm/org/apache/storm/multilang/BoltMsg.java |    79 +
 .../org/apache/storm/multilang/ISerializer.java |    82 +
 .../apache/storm/multilang/JsonSerializer.java  |   204 +
 .../storm/multilang/NoOutputException.java      |    40 +
 .../org/apache/storm/multilang/ShellMsg.java    |   184 +
 .../org/apache/storm/multilang/SpoutMsg.java    |    50 +
 .../AbstractDNSToSwitchMapping.java             |    96 +
 .../networktopography/DNSToSwitchMapping.java   |    49 +
 .../DefaultRackDNSToSwitchMapping.java          |    52 +
 .../storm/nimbus/DefaultTopologyValidator.java  |    31 +
 .../org/apache/storm/nimbus/ILeaderElector.java |    73 +
 .../nimbus/ITopologyActionNotifierPlugin.java   |    43 +
 .../apache/storm/nimbus/ITopologyValidator.java |    28 +
 .../jvm/org/apache/storm/nimbus/NimbusInfo.java |   116 +
 .../storm/pacemaker/IServerMessageHandler.java  |     2 +-
 .../apache/storm/pacemaker/PacemakerClient.java |    12 +-
 .../storm/pacemaker/PacemakerClientHandler.java |     4 +-
 .../apache/storm/pacemaker/PacemakerServer.java |    10 +-
 .../storm/pacemaker/codec/ThriftDecoder.java    |    10 +-
 .../storm/pacemaker/codec/ThriftEncoder.java    |    14 +-
 .../pacemaker/codec/ThriftNettyClientCodec.java |     6 +-
 .../pacemaker/codec/ThriftNettyServerCodec.java |    14 +-
 .../org/apache/storm/planner/CompoundSpout.java |    25 +
 .../org/apache/storm/planner/CompoundTask.java  |    25 +
 .../org/apache/storm/planner/TaskBundle.java    |    33 +
 .../jvm/org/apache/storm/scheduler/Cluster.java |   684 +
 .../apache/storm/scheduler/ExecutorDetails.java |    54 +
 .../jvm/org/apache/storm/scheduler/INimbus.java |    49 +
 .../org/apache/storm/scheduler/IScheduler.java  |    40 +
 .../org/apache/storm/scheduler/ISupervisor.java |    45 +
 .../storm/scheduler/SchedulerAssignment.java    |    58 +
 .../scheduler/SchedulerAssignmentImpl.java      |   105 +
 .../storm/scheduler/SupervisorDetails.java      |   132 +
 .../org/apache/storm/scheduler/Topologies.java  |    84 +
 .../apache/storm/scheduler/TopologyDetails.java |   515 +
 .../org/apache/storm/scheduler/WorkerSlot.java  |    77 +
 .../scheduler/multitenant/DefaultPool.java      |   219 +
 .../storm/scheduler/multitenant/FreePool.java   |   125 +
 .../scheduler/multitenant/IsolatedPool.java     |   363 +
 .../multitenant/MultitenantScheduler.java       |    98 +
 .../storm/scheduler/multitenant/Node.java       |   340 +
 .../storm/scheduler/multitenant/NodePool.java   |   296 +
 .../storm/scheduler/resource/Component.java     |    54 +
 .../storm/scheduler/resource/RAS_Node.java      |   528 +
 .../storm/scheduler/resource/RAS_Nodes.java     |   160 +
 .../resource/ResourceAwareScheduler.java        |   414 +
 .../storm/scheduler/resource/ResourceUtils.java |   184 +
 .../scheduler/resource/SchedulingResult.java    |   116 +
 .../scheduler/resource/SchedulingStatus.java    |    40 +
 .../apache/storm/scheduler/resource/User.java   |   348 +
 .../eviction/DefaultEvictionStrategy.java       |   126 +
 .../strategies/eviction/IEvictionStrategy.java  |    47 +
 .../DefaultSchedulingPriorityStrategy.java      |    81 +
 .../priority/ISchedulingPriorityStrategy.java   |    41 +
 .../DefaultResourceAwareStrategy.java           |   488 +
 .../strategies/scheduling/IStrategy.java        |    50 +
 .../storm/security/INimbusCredentialPlugin.java |    47 +
 .../apache/storm/security/auth/AuthUtils.java   |   348 +
 .../auth/DefaultHttpCredentialsPlugin.java      |    96 +
 .../security/auth/DefaultPrincipalToLocal.java  |    42 +
 .../apache/storm/security/auth/IAuthorizer.java |    53 +
 .../storm/security/auth/IAutoCredentials.java   |    55 +
 .../security/auth/ICredentialsRenewer.java      |    40 +
 .../auth/IGroupMappingServiceProvider.java      |    42 +
 .../security/auth/IHttpCredentialsPlugin.java   |    48 +
 .../storm/security/auth/IPrincipalToLocal.java  |    41 +
 .../storm/security/auth/ITransportPlugin.java   |    57 +
 .../security/auth/KerberosPrincipalToLocal.java |    45 +
 .../storm/security/auth/NimbusPrincipal.java    |    29 +
 .../apache/storm/security/auth/ReqContext.java  |   154 +
 .../security/auth/SaslTransportPlugin.java      |   174 +
 .../security/auth/ShellBasedGroupsMapping.java  |    94 +
 .../security/auth/SimpleTransportPlugin.java    |   161 +
 .../security/auth/SingleUserPrincipal.java      |    53 +
 .../storm/security/auth/TBackoffConnect.java    |    76 +
 .../storm/security/auth/ThriftClient.java       |   114 +
 .../security/auth/ThriftConnectionType.java     |    77 +
 .../storm/security/auth/ThriftServer.java       |    78 +
 .../auth/authorizer/DRPCAuthorizerBase.java     |    63 +
 .../authorizer/DRPCSimpleACLAuthorizer.java     |   174 +
 .../auth/authorizer/DenyAuthorizer.java         |    47 +
 .../authorizer/ImpersonationAuthorizer.java     |   172 +
 .../auth/authorizer/NoopAuthorizer.java         |    47 +
 .../auth/authorizer/SimpleACLAuthorizer.java    |   167 +
 .../authorizer/SimpleWhitelistAuthorizer.java   |    60 +
 .../auth/digest/ClientCallbackHandler.java      |   108 +
 .../auth/digest/DigestSaslTransportPlugin.java  |    68 +
 .../auth/digest/ServerCallbackHandler.java      |   132 +
 .../storm/security/auth/kerberos/AutoTGT.java   |   277 +
 .../auth/kerberos/AutoTGTKrb5LoginModule.java   |   108 +
 .../kerberos/AutoTGTKrb5LoginModuleTest.java    |    44 +
 .../auth/kerberos/ClientCallbackHandler.java    |   104 +
 .../kerberos/KerberosSaslTransportPlugin.java   |   210 +
 .../security/auth/kerberos/NoOpTTrasport.java   |    54 +
 .../auth/kerberos/ServerCallbackHandler.java    |    96 +
 .../auth/kerberos/jaas_kerberos_cluster.conf    |    49 +
 .../auth/kerberos/jaas_kerberos_launcher.conf   |    31 +
 .../serialization/BlowfishTupleSerializer.java  |    92 +
 .../storm/serialization/DefaultKryoFactory.java |    64 +
 .../DefaultSerializationDelegate.java           |    58 +
 .../GzipBridgeSerializationDelegate.java        |    65 +
 .../GzipBridgeThriftSerializationDelegate.java  |    64 +
 .../GzipSerializationDelegate.java              |    64 +
 .../GzipThriftSerializationDelegate.java        |    56 +
 .../storm/serialization/IKryoDecorator.java     |    23 +
 .../storm/serialization/IKryoFactory.java       |    40 +
 .../storm/serialization/ITupleDeserializer.java |    24 +
 .../storm/serialization/ITupleSerializer.java   |    26 +
 .../serialization/KryoTupleDeserializer.java    |    56 +
 .../serialization/KryoTupleSerializer.java      |    60 +
 .../serialization/KryoValuesDeserializer.java   |    50 +
 .../serialization/KryoValuesSerializer.java     |    58 +
 .../serialization/SerializableSerializer.java   |    61 +
 .../serialization/SerializationDelegate.java    |    35 +
 .../serialization/SerializationFactory.java     |   223 +
 .../ThriftSerializationDelegate.java            |    52 +
 .../types/ArrayListSerializer.java              |    32 +
 .../serialization/types/HashMapSerializer.java  |    32 +
 .../serialization/types/HashSetSerializer.java  |    32 +
 .../types/ListDelegateSerializer.java           |    32 +
 .../org/apache/storm/spout/CheckPointState.java |   172 +
 .../org/apache/storm/spout/CheckpointSpout.java |   232 +
 .../storm/spout/IMultiSchemableSpout.java       |    23 +
 .../org/apache/storm/spout/ISchemableSpout.java |    24 +
 .../src/jvm/org/apache/storm/spout/ISpout.java  |   105 +
 .../storm/spout/ISpoutOutputCollector.java      |    32 +
 .../apache/storm/spout/ISpoutWaitStrategy.java  |    34 +
 .../jvm/org/apache/storm/spout/MultiScheme.java |    29 +
 .../storm/spout/NothingEmptyEmitStrategy.java   |    31 +
 .../org/apache/storm/spout/RawMultiScheme.java  |    40 +
 .../jvm/org/apache/storm/spout/RawScheme.java   |    37 +
 .../src/jvm/org/apache/storm/spout/Scheme.java  |    29 +
 .../apache/storm/spout/SchemeAsMultiScheme.java |    42 +
 .../jvm/org/apache/storm/spout/ShellSpout.java  |   280 +
 .../storm/spout/SleepSpoutWaitStrategy.java     |    41 +
 .../storm/spout/SpoutOutputCollector.java       |   139 +
 .../storm/state/DefaultStateSerializer.java     |    65 +
 .../jvm/org/apache/storm/state/IStateSpout.java |    29 +
 .../storm/state/IStateSpoutOutputCollector.java |    22 +
 .../apache/storm/state/ISubscribedState.java    |    25 +
 .../state/ISynchronizeOutputCollector.java      |    24 +
 .../storm/state/InMemoryKeyValueState.java      |   114 +
 .../state/InMemoryKeyValueStateProvider.java    |    43 +
 .../org/apache/storm/state/KeyValueState.java   |    48 +
 .../jvm/org/apache/storm/state/Serializer.java  |    30 +
 .../src/jvm/org/apache/storm/state/State.java   |    55 +
 .../org/apache/storm/state/StateFactory.java    |    69 +
 .../org/apache/storm/state/StateProvider.java   |    38 +
 .../storm/state/StateSpoutOutputCollector.java  |    28 +
 .../storm/state/SynchronizeOutputCollector.java |    30 +
 .../storm/task/GeneralTopologyContext.java      |   199 +
 .../src/jvm/org/apache/storm/task/IBolt.java    |    84 +
 .../org/apache/storm/task/IErrorReporter.java   |    22 +
 .../org/apache/storm/task/IMetricsContext.java  |    31 +
 .../org/apache/storm/task/IOutputCollector.java |    32 +
 .../org/apache/storm/task/OutputCollector.java  |   225 +
 .../jvm/org/apache/storm/task/ShellBolt.java    |   406 +
 .../org/apache/storm/task/TopologyContext.java  |   389 +
 .../storm/task/WorkerTopologyContext.java       |   106 +
 .../apache/storm/testing/AckFailDelegate.java   |    25 +
 .../apache/storm/testing/AckFailMapTracker.java |    52 +
 .../org/apache/storm/testing/AckTracker.java    |    52 +
 .../AlternateRackDNSToSwitchMapping.java        |    65 +
 .../apache/storm/testing/BatchNumberList.java   |    72 +
 .../apache/storm/testing/BatchProcessWord.java  |    39 +
 .../org/apache/storm/testing/BatchRepeatA.java  |    48 +
 .../org/apache/storm/testing/BoltTracker.java   |    42 +
 .../storm/testing/CompleteTopologyParam.java    |    87 +
 .../apache/storm/testing/CountingBatchBolt.java |    55 +
 .../storm/testing/CountingCommitBolt.java       |    57 +
 .../org/apache/storm/testing/FeederSpout.java   |   100 +
 .../org/apache/storm/testing/FixedTuple.java    |    42 +
 .../apache/storm/testing/FixedTupleSpout.java   |   179 +
 .../testing/ForwardingMetricsConsumer.java      |   100 +
 .../org/apache/storm/testing/IdentityBolt.java  |    42 +
 .../apache/storm/testing/IntegrationTest.java   |    38 +
 .../storm/testing/KeyedCountingBatchBolt.java   |    61 +
 .../testing/KeyedCountingCommitterBolt.java     |    24 +
 .../storm/testing/KeyedSummingBatchBolt.java    |    61 +
 .../storm/testing/MemoryTransactionalSpout.java |   180 +
 .../testing/MemoryTransactionalSpoutMeta.java   |    38 +
 .../apache/storm/testing/MkClusterParam.java    |    57 +
 .../org/apache/storm/testing/MkTupleParam.java  |    51 +
 .../org/apache/storm/testing/MockedSources.java |    60 +
 .../jvm/org/apache/storm/testing/NGrouping.java |    50 +
 .../storm/testing/NonRichBoltTracker.java       |    51 +
 .../testing/OpaqueMemoryTransactionalSpout.java |   186 +
 .../apache/storm/testing/PrepareBatchBolt.java  |    52 +
 .../storm/testing/PythonShellMetricsBolt.java   |    49 +
 .../storm/testing/PythonShellMetricsSpout.java  |    52 +
 .../testing/SingleUserSimpleTransport.java      |    37 +
 .../org/apache/storm/testing/SpoutTracker.java  |   111 +
 .../storm/testing/TestAggregatesCounter.java    |    63 +
 .../org/apache/storm/testing/TestConfBolt.java  |    62 +
 .../apache/storm/testing/TestEventLogSpout.java |   139 +
 .../storm/testing/TestEventOrderCheckBolt.java  |    76 +
 .../apache/storm/testing/TestGlobalCount.java   |    60 +
 .../jvm/org/apache/storm/testing/TestJob.java   |    43 +
 .../apache/storm/testing/TestKryoDecorator.java |    31 +
 .../apache/storm/testing/TestPlannerBolt.java   |    45 +
 .../apache/storm/testing/TestPlannerSpout.java  |    85 +
 .../org/apache/storm/testing/TestSerObject.java |    37 +
 .../storm/testing/TestWordBytesCounter.java     |    27 +
 .../apache/storm/testing/TestWordCounter.java   |    65 +
 .../org/apache/storm/testing/TestWordSpout.java |    86 +
 .../apache/storm/testing/TrackedTopology.java   |    34 +
 .../apache/storm/testing/TupleCaptureBolt.java  |    83 +
 .../topology/BaseConfigurationDeclarer.java     |    83 +
 .../storm/topology/BasicBoltExecutor.java       |    67 +
 .../storm/topology/BasicOutputCollector.java    |    62 +
 .../org/apache/storm/topology/BoltDeclarer.java |    26 +
 .../topology/CheckpointTupleForwarder.java      |   250 +
 .../ComponentConfigurationDeclarer.java         |    32 +
 .../apache/storm/topology/FailedException.java  |    36 +
 .../org/apache/storm/topology/IBasicBolt.java   |    33 +
 .../storm/topology/IBasicOutputCollector.java   |    27 +
 .../org/apache/storm/topology/IComponent.java   |    44 +
 .../org/apache/storm/topology/IRichBolt.java    |    29 +
 .../org/apache/storm/topology/IRichSpout.java   |    29 +
 .../apache/storm/topology/IRichStateSpout.java  |    25 +
 .../apache/storm/topology/IStatefulBolt.java    |    26 +
 .../storm/topology/IStatefulComponent.java      |    56 +
 .../apache/storm/topology/IWindowedBolt.java    |    40 +
 .../apache/storm/topology/InputDeclarer.java    |   184 +
 .../storm/topology/OutputFieldsDeclarer.java    |    32 +
 .../storm/topology/OutputFieldsGetter.java      |    53 +
 .../storm/topology/ReportedFailedException.java |    36 +
 .../apache/storm/topology/SpoutDeclarer.java    |    22 +
 .../storm/topology/StatefulBoltExecutor.java    |   151 +
 .../apache/storm/topology/TopologyBuilder.java  |   506 +
 .../storm/topology/WindowedBoltExecutor.java    |   308 +
 .../storm/topology/base/BaseBasicBolt.java      |    33 +
 .../storm/topology/base/BaseBatchBolt.java      |    24 +
 .../storm/topology/base/BaseComponent.java      |    28 +
 ...BaseOpaquePartitionedTransactionalSpout.java |    25 +
 .../base/BasePartitionedTransactionalSpout.java |    25 +
 .../storm/topology/base/BaseRichBolt.java       |    26 +
 .../storm/topology/base/BaseRichSpout.java      |    46 +
 .../storm/topology/base/BaseStatefulBolt.java   |    64 +
 .../topology/base/BaseTransactionalBolt.java    |    24 +
 .../topology/base/BaseTransactionalSpout.java   |    24 +
 .../storm/topology/base/BaseWindowedBolt.java   |   212 +
 .../apache/storm/transactional/ICommitter.java  |    26 +
 .../ICommitterTransactionalSpout.java           |    31 +
 .../transactional/ITransactionalSpout.java      |    94 +
 .../storm/transactional/TransactionAttempt.java |    61 +
 .../TransactionalSpoutBatchExecutor.java        |    96 +
 .../TransactionalSpoutCoordinator.java          |   217 +
 .../TransactionalTopologyBuilder.java           |   521 +
 .../IOpaquePartitionedTransactionalSpout.java   |    56 +
 .../IPartitionedTransactionalSpout.java         |    69 +
 ...uePartitionedTransactionalSpoutExecutor.java |   160 +
 .../PartitionedTransactionalSpoutExecutor.java  |   142 +
 .../state/RotatingTransactionalState.java       |   149 +
 .../state/TestTransactionalState.java           |    47 +
 .../transactional/state/TransactionalState.java |   173 +
 .../jvm/org/apache/storm/trident/JoinType.java  |    30 +
 .../jvm/org/apache/storm/trident/Stream.java    |   377 +
 .../org/apache/storm/trident/TridentState.java  |    40 +
 .../apache/storm/trident/TridentTopology.java   |   827 +
 .../trident/drpc/ReturnResultsReducer.java      |   121 +
 .../fluent/ChainedAggregatorDeclarer.java       |   183 +
 .../fluent/ChainedFullAggregatorDeclarer.java   |    32 +
 .../ChainedPartitionAggregatorDeclarer.java     |    32 +
 .../trident/fluent/GlobalAggregationScheme.java |    26 +
 .../storm/trident/fluent/GroupedStream.java     |   174 +
 .../trident/fluent/IAggregatableStream.java     |    31 +
 .../fluent/IChainedAggregatorDeclarer.java      |    24 +
 .../storm/trident/fluent/UniqueIdGen.java       |    34 +
 .../storm/trident/graph/GraphGrouper.java       |   119 +
 .../org/apache/storm/trident/graph/Group.java   |    84 +
 .../storm/trident/operation/Aggregator.java     |    26 +
 .../storm/trident/operation/Assembly.java       |    25 +
 .../storm/trident/operation/BaseAggregator.java |    23 +
 .../storm/trident/operation/BaseFilter.java     |    23 +
 .../storm/trident/operation/BaseFunction.java   |    23 +
 .../trident/operation/BaseMultiReducer.java     |    33 +
 .../storm/trident/operation/BaseOperation.java  |    32 +
 .../trident/operation/CombinerAggregator.java   |    29 +
 .../storm/trident/operation/EachOperation.java  |    22 +
 .../apache/storm/trident/operation/Filter.java  |    24 +
 .../storm/trident/operation/Function.java       |    24 +
 .../trident/operation/GroupedMultiReducer.java  |    31 +
 .../storm/trident/operation/MultiReducer.java   |    31 +
 .../storm/trident/operation/Operation.java      |    26 +
 .../trident/operation/ReducerAggregator.java    |    26 +
 .../trident/operation/TridentCollector.java     |    26 +
 .../operation/TridentMultiReducerContext.java   |    36 +
 .../operation/TridentOperationContext.java      |    65 +
 .../storm/trident/operation/builtin/Count.java  |    41 +
 .../storm/trident/operation/builtin/Debug.java  |    39 +
 .../storm/trident/operation/builtin/Equals.java |    38 +
 .../trident/operation/builtin/FilterNull.java   |    31 +
 .../storm/trident/operation/builtin/FirstN.java |   125 +
 .../storm/trident/operation/builtin/MapGet.java |    38 +
 .../storm/trident/operation/builtin/Negate.java |    48 +
 .../trident/operation/builtin/SnapshotGet.java  |    44 +
 .../storm/trident/operation/builtin/Sum.java    |    42 +
 .../operation/builtin/TupleCollectionGet.java   |    46 +
 .../operation/impl/CaptureCollector.java        |    42 +
 .../operation/impl/ChainedAggregatorImpl.java   |   113 +
 .../trident/operation/impl/ChainedResult.java   |    53 +
 .../operation/impl/CombinerAggStateUpdater.java |    56 +
 .../impl/CombinerAggregatorCombineImpl.java     |    61 +
 .../impl/CombinerAggregatorInitImpl.java        |    49 +
 .../trident/operation/impl/FilterExecutor.java  |    53 +
 .../operation/impl/GlobalBatchToPartition.java  |    29 +
 .../trident/operation/impl/GroupCollector.java  |    48 +
 .../operation/impl/GroupedAggregator.java       |    96 +
 .../impl/GroupedMultiReducerExecutor.java       |    95 +
 .../operation/impl/IdentityMultiReducer.java    |    51 +
 .../impl/IndexHashBatchToPartition.java         |    29 +
 .../operation/impl/JoinerMultiReducer.java      |   159 +
 .../operation/impl/ReducerAggStateUpdater.java  |    53 +
 .../operation/impl/ReducerAggregatorImpl.java   |    56 +
 .../storm/trident/operation/impl/Result.java    |    27 +
 .../operation/impl/SingleEmitAggregator.java    |    95 +
 .../trident/operation/impl/TrueFilter.java      |    40 +
 .../storm/trident/partition/GlobalGrouping.java |    42 +
 .../trident/partition/IdentityGrouping.java     |    59 +
 .../trident/partition/IndexHashGrouping.java    |    53 +
 .../storm/trident/planner/BridgeReceiver.java   |    38 +
 .../org/apache/storm/trident/planner/Node.java  |    67 +
 .../storm/trident/planner/NodeStateInfo.java    |    31 +
 .../storm/trident/planner/PartitionNode.java    |    50 +
 .../storm/trident/planner/ProcessorContext.java |    29 +
 .../storm/trident/planner/ProcessorNode.java    |    33 +
 .../apache/storm/trident/planner/SpoutNode.java |    39 +
 .../storm/trident/planner/SubtopologyBolt.java  |   217 +
 .../storm/trident/planner/TridentProcessor.java |    40 +
 .../storm/trident/planner/TupleReceiver.java    |    27 +
 .../planner/processor/AggregateProcessor.java   |    84 +
 .../planner/processor/AppendCollector.java      |    62 +
 .../planner/processor/EachProcessor.java        |    80 +
 .../planner/processor/FreshCollector.java       |    59 +
 .../processor/MultiReducerProcessor.java        |    93 +
 .../processor/PartitionPersistProcessor.java    |   107 +
 .../planner/processor/ProjectedProcessor.java   |    73 +
 .../planner/processor/StateQueryProcessor.java  |   107 +
 .../planner/processor/TridentContext.java       |    76 +
 .../storm/trident/spout/BatchSpoutExecutor.java |    92 +
 .../apache/storm/trident/spout/IBatchID.java    |    24 +
 .../apache/storm/trident/spout/IBatchSpout.java |    33 +
 .../trident/spout/ICommitterTridentSpout.java   |    31 +
 .../spout/IOpaquePartitionedTridentSpout.java   |    63 +
 .../trident/spout/IPartitionedTridentSpout.java |    77 +
 .../storm/trident/spout/ISpoutPartition.java    |    25 +
 .../storm/trident/spout/ITridentDataSource.java |    26 +
 .../storm/trident/spout/ITridentSpout.java      |   125 +
 .../OpaquePartitionedTridentSpoutExecutor.java  |   201 +
 .../spout/PartitionedTridentSpoutExecutor.java  |   171 +
 .../trident/spout/RichSpoutBatchExecutor.java   |   204 +
 .../storm/trident/spout/RichSpoutBatchId.java   |    49 +
 .../spout/RichSpoutBatchIdSerializer.java       |    38 +
 .../trident/spout/RichSpoutBatchTriggerer.java  |   182 +
 .../trident/spout/TridentSpoutCoordinator.java  |    94 +
 .../trident/spout/TridentSpoutExecutor.java     |   138 +
 .../storm/trident/state/BaseQueryFunction.java  |    25 +
 .../storm/trident/state/BaseStateUpdater.java   |    25 +
 .../trident/state/CombinerValueUpdater.java     |    36 +
 .../storm/trident/state/ITupleCollection.java   |    26 +
 .../state/JSONNonTransactionalSerializer.java   |    44 +
 .../trident/state/JSONOpaqueSerializer.java     |    52 +
 .../state/JSONTransactionalSerializer.java      |    50 +
 .../apache/storm/trident/state/OpaqueValue.java |    75 +
 .../storm/trident/state/QueryFunction.java      |    28 +
 .../storm/trident/state/ReadOnlyState.java      |    31 +
 .../trident/state/ReducerValueUpdater.java      |    41 +
 .../apache/storm/trident/state/Serializer.java  |    26 +
 .../org/apache/storm/trident/state/State.java   |    39 +
 .../storm/trident/state/StateFactory.java       |    26 +
 .../apache/storm/trident/state/StateSpec.java   |    30 +
 .../apache/storm/trident/state/StateType.java   |    25 +
 .../storm/trident/state/StateUpdater.java       |    33 +
 .../storm/trident/state/TransactionalValue.java |    44 +
 .../storm/trident/state/ValueUpdater.java       |    23 +
 .../trident/state/map/CachedBatchReadsMap.java  |    80 +
 .../storm/trident/state/map/CachedMap.java      |    78 +
 .../storm/trident/state/map/IBackingMap.java    |    26 +
 .../state/map/MapCombinerAggStateUpdater.java   |    84 +
 .../state/map/MapReducerAggStateUpdater.java    |    91 +
 .../storm/trident/state/map/MapState.java       |    26 +
 .../state/map/MicroBatchIBackingMap.java        |    85 +
 .../trident/state/map/NonTransactionalMap.java  |    67 +
 .../storm/trident/state/map/OpaqueMap.java      |   124 +
 .../trident/state/map/ReadOnlyMapState.java     |    26 +
 .../trident/state/map/RemovableMapState.java    |    25 +
 .../trident/state/map/SnapshottableMap.java     |    76 +
 .../trident/state/map/TransactionalMap.java     |   109 +
 .../state/snapshot/ReadOnlySnapshottable.java   |    24 +
 .../trident/state/snapshot/Snapshottable.java   |    27 +
 .../trident/testing/CountAsAggregator.java      |    47 +
 .../storm/trident/testing/FeederBatchSpout.java |   185 +
 .../testing/FeederCommitterBatchSpout.java      |    96 +
 .../storm/trident/testing/FixedBatchSpout.java  |    97 +
 .../apache/storm/trident/testing/IFeeder.java   |    23 +
 .../trident/testing/LRUMemoryMapState.java      |   154 +
 .../storm/trident/testing/MemoryBackingMap.java |    47 +
 .../storm/trident/testing/MemoryMapState.java   |   176 +
 .../org/apache/storm/trident/testing/Split.java |    36 +
 .../storm/trident/testing/StringLength.java     |    32 +
 .../storm/trident/testing/TrueFilter.java       |    30 +
 .../storm/trident/testing/TuplifyArgs.java      |    37 +
 .../storm/trident/topology/BatchInfo.java       |    33 +
 .../trident/topology/ITridentBatchBolt.java     |    32 +
 .../topology/MasterBatchCoordinator.java        |   289 +
 .../trident/topology/TransactionAttempt.java    |    66 +
 .../trident/topology/TridentBoltExecutor.java   |   435 +
 .../topology/TridentTopologyBuilder.java        |   734 +
 .../state/RotatingTransactionalState.java       |   147 +
 .../topology/state/TestTransactionalState.java  |    47 +
 .../topology/state/TransactionalState.java      |   171 +
 .../apache/storm/trident/tuple/ComboList.java   |    92 +
 .../apache/storm/trident/tuple/ConsList.java    |    44 +
 .../storm/trident/tuple/TridentTuple.java       |    34 +
 .../storm/trident/tuple/TridentTupleView.java   |   361 +
 .../storm/trident/tuple/ValuePointer.java       |    60 +
 .../storm/trident/util/ErrorEdgeFactory.java    |    28 +
 .../apache/storm/trident/util/IndexedEdge.java  |    50 +
 .../org/apache/storm/trident/util/LRUMap.java   |    35 +
 .../apache/storm/trident/util/TridentUtils.java |   117 +
 .../org/apache/storm/tuple/AddressedTuple.java  |    48 +
 .../src/jvm/org/apache/storm/tuple/Fields.java  |   117 +
 .../src/jvm/org/apache/storm/tuple/ITuple.java  |   214 +
 .../jvm/org/apache/storm/tuple/MessageId.java   |    94 +
 .../src/jvm/org/apache/storm/tuple/Tuple.java   |    68 +
 .../jvm/org/apache/storm/tuple/TupleImpl.java   |   356 +
 .../src/jvm/org/apache/storm/tuple/Values.java  |    37 +
 .../storm/ui/InvalidRequestException.java       |    37 +
 .../storm/utils/BufferFileInputStream.java      |    54 +
 .../apache/storm/utils/BufferInputStream.java   |    53 +
 .../apache/storm/utils/CRC32OutputStream.java   |    44 +
 .../apache/storm/utils/ClojureTimerTask.java    |    35 +
 .../jvm/org/apache/storm/utils/Container.java   |    24 +
 .../jvm/org/apache/storm/utils/DRPCClient.java  |    64 +
 .../utils/DisruptorBackpressureCallback.java    |    27 +
 .../org/apache/storm/utils/DisruptorQueue.java  |   544 +
 .../storm/utils/ExtendedThreadPoolExecutor.java |    67 +
 .../storm/utils/IndifferentAccessMap.java       |   177 +
 .../org/apache/storm/utils/InprocMessaging.java |    59 +
 .../storm/utils/KeyedRoundRobinQueue.java       |    68 +
 .../org/apache/storm/utils/ListDelegate.java    |   156 +
 .../jvm/org/apache/storm/utils/LocalState.java  |   189 +
 .../src/jvm/org/apache/storm/utils/Monitor.java |   252 +
 .../jvm/org/apache/storm/utils/MutableInt.java  |    43 +
 .../jvm/org/apache/storm/utils/MutableLong.java |    43 +
 .../org/apache/storm/utils/MutableObject.java   |    38 +
 .../org/apache/storm/utils/NimbusClient.java    |   118 +
 .../utils/NimbusLeaderNotFoundException.java    |    41 +
 .../storm/utils/RegisteredGlobalState.java      |    62 +
 .../jvm/org/apache/storm/utils/RotatingMap.java |   128 +
 .../org/apache/storm/utils/ServiceRegistry.java |    47 +
 .../storm/utils/ShellBoltMessageQueue.java      |   121 +
 .../org/apache/storm/utils/ShellProcess.java    |   210 +
 .../jvm/org/apache/storm/utils/ShellUtils.java  |   505 +
 .../StormBoundedExponentialBackoffRetry.java    |    76 +
 .../jvm/org/apache/storm/utils/TestUtils.java   |    34 +
 .../apache/storm/utils/ThriftTopologyUtils.java |    66 +
 .../src/jvm/org/apache/storm/utils/Time.java    |   119 +
 .../org/apache/storm/utils/TimeCacheMap.java    |   125 +
 .../org/apache/storm/utils/TransferDrainer.java |   132 +
 .../jvm/org/apache/storm/utils/TupleUtils.java  |    55 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |  1373 +
 .../jvm/org/apache/storm/utils/VersionInfo.java |   131 +
 .../org/apache/storm/utils/VersionedStore.java  |   187 +
 .../storm/utils/WindowedTimeThrottler.java      |    51 +
 .../storm/utils/WorkerBackpressureCallback.java |    26 +
 .../storm/utils/WorkerBackpressureThread.java   |    59 +
 .../org/apache/storm/utils/WritableUtils.java   |   375 +
 .../apache/storm/utils/ZookeeperAuthInfo.java   |    53 +
 .../storm/utils/ZookeeperServerCnxnFactory.java |    84 +
 .../storm/validation/ConfigValidation.java      |   700 +
 .../validation/ConfigValidationAnnotations.java |   218 +
 .../storm/validation/ConfigValidationUtils.java |   175 +
 .../storm/windowing/CountEvictionPolicy.java    |    75 +
 .../storm/windowing/CountTriggerPolicy.java     |    68 +
 .../jvm/org/apache/storm/windowing/Event.java   |    49 +
 .../org/apache/storm/windowing/EventImpl.java   |    51 +
 .../apache/storm/windowing/EvictionPolicy.java  |    74 +
 .../storm/windowing/TimeEvictionPolicy.java     |    71 +
 .../storm/windowing/TimeTriggerPolicy.java      |   128 +
 .../apache/storm/windowing/TriggerHandler.java  |    31 +
 .../apache/storm/windowing/TriggerPolicy.java   |    42 +
 .../org/apache/storm/windowing/TupleWindow.java |    26 +
 .../apache/storm/windowing/TupleWindowImpl.java |    61 +
 .../apache/storm/windowing/WaterMarkEvent.java  |    38 +
 .../windowing/WaterMarkEventGenerator.java      |   116 +
 .../windowing/WatermarkCountEvictionPolicy.java |    65 +
 .../windowing/WatermarkCountTriggerPolicy.java  |    83 +
 .../windowing/WatermarkTimeEvictionPolicy.java  |    77 +
 .../windowing/WatermarkTimeTriggerPolicy.java   |   109 +
 .../jvm/org/apache/storm/windowing/Window.java  |    48 +
 .../windowing/WindowLifecycleListener.java      |    42 +
 .../apache/storm/windowing/WindowManager.java   |   289 +
 storm-core/src/jvm/storm/trident/JoinType.java  |    30 -
 storm-core/src/jvm/storm/trident/Stream.java    |   377 -
 .../src/jvm/storm/trident/TridentState.java     |    40 -
 .../src/jvm/storm/trident/TridentTopology.java  |   827 -
 .../trident/drpc/ReturnResultsReducer.java      |   121 -
 .../fluent/ChainedAggregatorDeclarer.java       |   183 -
 .../fluent/ChainedFullAggregatorDeclarer.java   |    32 -
 .../ChainedPartitionAggregatorDeclarer.java     |    32 -
 .../trident/fluent/GlobalAggregationScheme.java |    26 -
 .../jvm/storm/trident/fluent/GroupedStream.java |   174 -
 .../trident/fluent/IAggregatableStream.java     |    31 -
 .../fluent/IChainedAggregatorDeclarer.java      |    24 -
 .../jvm/storm/trident/fluent/UniqueIdGen.java   |    34 -
 .../jvm/storm/trident/graph/GraphGrouper.java   |   119 -
 .../src/jvm/storm/trident/graph/Group.java      |    84 -
 .../jvm/storm/trident/operation/Aggregator.java |    26 -
 .../jvm/storm/trident/operation/Assembly.java   |    25 -
 .../storm/trident/operation/BaseAggregator.java |    23 -
 .../jvm/storm/trident/operation/BaseFilter.java |    23 -
 .../storm/trident/operation/BaseFunction.java   |    23 -
 .../trident/operation/BaseMultiReducer.java     |    33 -
 .../storm/trident/operation/BaseOperation.java  |    32 -
 .../trident/operation/CombinerAggregator.java   |    29 -
 .../storm/trident/operation/EachOperation.java  |    22 -
 .../src/jvm/storm/trident/operation/Filter.java |    24 -
 .../jvm/storm/trident/operation/Function.java   |    24 -
 .../trident/operation/GroupedMultiReducer.java  |    31 -
 .../storm/trident/operation/MultiReducer.java   |    31 -
 .../jvm/storm/trident/operation/Operation.java  |    26 -
 .../trident/operation/ReducerAggregator.java    |    26 -
 .../trident/operation/TridentCollector.java     |    26 -
 .../operation/TridentMultiReducerContext.java   |    36 -
 .../operation/TridentOperationContext.java      |    65 -
 .../storm/trident/operation/builtin/Count.java  |    41 -
 .../storm/trident/operation/builtin/Debug.java  |    39 -
 .../storm/trident/operation/builtin/Equals.java |    38 -
 .../trident/operation/builtin/FilterNull.java   |    31 -
 .../storm/trident/operation/builtin/FirstN.java |   125 -
 .../storm/trident/operation/builtin/MapGet.java |    38 -
 .../storm/trident/operation/builtin/Negate.java |    48 -
 .../trident/operation/builtin/SnapshotGet.java  |    44 -
 .../storm/trident/operation/builtin/Sum.java    |    42 -
 .../operation/builtin/TupleCollectionGet.java   |    46 -
 .../operation/impl/CaptureCollector.java        |    42 -
 .../operation/impl/ChainedAggregatorImpl.java   |   113 -
 .../trident/operation/impl/ChainedResult.java   |    53 -
 .../operation/impl/CombinerAggStateUpdater.java |    56 -
 .../impl/CombinerAggregatorCombineImpl.java     |    61 -
 .../impl/CombinerAggregatorInitImpl.java        |    49 -
 .../trident/operation/impl/FilterExecutor.java  |    53 -
 .../operation/impl/GlobalBatchToPartition.java  |    29 -
 .../trident/operation/impl/GroupCollector.java  |    48 -
 .../operation/impl/GroupedAggregator.java       |    96 -
 .../impl/GroupedMultiReducerExecutor.java       |    95 -
 .../operation/impl/IdentityMultiReducer.java    |    51 -
 .../impl/IndexHashBatchToPartition.java         |    29 -
 .../operation/impl/JoinerMultiReducer.java      |   159 -
 .../operation/impl/ReducerAggStateUpdater.java  |    53 -
 .../operation/impl/ReducerAggregatorImpl.java   |    56 -
 .../storm/trident/operation/impl/Result.java    |    27 -
 .../operation/impl/SingleEmitAggregator.java    |    95 -
 .../trident/operation/impl/TrueFilter.java      |    40 -
 .../storm/trident/partition/GlobalGrouping.java |    42 -
 .../trident/partition/IdentityGrouping.java     |    59 -
 .../trident/partition/IndexHashGrouping.java    |    53 -
 .../storm/trident/planner/BridgeReceiver.java   |    38 -
 .../src/jvm/storm/trident/planner/Node.java     |    67 -
 .../storm/trident/planner/NodeStateInfo.java    |    31 -
 .../storm/trident/planner/PartitionNode.java    |    50 -
 .../storm/trident/planner/ProcessorContext.java |    29 -
 .../storm/trident/planner/ProcessorNode.java    |    33 -
 .../jvm/storm/trident/planner/SpoutNode.java    |    39 -
 .../storm/trident/planner/SubtopologyBolt.java  |   217 -
 .../storm/trident/planner/TridentProcessor.java |    40 -
 .../storm/trident/planner/TupleReceiver.java    |    27 -
 .../planner/processor/AggregateProcessor.java   |    84 -
 .../planner/processor/AppendCollector.java      |    62 -
 .../planner/processor/EachProcessor.java        |    80 -
 .../planner/processor/FreshCollector.java       |    59 -
 .../processor/MultiReducerProcessor.java        |    93 -
 .../processor/PartitionPersistProcessor.java    |   107 -
 .../planner/processor/ProjectedProcessor.java   |    73 -
 .../planner/processor/StateQueryProcessor.java  |   107 -
 .../planner/processor/TridentContext.java       |    76 -
 .../storm/trident/spout/BatchSpoutExecutor.java |    92 -
 .../src/jvm/storm/trident/spout/IBatchID.java   |    24 -
 .../jvm/storm/trident/spout/IBatchSpout.java    |    33 -
 .../trident/spout/ICommitterTridentSpout.java   |    31 -
 .../spout/IOpaquePartitionedTridentSpout.java   |    63 -
 .../trident/spout/IPartitionedTridentSpout.java |    77 -
 .../storm/trident/spout/ISpoutPartition.java    |    25 -
 .../storm/trident/spout/ITridentDataSource.java |    26 -
 .../jvm/storm/trident/spout/ITridentSpout.java  |   125 -
 .../OpaquePartitionedTridentSpoutExecutor.java  |   201 -
 .../spout/PartitionedTridentSpoutExecutor.java  |   171 -
 .../trident/spout/RichSpoutBatchExecutor.java   |   204 -
 .../storm/trident/spout/RichSpoutBatchId.java   |    49 -
 .../spout/RichSpoutBatchIdSerializer.java       |    38 -
 .../trident/spout/RichSpoutBatchTriggerer.java  |   182 -
 .../trident/spout/TridentSpoutCoordinator.java  |    94 -
 .../trident/spout/TridentSpoutExecutor.java     |   138 -
 .../storm/trident/state/BaseQueryFunction.java  |    25 -
 .../storm/trident/state/BaseStateUpdater.java   |    25 -
 .../trident/state/CombinerValueUpdater.java     |    36 -
 .../storm/trident/state/ITupleCollection.java   |    26 -
 .../state/JSONNonTransactionalSerializer.java   |    44 -
 .../trident/state/JSONOpaqueSerializer.java     |    52 -
 .../state/JSONTransactionalSerializer.java      |    50 -
 .../jvm/storm/trident/state/OpaqueValue.java    |    75 -
 .../jvm/storm/trident/state/QueryFunction.java  |    28 -
 .../jvm/storm/trident/state/ReadOnlyState.java  |    31 -
 .../trident/state/ReducerValueUpdater.java      |    41 -
 .../src/jvm/storm/trident/state/Serializer.java |    26 -
 .../src/jvm/storm/trident/state/State.java      |    39 -
 .../jvm/storm/trident/state/StateFactory.java   |    26 -
 .../src/jvm/storm/trident/state/StateSpec.java  |    30 -
 .../src/jvm/storm/trident/state/StateType.java  |    25 -
 .../jvm/storm/trident/state/StateUpdater.java   |    33 -
 .../storm/trident/state/TransactionalValue.java |    44 -
 .../jvm/storm/trident/state/ValueUpdater.java   |    23 -
 .../trident/state/map/CachedBatchReadsMap.java  |    80 -
 .../jvm/storm/trident/state/map/CachedMap.java  |    78 -
 .../storm/trident/state/map/IBackingMap.java    |    26 -
 .../state/map/MapCombinerAggStateUpdater.java   |    83 -
 .../state/map/MapReducerAggStateUpdater.java    |    92 -
 .../jvm/storm/trident/state/map/MapState.java   |    26 -
 .../state/map/MicroBatchIBackingMap.java        |    85 -
 .../trident/state/map/NonTransactionalMap.java  |    67 -
 .../jvm/storm/trident/state/map/OpaqueMap.java  |   124 -
 .../trident/state/map/ReadOnlyMapState.java     |    26 -
 .../trident/state/map/RemovableMapState.java    |    25 -
 .../trident/state/map/SnapshottableMap.java     |    76 -
 .../trident/state/map/TransactionalMap.java     |   109 -
 .../state/snapshot/ReadOnlySnapshottable.java   |    24 -
 .../trident/state/snapshot/Snapshottable.java   |    27 -
 .../trident/testing/CountAsAggregator.java      |    47 -
 .../storm/trident/testing/FeederBatchSpout.java |   185 -
 .../testing/FeederCommitterBatchSpout.java      |    96 -
 .../storm/trident/testing/FixedBatchSpout.java  |    97 -
 .../src/jvm/storm/trident/testing/IFeeder.java  |    23 -
 .../trident/testing/LRUMemoryMapState.java      |   154 -
 .../storm/trident/testing/MemoryBackingMap.java |    47 -
 .../storm/trident/testing/MemoryMapState.java   |   176 -
 .../src/jvm/storm/trident/testing/Split.java    |    36 -
 .../jvm/storm/trident/testing/StringLength.java |    32 -
 .../jvm/storm/trident/testing/TrueFilter.java   |    30 -
 .../jvm/storm/trident/testing/TuplifyArgs.java  |    37 -
 .../jvm/storm/trident/topology/BatchInfo.java   |    33 -
 .../trident/topology/ITridentBatchBolt.java     |    32 -
 .../topology/MasterBatchCoordinator.java        |   289 -
 .../trident/topology/TransactionAttempt.java    |    66 -
 .../trident/topology/TridentBoltExecutor.java   |   425 -
 .../topology/TridentTopologyBuilder.java        |   734 -
 .../state/RotatingTransactionalState.java       |   147 -
 .../topology/state/TestTransactionalState.java  |    47 -
 .../topology/state/TransactionalState.java      |   171 -
 .../src/jvm/storm/trident/tuple/ComboList.java  |    92 -
 .../src/jvm/storm/trident/tuple/ConsList.java   |    44 -
 .../jvm/storm/trident/tuple/TridentTuple.java   |    34 -
 .../storm/trident/tuple/TridentTupleView.java   |   361 -
 .../jvm/storm/trident/tuple/ValuePointer.java   |    60 -
 .../storm/trident/util/ErrorEdgeFactory.java    |    28 -
 .../src/jvm/storm/trident/util/IndexedEdge.java |    50 -
 .../src/jvm/storm/trident/util/LRUMap.java      |    35 -
 .../jvm/storm/trident/util/TridentUtils.java    |   117 -
 storm-core/src/storm.thrift                     |     7 +-
 storm-core/src/ui/public/component.html         |   247 +-
 .../templates/component-page-template.html      |   115 +-
 .../test/clj/backtype/storm/clojure_test.clj    |   145 -
 .../test/clj/backtype/storm/cluster_test.clj    |   321 -
 .../test/clj/backtype/storm/drpc_test.clj       |   241 -
 .../test/clj/backtype/storm/fields_test.clj     |    59 -
 .../test/clj/backtype/storm/grouping_test.clj   |   150 -
 .../clj/backtype/storm/local_state_test.clj     |    55 -
 .../test/clj/backtype/storm/logviewer_test.clj  |   736 -
 .../storm/messaging/netty_integration_test.clj  |    57 -
 .../storm/messaging/netty_unit_test.clj         |   327 -
 .../test/clj/backtype/storm/messaging_test.clj  |    63 -
 .../test/clj/backtype/storm/metrics_test.clj    |   359 -
 .../test/clj/backtype/storm/multilang_test.clj  |    66 -
 .../test/clj/backtype/storm/nimbus_test.clj     |  1516 -
 .../scheduler/multitenant_scheduler_test.clj    |   859 -
 .../scheduler/resource_aware_scheduler_test.clj |   734 -
 .../test/clj/backtype/storm/scheduler_test.clj  |   281 -
 .../storm/security/auth/AuthUtils_test.clj      |    75 -
 .../auth/DefaultHttpCredentialsPlugin_test.clj  |    75 -
 .../storm/security/auth/ReqContext_test.clj     |    73 -
 .../security/auth/SaslTransportPlugin_test.clj  |    43 -
 .../storm/security/auth/ThriftClient_test.clj   |    60 -
 .../storm/security/auth/ThriftServer_test.clj   |    31 -
 .../backtype/storm/security/auth/auth_test.clj  |   460 -
 .../authorizer/DRPCSimpleACLAuthorizer_test.clj |   241 -
 .../security/auth/auto_login_module_test.clj    |    91 -
 .../storm/security/auth/drpc-auth-alice.jaas    |    22 -
 .../storm/security/auth/drpc-auth-bob.jaas      |    22 -
 .../storm/security/auth/drpc-auth-charlie.jaas  |    22 -
 .../storm/security/auth/drpc-auth-server.jaas   |    23 -
 .../storm/security/auth/drpc_auth_test.clj      |   312 -
 .../storm/security/auth/jaas_digest.conf        |    30 -
 .../security/auth/jaas_digest_bad_password.conf |    31 -
 .../auth/jaas_digest_missing_client.conf        |    23 -
 .../security/auth/jaas_digest_unknown_user.conf |    31 -
 .../storm/security/auth/nimbus_auth_test.clj    |   179 -
 .../BlowfishTupleSerializer_test.clj            |    78 -
 .../serialization/SerializationFactory_test.clj |    54 -
 .../clj/backtype/storm/serialization_test.clj   |    98 -
 .../test/clj/backtype/storm/submitter_test.clj  |    75 -
 .../clj/backtype/storm/subtopology_test.clj     |    62 -
 .../test/clj/backtype/storm/supervisor_test.clj |   734 -
 .../test/clj/backtype/storm/tick_tuple_test.clj |    49 -
 .../clj/backtype/storm/transactional_test.clj   |   736 -
 .../test/clj/backtype/storm/tuple_test.clj      |    51 -
 .../utils/ZookeeperServerCnxnFactory_test.clj   |    35 -
 .../test/clj/backtype/storm/utils_test.clj      |   110 -
 .../clj/backtype/storm/versioned_store_test.clj |    45 -
 .../test/clj/backtype/storm/worker_test.clj     |   206 -
 .../backtype/storm/integration_test.clj         |   622 -
 .../backtype/storm/testing4j_test.clj           |   212 -
 .../org/apache/storm/integration_test.clj       |   622 +
 .../org/apache/storm/testing4j_test.clj         |   212 +
 .../apache/storm/trident/integration_test.clj   |   292 +
 .../storm/trident/integration_test.clj          |   292 -
 .../test/clj/org/apache/storm/clojure_test.clj  |   145 +
 .../test/clj/org/apache/storm/cluster_test.clj  |   321 +
 .../test/clj/org/apache/storm/drpc_test.clj     |   241 +
 .../test/clj/org/apache/storm/fields_test.clj   |    59 +
 .../test/clj/org/apache/storm/grouping_test.clj |   150 +
 .../clj/org/apache/storm/local_state_test.clj   |    55 +
 .../clj/org/apache/storm/logviewer_test.clj     |   765 +
 .../storm/messaging/netty_integration_test.clj  |    57 +
 .../apache/storm/messaging/netty_unit_test.clj  |   327 +
 .../clj/org/apache/storm/messaging_test.clj     |    63 +
 .../test/clj/org/apache/storm/metrics_test.clj  |   359 +
 .../test/clj/org/apache/storm/nimbus_test.clj   |  1516 +
 .../storm/pacemaker_state_factory_test.clj      |     4 +-
 .../clj/org/apache/storm/pacemaker_test.clj     |     2 +-
 .../scheduler/multitenant_scheduler_test.clj    |   859 +
 .../scheduler/resource_aware_scheduler_test.clj |   734 +
 .../clj/org/apache/storm/scheduler_test.clj     |   281 +
 .../storm/security/auth/AuthUtils_test.clj      |    75 +
 .../auth/DefaultHttpCredentialsPlugin_test.clj  |    75 +
 .../storm/security/auth/ReqContext_test.clj     |    73 +
 .../security/auth/SaslTransportPlugin_test.clj  |    43 +
 .../storm/security/auth/ThriftClient_test.clj   |    60 +
 .../storm/security/auth/ThriftServer_test.clj   |    31 +
 .../apache/storm/security/auth/auth_test.clj    |   460 +
 .../authorizer/DRPCSimpleACLAuthorizer_test.clj |   241 +
 .../security/auth/auto_login_module_test.clj    |    91 +
 .../storm/security/auth/drpc-auth-alice.jaas    |    22 +
 .../storm/security/auth/drpc-auth-bob.jaas      |    22 +
 .../storm/security/auth/drpc-auth-charlie.jaas  |    22 +
 .../storm/security/auth/drpc-auth-server.jaas   |    23 +
 .../storm/security/auth/drpc_auth_test.clj      |   312 +
 .../apache/storm/security/auth/jaas_digest.conf |    30 +
 .../security/auth/jaas_digest_bad_password.conf |    31 +
 .../auth/jaas_digest_missing_client.conf        |    23 +
 .../security/auth/jaas_digest_unknown_user.conf |    31 +
 .../storm/security/auth/nimbus_auth_test.clj    |   179 +
 .../BlowfishTupleSerializer_test.clj            |    78 +
 .../serialization/SerializationFactory_test.clj |    54 +
 .../clj/org/apache/storm/serialization_test.clj |    98 +
 .../clj/org/apache/storm/submitter_test.clj     |    75 +
 .../clj/org/apache/storm/subtopology_test.clj   |    62 +
 .../clj/org/apache/storm/supervisor_test.clj    |   734 +
 .../clj/org/apache/storm/tick_tuple_test.clj    |    49 +
 .../clj/org/apache/storm/transactional_test.clj |   736 +
 .../clj/org/apache/storm/trident/state_test.clj |   150 +
 .../clj/org/apache/storm/trident/tuple_test.clj |   122 +
 .../test/clj/org/apache/storm/tuple_test.clj    |    51 +
 .../utils/ZookeeperServerCnxnFactory_test.clj   |    35 +
 .../test/clj/org/apache/storm/utils_test.clj    |   110 +
 .../org/apache/storm/versioned_store_test.clj   |    45 +
 .../test/clj/org/apache/storm/worker_test.clj   |   206 +
 .../test/clj/storm/trident/state_test.clj       |   150 -
 .../test/clj/storm/trident/tuple_test.clj       |   122 -
 .../jvm/backtype/storm/TestConfigValidate.java  |   744 -
 .../backtype/storm/blobstore/BlobStoreTest.java |   461 -
 .../storm/blobstore/BlobSynchronizerTest.java   |   137 -
 .../storm/blobstore/ClientBlobStoreTest.java    |   179 -
 .../storm/grouping/PartialKeyGroupingTest.java  |    66 -
 .../LocalizedResourceRetentionSetTest.java      |    85 -
 .../localizer/LocalizedResourceSetTest.java     |    74 -
 .../backtype/storm/localizer/LocalizerTest.java |   669 -
 .../jvm/backtype/storm/localizer/localtest.zip  |   Bin 6378 -> 0 bytes
 .../storm/localizer/localtestwithsymlink.jar    |   Bin 6591 -> 0 bytes
 .../storm/localizer/localtestwithsymlink.tar    |   Bin 24576 -> 0 bytes
 .../storm/localizer/localtestwithsymlink.tar.gz |   Bin 6106 -> 0 bytes
 .../storm/localizer/localtestwithsymlink.tgz    |   Bin 6106 -> 0 bytes
 .../metric/internal/CountStatAndMetricTest.java |    86 -
 .../internal/LatencyStatAndMetricTest.java      |    83 -
 .../storm/metric/internal/RateTrackerTest.java  |    94 -
 .../nimbus/InMemoryTopologyActionNotifier.java  |    53 -
 .../resource/TestResourceAwareScheduler.java    |  1227 -
 .../storm/scheduler/resource/TestUser.java      |   111 -
 .../TestUtilsForResourceAwareScheduler.java     |   288 -
 .../GzipBridgeSerializationDelegateTest.java    |    82 -
 ...ipBridgeThriftSerializationDelegateTest.java |    71 -
 .../ThriftBridgeSerializationDelegateTest.java  |    60 -
 .../storm/topology/TopologyBuilderTest.java     |    53 -
 .../topology/WindowedBoltExecutorTest.java      |   142 -
 .../utils/DisruptorQueueBackpressureTest.java   |   110 -
 .../storm/utils/DisruptorQueueTest.java         |   187 -
 .../backtype/storm/utils/MockTupleHelpers.java  |    40 -
 .../storm/utils/ShellBoltMessageQueueTest.java  |    85 -
 ...StormBoundedExponentialBackoffRetryTest.java |   101 -
 .../storm/utils/ThriftTopologyUtilsTest.java    |    94 -
 .../windowing/WaterMarkEventGeneratorTest.java  |   117 -
 .../storm/windowing/WindowManagerTest.java      |   494 -
 .../org/apache/storm/TestConfigValidate.java    |   744 +
 .../apache/storm/blobstore/BlobStoreTest.java   |   460 +
 .../storm/blobstore/BlobSynchronizerTest.java   |   137 +
 .../storm/blobstore/ClientBlobStoreTest.java    |   179 +
 .../storm/grouping/PartialKeyGroupingTest.java  |    66 +
 .../LocalizedResourceRetentionSetTest.java      |    85 +
 .../localizer/LocalizedResourceSetTest.java     |    74 +
 .../apache/storm/localizer/LocalizerTest.java   |   667 +
 .../org/apache/storm/localizer/localtest.zip    |   Bin 0 -> 6378 bytes
 .../storm/localizer/localtestwithsymlink.jar    |   Bin 0 -> 6591 bytes
 .../storm/localizer/localtestwithsymlink.tar    |   Bin 0 -> 24576 bytes
 .../storm/localizer/localtestwithsymlink.tar.gz |   Bin 0 -> 6106 bytes
 .../storm/localizer/localtestwithsymlink.tgz    |   Bin 0 -> 6106 bytes
 .../metric/internal/CountStatAndMetricTest.java |    86 +
 .../internal/LatencyStatAndMetricTest.java      |    83 +
 .../storm/metric/internal/RateTrackerTest.java  |    94 +
 .../nimbus/InMemoryTopologyActionNotifier.java  |    53 +
 .../resource/TestResourceAwareScheduler.java    |  1227 +
 .../storm/scheduler/resource/TestUser.java      |   111 +
 .../TestUtilsForResourceAwareScheduler.java     |   288 +
 .../GzipBridgeSerializationDelegateTest.java    |    82 +
 ...ipBridgeThriftSerializationDelegateTest.java |    71 +
 .../ThriftBridgeSerializationDelegateTest.java  |    60 +
 .../apache/storm/spout/CheckpointSpoutTest.java |   262 +
 .../storm/state/InMemoryKeyValueStateTest.java  |    72 +
 .../topology/StatefulBoltExecutorTest.java      |   177 +
 .../storm/topology/TopologyBuilderTest.java     |    53 +
 .../topology/WindowedBoltExecutorTest.java      |   142 +
 .../utils/DisruptorQueueBackpressureTest.java   |   110 +
 .../apache/storm/utils/DisruptorQueueTest.java  |   187 +
 .../apache/storm/utils/MockTupleHelpers.java    |    40 +
 .../storm/utils/ShellBoltMessageQueueTest.java  |    85 +
 ...StormBoundedExponentialBackoffRetryTest.java |   101 +
 .../storm/utils/ThriftTopologyUtilsTest.java    |    94 +
 .../windowing/WaterMarkEventGeneratorTest.java  |   117 +
 .../storm/windowing/WindowManagerTest.java      |   494 +
 .../jvm/storm/trident/TestTridentTopology.java  |    20 +-
 storm-dist/binary/pom.xml                       |     7 +-
 storm-dist/source/pom.xml                       |     2 +-
 storm-multilang/javascript/pom.xml              |     2 +-
 storm-multilang/python/pom.xml                  |     2 +-
 storm-multilang/ruby/pom.xml                    |     2 +-
 storm-rename-hack/pom.xml                       |   107 +
 .../org/apache/storm/hack/DefaultShader.java    |   391 +
 .../main/java/org/apache/storm/hack/IOUtil.java |    41 +
 .../org/apache/storm/hack/ShadeRequest.java     |    69 +
 .../apache/storm/hack/StormShadeRequest.java    |    40 +
 .../storm/hack/StormShadeTransformer.java       |    37 +
 .../apache/storm/hack/relocation/Relocator.java |    40 +
 .../storm/hack/relocation/SimpleRelocator.java  |    97 +
 .../storm/hack/resource/ClojureTransformer.java |    71 +
 .../hack/resource/ResourceTransformer.java      |    46 +
 2335 files changed, 221016 insertions(+), 216390 deletions(-)
----------------------------------------------------------------------



[02/11] storm git commit: on dossett&hmcl 's comments

Posted by pt...@apache.org.
on dossett&hmcl 's comments

Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cea44369
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cea44369
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cea44369

Branch: refs/heads/1.x-branch
Commit: cea443699522b1dcb3d6953604eb3ca95da6b56d
Parents: db03e4a
Author: Xin Wang <be...@163.com>
Authored: Thu Jan 7 23:12:05 2016 +0800
Committer: Xin Wang <be...@163.com>
Committed: Thu Jan 7 23:12:05 2016 +0800

----------------------------------------------------------------------
 .../apache/storm/solr/bolt/SolrUpdateBolt.java  | 52 ++++++++++++++++----
 1 file changed, 43 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/cea44369/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
index 814d3b2..adb2b92 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
@@ -18,12 +18,14 @@
 
 package org.apache.storm.solr.bolt;
 
+import backtype.storm.Config;
 import backtype.storm.task.OutputCollector;
 import backtype.storm.task.TopologyContext;
 import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichBolt;
 import backtype.storm.tuple.Tuple;
 import backtype.storm.utils.TupleUtils;
+import backtype.storm.utils.Utils;
 
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
@@ -52,6 +54,7 @@ public class SolrUpdateBolt extends BaseRichBolt {
     private SolrClient solrClient;
     private OutputCollector collector;
     private List<Tuple> toCommitTuples;
+    private Integer tickTupleInterval = 0;
 
     public SolrUpdateBolt(SolrConfig solrConfig, SolrMapper solrMapper) {
         this(solrConfig, solrMapper, null);
@@ -66,11 +69,19 @@ public class SolrUpdateBolt extends BaseRichBolt {
                     this.getClass().getSimpleName(), solrConfig, solrMapper, commitStgy);
     }
 
+    @Override
     public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
         this.collector = collector;
         this.solrClient = new CloudSolrClient(solrConfig.getZkHostString());
         this.toCommitTuples = new ArrayList<>(capacity());
 
+        //set default tickTupleInterval if interval is zero
+        if (stormConf.containsKey("topology.message.timeout.secs") && tickTupleInterval == 0) {
+            Integer topologyTimeout = Utils.getInt(stormConf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS));
+            tickTupleInterval = (int)(Math.floor(topologyTimeout / 2));
+            LOG.debug("Setting tick tuple interval to [{}] based on topology timeout", tickTupleInterval);
+        }
+
     }
 
     private int capacity() {
@@ -80,10 +91,13 @@ public class SolrUpdateBolt extends BaseRichBolt {
                 defArrListCpcty;
     }
 
+    @Override
     public void execute(Tuple tuple) {
         try {
-            SolrRequest request = solrMapper.toSolrRequest(tuple);
-            solrClient.request(request, solrMapper.getCollection());
+            if (!TupleUtils.isTick(tuple)) {//Don't add tick tuples to the SolrRequest
+                SolrRequest request = solrMapper.toSolrRequest(tuple);
+                solrClient.request(request, solrMapper.getCollection());
+            }
             ack(tuple);
         } catch (Exception e) {
             fail(tuple, e);
@@ -94,19 +108,19 @@ public class SolrUpdateBolt extends BaseRichBolt {
         if (commitStgy == null) {
             collector.ack(tuple);
         } else {
+            boolean forceCommit = false;
             if (TupleUtils.isTick(tuple)) {
                 LOG.debug("TICK! forcing solr client commit");
                 collector.ack(tuple);
-                commitStgy.commit();
-                solrClient.commit(solrMapper.getCollection());
-                ackCommittedTuples();
+                forceCommit = true;
             } else {
                 toCommitTuples.add(tuple);
                 commitStgy.update();
-                if (commitStgy.commit()) {
-                    solrClient.commit(solrMapper.getCollection());
-                    ackCommittedTuples();
-                }
+            }
+
+            if (forceCommit || commitStgy.commit()) {
+                solrClient.commit(solrMapper.getCollection());
+                ackCommittedTuples();
             }
         }
     }
@@ -141,6 +155,26 @@ public class SolrUpdateBolt extends BaseRichBolt {
         return queuedTuples;
     }
 
+    public SolrUpdateBolt withTickIntervalSecs(int tickTupleInterval) {
+        this.tickTupleInterval = tickTupleInterval;
+        return this;
+    }
+
+    @Override
+    public Map<String, Object> getComponentConfiguration() {
+        Map<String, Object> conf = super.getComponentConfiguration();
+        if (conf == null)
+            conf = new Config();
+
+        if (tickTupleInterval > 0) {
+            LOG.info("Enabling tick tuple with interval [{}]", tickTupleInterval);
+            conf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, tickTupleInterval);
+        }
+
+        return conf;
+    }
+
+    @Override
     public void declareOutputFields(OutputFieldsDeclarer declarer) { }
 
 }


[07/11] storm git commit: Merge remote-tracking branch 'apache/master' into STORM-1419

Posted by pt...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/023cebd0/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
----------------------------------------------------------------------
diff --cc external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
index 8d4affd,2c56c39..ee9461a
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
@@@ -18,15 -18,11 +18,23 @@@
  
  package org.apache.storm.solr.bolt;
  
++<<<<<<< HEAD
 +import backtype.storm.Config;
 +import backtype.storm.task.OutputCollector;
 +import backtype.storm.task.TopologyContext;
 +import backtype.storm.topology.OutputFieldsDeclarer;
 +import backtype.storm.topology.base.BaseRichBolt;
 +import backtype.storm.tuple.Tuple;
 +import backtype.storm.utils.TupleUtils;
 +import backtype.storm.utils.Utils;
 +
++=======
+ import org.apache.storm.task.OutputCollector;
+ import org.apache.storm.task.TopologyContext;
+ import org.apache.storm.topology.OutputFieldsDeclarer;
+ import org.apache.storm.topology.base.BaseRichBolt;
+ import org.apache.storm.tuple.Tuple;
++>>>>>>> apache/master
  import org.apache.solr.client.solrj.SolrClient;
  import org.apache.solr.client.solrj.SolrRequest;
  import org.apache.solr.client.solrj.SolrServerException;


[10/11] storm git commit: Merge branch 'STORM-1419' of github.com:vesense/storm into 1.x-branch

Posted by pt...@apache.org.
Merge branch 'STORM-1419' of github.com:vesense/storm into 1.x-branch


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b9bf574a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b9bf574a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b9bf574a

Branch: refs/heads/1.x-branch
Commit: b9bf574a11ecdf9957c8c5d526e0528c4e13ea97
Parents: 3a5c101 d1d6dbe
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Jan 13 12:21:20 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jan 13 12:21:20 2016 -0500

----------------------------------------------------------------------
 .../apache/storm/solr/bolt/SolrUpdateBolt.java  | 42 ++++++++++++---
 .../apache/storm/solr/config/SolrConfig.java    | 17 +++++-
 .../jvm/org/apache/storm/utils/TupleUtils.java  | 56 +++++++++++++-------
 3 files changed, 87 insertions(+), 28 deletions(-)
----------------------------------------------------------------------



[09/11] storm git commit: resolve conflicts

Posted by pt...@apache.org.
resolve conflicts


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d1d6dbea
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d1d6dbea
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d1d6dbea

Branch: refs/heads/1.x-branch
Commit: d1d6dbea95c263086f0e3820e7acd5aed74a07f8
Parents: 023cebd
Author: vesense <be...@163.com>
Authored: Wed Jan 13 14:11:53 2016 +0800
Committer: vesense <be...@163.com>
Committed: Wed Jan 13 14:37:04 2016 +0800

----------------------------------------------------------------------
 .../apache/storm/solr/bolt/SolrUpdateBolt.java  | 15 ++----
 .../jvm/org/apache/storm/utils/TupleUtils.java  | 56 +++++++++++++-------
 2 files changed, 40 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/d1d6dbea/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
index ee9461a..c9b2b0c 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
@@ -18,23 +18,14 @@
 
 package org.apache.storm.solr.bolt;
 
-<<<<<<< HEAD
-import backtype.storm.Config;
-import backtype.storm.task.OutputCollector;
-import backtype.storm.task.TopologyContext;
-import backtype.storm.topology.OutputFieldsDeclarer;
-import backtype.storm.topology.base.BaseRichBolt;
-import backtype.storm.tuple.Tuple;
-import backtype.storm.utils.TupleUtils;
-import backtype.storm.utils.Utils;
-
-=======
+import org.apache.storm.Config;
 import org.apache.storm.task.OutputCollector;
 import org.apache.storm.task.TopologyContext;
 import org.apache.storm.topology.OutputFieldsDeclarer;
 import org.apache.storm.topology.base.BaseRichBolt;
 import org.apache.storm.tuple.Tuple;
->>>>>>> apache/master
+import org.apache.storm.utils.TupleUtils;
+import org.apache.storm.utils.Utils;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;

http://git-wip-us.apache.org/repos/asf/storm/blob/d1d6dbea/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java b/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
index 0b4c4be..c2ec61e 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
@@ -17,30 +17,48 @@
  */
 package org.apache.storm.utils;
 
-import java.util.Arrays;
-import java.util.List;
-
+import org.apache.storm.Config;
 import org.apache.storm.Constants;
 import org.apache.storm.tuple.Tuple;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 public final class TupleUtils {
+    private static final Logger LOG = LoggerFactory.getLogger(TupleUtils.class);
+
+    private TupleUtils() {
+      // No instantiation
+    }
+
+    public static boolean isTick(Tuple tuple) {
+      return tuple != null
+             && Constants.SYSTEM_COMPONENT_ID.equals(tuple.getSourceComponent())
+             && Constants.SYSTEM_TICK_STREAM_ID.equals(tuple.getSourceStreamId());
+    }
+
+    public static <T> int listHashCode(List<T> alist) {
+      if (alist == null) {
+          return 1;
+      } else {
+          return Arrays.deepHashCode(alist.toArray());
+      }
+    }
+
+    public static Map<String, Object> putTickFreqencyIntoComponentConfig(Map<String, Object> conf, int tickFreqSecs) {
+      if (conf == null) {
+          conf = new Config();
+      }
+
+      if (tickFreqSecs > 0) {
+          LOG.info("Enabling tick tuple with interval [{}]", tickFreqSecs);
+          conf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, tickFreqSecs);
+      }
 
-  private TupleUtils() {
-    // No instantiation
-  }
-
-  public static boolean isTick(Tuple tuple) {
-    return tuple != null
-           && Constants.SYSTEM_COMPONENT_ID  .equals(tuple.getSourceComponent())
-           && Constants.SYSTEM_TICK_STREAM_ID.equals(tuple.getSourceStreamId());
-  }
-
-  public static <T> int listHashCode(List<T> alist) {
-    if (alist == null) {
-      return 1;
-    } else {
-      return Arrays.deepHashCode(alist.toArray());
+      return conf;
     }
-  }
 
 }


[04/11] storm git commit: this closes #947

Posted by pt...@apache.org.
this closes #947


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/82b68264
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/82b68264
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/82b68264

Branch: refs/heads/1.x-branch
Commit: 82b68264d9190c5a84038acc1d0f73a7b74b7981
Parents: b24d7d9
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jan 12 15:35:58 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jan 12 15:35:58 2016 -0500

----------------------------------------------------------------------
 README.markdown | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/82b68264/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 93726fe..c7c4baf 100644
--- a/README.markdown
+++ b/README.markdown
@@ -254,3 +254,4 @@ under the License.
 
 YourKit is kindly supporting open source projects with its full-featured Java Profiler. YourKit, LLC is the creator of innovative and intelligent tools for profiling Java and .NET applications. Take a look at YourKit's leading software products: [YourKit Java Profiler](http://www.yourkit.com/java/profiler/index.jsp) and [YourKit .NET Profiler](http://www.yourkit.com/.net/profiler/index.jsp).
 
+


[11/11] storm git commit: add STORM-1419 to changelog

Posted by pt...@apache.org.
add STORM-1419 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/68ac3af1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/68ac3af1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/68ac3af1

Branch: refs/heads/1.x-branch
Commit: 68ac3af18b171028504f20a8329bfd8793d70445
Parents: b9bf574
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Jan 13 12:21:42 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jan 13 12:21:42 2016 -0500

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/68ac3af1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd0b673..94549ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.0.0
+ * STORM-1419: Solr bolt should handle tick tuples
  * STORM-1175: State store for windowing operations
  * STORM-1202: Migrate APIs to org.apache.storm, but try to provide some form of backwards compatability
  * STORM-468: java.io.NotSerializableException should be explained


[05/11] storm git commit: this closes #442

Posted by pt...@apache.org.
this closes #442


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2289d368
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2289d368
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2289d368

Branch: refs/heads/1.x-branch
Commit: 2289d36847f113e4b18e105e6623190108bca2ae
Parents: 82b6826
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jan 12 15:38:28 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jan 12 15:38:28 2016 -0500

----------------------------------------------------------------------
 README.markdown | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/2289d368/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index c7c4baf..93726fe 100644
--- a/README.markdown
+++ b/README.markdown
@@ -254,4 +254,3 @@ under the License.
 
 YourKit is kindly supporting open source projects with its full-featured Java Profiler. YourKit, LLC is the creator of innovative and intelligent tools for profiling Java and .NET applications. Take a look at YourKit's leading software products: [YourKit Java Profiler](http://www.yourkit.com/java/profiler/index.jsp) and [YourKit .NET Profiler](http://www.yourkit.com/.net/profiler/index.jsp).
 
-