Merge branch 'STORM-2607-fixup' of https://github.com/srdo/storm 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/15845336 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/15845336 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/15845336 Branch: refs/heads/master Commit: 15845336fd878f45298cfb49069bdfda326fa5fb Parents: 414f2b4 d7bdc2d Author: Stig Rohde Døssing <[email protected]> Authored: Sat Oct 14 08:49:59 2017 +0200 Committer: Stig Rohde Døssing <[email protected]> Committed: Sat Oct 14 08:49:59 2017 +0200 ---------------------------------------------------------------------- .../apache/storm/kafka/spout/KafkaSpout.java | 6 +- .../kafka/spout/internal/OffsetManager.java | 83 +++++++----- .../storm/kafka/spout/KafkaSpoutCommitTest.java | 9 +- .../storm/kafka/spout/KafkaSpoutEmitTest.java | 21 +-- .../spout/KafkaSpoutMessagingGuaranteeTest.java | 8 +- .../kafka/spout/KafkaSpoutRebalanceTest.java | 15 ++- .../kafka/spout/KafkaSpoutRetryLimitTest.java | 10 +- .../kafka/spout/MaxUncommittedOffsetTest.java | 8 +- .../kafka/spout/SingleTopicKafkaSpoutTest.java | 42 +++--- .../spout/SingleTopicKafkaUnitSetupHelper.java | 2 +- .../SpoutWithMockedConsumerSetupHelper.java | 2 +- .../kafka/spout/internal/OffsetManagerTest.java | 135 +++++++++++++++---- 12 files changed, 226 insertions(+), 115 deletions(-) ----------------------------------------------------------------------
