Merge branch 'STORM-2937' of https://github.com/erikdw/storm into 
STORM-2937-1.0.x-merge


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4348548a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4348548a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4348548a

Branch: refs/heads/1.0.x-branch
Commit: 4348548aafabf9dbddc3c34740f6c8c0768a0c88
Parents: 9c89300 72fb417
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Thu Feb 8 18:04:20 2018 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Thu Feb 8 18:04:20 2018 +0900

----------------------------------------------------------------------
 docs/index.md                                   |   2 +-
 docs/storm-kafka-client.md                      | 361 ++++++++
 .../trident/OpaqueTridentEventHubEmitter.java   |  20 +-
 external/storm-kafka-client/README.md           | 162 +---
 external/storm-kafka-client/pom.xml             |  78 +-
 .../org/apache/storm/kafka/bolt/KafkaBolt.java  | 220 +++++
 .../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    | 149 +++
 .../kafka/spout/DefaultRecordTranslator.java    |  47 +
 .../kafka/spout/EmptyKafkaTupleListener.java    |  53 ++
 .../java/org/apache/storm/kafka/spout/Func.java |  28 +
 .../apache/storm/kafka/spout/KafkaSpout.java    | 887 ++++++++++--------
 .../storm/kafka/spout/KafkaSpoutConfig.java     | 928 +++++++++++++++----
 .../storm/kafka/spout/KafkaSpoutMessageId.java  |  57 +-
 .../KafkaSpoutRetryExponentialBackoff.java      | 150 ++-
 .../kafka/spout/KafkaSpoutRetryService.java     |  38 +-
 .../storm/kafka/spout/KafkaSpoutStream.java     | 121 ---
 .../storm/kafka/spout/KafkaSpoutStreams.java    |  35 -
 .../spout/KafkaSpoutStreamsNamedTopics.java     | 154 ---
 .../spout/KafkaSpoutStreamsWildcardTopics.java  |  61 --
 .../kafka/spout/KafkaSpoutTupleBuilder.java     |  58 --
 .../kafka/spout/KafkaSpoutTuplesBuilder.java    |  32 -
 .../KafkaSpoutTuplesBuilderNamedTopics.java     |  78 --
 .../KafkaSpoutTuplesBuilderWildcardTopics.java  |  36 -
 .../apache/storm/kafka/spout/KafkaTuple.java    |  47 +
 .../storm/kafka/spout/KafkaTupleListener.java   |  83 ++
 .../spout/ManualPartitionSubscription.java      |  69 ++
 .../storm/kafka/spout/ManualPartitioner.java    |  41 +
 .../storm/kafka/spout/NamedSubscription.java    |  64 ++
 .../storm/kafka/spout/NamedTopicFilter.java     |  68 ++
 .../storm/kafka/spout/PatternSubscription.java  |  56 ++
 .../storm/kafka/spout/PatternTopicFilter.java   |  70 ++
 .../storm/kafka/spout/RecordTranslator.java     |  56 ++
 .../spout/RoundRobinManualPartitioner.java      |  50 +
 .../kafka/spout/SerializableDeserializer.java   |  29 +
 .../kafka/spout/SimpleRecordTranslator.java     |  58 ++
 .../apache/storm/kafka/spout/Subscription.java  |  56 ++
 .../apache/storm/kafka/spout/TopicFilter.java   |  38 +
 .../kafka/spout/TopicPartitionComparator.java   |  49 +
 .../kafka/spout/internal/CommitMetadata.java    |  63 ++
 .../spout/internal/CommitMetadataManager.java   |  91 ++
 .../internal/KafkaConsumerFactoryDefault.java   |   3 +-
 .../kafka/spout/internal/OffsetManager.java     | 246 +++++
 .../storm/kafka/spout/internal/Timer.java       |  75 ++
 .../kafka/spout/metrics/KafkaOffsetMetric.java  | 141 +++
 .../trident/KafkaTridentSpoutBatchMetadata.java | 124 +++
 .../spout/trident/KafkaTridentSpoutEmitter.java | 279 ++++++
 .../spout/trident/KafkaTridentSpoutManager.java | 117 +++
 .../spout/trident/KafkaTridentSpoutOpaque.java  |  75 ++
 .../KafkaTridentSpoutOpaqueCoordinator.java     |  70 ++
 .../KafkaTridentSpoutTopicPartition.java        |  68 ++
 ...KafkaTridentSpoutTopicPartitionRegistry.java |  48 +
 .../trident/KafkaTridentSpoutTransactional.java |  48 +
 .../spout/trident/TopicPartitionSerializer.java |  47 +
 .../storm/kafka/trident/TridentKafkaState.java  | 138 +++
 .../kafka/trident/TridentKafkaStateFactory.java |  64 ++
 .../kafka/trident/TridentKafkaStateUpdater.java |  34 +
 .../FieldNameBasedTupleToKafkaMapper.java       |  41 +
 .../mapper/TridentTupleToKafkaMapper.java       |  28 +
 .../trident/selector/DefaultTopicSelector.java  |  34 +
 .../trident/selector/KafkaTopicSelector.java    |  26 +
 .../java/org/apache/storm/kafka/KafkaUnit.java  | 114 +++
 .../org/apache/storm/kafka/KafkaUnitRule.java   |  46 +
 .../apache/storm/kafka/bolt/KafkaBoltTest.java  |  91 ++
 .../spout/ByTopicRecordTranslatorTest.java      |  93 ++
 .../spout/DefaultRecordTranslatorTest.java      |  37 +
 .../kafka/spout/KafkaSpoutAbstractTest.java     | 179 ++++
 .../storm/kafka/spout/KafkaSpoutConfigTest.java | 241 +++++
 .../storm/kafka/spout/KafkaSpoutEmitTest.java   | 214 +++++
 .../KafkaSpoutLogCompactionSupportTest.java     | 223 +++++
 .../spout/KafkaSpoutMessagingGuaranteeTest.java | 259 ++++++
 .../kafka/spout/KafkaSpoutReactivationTest.java | 145 +++
 .../kafka/spout/KafkaSpoutRebalanceTest.java    | 204 ++--
 .../KafkaSpoutRetryExponentialBackoffTest.java  | 292 ++++++
 .../kafka/spout/KafkaSpoutRetryLimitTest.java   | 114 +++
 .../kafka/spout/KafkaSpoutSingleTopicTest.java  | 379 ++++++++
 ...outTopologyDeployActivateDeactivateTest.java | 116 +++
 .../kafka/spout/MaxUncommittedOffsetTest.java   | 293 ++++++
 .../kafka/spout/NamedSubscriptionTest.java      |  54 ++
 .../storm/kafka/spout/NamedTopicFilterTest.java |  70 ++
 .../kafka/spout/PatternTopicFilterTest.java     |  75 ++
 .../spout/SingleTopicKafkaUnitSetupHelper.java  |  89 ++
 .../SpoutWithMockedConsumerSetupHelper.java     | 171 ++++
 .../SingleTopicKafkaSpoutConfiguration.java     |  82 +-
 .../builders/TopicKeyValueTupleBuilder.java     |  40 -
 .../kafka/spout/internal/OffsetManagerTest.java | 196 ++++
 .../ManualPartitionSubscriptionTest.java        |  81 ++
 .../test/KafkaSpoutTopologyMainNamedTopics.java |  88 +-
 .../KafkaSpoutTopologyMainWildcardTopics.java   |  52 +-
 .../spout/test/TopicTest2TupleBuilder.java      |  40 -
 .../test/TopicsTest0Test1TupleBuilder.java      |  42 -
 .../KafkaTridentSpoutBatchMetadataTest.java     |  66 ++
 .../src/test/resources/log4j2.xml               |  32 +
 .../kafka/trident/TridentKafkaEmitter.java      |  19 +-
 pom.xml                                         |   3 +-
 .../storm/annotation/InterfaceStability.java    |  54 ++
 .../spout/IOpaquePartitionedTridentSpout.java   |  19 +-
 .../OpaquePartitionedTridentSpoutExecutor.java  |  16 +-
 .../topology/state/TransactionalState.java      |   4 +
 .../src/jvm/org/apache/storm/tuple/Fields.java  |  16 +
 .../src/jvm/org/apache/storm/utils/Time.java    | 183 +++-
 .../storm/daemon/supervisor/SlotTest.java       |  31 +-
 107 files changed, 9471 insertions(+), 1782 deletions(-)
----------------------------------------------------------------------


Reply via email to