You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/05/21 10:41:53 UTC
[4/5] storm git commit: Merge branch 'STORM-2515-cherry-picking'
Merge branch 'STORM-2515-cherry-picking'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c02fc097
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c02fc097
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c02fc097
Branch: refs/heads/master
Commit: c02fc09713d6a19122cd74ae6efa4761511bc6a9
Parents: 2a0c168 9d5a570
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun May 21 19:30:55 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun May 21 19:30:55 2017 +0900
----------------------------------------------------------------------
external/storm-kafka-client/pom.xml | 2 +-
.../org/apache/storm/kafka/bolt/KafkaBolt.java | 43 +++---
.../FieldNameBasedTupleToKafkaMapper.java | 1 +
.../kafka/bolt/mapper/TupleToKafkaMapper.java | 6 +-
.../bolt/selector/DefaultTopicSelector.java | 1 +
.../bolt/selector/FieldIndexTopicSelector.java | 6 +
.../bolt/selector/FieldNameTopicSelector.java | 1 +
.../kafka/bolt/selector/KafkaTopicSelector.java | 4 +-
.../kafka/spout/ByTopicRecordTranslator.java | 23 +--
.../kafka/spout/DefaultRecordTranslator.java | 3 +-
.../java/org/apache/storm/kafka/spout/Func.java | 3 +-
.../apache/storm/kafka/spout/KafkaSpout.java | 73 ++++++----
.../storm/kafka/spout/KafkaSpoutConfig.java | 143 +++++++++++--------
.../storm/kafka/spout/KafkaSpoutMessageId.java | 40 ++++--
.../KafkaSpoutRetryExponentialBackoff.java | 56 ++++----
.../kafka/spout/KafkaSpoutRetryService.java | 12 +-
.../apache/storm/kafka/spout/KafkaTuple.java | 8 +-
.../spout/ManualPartitionNamedSubscription.java | 2 +-
.../ManualPartitionPatternSubscription.java | 4 +-
.../storm/kafka/spout/ManualPartitioner.java | 2 +-
.../storm/kafka/spout/NamedSubscription.java | 4 +-
.../storm/kafka/spout/PatternSubscription.java | 4 +-
.../storm/kafka/spout/RecordTranslator.java | 16 +--
.../spout/RoundRobinManualPartitioner.java | 6 +-
.../kafka/spout/SerializableDeserializer.java | 1 +
.../kafka/spout/SimpleRecordTranslator.java | 8 +-
.../apache/storm/kafka/spout/Subscription.java | 2 +-
.../kafka/spout/TopicPartitionComparator.java | 6 +-
.../spout/internal/KafkaConsumerFactory.java | 3 +-
.../internal/KafkaConsumerFactoryDefault.java | 1 +
.../kafka/spout/internal/OffsetManager.java | 30 ++--
.../storm/kafka/spout/internal/Timer.java | 3 +-
.../trident/KafkaTridentSpoutBatchMetadata.java | 29 ++--
.../spout/trident/KafkaTridentSpoutEmitter.java | 56 ++++----
.../spout/trident/KafkaTridentSpoutManager.java | 15 +-
.../spout/trident/KafkaTridentSpoutOpaque.java | 12 +-
.../KafkaTridentSpoutOpaqueCoordinator.java | 16 +--
.../KafkaTridentSpoutTopicPartition.java | 13 +-
...KafkaTridentSpoutTopicPartitionRegistry.java | 3 +-
.../trident/KafkaTridentSpoutTransactional.java | 3 +-
.../storm/kafka/trident/TridentKafkaState.java | 78 +++++-----
.../kafka/trident/TridentKafkaStateFactory.java | 12 +-
.../FieldNameBasedTupleToKafkaMapper.java | 1 +
.../mapper/TridentTupleToKafkaMapper.java | 7 +-
.../trident/selector/DefaultTopicSelector.java | 1 +
.../trident/selector/KafkaTopicSelector.java | 4 +-
.../java/org/apache/storm/kafka/KafkaUnit.java | 21 ++-
.../org/apache/storm/kafka/KafkaUnitRule.java | 3 +-
.../apache/storm/kafka/bolt/KafkaBoltTest.java | 1 -
.../spout/ByTopicRecordTranslatorTest.java | 1 -
.../spout/DefaultRecordTranslatorTest.java | 1 -
.../storm/kafka/spout/KafkaSpoutConfigTest.java | 9 +-
.../storm/kafka/spout/KafkaSpoutEmitTest.java | 16 +--
.../kafka/spout/KafkaSpoutRebalanceTest.java | 1 -
.../kafka/spout/MaxUncommittedOffsetTest.java | 1 -
.../kafka/spout/SingleTopicKafkaSpoutTest.java | 31 ++--
.../kafka/spout/test/KafkaSpoutTestBolt.java | 3 +-
.../test/KafkaSpoutTopologyMainNamedTopics.java | 1 -
.../KafkaSpoutTopologyMainWildcardTopics.java | 1 -
59 files changed, 471 insertions(+), 386 deletions(-)
----------------------------------------------------------------------