You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/04/12 08:29:17 UTC

[09/10] storm git commit: Merge branch 'STORM-2447' of https://github.com/revans2/incubator-storm into STORM-2447-merge

Merge branch 'STORM-2447' of https://github.com/revans2/incubator-storm into STORM-2447-merge


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

Branch: refs/heads/master
Commit: a011de4e8b489f5ee09b9079a1271bd22d78b8f2
Parents: 65c8b7b 71dc2e0
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Apr 12 16:33:26 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Apr 12 16:33:26 2017 +0900

----------------------------------------------------------------------
 bin/storm.py                                    | 143 ++++-
 docs/Clojure-DSL.md                             |   2 +-
 docs/Distributed-RPC.md                         |  27 +-
 docs/Local-mode.md                              |  65 +-
 docs/Tutorial.md                                |  31 +-
 docs/flux.md                                    |  33 +-
 docs/storm-hbase.md                             |  24 +-
 examples/storm-elasticsearch-examples/pom.xml   |   2 +-
 .../elasticsearch/bolt/EsIndexTopology.java     |  26 +-
 .../trident/TridentEsTopology.java              |  23 +-
 examples/storm-hbase-examples/pom.xml           |   2 +-
 .../storm/hbase/topology/LookupWordCount.java   |  27 +-
 .../hbase/topology/PersistentWordCount.java     |  33 +-
 .../storm/hbase/trident/WordCountTrident.java   |  27 +-
 examples/storm-hdfs-examples/pom.xml            |   2 +-
 .../storm/hdfs/bolt/HdfsFileTopology.java       |  52 +-
 .../storm/hdfs/bolt/SequenceFileTopology.java   |  51 +-
 .../storm/hdfs/spout/HdfsSpoutTopology.java     |   6 +-
 .../storm/hdfs/trident/TridentFileTopology.java |  37 +-
 .../hdfs/trident/TridentSequenceTopology.java   |  38 +-
 examples/storm-hive-examples/pom.xml            |   2 +-
 .../storm/hive/bolt/BucketTestHiveTopology.java |  44 +-
 .../apache/storm/hive/bolt/HiveTopology.java    |  30 +-
 .../hive/bolt/HiveTopologyPartitioned.java      |  29 +-
 .../storm/hive/trident/TridentHiveTopology.java |  70 +-
 examples/storm-jdbc-examples/pom.xml            |   2 +-
 .../jdbc/topology/AbstractUserTopology.java     |  31 +-
 examples/storm-jms-examples/pom.xml             |  37 +-
 .../storm/jms/example/ExampleJmsTopology.java   |  23 +-
 examples/storm-kafka-client-examples/pom.xml    |   4 +-
 .../TridentKafkaClientWordCountNamedTopics.java |  70 +-
 examples/storm-kafka-examples/pom.xml           |   2 +-
 .../storm/kafka/trident/DrpcResultsPrinter.java |  18 +-
 .../storm/kafka/trident/LocalSubmitter.java     | 106 ---
 .../trident/TridentKafkaConsumerTopology.java   |  17 +-
 .../kafka/trident/TridentKafkaTopology.java     |  13 +-
 .../kafka/trident/TridentKafkaWordCount.java    |  48 +-
 examples/storm-mongodb-examples/pom.xml         |   2 +-
 .../storm/mongodb/topology/InsertWordCount.java |  25 +-
 .../storm/mongodb/topology/LookupWordCount.java |  18 +-
 .../storm/mongodb/topology/UpdateWordCount.java |  24 +-
 .../storm/mongodb/trident/WordCountTrident.java |  20 +-
 .../mongodb/trident/WordCountTridentMap.java    |  22 +-
 examples/storm-mqtt-examples/pom.xml            |   2 +-
 examples/storm-opentsdb-examples/pom.xml        |   2 +-
 .../opentsdb/SampleOpenTsdbBoltTopology.java    |  27 +-
 .../opentsdb/SampleOpenTsdbTridentTopology.java |  26 +-
 examples/storm-perf/pom.xml                     |   2 +-
 .../perf/ConstSpoutIdBoltNullBoltTopo.java      |  37 +-
 .../storm/perf/ConstSpoutNullBoltTopo.java      |  42 +-
 .../apache/storm/perf/ConstSpoutOnlyTopo.java   |  32 +-
 .../storm/perf/FileReadWordCountTopo.java       |  42 +-
 .../storm/perf/StrGenSpoutHdfsBoltTopo.java     |  45 +-
 .../storm/perf/utils/BasicMetricsCollector.java |  49 +-
 .../org/apache/storm/perf/utils/Helper.java     | 134 ++--
 .../apache/storm/perf/utils/MetricsSample.java  |  15 +-
 examples/storm-pmml-examples/pom.xml            |   4 +-
 .../storm/pmml/JpmmlRunnerTestTopology.java     |  44 +-
 examples/storm-redis-examples/pom.xml           |   2 +-
 .../storm/redis/topology/LookupWordCount.java   |  35 +-
 .../redis/topology/PersistentWordCount.java     |  32 +-
 .../redis/topology/WhitelistWordCount.java      |  25 +-
 .../redis/trident/WordCountTridentRedis.java    |  31 +-
 .../trident/WordCountTridentRedisCluster.java   |  37 +-
 .../WordCountTridentRedisClusterMap.java        |  38 +-
 .../redis/trident/WordCountTridentRedisMap.java |  31 +-
 examples/storm-solr-examples/pom.xml            |   2 +-
 .../storm/solr/topology/SolrTopology.java       |  23 +-
 examples/storm-starter/pom.xml                  |  27 +-
 .../apache/storm/starter/clj/exclamation.clj    |   9 +-
 .../storm/starter/clj/rolling_top_words.clj     |   9 +-
 .../org/apache/storm/starter/clj/word_count.clj |   9 +-
 .../apache/storm/starter/BasicDRPCTopology.java |  61 +-
 .../storm/starter/ExclamationTopology.java      |   6 +-
 .../storm/starter/FastWordCountTopology.java    |   6 +-
 .../storm/starter/InOrderDeliveryTest.java      |   6 +-
 .../apache/storm/starter/JoinBoltExample.java   |  20 +-
 .../org/apache/storm/starter/ManualDRPC.java    |  25 +-
 .../storm/starter/MultipleLoggerTopology.java   |  20 +-
 .../org/apache/storm/starter/ReachTopology.java | 239 ++++---
 .../starter/ResourceAwareExampleTopology.java   |  20 +-
 .../apache/storm/starter/RollingTopWords.java   |   9 -
 .../apache/storm/starter/SingleJoinExample.java |  60 +-
 .../storm/starter/SkewedRollingTopWords.java    |   9 -
 .../storm/starter/SlidingTupleTsTopology.java   |  28 +-
 .../storm/starter/SlidingWindowTopology.java    |  29 +-
 .../apache/storm/starter/StatefulTopology.java  |  19 +-
 .../starter/StatefulWindowingTopology.java      |  22 +-
 .../storm/starter/ThroughputVsLatency.java      | 638 +++++++++----------
 .../storm/starter/TransactionalGlobalCount.java | 235 +++----
 .../storm/starter/TransactionalWords.java       | 355 ++++++-----
 .../apache/storm/starter/WordCountTopology.java |  10 +-
 .../storm/starter/WordCountTopologyNode.java    | 107 ++--
 .../storm/starter/streams/AggregateExample.java |  13 +-
 .../storm/starter/streams/BranchExample.java    |  14 +-
 .../streams/GroupByKeyAndWindowExample.java     |  20 +-
 .../storm/starter/streams/JoinExample.java      |  20 +-
 .../starter/streams/StateQueryExample.java      |  17 +-
 .../starter/streams/StatefulWordCount.java      |  14 +-
 .../starter/streams/TypedTupleExample.java      |  19 +-
 .../starter/streams/WindowedWordCount.java      |  20 +-
 .../storm/starter/streams/WordCountToBolt.java  |  13 +-
 .../TridentHBaseWindowingStoreTopology.java     |  22 +-
 .../starter/trident/TridentMapExample.java      |  35 +-
 .../trident/TridentMinMaxOfDevicesTopology.java |  25 +-
 .../TridentMinMaxOfVehiclesTopology.java        |  25 +-
 .../storm/starter/trident/TridentReach.java     | 190 +++---
 .../TridentWindowingInmemoryStoreTopology.java  |  36 +-
 .../storm/starter/trident/TridentWordCount.java |  82 ++-
 external/storm-eventhubs/pom.xml                |   7 -
 .../storm/eventhubs/samples/EventCount.java     |  39 +-
 .../main/java/org/apache/storm/flux/Flux.java   |  72 +--
 flux/pom.xml                                    |   9 +-
 .../org/apache/storm/ExclamationTopology.java   |  16 +-
 .../apache/storm/st/wrapper/StormCluster.java   |   4 +-
 pom.xml                                         |   3 +-
 .../jvm/org/apache/storm/drpc/DRPCSpout.java    |  10 +-
 .../storm/security/auth/ThriftClient.java       |   6 +-
 .../security/auth/ThriftConnectionType.java     |  29 +-
 .../storm/topology/ConfigurableTopology.java    | 151 +++++
 .../jvm/org/apache/storm/utils/DRPCClient.java  |  78 ++-
 .../org/apache/storm/utils/NimbusClient.java    |  45 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |   2 +-
 storm-clojure-test/pom.xml                      |  66 ++
 .../src/clj/org/apache/storm/testing.clj        | 270 ++++++++
 storm-clojure/pom.xml                           |  15 +-
 .../src/clj/org/apache/storm/config.clj         |  28 +
 storm-clojure/src/clj/org/apache/storm/log.clj  |  34 +
 .../src/clj/org/apache/storm/testing.clj        | 270 --------
 storm-clojure/src/clj/org/apache/storm/util.clj | 134 ++++
 storm-core/pom.xml                              |   2 +-
 .../jvm/org/apache/storm/command/Activate.java  |   2 +-
 .../org/apache/storm/command/Deactivate.java    |   2 +-
 .../jvm/org/apache/storm/command/GetErrors.java |   2 +-
 .../org/apache/storm/command/KillTopology.java  |   2 +-
 .../apache/storm/command/ListTopologies.java    |   2 +-
 .../jvm/org/apache/storm/command/Monitor.java   |   2 +-
 .../jvm/org/apache/storm/command/Rebalance.java |   2 +-
 .../org/apache/storm/command/SetLogLevel.java   |   2 +-
 .../src/jvm/org/apache/storm/utils/Monitor.java |   6 +-
 .../java/org/apache/storm/LocalCluster.java     | 296 ++++++++-
 .../storm/topology/ConfigurableTopology.java    | 184 ------
 142 files changed, 3102 insertions(+), 3300 deletions(-)
----------------------------------------------------------------------