Merge branch 'STORM-2648-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/cb2d7e8b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cb2d7e8b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cb2d7e8b Branch: refs/heads/1.x-branch Commit: cb2d7e8be2423bc7be34e388dee4fbd697724c48 Parents: fca692d 11a7a15 Author: Stig Rohde Døssing <[email protected]> Authored: Mon Oct 2 18:09:11 2017 +0200 Committer: Stig Rohde Døssing <[email protected]> Committed: Mon Oct 2 18:09:11 2017 +0200 ---------------------------------------------------------------------- docs/storm-kafka-client.md | 31 ++- .../apache/storm/kafka/spout/KafkaSpout.java | 175 +++++++++------- .../storm/kafka/spout/KafkaSpoutConfig.java | 99 ++++++++- .../storm/kafka/spout/KafkaSpoutCommitTest.java | 5 +- .../storm/kafka/spout/KafkaSpoutEmitTest.java | 8 +- .../spout/KafkaSpoutMessagingGuaranteeTest.java | 207 +++++++++++++++++++ .../kafka/spout/KafkaSpoutRebalanceTest.java | 8 +- .../kafka/spout/KafkaSpoutRetryLimitTest.java | 5 +- .../kafka/spout/MaxUncommittedOffsetTest.java | 32 +-- .../kafka/spout/SingleTopicKafkaSpoutTest.java | 47 ++--- .../spout/SingleTopicKafkaUnitSetupHelper.java | 67 ++++++ .../SingleTopicKafkaSpoutConfiguration.java | 23 +-- 12 files changed, 522 insertions(+), 185 deletions(-) ----------------------------------------------------------------------
