storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [2/4] git commit: Merge branch 'apache-master' into new-curator
Date Fri, 25 Apr 2014 15:44:36 GMT
Merge branch 'apache-master' into new-curator

Conflicts:
	storm-core/src/jvm/backtype/storm/utils/Utils.java


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

Branch: refs/heads/master
Commit: e64cb1843ff158371b09525bdb963c864be62167
Parents: d68cd23 6589660
Author: Robert (Bobby) Evans <evans@yahoo-inc.com>
Authored: Fri Apr 25 14:42:39 2014 +0000
Committer: Robert (Bobby) Evans <evans@yahoo-inc.com>
Committed: Fri Apr 25 14:42:39 2014 +0000

----------------------------------------------------------------------
 CHANGELOG.md                                    |  23 ++
 NOTICE                                          |   9 +-
 README.markdown                                 |   5 +-
 bin/storm                                       |  19 +-
 bin/storm-config.cmd                            |  19 +-
 bin/storm.cmd                                   |  14 +-
 examples/storm-starter/README.markdown          | 108 ++++++
 .../multilang/resources/splitsentence.py        |  24 ++
 .../multilang/resources/splitsentence.rb        |  26 ++
 .../storm-starter/multilang/resources/storm.py  | 221 +++++++++++
 .../storm-starter/multilang/resources/storm.rb  | 200 ++++++++++
 examples/storm-starter/pom.xml                  | 161 ++++++++
 .../src/clj/storm/starter/clj/word_count.clj    |  95 +++++
 .../jvm/storm/starter/BasicDRPCTopology.java    |  78 ++++
 .../jvm/storm/starter/ExclamationTopology.java  |  87 +++++
 .../src/jvm/storm/starter/ManualDRPC.java       |  68 ++++
 .../jvm/storm/starter/PrintSampleStream.java    |  54 +++
 .../src/jvm/storm/starter/ReachTopology.java    | 196 ++++++++++
 .../src/jvm/storm/starter/RollingTopWords.java  |  78 ++++
 .../jvm/storm/starter/SingleJoinExample.java    |  64 ++++
 .../storm/starter/TransactionalGlobalCount.java | 173 +++++++++
 .../jvm/storm/starter/TransactionalWords.java   | 246 +++++++++++++
 .../jvm/storm/starter/WordCountTopology.java    | 107 ++++++
 .../storm/starter/bolt/AbstractRankerBolt.java  | 110 ++++++
 .../starter/bolt/IntermediateRankingsBolt.java  |  58 +++
 .../src/jvm/storm/starter/bolt/PrinterBolt.java |  37 ++
 .../storm/starter/bolt/RollingCountBolt.java    | 142 +++++++
 .../jvm/storm/starter/bolt/SingleJoinBolt.java  | 114 ++++++
 .../storm/starter/bolt/TotalRankingsBolt.java   |  59 +++
 .../starter/spout/RandomSentenceSpout.java      |  64 ++++
 .../storm/starter/spout/TwitterSampleSpout.java | 122 ++++++
 .../tools/NthLastModifiedTimeTracker.java       |  70 ++++
 .../src/jvm/storm/starter/tools/Rankable.java   |  32 ++
 .../starter/tools/RankableObjectWithFields.java | 148 ++++++++
 .../src/jvm/storm/starter/tools/Rankings.java   | 156 ++++++++
 .../starter/tools/SlidingWindowCounter.java     | 119 ++++++
 .../storm/starter/tools/SlotBasedCounter.java   | 118 ++++++
 .../jvm/storm/starter/trident/TridentReach.java | 156 ++++++++
 .../storm/starter/trident/TridentWordCount.java |  85 +++++
 .../src/jvm/storm/starter/util/StormRunner.java |  39 ++
 .../jvm/storm/starter/util/TupleHelpers.java    |  33 ++
 .../bolt/IntermediateRankingsBoltTest.java      | 146 ++++++++
 .../starter/bolt/RollingCountBoltTest.java      | 113 ++++++
 .../starter/bolt/TotalRankingsBoltTest.java     | 147 ++++++++
 .../storm/starter/tools/MockTupleHelpers.java   |  40 ++
 .../tools/NthLastModifiedTimeTrackerTest.java   | 125 +++++++
 .../tools/RankableObjectWithFieldsTest.java     | 252 +++++++++++++
 .../jvm/storm/starter/tools/RankingsTest.java   | 368 +++++++++++++++++++
 .../starter/tools/SlidingWindowCounterTest.java | 106 ++++++
 .../starter/tools/SlotBasedCounterTest.java     | 181 +++++++++
 external/storm-kafka/CHANGELOG.md               |  13 +
 external/storm-kafka/README.md                  |  25 ++
 external/storm-kafka/pom.xml                    | 138 +++++++
 .../storm-kafka/src/jvm/storm/kafka/Broker.java |  80 ++++
 .../src/jvm/storm/kafka/BrokerHosts.java        |  25 ++
 .../jvm/storm/kafka/DynamicBrokersReader.java   | 145 ++++++++
 .../kafka/DynamicPartitionConnections.java      |  94 +++++
 .../jvm/storm/kafka/FailedFetchException.java   |  29 ++
 .../src/jvm/storm/kafka/KafkaConfig.java        |  50 +++
 .../src/jvm/storm/kafka/KafkaError.java         |  43 +++
 .../src/jvm/storm/kafka/KafkaSpout.java         | 190 ++++++++++
 .../src/jvm/storm/kafka/KafkaUtils.java         | 235 ++++++++++++
 .../src/jvm/storm/kafka/KeyValueScheme.java     |  28 ++
 .../kafka/KeyValueSchemeAsMultiScheme.java      |  36 ++
 .../src/jvm/storm/kafka/Partition.java          |  64 ++++
 .../jvm/storm/kafka/PartitionCoordinator.java   |  26 ++
 .../src/jvm/storm/kafka/PartitionManager.java   | 241 ++++++++++++
 .../src/jvm/storm/kafka/SpoutConfig.java        |  36 ++
 .../src/jvm/storm/kafka/StaticCoordinator.java  |  48 +++
 .../src/jvm/storm/kafka/StaticHosts.java        |  38 ++
 .../storm/kafka/StaticPartitionConnections.java |  52 +++
 .../jvm/storm/kafka/StringKeyValueScheme.java   |  37 ++
 .../src/jvm/storm/kafka/StringScheme.java       |  46 +++
 .../src/jvm/storm/kafka/ZkCoordinator.java      | 112 ++++++
 .../src/jvm/storm/kafka/ZkHosts.java            |  36 ++
 .../src/jvm/storm/kafka/ZkState.java            | 116 ++++++
 .../src/jvm/storm/kafka/bolt/KafkaBolt.java     |  89 +++++
 .../jvm/storm/kafka/trident/Coordinator.java    |  50 +++
 .../storm/kafka/trident/DefaultCoordinator.java |  31 ++
 .../trident/GlobalPartitionInformation.java     |  99 +++++
 .../storm/kafka/trident/IBatchCoordinator.java  |  26 ++
 .../jvm/storm/kafka/trident/IBrokerReader.java  |  25 ++
 .../src/jvm/storm/kafka/trident/MaxMetric.java  |  40 ++
 .../kafka/trident/OpaqueTridentKafkaSpout.java  |  59 +++
 .../storm/kafka/trident/StaticBrokerReader.java |  36 ++
 .../trident/TransactionalTridentKafkaSpout.java |  58 +++
 .../storm/kafka/trident/TridentKafkaConfig.java |  37 ++
 .../kafka/trident/TridentKafkaEmitter.java      | 269 ++++++++++++++
 .../jvm/storm/kafka/trident/ZkBrokerReader.java |  62 ++++
 .../storm/kafka/DynamicBrokersReaderTest.java   | 155 ++++++++
 .../src/test/storm/kafka/KafkaErrorTest.java    |  39 ++
 .../src/test/storm/kafka/KafkaTestBroker.java   |  58 +++
 .../src/test/storm/kafka/KafkaUtilsTest.java    | 221 +++++++++++
 .../storm/kafka/StringKeyValueSchemeTest.java   |  38 ++
 .../src/test/storm/kafka/TestUtils.java         |  20 +
 .../src/test/storm/kafka/ZkCoordinatorTest.java | 130 +++++++
 .../test/storm/kafka/bolt/KafkaBoltTest.java    | 171 +++++++++
 pom.xml                                         |  25 +-
 storm-core/pom.xml                              |  36 +-
 storm-core/src/clj/backtype/storm/config.clj    |   2 +-
 .../src/clj/backtype/storm/daemon/common.clj    |   6 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  48 ++-
 .../src/clj/backtype/storm/daemon/worker.clj    |   2 +-
 storm-core/src/clj/backtype/storm/timer.clj     |   2 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |  27 +-
 .../src/clj/backtype/storm/ui/helpers.clj       |   4 +-
 storm-core/src/clj/backtype/storm/util.clj      |  14 +-
 storm-core/src/jvm/backtype/storm/Config.java   |   5 +-
 .../jvm/backtype/storm/ConfigValidation.java    |  17 +
 .../src/jvm/backtype/storm/StormSubmitter.java  |  24 +-
 .../backtype/storm/messaging/netty/Client.java  | 195 ++++++----
 .../backtype/storm/messaging/netty/Context.java |  30 +-
 .../storm/messaging/netty/MessageBatch.java     |  55 +--
 .../backtype/storm/messaging/netty/Server.java  |   2 +-
 .../messaging/netty/StormClientHandler.java     |  80 ++--
 .../src/jvm/backtype/storm/utils/Time.java      |  18 +-
 .../src/jvm/backtype/storm/utils/Utils.java     |  39 +-
 .../trident/spout/RichSpoutBatchTriggerer.java  |   1 +
 .../jvm/storm/trident/state/map/OpaqueMap.java  |   6 +-
 .../trident/state/map/RemovableMapState.java    |   8 +
 .../storm/trident/testing/MemoryMapState.java   |  27 +-
 .../test/clj/backtype/storm/config_test.clj     |  20 +
 .../test/clj/backtype/storm/supervisor_test.clj |  64 +++-
 .../test/clj/backtype/storm/utils_test.clj      |  11 +
 .../test/clj/storm/trident/state_test.clj       |  33 +-
 storm-dist/binary/NOTICE                        |   9 +-
 storm-dist/binary/src/main/assembly/binary.xml  |  31 ++
 127 files changed, 9435 insertions(+), 317 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/e64cb184/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/e64cb184/storm-core/pom.xml
