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 2015/05/29 19:55:48 UTC
[3/6] storm git commit: Merge branch 'master' into STORM-737
Merge branch 'master' into STORM-737
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/52bd47b3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/52bd47b3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/52bd47b3
Branch: refs/heads/master
Commit: 52bd47b31505db9352e299178c85e990c3f10235
Parents: 85af195 847958c
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu May 14 06:43:28 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu May 14 06:43:28 2015 +0900
----------------------------------------------------------------------
.gitignore | 1 +
.travis.yml | 9 +
CHANGELOG.md | 31 +
LICENSE | 29 +
README.markdown | 4 +
SECURITY.md | 50 ++
bin/storm | 2 +-
bin/storm.cmd | 4 +-
bin/storm.py | 24 +-
conf/defaults.yaml | 2 +-
dev-tools/test-ns.py | 19 +-
.../print-errors-from-clojure-test-reports.py | 58 ++
dev-tools/travis/travis-build.sh | 50 ++
docs/documentation/Multilang-protocol.md | 63 +-
.../documentation/Setting-up-a-Storm-cluster.md | 7 +-
docs/documentation/Trident-API-Overview.md | 2 +-
examples/storm-starter/README.markdown | 8 +-
.../storm-starter/multilang/resources/storm.js | 373 ---------
.../storm-starter/multilang/resources/storm.py | 260 -------
.../storm-starter/multilang/resources/storm.rb | 236 ------
examples/storm-starter/pom.xml | 67 +-
external/storm-eventhubs/README.md | 41 +
external/storm-eventhubs/pom.xml | 122 +++
.../storm/eventhubs/bolt/EventHubBolt.java | 81 ++
.../client/ConnectionStringBuilder.java | 116 +++
.../storm/eventhubs/client/Constants.java | 32 +
.../storm/eventhubs/client/EventHubClient.java | 92 +++
.../eventhubs/client/EventHubConsumerGroup.java | 72 ++
.../eventhubs/client/EventHubException.java | 37 +
.../eventhubs/client/EventHubReceiver.java | 139 ++++
.../eventhubs/client/EventHubSendClient.java | 70 ++
.../storm/eventhubs/client/EventHubSender.java | 95 +++
.../storm/eventhubs/client/SelectorFilter.java | 38 +
.../eventhubs/client/SelectorFilterWriter.java | 64 ++
.../eventhubs/samples/AtMostOnceEventCount.java | 54 ++
.../storm/eventhubs/samples/EventCount.java | 155 ++++
.../storm/eventhubs/samples/EventHubLoop.java | 51 ++
.../samples/OpaqueTridentEventCount.java | 53 ++
.../samples/TransactionalTridentEventCount.java | 81 ++
.../eventhubs/samples/bolt/GlobalCountBolt.java | 83 ++
.../samples/bolt/PartialCountBolt.java | 63 ++
.../apache/storm/eventhubs/spout/EventData.java | 48 ++
.../storm/eventhubs/spout/EventDataScheme.java | 55 ++
.../eventhubs/spout/EventHubReceiverFilter.java | 56 ++
.../eventhubs/spout/EventHubReceiverImpl.java | 150 ++++
.../storm/eventhubs/spout/EventHubSpout.java | 258 +++++++
.../eventhubs/spout/EventHubSpoutConfig.java | 165 ++++
.../eventhubs/spout/EventHubSpoutException.java | 37 +
.../storm/eventhubs/spout/FieldConstants.java | 25 +
.../storm/eventhubs/spout/IEventDataScheme.java | 30 +
.../eventhubs/spout/IEventHubReceiver.java | 35 +
.../spout/IEventHubReceiverFactory.java | 30 +
.../spout/IEventHubReceiverFilter.java | 35 +
.../eventhubs/spout/IPartitionCoordinator.java | 27 +
.../eventhubs/spout/IPartitionManager.java | 37 +
.../spout/IPartitionManagerFactory.java | 33 +
.../storm/eventhubs/spout/IStateStore.java | 31 +
.../apache/storm/eventhubs/spout/MessageId.java | 56 ++
.../storm/eventhubs/spout/PartitionManager.java | 101 +++
.../eventhubs/spout/SimplePartitionManager.java | 136 ++++
.../spout/StaticPartitionCoordinator.java | 85 +++
.../eventhubs/spout/ZookeeperStateStore.java | 95 +++
.../storm/eventhubs/trident/Coordinator.java | 60 ++
.../trident/ITridentPartitionManager.java | 35 +
.../ITridentPartitionManagerFactory.java | 26 +
.../trident/OpaqueTridentEventHubEmitter.java | 69 ++
.../trident/OpaqueTridentEventHubSpout.java | 64 ++
.../storm/eventhubs/trident/Partition.java | 39 +
.../storm/eventhubs/trident/Partitions.java | 41 +
.../TransactionalTridentEventHubEmitter.java | 167 ++++
.../TransactionalTridentEventHubSpout.java | 66 ++
.../trident/TridentPartitionManager.java | 91 +++
.../src/main/resources/config.properties | 27 +
.../eventhubs/spout/EventHubReceiverMock.java | 105 +++
.../spout/EventHubSpoutCallerMock.java | 96 +++
.../spout/PartitionManagerCallerMock.java | 105 +++
.../spout/SpoutOutputCollectorMock.java | 61 ++
.../storm/eventhubs/spout/StateStoreMock.java | 54 ++
.../storm/eventhubs/spout/TestEventData.java | 47 ++
.../eventhubs/spout/TestEventHubSpout.java | 70 ++
.../eventhubs/spout/TestPartitionManager.java | 117 +++
.../TestTransactionalTridentEmitter.java | 93 +++
.../eventhubs/trident/TridentCollectorMock.java | 52 ++
.../mapper/SimpleTridentHBaseMapMapper.java | 50 ++
.../trident/mapper/TridentHBaseMapMapper.java | 40 +
.../hbase/trident/state/HBaseMapState.java | 45 +-
external/storm-kafka/README.md | 44 +-
.../jvm/storm/kafka/DynamicBrokersReader.java | 26 +
.../src/jvm/storm/kafka/KafkaConfig.java | 2 +-
.../src/jvm/storm/kafka/KafkaUtils.java | 5 +-
.../src/jvm/storm/kafka/PartitionManager.java | 4 +-
.../src/jvm/storm/kafka/bolt/KafkaBolt.java | 1 +
.../kafka/trident/TridentKafkaEmitter.java | 4 +-
.../storm/kafka/DynamicBrokersReaderTest.java | 13 +
.../src/test/storm/kafka/KafkaUtilsTest.java | 6 +-
.../test/storm/kafka/bolt/KafkaBoltTest.java | 27 +
external/storm-redis/pom.xml | 2 +-
.../redis/common/container/JedisContainer.java | 7 +-
.../redis/trident/state/RedisMapState.java | 10 +-
pom.xml | 4 +
storm-core/pom.xml | 35 +
storm-core/src/clj/backtype/storm/cluster.clj | 5 +-
storm-core/src/clj/backtype/storm/converter.clj | 10 +-
.../src/clj/backtype/storm/daemon/common.clj | 15 +-
.../src/clj/backtype/storm/daemon/drpc.clj | 21 +-
.../src/clj/backtype/storm/daemon/executor.clj | 9 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 1 +
.../src/clj/backtype/storm/daemon/nimbus.clj | 9 +-
.../clj/backtype/storm/daemon/supervisor.clj | 45 +-
.../src/clj/backtype/storm/daemon/worker.clj | 15 +-
.../src/clj/backtype/storm/local_state.clj | 99 +++
storm-core/src/clj/backtype/storm/testing.clj | 25 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 29 +-
.../src/clj/backtype/storm/ui/helpers.clj | 51 +-
storm-core/src/clj/backtype/storm/util.clj | 37 +-
storm-core/src/dev/resources/storm.js | 373 ---------
storm-core/src/dev/resources/storm.py | 260 -------
storm-core/src/dev/resources/storm.rb | 236 ------
storm-core/src/jvm/backtype/storm/Config.java | 94 +++
.../src/jvm/backtype/storm/drpc/DRPCSpout.java | 8 +-
.../storm/generated/ClusterWorkerHeartbeat.java | 102 ++-
.../storm/generated/LSApprovedWorkers.java | 458 +++++++++++
.../generated/LSSupervisorAssignments.java | 471 ++++++++++++
.../storm/generated/LSSupervisorId.java | 406 ++++++++++
.../storm/generated/LSWorkerHeartbeat.java | 755 +++++++++++++++++++
.../storm/generated/LocalAssignment.java | 561 ++++++++++++++
.../storm/generated/LocalStateData.java | 471 ++++++++++++
.../jvm/backtype/storm/generated/Nimbus.java | 12 +-
.../storm/generated/SupervisorInfo.java | 116 ++-
.../storm/generated/SupervisorSummary.java | 117 ++-
.../storm/generated/ThriftSerializedObject.java | 516 +++++++++++++
.../storm/generated/TopologySummary.java | 2 +-
.../security/auth/SaslTransportPlugin.java | 17 +-
.../GzipBridgeThriftSerializationDelegate.java | 64 ++
.../GzipThriftSerializationDelegate.java | 57 ++
.../jvm/backtype/storm/spout/ShellSpout.java | 6 +
.../src/jvm/backtype/storm/task/IBolt.java | 4 +-
.../src/jvm/backtype/storm/task/ShellBolt.java | 5 +-
.../backtype/storm/task/TopologyContext.java | 104 ++-
.../storm/utils/ExtendedThreadPoolExecutor.java | 67 ++
.../jvm/backtype/storm/utils/LocalState.java | 163 +++-
.../src/jvm/backtype/storm/utils/Utils.java | 49 ++
storm-core/src/multilang/js/storm.js | 366 ---------
storm-core/src/multilang/py/storm.py | 260 -------
storm-core/src/multilang/rb/storm.rb | 236 ------
storm-core/src/py/__init__.py | 2 +
storm-core/src/py/storm/DistributedRPC.py | 2 +
.../src/py/storm/DistributedRPCInvocations.py | 2 +
storm-core/src/py/storm/Nimbus.py | 10 +
storm-core/src/py/storm/__init__.py | 2 +
storm-core/src/py/storm/constants.py | 2 +
storm-core/src/py/storm/ttypes.py | 645 +++++++++++++++-
storm-core/src/storm.thrift | 43 ++
.../src/ui/public/css/jsonFormatter.min.css | 1 +
storm-core/src/ui/public/css/style.css | 11 +
storm-core/src/ui/public/index.html | 3 +
.../src/ui/public/js/jsonFormatter.min.js | 2 +
storm-core/src/ui/public/js/script.js | 2 +-
.../templates/component-page-template.html | 2 +-
.../public/templates/index-page-template.html | 6 +
storm-core/src/ui/public/topology.html | 3 +
.../test/clj/backtype/storm/cluster_test.clj | 4 +-
.../clj/backtype/storm/local_state_test.clj | 40 +-
.../storm/security/auth/nimbus_auth_test.clj | 2 +-
.../clj/backtype/storm/transactional_test.clj | 6 +-
...ipBridgeThriftSerializationDelegateTest.java | 71 ++
.../storm/utils/DisruptorQueueTest.java | 38 +-
storm-core/test/resources/logback-test.xml | 26 +
storm-dist/binary/src/main/assembly/binary.xml | 41 +-
storm-multilang/javascript/pom.xml | 32 +
.../src/main/resources/resources/storm.js | 373 +++++++++
storm-multilang/python/pom.xml | 32 +
.../src/main/resources/resources/storm.py | 260 +++++++
storm-multilang/ruby/pom.xml | 32 +
.../ruby/src/main/resources/resources/storm.rb | 236 ++++++
175 files changed, 11890 insertions(+), 2941 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/52bd47b3/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------