Merge branch 'STORM-2225' of https://github.com/revans2/incubator-storm into STORM-2225
STORM-2225: change spout config to be simpler. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0d037042 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0d037042 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0d037042 Branch: refs/heads/master Commit: 0d037042b95486c631f8e407f19f4a2c9c9ab095 Parents: 22cecb0 c9f9348 Author: Robert (Bobby) Evans <ev...@yahoo-inc.com> Authored: Wed Feb 1 09:15:04 2017 -0600 Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com> Committed: Wed Feb 1 09:15:04 2017 -0600 ---------------------------------------------------------------------- docs/storm-kafka-client.md | 293 ++++++++--- .../TridentKafkaClientWordCountNamedTopics.java | 69 +-- ...identKafkaClientWordCountWildcardTopics.java | 31 +- external/storm-kafka-client/README.md | 192 +------ .../org/apache/storm/kafka/bolt/KafkaBolt.java | 223 ++++++++ .../FieldNameBasedTupleToKafkaMapper.java | 48 ++ .../kafka/bolt/mapper/TupleToKafkaMapper.java | 32 ++ .../bolt/selector/DefaultTopicSelector.java | 34 ++ .../bolt/selector/FieldIndexTopicSelector.java | 52 ++ .../bolt/selector/FieldNameTopicSelector.java | 49 ++ .../kafka/bolt/selector/KafkaTopicSelector.java | 26 + .../kafka/spout/ByTopicRecordTranslator.java | 146 ++++++ .../kafka/spout/DefaultRecordTranslator.java | 42 ++ .../java/org/apache/storm/kafka/spout/Func.java | 26 + .../apache/storm/kafka/spout/KafkaSpout.java | 117 ++--- .../storm/kafka/spout/KafkaSpoutConfig.java | 506 +++++++++++++------ .../storm/kafka/spout/KafkaSpoutMessageId.java | 2 +- .../storm/kafka/spout/KafkaSpoutStream.java | 121 ----- .../storm/kafka/spout/KafkaSpoutStreams.java | 38 -- .../spout/KafkaSpoutStreamsNamedTopics.java | 165 ------ .../spout/KafkaSpoutStreamsWildcardTopics.java | 67 --- .../kafka/spout/KafkaSpoutTupleBuilder.java | 58 --- .../kafka/spout/KafkaSpoutTuplesBuilder.java | 32 -- .../KafkaSpoutTuplesBuilderNamedTopics.java | 78 --- .../KafkaSpoutTuplesBuilderWildcardTopics.java | 36 -- .../apache/storm/kafka/spout/KafkaTuple.java | 47 ++ .../spout/ManualPartitionNamedSubscription.java | 78 +++ .../ManualPartitionPatternSubscription.java | 76 +++ .../storm/kafka/spout/ManualPartitioner.java | 40 ++ .../storm/kafka/spout/NamedSubscription.java | 61 +++ .../storm/kafka/spout/PatternSubscription.java | 54 ++ .../storm/kafka/spout/RecordTranslator.java | 55 ++ .../spout/RoundRobinManualPartitioner.java | 50 ++ .../kafka/spout/SimpleRecordTranslator.java | 58 +++ .../apache/storm/kafka/spout/Subscription.java | 53 ++ .../kafka/spout/TopicPartitionComparator.java | 21 +- .../storm/kafka/spout/internal/Timer.java | 3 +- .../fetcher/AutomaticKafkaRecordsFetcher.java | 67 --- .../internal/fetcher/KafkaRecordsFetcher.java | 25 - .../internal/fetcher/KafkaRecordsFetchers.java | 54 -- .../fetcher/ManualKafkaRecordsFetcher.java | 108 ---- .../partition/KafkaPartitionReader.java | 28 - .../partition/KafkaPartitionReaders.java | 45 -- .../partition/NamedTopicPartitionReader.java | 47 -- .../partition/WildcardTopicPartitionReader.java | 51 -- .../spout/trident/KafkaTridentSpoutEmitter.java | 60 ++- .../spout/trident/KafkaTridentSpoutManager.java | 58 +-- .../spout/trident/KafkaTridentSpoutOpaque.java | 12 +- .../storm/kafka/trident/TridentKafkaState.java | 115 +++++ .../kafka/trident/TridentKafkaStateFactory.java | 63 +++ .../FieldNameBasedTupleToKafkaMapper.java | 41 ++ .../mapper/TridentTupleToKafkaMapper.java | 28 + .../trident/selector/DefaultTopicSelector.java | 34 ++ .../trident/selector/KafkaTopicSelector.java | 26 + .../apache/storm/kafka/bolt/KafkaBoltTest.java | 91 ++++ .../spout/ByTopicRecordTranslatorTest.java | 72 +++ .../spout/DefaultRecordTranslatorTest.java | 37 ++ .../storm/kafka/spout/KafkaSpoutConfigTest.java | 40 ++ .../kafka/spout/KafkaSpoutRebalanceTest.java | 35 +- .../spout/KafkaSpoutStreamsNamedTopicsTest.java | 38 -- .../kafka/spout/SingleTopicKafkaSpoutTest.java | 2 +- .../SingleTopicKafkaSpoutConfiguration.java | 61 +-- .../builders/TopicKeyValueTupleBuilder.java | 40 -- .../test/KafkaSpoutTopologyMainNamedTopics.java | 70 +-- .../KafkaSpoutTopologyMainWildcardTopics.java | 40 +- .../spout/test/TopicTest2TupleBuilder.java | 40 -- .../test/TopicsTest0Test1TupleBuilder.java | 42 -- .../kafka/DynamicPartitionConnections.java | 2 +- .../jvm/org/apache/storm/kafka/KafkaSpout.java | 2 +- .../jvm/org/apache/storm/kafka/KafkaUtils.java | 4 +- .../apache/storm/kafka/PartitionManager.java | 2 +- .../apache/storm/kafka/StaticCoordinator.java | 4 +- .../org/apache/storm/kafka/bolt/KafkaBolt.java | 2 + .../storm/kafka/DynamicBrokersReaderTest.java | 6 +- .../apache/storm/kafka/TridentKafkaTest.java | 2 +- .../apache/storm/kafka/ZkCoordinatorTest.java | 2 +- .../apache/storm/kafka/bolt/KafkaBoltTest.java | 4 +- .../src/jvm/org/apache/storm/tuple/Fields.java | 18 +- 78 files changed, 2661 insertions(+), 1936 deletions(-) ----------------------------------------------------------------------
