You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/11/29 18:19:12 UTC
[3/3] storm git commit: Merge branch 'STORM-3290' into asfgit-master
Merge branch 'STORM-3290' into asfgit-master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6d871a73
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6d871a73
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6d871a73
Branch: refs/heads/master
Commit: 6d871a73e7341c956a56d09f7b3f7a367a5752e3
Parents: 52cb6b2 63de17e
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Thu Nov 29 19:18:00 2018 +0100
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Thu Nov 29 19:18:00 2018 +0100
----------------------------------------------------------------------
.../KafkaSpoutTopologyMainNamedTopics.java | 2 +-
.../KafkaSpoutTopologyMainWildcardTopics.java | 2 +-
.../TridentKafkaClientTopologyNamedTopics.java | 27 +-
...ridentKafkaClientTopologyWildcardTopics.java | 12 +-
.../apache/storm/perf/KafkaClientHdfsTopo.java | 3 +-
.../perf/KafkaClientSpoutNullBoltTopo.java | 3 +-
.../kafka/spout/FirstPollOffsetStrategy.java | 42 +++
.../apache/storm/kafka/spout/KafkaSpout.java | 11 +-
.../storm/kafka/spout/KafkaSpoutConfig.java | 330 ++++---------------
.../spout/internal/CommonKafkaSpoutConfig.java | 264 +++++++++++++++
.../kafka/spout/internal/ConsumerFactory.java | 4 +-
.../spout/internal/ConsumerFactoryDefault.java | 6 +-
.../spout/trident/KafkaTridentSpoutConfig.java | 100 ++++++
.../trident/KafkaTridentSpoutCoordinator.java | 8 +-
.../spout/trident/KafkaTridentSpoutEmitter.java | 32 +-
.../spout/trident/KafkaTridentSpoutOpaque.java | 4 +-
.../trident/KafkaTridentSpoutTransactional.java | 4 +-
.../trident/internal/OutputFieldsExtractor.java | 4 +-
.../kafka/spout/KafkaSpoutAbstractTest.java | 4 +-
.../storm/kafka/spout/KafkaSpoutConfigTest.java | 1 -
.../kafka/spout/KafkaSpoutReactivationTest.java | 4 +-
.../kafka/spout/KafkaSpoutRebalanceTest.java | 2 +-
...outTopologyDeployActivateDeactivateTest.java | 2 +-
.../kafka/spout/MaxUncommittedOffsetTest.java | 2 +-
.../SingleTopicKafkaSpoutConfiguration.java | 2 +-
.../KafkaTridentSpoutBatchMetadataTest.java | 2 -
.../trident/KafkaTridentSpoutEmitterTest.java | 16 +-
.../KafkaTridentSpoutOpaqueCoordinatorTest.java | 11 +-
...ngleTopicKafkaTridentSpoutConfiguration.java | 47 +++
29 files changed, 591 insertions(+), 360 deletions(-)
----------------------------------------------------------------------