You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/12/03 15:50:09 UTC
[09/10] storm git commit: Merge branch 'STORM-1281' of
https://github.com/revans2/incubator-storm into STORM-1281
Merge branch 'STORM-1281' of https://github.com/revans2/incubator-storm into STORM-1281
STORM-1281: LocalCluster, testing4j and testing.clj to java
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/557c49d5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/557c49d5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/557c49d5
Branch: refs/heads/master
Commit: 557c49d561b7278495db47a759625b45c95f6a7b
Parents: 612aea6 4efcc99
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Sat Dec 3 09:28:12 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Sat Dec 3 09:28:12 2016 -0600
----------------------------------------------------------------------
.../elasticsearch/bolt/EsIndexTopology.java | 12 +-
.../trident/TridentEsTopology.java | 14 +-
.../storm/hbase/topology/LookupWordCount.java | 10 +-
.../hbase/topology/PersistentWordCount.java | 10 +-
.../storm/hbase/trident/WordCountTrident.java | 10 +-
.../storm/hdfs/bolt/HdfsFileTopology.java | 11 +-
.../storm/hdfs/bolt/SequenceFileTopology.java | 11 +-
.../storm/hdfs/trident/TridentFileTopology.java | 8 +-
.../hdfs/trident/TridentSequenceTopology.java | 8 +-
.../storm/hive/bolt/BucketTestHiveTopology.java | 12 +-
.../apache/storm/hive/bolt/HiveTopology.java | 12 +-
.../hive/bolt/HiveTopologyPartitioned.java | 12 +-
.../storm/hive/trident/TridentHiveTopology.java | 17 +-
.../jdbc/topology/AbstractUserTopology.java | 10 +-
.../storm/kafka/trident/LocalSubmitter.java | 20 +-
.../kafka/trident/TridentKafkaTopology.java | 11 +-
.../storm/mongodb/topology/InsertWordCount.java | 10 +-
.../storm/mongodb/topology/UpdateWordCount.java | 10 +-
.../storm/mongodb/trident/WordCountTrident.java | 10 +-
.../opentsdb/SampleOpenTsdbBoltTopology.java | 11 +-
.../opentsdb/SampleOpenTsdbTridentTopology.java | 11 +-
.../storm/redis/topology/LookupWordCount.java | 10 +-
.../redis/topology/PersistentWordCount.java | 10 +-
.../redis/topology/WhitelistWordCount.java | 10 +-
.../redis/trident/WordCountTridentRedis.java | 10 +-
.../trident/WordCountTridentRedisCluster.java | 10 +-
.../WordCountTridentRedisClusterMap.java | 10 +-
.../redis/trident/WordCountTridentRedisMap.java | 10 +-
.../storm/solr/topology/SolrTopology.java | 14 +-
.../apache/storm/starter/clj/exclamation.clj | 8 +-
.../storm/starter/clj/rolling_top_words.clj | 7 +-
.../org/apache/storm/starter/clj/word_count.clj | 8 +-
.../apache/storm/starter/BasicDRPCTopology.java | 17 +-
.../storm/starter/ExclamationTopology.java | 10 +-
.../org/apache/storm/starter/ManualDRPC.java | 25 +-
.../storm/starter/MultipleLoggerTopology.java | 10 +-
.../apache/storm/starter/PrintSampleStream.java | 15 +-
.../org/apache/storm/starter/ReachTopology.java | 16 +-
.../starter/ResourceAwareExampleTopology.java | 10 +-
.../apache/storm/starter/SingleJoinExample.java | 33 +-
.../storm/starter/SlidingTupleTsTopology.java | 10 +-
.../storm/starter/SlidingWindowTopology.java | 10 +-
.../storm/starter/ThroughputVsLatency.java | 2 +-
.../storm/starter/TransactionalGlobalCount.java | 13 +-
.../storm/starter/TransactionalWords.java | 15 +-
.../apache/storm/starter/WordCountTopology.java | 11 +-
.../storm/starter/WordCountTopologyNode.java | 11 +-
.../TridentHBaseWindowingStoreTopology.java | 11 +-
.../starter/trident/TridentMapExample.java | 15 +-
.../trident/TridentMinMaxOfDevicesTopology.java | 9 +-
.../TridentMinMaxOfVehiclesTopology.java | 9 +-
.../storm/starter/trident/TridentReach.java | 21 +-
.../TridentWindowingInmemoryStoreTopology.java | 10 +-
.../storm/starter/trident/TridentWordCount.java | 14 +-
.../apache/storm/starter/util/StormRunner.java | 12 +-
.../src/jvm/storm/starter/StatefulTopology.java | 11 +-
.../starter/StatefulWindowingTopology.java | 11 +-
.../main/java/org/apache/storm/flux/Flux.java | 11 +-
.../backends/trident/TestPlanCompiler.java | 32 +-
.../storm/druid/SampleDruidBoltTopology.java | 11 +-
.../druid/SampleDruidBoltTridentTopology.java | 11 +-
.../storm/eventhubs/samples/EventCount.java | 13 +-
.../storm/jms/example/ExampleJmsTopology.java | 10 +-
.../test/KafkaSpoutTopologyMainNamedTopics.java | 3 +-
.../ExponentialBackoffMsgRetryManagerTest.java | 9 +-
.../storm/mqtt/StormMqttIntegrationTest.java | 41 +-
.../org/apache/storm/ExclamationTopology.java | 10 +-
.../src/clj/org/apache/storm/clojure.clj | 18 +
.../src/clj/org/apache/storm/testing.clj | 270 ++++++
.../src/clj/org/apache/storm/LocalCluster.clj | 106 ---
storm-core/src/clj/org/apache/storm/config.clj | 18 +-
.../src/clj/org/apache/storm/converter.clj | 240 -----
.../src/clj/org/apache/storm/daemon/common.clj | 55 --
.../apache/storm/daemon/local_supervisor.clj | 28 -
.../clj/org/apache/storm/internal/thrift.clj | 18 -
.../org/apache/storm/local_state_converter.clj | 24 -
storm-core/src/clj/org/apache/storm/log.clj | 24 +-
storm-core/src/clj/org/apache/storm/testing.clj | 766 ----------------
.../src/clj/org/apache/storm/testing4j.clj | 185 ----
.../clj/org/apache/storm/trident/testing.clj | 78 --
storm-core/src/clj/org/apache/storm/ui/core.clj | 14 +-
storm-core/src/clj/org/apache/storm/util.clj | 111 ---
.../src/jvm/org/apache/storm/ILocalCluster.java | 195 +++-
.../src/jvm/org/apache/storm/ILocalDRPC.java | 13 +-
.../src/jvm/org/apache/storm/LocalCluster.java | 824 +++++++++++++++++
.../src/jvm/org/apache/storm/LocalDRPC.java | 23 +-
.../src/jvm/org/apache/storm/Testing.java | 716 +++++++++++++++
storm-core/src/jvm/org/apache/storm/Thrift.java | 2 +-
.../apache/storm/blobstore/BlobStoreUtils.java | 18 +-
.../storm/blobstore/LocalFsBlobStore.java | 8 +-
.../storm/cluster/IStormClusterState.java | 12 +-
.../org/apache/storm/daemon/nimbus/Nimbus.java | 125 +--
.../storm/daemon/supervisor/LocalContainer.java | 4 -
.../apache/storm/testing/CompletableSpout.java | 39 +
.../storm/testing/CompleteTopologyParam.java | 30 +-
.../org/apache/storm/testing/FeederSpout.java | 4 +
.../apache/storm/testing/FixedTupleSpout.java | 7 +-
.../storm/testing/InProcessZookeeper.java | 59 ++
.../apache/storm/testing/MkClusterParam.java | 6 +-
.../org/apache/storm/testing/MkTupleParam.java | 15 +-
.../apache/storm/testing/MockLeaderElector.java | 79 ++
.../org/apache/storm/testing/MockedSources.java | 8 +
.../apache/storm/testing/TestEventLogSpout.java | 7 +-
.../jvm/org/apache/storm/testing/TmpPath.java | 69 ++
.../apache/storm/testing/TrackedTopology.java | 117 ++-
.../apache/storm/topology/TopologyBuilder.java | 8 +-
.../src/jvm/org/apache/storm/utils/Time.java | 59 +-
.../org/apache/storm/integration_test.clj | 246 ++---
.../org/apache/storm/testing4j_test.clj | 20 +-
.../apache/storm/trident/integration_test.clj | 252 +++---
.../test/clj/org/apache/storm/clojure_test.clj | 159 ----
.../test/clj/org/apache/storm/cluster_test.clj | 144 +--
.../test/clj/org/apache/storm/drpc_test.clj | 4 +-
.../test/clj/org/apache/storm/grouping_test.clj | 60 +-
.../clj/org/apache/storm/local_state_test.clj | 14 +-
.../clj/org/apache/storm/logviewer_test.clj | 3 +-
.../storm/messaging/netty_integration_test.clj | 31 +-
.../apache/storm/messaging/netty_unit_test.clj | 13 +-
.../clj/org/apache/storm/messaging_test.clj | 46 +-
.../test/clj/org/apache/storm/metrics_test.clj | 170 ++--
.../test/clj/org/apache/storm/nimbus_test.clj | 891 ++++++++++---------
.../scheduler/multitenant_scheduler_test.clj | 2 +-
.../clj/org/apache/storm/scheduler_test.clj | 2 +-
.../apache/storm/security/auth/auth_test.clj | 8 +-
.../storm/security/auth/drpc_auth_test.clj | 18 +-
.../storm/security/auth/nimbus_auth_test.clj | 78 +-
.../clj/org/apache/storm/submitter_test.clj | 2 +-
.../clj/org/apache/storm/subtopology_test.clj | 62 --
.../clj/org/apache/storm/tick_tuple_test.clj | 12 +-
.../clj/org/apache/storm/transactional_test.clj | 309 +++----
.../clj/org/apache/storm/trident/state_test.clj | 2 -
.../clj/org/apache/storm/trident/tuple_test.clj | 38 +-
.../test/clj/org/apache/storm/tuple_test.clj | 13 +-
.../org/apache/storm/versioned_store_test.clj | 6 +-
.../storm/daemon/supervisor/SlotTest.java | 31 +-
.../daemon/worker/LogConfigManagerTest.java | 31 +-
.../storm/executor/error/ReportErrorTest.java | 6 +-
.../jvm/org/apache/storm/utils/TimeTest.java | 31 +-
138 files changed, 4274 insertions(+), 3661 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/557c49d5/storm-core/src/jvm/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------