Merge branch 'STORM-843' of github.com:HeartSaVioR/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cf923a56 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cf923a56 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cf923a56 Branch: refs/heads/master Commit: cf923a563018f991447fd708bc694f3b6faff039 Parents: e2894f7 8d05605 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Tue Jun 30 07:06:43 2015 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Tue Jun 30 07:06:43 2015 +0900 ---------------------------------------------------------------------- .../storm/redis/bolt/AbstractRedisBolt.java | 42 +++++++ .../storm/redis/bolt/RedisLookupBolt.java | 23 +++- .../apache/storm/redis/bolt/RedisStoreBolt.java | 21 ++++ .../redis/common/config/JedisClusterConfig.java | 55 +++++++- .../redis/common/config/JedisPoolConfig.java | 66 ++++++++++ .../common/container/JedisClusterContainer.java | 18 +++ .../JedisCommandsContainerBuilder.java | 15 +++ .../JedisCommandsInstanceContainer.java | 12 ++ .../redis/common/container/JedisContainer.java | 16 +++ .../common/mapper/RedisDataTypeDescription.java | 20 +++ .../redis/common/mapper/RedisLookupMapper.java | 7 +- .../storm/redis/common/mapper/RedisMapper.java | 9 +- .../redis/common/mapper/RedisStoreMapper.java | 3 + .../storm/redis/common/mapper/TupleMapper.java | 18 ++- .../trident/state/AbstractRedisMapState.java | 41 ++++++ .../state/AbstractRedisStateQuerier.java | 28 ++++- .../state/AbstractRedisStateUpdater.java | 27 ++++ .../storm/redis/trident/state/KeyFactory.java | 22 ++++ .../storm/redis/trident/state/Options.java | 6 + .../trident/state/RedisClusterMapState.java | 124 +++++++++++++++++- .../redis/trident/state/RedisClusterState.java | 44 ++++++- .../trident/state/RedisClusterStateQuerier.java | 19 ++- .../trident/state/RedisClusterStateUpdater.java | 19 +++ .../redis/trident/state/RedisMapState.java | 126 +++++++++++++++++-- .../storm/redis/trident/state/RedisState.java | 44 ++++++- .../redis/trident/state/RedisStateQuerier.java | 19 ++- .../redis/trident/state/RedisStateUpdater.java | 19 +++ 27 files changed, 822 insertions(+), 41 deletions(-) ----------------------------------------------------------------------