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/07/10 23:23:12 UTC
[3/4] storm git commit: Merge branch 'STORM-2594' of https://github.com/vesense/storm into STORM-2594-merge

Merge branch 'STORM-2594' of https://github.com/vesense/storm into STORM-2594-merge


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

Branch: refs/heads/master
Commit: 88e691aa3009cf14f433333775d37b964fcd6c90
Parents: 29a8a42 1d7be76
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Jul 11 08:22:26 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Jul 11 08:22:26 2017 +0900

----------------------------------------------------------------------
 docs/storm-rocketmq.md                          |  28 +--
 .../rocketmq/topology/WordCountTopology.java    |  12 +-
 .../rocketmq/trident/WordCountTrident.java      |  16 +-
 external/storm-rocketmq/README.md               |  28 +--
 external/storm-rocketmq/pom.xml                 |   3 -
 .../apache/storm/rocketmq/ConsumerMessage.java  |   1 +
 .../rocketmq/DefaultMessageBodySerializer.java  |   3 +-
 .../rocketmq/DefaultMessageRetryManager.java    |  20 +-
 .../storm/rocketmq/MessageBodySerializer.java   |   5 +-
 .../storm/rocketmq/MessageRetryManager.java     |  13 +-
 .../apache/storm/rocketmq/RocketMQConfig.java   | 162 --------------
 .../apache/storm/rocketmq/RocketMQUtils.java    |  64 ------
 .../apache/storm/rocketmq/RocketMqConfig.java   | 178 +++++++++++++++
 .../apache/storm/rocketmq/RocketMqUtils.java    |  76 +++++++
 .../org/apache/storm/rocketmq/SpoutConfig.java  |   3 +-
 .../storm/rocketmq/bolt/RocketMQBolt.java       | 160 -------------
 .../storm/rocketmq/bolt/RocketMqBolt.java       | 160 +++++++++++++
 .../FieldNameBasedTupleToMessageMapper.java     |  14 +-
 .../common/mapper/TupleToMessageMapper.java     |   6 +-
 .../common/selector/DefaultTopicSelector.java   |   5 +-
 .../selector/FieldNameBasedTopicSelector.java   |   9 +-
 .../rocketmq/common/selector/TopicSelector.java |   6 +-
 .../storm/rocketmq/spout/RocketMQSpout.java     | 218 ------------------
 .../storm/rocketmq/spout/RocketMqSpout.java     | 223 +++++++++++++++++++
 .../rocketmq/spout/scheme/KeyValueScheme.java   |   4 +-
 .../spout/scheme/StringKeyValueScheme.java      |   6 +-
 .../rocketmq/spout/scheme/StringScheme.java     |  23 +-
 .../rocketmq/trident/state/RocketMQState.java   | 117 ----------
 .../trident/state/RocketMQStateFactory.java     |  42 ----
 .../trident/state/RocketMQStateUpdater.java     |  34 ---
 .../rocketmq/trident/state/RocketMqState.java   | 123 ++++++++++
 .../trident/state/RocketMqStateFactory.java     |  43 ++++
 .../trident/state/RocketMqStateUpdater.java     |  35 +++
 .../storm/rocketmq/TestMessageRetryManager.java |  15 +-
 34 files changed, 964 insertions(+), 891 deletions(-)
----------------------------------------------------------------------