Merge branch 'STORM-2648-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/293643f0 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/293643f0 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/293643f0 Branch: refs/heads/master Commit: 293643f0956abbd2ccdf2b85c70fee0e1dce6be0 Parents: 5c05bb7 48f6969 Author: Jungtaek Lim <[email protected]> Authored: Fri Sep 29 14:26:30 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Fri Sep 29 14:26:30 2017 +0900 ---------------------------------------------------------------------- docs/storm-kafka-client.md | 31 ++- .../apache/storm/kafka/spout/KafkaSpout.java | 157 +++++++------- .../storm/kafka/spout/KafkaSpoutConfig.java | 85 +++++++- .../spout/KafkaSpoutMessagingGuaranteeTest.java | 207 +++++++++++++++++++ .../kafka/spout/MaxUncommittedOffsetTest.java | 27 +-- .../kafka/spout/SingleTopicKafkaSpoutTest.java | 47 ++--- .../spout/SingleTopicKafkaUnitSetupHelper.java | 67 ++++++ .../SingleTopicKafkaSpoutConfiguration.java | 17 +- 8 files changed, 468 insertions(+), 170 deletions(-) ----------------------------------------------------------------------
