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 2015/05/22 21:54:56 UTC
[11/18] storm git commit: Merge pull request #20 from apache/master
Merge pull request #20 from apache/master
Merge from apache/storm to caofangkun/apache-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8696317b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8696317b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8696317b
Branch: refs/heads/master
Commit: 8696317ba1f3ac19befd53ff6d892282948596e8
Parents: bb8583a 7712102
Author: caofangkun <ca...@gmail.com>
Authored: Tue Apr 28 15:33:25 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Tue Apr 28 15:33:25 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 +
.travis.yml | 9 +
CHANGELOG.md | 14 +
SECURITY.md | 50 +++
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 +++-
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 +++
external/storm-kafka/README.md | 49 ++-
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 | 7 +-
.../src/clj/backtype/storm/daemon/common.clj | 2 +-
.../src/clj/backtype/storm/daemon/drpc.clj | 21 +-
.../src/clj/backtype/storm/daemon/executor.clj | 3 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 1 +
.../src/clj/backtype/storm/daemon/nimbus.clj | 9 +-
.../clj/backtype/storm/daemon/supervisor.clj | 11 +-
.../src/clj/backtype/storm/daemon/worker.clj | 1 +
storm-core/src/clj/backtype/storm/ui/core.clj | 27 +-
.../src/clj/backtype/storm/ui/helpers.clj | 51 ++-
storm-core/src/clj/backtype/storm/util.clj | 32 ++
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 | 1 +
.../jvm/backtype/storm/generated/Nimbus.java | 12 +-
.../storm/generated/SupervisorInfo.java | 116 +++++-
.../storm/generated/SupervisorSummary.java | 117 +++++-
.../storm/generated/TopologySummary.java | 2 +-
.../security/auth/SaslTransportPlugin.java | 17 +-
.../GzipBridgeThriftSerializationDelegate.java | 64 ++++
.../GzipThriftSerializationDelegate.java | 57 +++
.../src/jvm/backtype/storm/task/ShellBolt.java | 5 +-
.../backtype/storm/task/TopologyContext.java | 104 ++++--
.../storm/utils/ExtendedThreadPoolExecutor.java | 67 ++++
.../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/storm/Nimbus.py | 8 +
storm-core/src/py/storm/ttypes.py | 32 +-
storm-core/src/storm.thrift | 9 +
.../templates/component-page-template.html | 2 +-
.../public/templates/index-page-template.html | 6 +
.../test/clj/backtype/storm/cluster_test.clj | 4 +-
...ipBridgeThriftSerializationDelegateTest.java | 71 ++++
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 ++++++++++++
131 files changed, 6900 insertions(+), 2770 deletions(-)
----------------------------------------------------------------------