You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/05/22 21:54:52 UTC

[07/18] storm git commit: Merge pull request #16 from apache/master

Merge pull request #16 from apache/master

Merge from apache/storm to caofangkun/apache-storm

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

Branch: refs/heads/master
Commit: 2bc9447c78fc6945d71db3772bdb49edad153f07
Parents: 2c5b402 330e135
Author: caofangkun <ca...@gmail.com>
Authored: Mon Mar 30 10:46:28 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Mon Mar 30 10:46:28 2015 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |   6 +
 README.markdown                                 |   1 +
 docs/_posts/2015-03-25-storm094-released.md     |  24 ++++
 docs/downloads.html                             |  64 +++++++----
 examples/storm-starter/pom.xml                  |   2 +-
 external/storm-hbase/pom.xml                    |   2 +-
 external/storm-hdfs/pom.xml                     |   2 +-
 external/storm-hive/pom.xml                     |   2 +-
 external/storm-jdbc/pom.xml                     |   2 +-
 external/storm-kafka/pom.xml                    |   2 +-
 external/storm-redis/pom.xml                    |   2 +-
 .../storm/redis/bolt/AbstractRedisBolt.java     |   8 +-
 .../storm/redis/bolt/RedisLookupBolt.java       | 112 ++++++++++++++++++
 .../apache/storm/redis/bolt/RedisStoreBolt.java | 100 ++++++++++++++++
 .../redis/common/config/JedisClusterConfig.java |  82 +++++++++++++
 .../redis/common/config/JedisPoolConfig.java    |  97 ++++++++++++++++
 .../common/container/JedisClusterContainer.java |  47 ++++++++
 .../JedisCommandsContainerBuilder.java          |  38 ++++++
 .../JedisCommandsInstanceContainer.java         |  25 ++++
 .../redis/common/container/JedisContainer.java  |  65 +++++++++++
 .../common/mapper/RedisDataTypeDescription.java |  50 ++++++++
 .../redis/common/mapper/RedisLookupMapper.java  |  40 +++++++
 .../storm/redis/common/mapper/RedisMapper.java  |  22 ++++
 .../redis/common/mapper/RedisStoreMapper.java   |  21 ++++
 .../storm/redis/common/mapper/TupleMapper.java  |  27 +++++
 .../trident/mapper/TridentTupleMapper.java      |  27 -----
 .../trident/state/RedisClusterMapState.java     |   2 +-
 .../redis/trident/state/RedisClusterState.java  |   2 +-
 .../trident/state/RedisClusterStateQuerier.java |  10 +-
 .../trident/state/RedisClusterStateUpdater.java |  10 +-
 .../redis/trident/state/RedisMapState.java      |  21 +---
 .../storm/redis/trident/state/RedisState.java   |   2 +-
 .../redis/trident/state/RedisStateQuerier.java  |  10 +-
 .../state/RedisStateSetCountQuerier.java        |  74 ------------
 .../trident/state/RedisStateSetUpdater.java     |  80 -------------
 .../redis/trident/state/RedisStateUpdater.java  |  10 +-
 .../redis/util/config/JedisClusterConfig.java   |  82 -------------
 .../redis/util/config/JedisPoolConfig.java      |  97 ----------------
 .../util/container/JedisClusterContainer.java   |  47 --------
 .../JedisCommandsContainerBuilder.java          |  38 ------
 .../JedisCommandsInstanceContainer.java         |  25 ----
 .../redis/util/container/JedisContainer.java    |  65 -----------
 .../storm/redis/topology/LookupWordCount.java   | 115 +++++++++++++------
 .../redis/topology/PersistentWordCount.java     |  46 +++++++-
 .../storm/redis/topology/WordCounter.java       |  19 ++-
 .../redis/trident/WordCountTridentRedis.java    |   7 +-
 .../trident/WordCountTridentRedisCluster.java   |   6 +-
 .../WordCountTridentRedisClusterMap.java        |   8 +-
 .../redis/trident/WordCountTridentRedisMap.java |   9 +-
 .../redis/trident/WordCountTupleMapper.java     |  10 +-
 pom.xml                                         |   2 +-
 .../maven-shade-clojure-transformer/pom.xml     |   2 +-
 storm-buildtools/storm-maven-plugins/pom.xml    |   2 +-
 storm-core/pom.xml                              |   2 +-
 storm-core/src/ui/public/css/style.css          |  62 ++++++++++
 storm-dist/binary/pom.xml                       |   2 +-
 storm-dist/source/pom.xml                       |   2 +-
 57 files changed, 1056 insertions(+), 683 deletions(-)
----------------------------------------------------------------------