Merge branch 'STORM-2549-1.x' of https://github.com/srdo/storm into asfgit-1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ef73328d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ef73328d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ef73328d Branch: refs/heads/1.x-branch Commit: ef73328df9f3f70cdf0d492dca3cfb9fea6b342e Parents: c70d7d4 07ecff1 Author: Stig Rohde Døssing <[email protected]> Authored: Sat Nov 11 18:53:41 2017 +0100 Committer: Stig Rohde Døssing <[email protected]> Committed: Sat Nov 11 18:53:41 2017 +0100 ---------------------------------------------------------------------- .../apache/storm/kafka/spout/KafkaSpout.java | 111 +++++++++------ .../storm/kafka/spout/KafkaSpoutConfig.java | 11 +- .../kafka/spout/internal/OffsetManager.java | 22 +++ .../storm/kafka/spout/KafkaSpoutCommitTest.java | 12 +- .../storm/kafka/spout/KafkaSpoutEmitTest.java | 138 +++++++------------ .../kafka/spout/KafkaSpoutRebalanceTest.java | 15 +- .../kafka/spout/KafkaSpoutRetryLimitTest.java | 11 +- .../kafka/spout/MaxUncommittedOffsetTest.java | 32 +++-- .../kafka/spout/SingleTopicKafkaSpoutTest.java | 52 ++++--- .../SpoutWithMockedConsumerSetupHelper.java | 52 ++++--- .../SingleTopicKafkaSpoutConfiguration.java | 2 +- .../kafka/spout/internal/OffsetManagerTest.java | 15 ++ 12 files changed, 266 insertions(+), 207 deletions(-) ----------------------------------------------------------------------
