Merge branch 'STORM-2546-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/818ed16f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/818ed16f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/818ed16f Branch: refs/heads/1.x-branch Commit: 818ed16f2281a6ee0ff65768a36fc8b8354b3ef5 Parents: 3badc16 d9fe768 Author: Stig Rohde Døssing <[email protected]> Authored: Thu Nov 16 07:13:20 2017 +0100 Committer: Stig Rohde Døssing <[email protected]> Committed: Thu Nov 16 07:13:20 2017 +0100 ---------------------------------------------------------------------- .../apache/storm/kafka/spout/KafkaSpout.java | 48 +++- .../storm/kafka/spout/KafkaSpoutConfig.java | 21 ++ .../storm/kafka/spout/KafkaSpoutCommitTest.java | 113 ---------- .../storm/kafka/spout/KafkaSpoutConfigTest.java | 24 ++ .../storm/kafka/spout/KafkaSpoutEmitTest.java | 9 +- .../KafkaSpoutLogCompactionSupportTest.java | 223 +++++++++++++++++++ .../spout/KafkaSpoutMessagingGuaranteeTest.java | 8 +- .../kafka/spout/KafkaSpoutRetryLimitTest.java | 3 +- .../SpoutWithMockedConsumerSetupHelper.java | 66 +++++- .../kafka/spout/internal/OffsetManagerTest.java | 1 - 10 files changed, 378 insertions(+), 138 deletions(-) ----------------------------------------------------------------------