----------------------------------------------------------------------
diff --cc storm-core/pom.xml
index 08f0388,a156794..648fe74
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@@ -109,8 -109,18 +109,18 @@@
  
  
          <dependency>
 -            <groupId>com.netflix.curator</groupId>
 +            <groupId>org.apache.curator</groupId>
              <artifactId>curator-framework</artifactId>
+             <exclusions>
+                 <exclusion>
+                     <groupId>log4j</groupId>
+                     <artifactId>log4j</artifactId>
+                 </exclusion>
+                 <exclusion>
+                     <groupId>org.slf4j</groupId>
+                     <artifactId>slf4j-log4j12</artifactId>
+                 </exclusion>
+             </exclusions>
          </dependency>
          <dependency>
              <groupId>com.googlecode.json-simple</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/e64cb184/storm-core/src/jvm/backtype/storm/utils/Utils.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/utils/Utils.java
index 1489de8,c15e817..e7f6466
--- a/storm-core/src/jvm/backtype/storm/utils/Utils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java
@@@ -46,11 -38,23 +38,22 @@@ import java.util.List
  import java.util.Map;
  import java.util.TreeMap;
  import java.util.UUID;
+ 
++import org.apache.curator.framework.CuratorFramework;
++import org.apache.curator.framework.CuratorFrameworkFactory;
++import org.apache.curator.retry.ExponentialBackoffRetry;
  import org.apache.commons.lang.StringUtils;
  import org.apache.thrift.TException;
  import org.json.simple.JSONValue;
  import org.yaml.snakeyaml.Yaml;
  
+ import backtype.storm.Config;
+ import backtype.storm.generated.ComponentCommon;
+ import backtype.storm.generated.ComponentObject;
+ import backtype.storm.generated.StormTopology;
+ import clojure.lang.IFn;
+ import clojure.lang.RT;
+ 
 -import com.netflix.curator.framework.CuratorFramework;
 -import com.netflix.curator.framework.CuratorFrameworkFactory;
 -import com.netflix.curator.retry.ExponentialBackoffRetry;
 -
  public class Utils {
      public static final String DEFAULT_STREAM_ID = "default";
  

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/e64cb184/storm-core/test/clj/backtype/storm/utils_test.clj
----------------------------------------------------------------------


Mime
View raw message