From 3e5ea61ade4283ee4f93d6345c813089a1e35246 Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 15 Dec 2015 13:31:19 +0300 Subject: [PATCH] getBuckets deprecated, use findBuckets --- src/main/java/org/redisson/Redisson.java | 14 ++++++++++---- src/main/java/org/redisson/RedissonClient.java | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/redisson/Redisson.java b/src/main/java/org/redisson/Redisson.java index fc5b3fb8c..cca20cd04 100755 --- a/src/main/java/org/redisson/Redisson.java +++ b/src/main/java/org/redisson/Redisson.java @@ -156,18 +156,24 @@ public class Redisson implements RedissonClient { } @Override - public List> getBuckets(String pattern) { + public List> findBuckets(String pattern) { Future> r = commandExecutor.readAllAsync(RedisCommands.KEYS, pattern); Collection keys = commandExecutor.get(r); List> buckets = new ArrayList>(keys.size()); - for (Object key : keys) { - if(key != null) { - buckets.add(this.getBucket(key.toString())); + for (String key : keys) { + if(key == null) { + continue; } + buckets.add(this.getBucket(key)); } return buckets; } + @Override + public List> getBuckets(String pattern) { + return findBuckets(pattern); + } + @Override public RHyperLogLog getHyperLogLog(String name) { return new RedissonHyperLogLog(commandExecutor, name); diff --git a/src/main/java/org/redisson/RedissonClient.java b/src/main/java/org/redisson/RedissonClient.java index ce699ab2d..a77c63972 100755 --- a/src/main/java/org/redisson/RedissonClient.java +++ b/src/main/java/org/redisson/RedissonClient.java @@ -122,7 +122,25 @@ public interface RedissonClient { /** * Returns a list of object holder instances by a key pattern. + * + * Supported glob-style patterns: + * h?llo subscribes to hello, hallo and hxllo + * h*llo subscribes to hllo and heeeello + * h[ae]llo subscribes to hello and hallo, but not hillo + * h[^e]llo matches hallo, hbllo, ... but not hello + * h[a-b]llo matches hallo and hbllo + * + * Use \ to escape special characters if you want to match them verbatim. + * + * @param pattern + * @return + */ + List> findBuckets(String pattern); + + /** + * Use {@link #findBuckets(String)} */ + @Deprecated List> getBuckets(String pattern); /**