storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [2/2] storm git commit: Merge branch 'STORM-2675-1.x' of https://github.com/srdo/storm into STORM-2675-1.x-merge
Date Wed, 13 Sep 2017 08:03:49 GMT
Merge branch 'STORM-2675-1.x' of https://github.com/srdo/storm into STORM-2675-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: 642e4f6f6eeda5c79a8d735d08ce350eb500efe9
Parents: e462979 9e137ee
Author: Jungtaek Lim <kabhwan@gmail.com>
Authored: Wed Sep 13 17:02:33 2017 +0900
Committer: Jungtaek Lim <kabhwan@gmail.com>
Committed: Wed Sep 13 17:02:33 2017 +0900

----------------------------------------------------------------------
 .../apache/storm/kafka/spout/Subscription.java  |   5 +-
 .../trident/KafkaTridentSpoutBatchMetadata.java |  78 ++++++++++----
 .../spout/trident/KafkaTridentSpoutEmitter.java | 108 +++++++++++--------
 .../spout/trident/KafkaTridentSpoutManager.java |  10 +-
 .../spout/trident/KafkaTridentSpoutOpaque.java  |  18 ++--
 .../KafkaTridentSpoutOpaqueCoordinator.java     |  26 +++--
 .../spout/trident/TopicPartitionSerializer.java |  47 ++++++++
 .../storm/kafka/trident/TridentKafkaState.java  |   9 ++
 .../storm/kafka/spout/KafkaSpoutConfigTest.java |   2 +-
 .../SpoutWithMockedConsumerSetupHelper.java     |  30 +++++-
 .../KafkaTridentSpoutBatchMetadataTest.java     |  66 ++++++++++++
 .../spout/IOpaquePartitionedTridentSpout.java   |  22 +++-
 .../topology/state/TransactionalState.java      |  14 ++-
 13 files changed, 336 insertions(+), 99 deletions(-)
----------------------------------------------------------------------



Mime
View raw message