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 2017/07/19 18:25:06 UTC
[3/4] storm git commit: Merge branch 'STORM-2542' of
https://github.com/srdo/storm into STORM-2542-merge
Merge branch 'STORM-2542' of https://github.com/srdo/storm into STORM-2542-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f67699cc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f67699cc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f67699cc
Branch: refs/heads/master
Commit: f67699cce3d71c416ee4db3e8692c289cae0f4db
Parents: 10d381b fdb649e
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Wed Jul 19 20:15:20 2017 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Wed Jul 19 20:15:20 2017 +0200
----------------------------------------------------------------------
docs/storm-kafka-client.md | 7 +-
.../storm/kafka/spout/KafkaSpoutConfig.java | 175 ++++++++++---------
.../spout/ManualPartitionSubscription.java | 71 --------
.../storm/kafka/spout/ManualPartitioner.java | 40 -----
.../storm/kafka/spout/NamedSubscription.java | 61 -------
.../storm/kafka/spout/NamedTopicFilter.java | 67 -------
.../storm/kafka/spout/PatternSubscription.java | 54 ------
.../storm/kafka/spout/PatternTopicFilter.java | 69 --------
.../spout/RoundRobinManualPartitioner.java | 50 ------
.../apache/storm/kafka/spout/Subscription.java | 53 ------
.../apache/storm/kafka/spout/TopicFilter.java | 38 ----
.../ManualPartitionSubscription.java | 72 ++++++++
.../spout/subscription/ManualPartitioner.java | 40 +++++
.../spout/subscription/NamedTopicFilter.java | 67 +++++++
.../spout/subscription/PatternTopicFilter.java | 69 ++++++++
.../RoundRobinManualPartitioner.java | 50 ++++++
.../kafka/spout/subscription/Subscription.java | 53 ++++++
.../kafka/spout/subscription/TopicFilter.java | 38 ++++
.../storm/kafka/spout/KafkaSpoutCommitTest.java | 36 ++--
.../storm/kafka/spout/KafkaSpoutEmitTest.java | 48 ++---
.../kafka/spout/KafkaSpoutRebalanceTest.java | 37 ++--
.../kafka/spout/KafkaSpoutRetryLimitTest.java | 74 ++++----
.../kafka/spout/MaxUncommittedOffsetTest.java | 7 +-
.../storm/kafka/spout/NamedTopicFilterTest.java | 69 --------
.../kafka/spout/PatternTopicFilterTest.java | 73 --------
.../kafka/spout/SingleTopicKafkaSpoutTest.java | 9 +-
.../SpoutWithMockedConsumerSetupHelper.java | 74 ++++++++
.../SingleTopicKafkaSpoutConfiguration.java | 44 +++--
.../subscription/NamedTopicFilterTest.java | 68 +++++++
.../subscription/PatternTopicFilterTest.java | 73 ++++++++
30 files changed, 827 insertions(+), 859 deletions(-)
----------------------------------------------------------------------