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/02/08 02:11:37 UTC
[2/3] storm git commit: Merge branch
'Apache_master_STORM-2281_TridentParellism2+' of
https://github.com/hmcl/storm-apache into STORM-2281-merge
Merge branch 'Apache_master_STORM-2281_TridentParellism2+' of https://github.com/hmcl/storm-apache into STORM-2281-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/46916263
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/46916263
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/46916263
Branch: refs/heads/master
Commit: 469162639ece6e774f1e526c91b799b6cc85daec
Parents: d3250b2 07cf86e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Feb 8 10:25:00 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Feb 8 10:25:00 2017 +0900
----------------------------------------------------------------------
.../TridentKafkaClientWordCountNamedTopics.java | 44 ++--
.../storm/kafka/trident/LocalSubmitter.java | 7 +-
.../trident/TridentKafkaConsumerTopology.java | 20 +-
.../trident/KafkaTridentSpoutBatchMetadata.java | 8 +-
.../spout/trident/KafkaTridentSpoutEmitter.java | 206 +++++++++++++------
.../spout/trident/KafkaTridentSpoutManager.java | 85 ++++----
.../spout/trident/KafkaTridentSpoutOpaque.java | 17 +-
.../KafkaTridentSpoutOpaqueCoordinator.java | 4 +-
.../KafkaTridentSpoutTopicPartition.java | 2 +-
...KafkaTridentSpoutTopicPartitionRegistry.java | 4 +-
10 files changed, 237 insertions(+), 160 deletions(-)
----------------------------------------------------------------------