Merge branch 'STORM-2250-1.x' of github.com:srdo/storm into 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/d14c2935 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d14c2935 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d14c2935 Branch: refs/heads/1.x-branch Commit: d14c2935effa914ede12e0e038ebb5b732a1ef62 Parents: 191a806 a03137e Author: P. Taylor Goetz <[email protected]> Authored: Wed Feb 15 16:31:25 2017 -0500 Committer: P. Taylor Goetz <[email protected]> Committed: Wed Feb 15 16:31:25 2017 -0500 ---------------------------------------------------------------------- external/storm-kafka-client/pom.xml | 9 +- .../apache/storm/kafka/spout/KafkaSpout.java | 159 ++------- .../kafka/spout/internal/OffsetManager.java | 157 ++++++++ .../storm/kafka/spout/internal/Timer.java | 7 +- .../spout/ByTopicRecordTranslatorTest.java | 2 +- .../spout/DefaultRecordTranslatorTest.java | 2 +- .../storm/kafka/spout/KafkaSpoutConfigTest.java | 4 +- .../kafka/spout/KafkaSpoutRebalanceTest.java | 77 ++-- .../kafka/spout/SingleTopicKafkaSpoutTest.java | 355 ++++++++++--------- .../test/KafkaSpoutTopologyMainNamedTopics.java | 6 +- .../KafkaSpoutTopologyMainWildcardTopics.java | 2 +- pom.xml | 1 - .../src/jvm/org/apache/storm/utils/Time.java | 183 +++++++--- .../storm/daemon/supervisor/SlotTest.java | 31 +- 14 files changed, 569 insertions(+), 426 deletions(-) ----------------------------------------------------------------------
