From 971e99e79add8ec19a055dcf7d9ec9fcb1bab611 Mon Sep 17 00:00:00 2001 From: Nikita Date: Sat, 27 Dec 2014 20:29:08 +0300 Subject: [PATCH] Slot calculation from key name. #27 --- .../java/org/redisson/RedissonAtomicLong.java | 14 ++--- .../java/org/redisson/RedissonBucket.java | 8 +-- .../java/org/redisson/RedissonExpirable.java | 8 +-- src/main/java/org/redisson/RedissonMap.java | 39 +++++++------- .../java/org/redisson/RedissonObject.java | 2 +- .../java/org/redisson/connection/CRC16.java | 49 ++++++++++++++++++ .../connection/ClusterConnectionManager.java | 10 ++-- .../connection/ConnectionManager.java | 12 +++++ .../MasterSlaveConnectionManager.java | 51 ++++++++++++++++++- 9 files changed, 151 insertions(+), 42 deletions(-) create mode 100644 src/main/java/org/redisson/connection/CRC16.java diff --git a/src/main/java/org/redisson/RedissonAtomicLong.java b/src/main/java/org/redisson/RedissonAtomicLong.java index 5be4c6eb1..71bf1ae57 100644 --- a/src/main/java/org/redisson/RedissonAtomicLong.java +++ b/src/main/java/org/redisson/RedissonAtomicLong.java @@ -39,7 +39,7 @@ public class RedissonAtomicLong extends RedissonExpirable implements RAtomicLong @Override public long addAndGet(final long delta) { - return connectionManager.write(new ResultOperation() { + return connectionManager.write(getName(), new ResultOperation() { @Override protected Future execute(RedisAsyncConnection async) { return async.incrby(getName(), delta); @@ -49,7 +49,7 @@ public class RedissonAtomicLong extends RedissonExpirable implements RAtomicLong @Override public boolean compareAndSet(final long expect, final long update) { - return connectionManager.write(new SyncOperation() { + return connectionManager.write(getName(), new SyncOperation() { @Override public Boolean execute(RedisConnection conn) { while (true) { @@ -73,7 +73,7 @@ public class RedissonAtomicLong extends RedissonExpirable implements RAtomicLong @Override public long decrementAndGet() { - return connectionManager.write(new ResultOperation() { + return connectionManager.write(getName(), new ResultOperation() { @Override protected Future execute(RedisAsyncConnection async) { return async.decr(getName()); @@ -88,7 +88,7 @@ public class RedissonAtomicLong extends RedissonExpirable implements RAtomicLong @Override public long getAndAdd(final long delta) { - return connectionManager.write(new SyncOperation() { + return connectionManager.write(getName(), new SyncOperation() { @Override public Long execute(RedisConnection conn) { while (true) { @@ -117,7 +117,7 @@ public class RedissonAtomicLong extends RedissonExpirable implements RAtomicLong @Override public long getAndSet(final long newValue) { - return connectionManager.write(new SyncOperation() { + return connectionManager.write(getName(), new SyncOperation() { @Override public Long execute(RedisConnection conn) { while (true) { @@ -137,7 +137,7 @@ public class RedissonAtomicLong extends RedissonExpirable implements RAtomicLong @Override public long incrementAndGet() { - return connectionManager.write(new ResultOperation() { + return connectionManager.write(getName(), new ResultOperation() { @Override protected Future execute(RedisAsyncConnection async) { return async.incr(getName()); @@ -156,7 +156,7 @@ public class RedissonAtomicLong extends RedissonExpirable implements RAtomicLong @Override public void set(final long newValue) { - connectionManager.write(new ResultOperation() { + connectionManager.write(getName(), new ResultOperation() { @Override protected Future execute(RedisAsyncConnection async) { return async.set(getName(), newValue); diff --git a/src/main/java/org/redisson/RedissonBucket.java b/src/main/java/org/redisson/RedissonBucket.java index 6ae92f689..71b006a70 100644 --- a/src/main/java/org/redisson/RedissonBucket.java +++ b/src/main/java/org/redisson/RedissonBucket.java @@ -39,7 +39,7 @@ public class RedissonBucket extends RedissonExpirable implements RBucket { @Override public Future getAsync() { - return connectionManager.readAsync(new ResultOperation() { + return connectionManager.readAsync(getName(), new ResultOperation() { @Override public Future execute(RedisAsyncConnection async) { return async.get(getName()); @@ -54,7 +54,7 @@ public class RedissonBucket extends RedissonExpirable implements RBucket { @Override public Future setAsync(final V value) { - return connectionManager.writeAsync(new VoidOperation() { + return connectionManager.writeAsync(getName(), new VoidOperation() { @Override public Future execute(RedisAsyncConnection async) { return async.set(getName(), value); @@ -69,7 +69,7 @@ public class RedissonBucket extends RedissonExpirable implements RBucket { @Override public Future setAsync(final V value, final long timeToLive, final TimeUnit timeUnit) { - return connectionManager.writeAsync(new VoidOperation() { + return connectionManager.writeAsync(getName(), new VoidOperation() { @Override public Future execute(RedisAsyncConnection async) { return async.setex(getName(), timeUnit.toSeconds(timeToLive), value); @@ -84,7 +84,7 @@ public class RedissonBucket extends RedissonExpirable implements RBucket { @Override public Future existsAsync() { - return connectionManager.readAsync(new ResultOperation() { + return connectionManager.readAsync(getName(), new ResultOperation() { @Override public Future execute(RedisAsyncConnection async) { return async.exists(getName()); diff --git a/src/main/java/org/redisson/RedissonExpirable.java b/src/main/java/org/redisson/RedissonExpirable.java index cd24d83a7..d864d1a20 100644 --- a/src/main/java/org/redisson/RedissonExpirable.java +++ b/src/main/java/org/redisson/RedissonExpirable.java @@ -34,7 +34,7 @@ abstract class RedissonExpirable extends RedissonObject implements RExpirable { @Override public boolean expire(final long timeToLive, final TimeUnit timeUnit) { - return connectionManager.write(new ResultOperation() { + return connectionManager.write(getName(), new ResultOperation() { @Override protected Future execute(RedisAsyncConnection async) { return async.expire(getName(), timeUnit.toSeconds(timeToLive)); @@ -44,7 +44,7 @@ abstract class RedissonExpirable extends RedissonObject implements RExpirable { @Override public boolean expireAt(final long timestamp) { - return connectionManager.write(new ResultOperation() { + return connectionManager.write(getName(), new ResultOperation() { @Override protected Future execute(RedisAsyncConnection async) { return async.expireat(getName(), timestamp); @@ -54,7 +54,7 @@ abstract class RedissonExpirable extends RedissonObject implements RExpirable { @Override public boolean expireAt(final Date timestamp) { - return connectionManager.write(new ResultOperation() { + return connectionManager.write(getName(), new ResultOperation() { @Override protected Future execute(RedisAsyncConnection async) { return async.expireat(getName(), timestamp); @@ -64,7 +64,7 @@ abstract class RedissonExpirable extends RedissonObject implements RExpirable { @Override public boolean clearExpire() { - return connectionManager.write(new ResultOperation() { + return connectionManager.write(getName(), new ResultOperation() { @Override protected Future execute(RedisAsyncConnection async) { return async.persist(getName()); diff --git a/src/main/java/org/redisson/RedissonMap.java b/src/main/java/org/redisson/RedissonMap.java index 6edeb792d..c127a7842 100644 --- a/src/main/java/org/redisson/RedissonMap.java +++ b/src/main/java/org/redisson/RedissonMap.java @@ -51,7 +51,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public int size() { - return connectionManager.read(new ResultOperation() { + return connectionManager.read(getName(), new ResultOperation() { @Override public Future execute(RedisAsyncConnection async) { return async.hlen(getName()); @@ -66,7 +66,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public boolean containsKey(final Object key) { - return connectionManager.read(new ResultOperation() { + return connectionManager.read(getName(), new ResultOperation() { @Override public Future execute(RedisAsyncConnection async) { return async.hexists(getName(), key); @@ -76,7 +76,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public boolean containsValue(final Object value) { - List list = connectionManager.read(new ResultOperation, V>() { + List list = connectionManager.read(getName(), new ResultOperation, V>() { @Override public Future> execute(RedisAsyncConnection async) { return async.hvals(getName()); @@ -91,7 +91,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { return Collections.emptyMap(); } final Object[] keysArray = keys.toArray(); - List list = connectionManager.read(new ResultOperation, V>() { + List list = connectionManager.read(getName(), new ResultOperation, V>() { @Override protected Future> execute(RedisAsyncConnection async) { return async.hmget(getName(), keysArray); @@ -126,7 +126,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public void putAll(final Map map) { - connectionManager.write(new ResultOperation() { + connectionManager.write(getName(), new ResultOperation() { @Override public Future execute(RedisAsyncConnection async) { return async.hmset(getName(), (Map) map); @@ -141,7 +141,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public Set keySet() { - return (Set) connectionManager.read(new ResultOperation, V>() { + return (Set) connectionManager.read(getName(), new ResultOperation, V>() { @Override public Future> execute(RedisAsyncConnection async) { return async.hkeys(getName()); @@ -151,7 +151,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public Collection values() { - return connectionManager.read(new ResultOperation, V>() { + return connectionManager.read(getName(), new ResultOperation, V>() { @Override public Future> execute(RedisAsyncConnection async) { return async.hvals(getName()); @@ -161,7 +161,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public Set> entrySet() { - Map map = connectionManager.read(new ResultOperation, Object>() { + Map map = connectionManager.read(getName(), new ResultOperation, Object>() { @Override public Future> execute(RedisAsyncConnection async) { return async.hgetall(getName()); @@ -189,7 +189,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { // } // } - return connectionManager.write(new AsyncOperation() { + return connectionManager.write(getName(), new AsyncOperation() { @Override public void execute(final Promise promise, final RedisAsyncConnection async) { final AsyncOperation timeoutCallback = this; @@ -225,7 +225,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public boolean remove(final Object key, final Object value) { - return connectionManager.write(new SyncOperation() { + return connectionManager.write(getName(), new SyncOperation() { @Override public Boolean execute(RedisConnection connection) { while (true) { @@ -248,7 +248,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public boolean replace(final K key, final V oldValue, final V newValue) { - return connectionManager.write(new SyncOperation() { + return connectionManager.write(getName(), new SyncOperation() { @Override public Boolean execute(RedisConnection connection) { while (true) { @@ -271,7 +271,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public V replace(final K key, final V value) { - return connectionManager.write(new SyncOperation() { + return connectionManager.write(getName(), new SyncOperation() { @Override public V execute(RedisConnection connection) { while (true) { @@ -294,7 +294,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public Future getAsync(final K key) { - return connectionManager.readAsync(new ResultOperation() { + return connectionManager.readAsync(getName(), new ResultOperation() { @Override public Future execute(RedisAsyncConnection async) { return async.hget(getName(), key); @@ -314,7 +314,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { // } // } - return connectionManager.writeAsync(new AsyncOperation() { + return connectionManager.writeAsync(getName(), new AsyncOperation() { @Override public void execute(final Promise promise, RedisAsyncConnection async) { putAsync(key, value, promise, async, this); @@ -375,7 +375,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { // } // } - return connectionManager.writeAsync(new AsyncOperation() { + return connectionManager.writeAsync(getName(), new AsyncOperation() { @Override public void execute(final Promise promise, RedisAsyncConnection async) { removeAsync(key, promise, async, this); @@ -426,7 +426,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public Future fastPutAsync(final K key, final V value) { - return connectionManager.writeAsync(new ResultOperation() { + return connectionManager.writeAsync(getName(), new ResultOperation() { @Override public Future execute(RedisAsyncConnection async) { return async.hset(getName(), key, value); @@ -442,7 +442,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public Future fastRemoveAsync(final K ... keys) { if (keys != null && keys.length > 0) { - return connectionManager.writeAsync(new ResultOperation() { + return connectionManager.writeAsync(getName(), new ResultOperation() { @Override public Future execute(RedisAsyncConnection async) { return async.hdel(getName(), keys); @@ -459,7 +459,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { } private MapScanResult scanIterator(final long startPos) { - return connectionManager.read(new ResultOperation, V>() { + return connectionManager.read(getName(), new ResultOperation, V>() { @Override public Future> execute(RedisAsyncConnection async) { return async.hscan(getName(), startPos); @@ -551,7 +551,7 @@ public class RedissonMap extends RedissonExpirable implements RMap { @Override public V addAndGet(final K key, final V value) { - String res = connectionManager.write(new ResultOperation() { + String res = connectionManager.write(getName(), new ResultOperation() { @Override protected Future execute(RedisAsyncConnection async) { @@ -560,7 +560,6 @@ public class RedissonMap extends RedissonExpirable implements RMap { } }); - //long if (value instanceof Long) { Object obj = Long.parseLong(res); return (V)obj; diff --git a/src/main/java/org/redisson/RedissonObject.java b/src/main/java/org/redisson/RedissonObject.java index 28ea57533..bfeabdab3 100644 --- a/src/main/java/org/redisson/RedissonObject.java +++ b/src/main/java/org/redisson/RedissonObject.java @@ -53,7 +53,7 @@ abstract class RedissonObject implements RObject { } void delete(String name) { - connectionManager.write(new ResultOperation() { + connectionManager.write(getName(), new ResultOperation() { @Override protected Future execute(RedisAsyncConnection async) { return async.del(getName()); diff --git a/src/main/java/org/redisson/connection/CRC16.java b/src/main/java/org/redisson/connection/CRC16.java new file mode 100644 index 000000000..82cb3e97b --- /dev/null +++ b/src/main/java/org/redisson/connection/CRC16.java @@ -0,0 +1,49 @@ +package org.redisson.connection; + +/** + * @author Mark Paluch +**/ +public class CRC16 { + + private static final int LOOKUP_TABLE[] = { 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, + 0x70E7, 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, 0x1231, 0x0210, 0x3273, + 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6, 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, + 0xE3DE, 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485, 0xA56A, 0xB54B, 0x8528, + 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D, 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, + 0x46B4, 0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC, 0x48C4, 0x58E5, 0x6886, + 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823, 0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, + 0xB92B, 0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12, 0xDBFD, 0xCBDC, 0xFBBF, + 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A, 0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, + 0x1C41, 0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49, 0x7E97, 0x6EB6, 0x5ED5, + 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70, 0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, + 0x8F78, 0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F, 0x1080, 0x00A1, 0x30C2, + 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067, 0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, + 0xF35E, 0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256, 0xB5EA, 0xA5CB, 0x95A8, + 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D, 0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, + 0x4405, 0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C, 0x26D3, 0x36F2, 0x0691, + 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634, 0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, + 0xA9AB, 0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3, 0xCB7D, 0xDB5C, 0xEB3F, + 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A, 0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, + 0x3A92, 0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9, 0x7C26, 0x6C07, 0x5C64, + 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1, 0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, + 0x9FF8, 0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0 }; + + private CRC16() { + } + + /** + * Create a CRC16 checksum from the bytes. + * + * @param bytes + * @return CRC16 as interger value + */ + public static int crc16(byte[] bytes) { + int crc = 0x0000; + + for (byte b : bytes) { + crc = ((crc << 8) ^ LOOKUP_TABLE[((crc >>> 8) ^ (b & 0xFF)) & 0xFF]); + } + return crc & 0xFFFF; + } + +} diff --git a/src/main/java/org/redisson/connection/ClusterConnectionManager.java b/src/main/java/org/redisson/connection/ClusterConnectionManager.java index cdb305a47..9e61a798a 100644 --- a/src/main/java/org/redisson/connection/ClusterConnectionManager.java +++ b/src/main/java/org/redisson/connection/ClusterConnectionManager.java @@ -87,12 +87,12 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager { MasterSlaveServersConfig c = create(cfg); log.info("master: {}", partition.getMasterAddress()); c.setMasterAddress(partition.getMasterAddress()); - for (String slaveAddress : partition.getSlaveAddresses()) { - log.info("slave: {}", slaveAddress); - c.addSlaveAddress(slaveAddress); - } +// for (String slaveAddress : partition.getSlaveAddresses()) { +// log.info("slave: {}", slaveAddress); +// c.addSlaveAddress(slaveAddress); +// } - MasterSlaveEntry entry = new MasterSlaveEntry(codec, group, c); + SingleEntry entry = new SingleEntry(codec, group, c); entries.put(partition.getEndSlot(), entry); } diff --git a/src/main/java/org/redisson/connection/ConnectionManager.java b/src/main/java/org/redisson/connection/ConnectionManager.java index 459f63bc3..25f731585 100644 --- a/src/main/java/org/redisson/connection/ConnectionManager.java +++ b/src/main/java/org/redisson/connection/ConnectionManager.java @@ -34,18 +34,30 @@ public interface ConnectionManager { V get(Future future); + R read(String key, SyncOperation operation); + R read(SyncOperation operation); + R write(String key, SyncOperation operation); + R write(SyncOperation operation); + R write(String key, AsyncOperation asyncOperation); + R write(AsyncOperation asyncOperation); Future writeAllAsync(AsyncOperation asyncOperation); + T read(String key, AsyncOperation asyncOperation); + T read(AsyncOperation asyncOperation); + Future readAsync(String key, AsyncOperation asyncOperation); + Future readAsync(AsyncOperation asyncOperation); + Future writeAsync(String key, AsyncOperation asyncOperation); + Future writeAsync(AsyncOperation asyncOperation); RedisConnection connectionReadOp(int slot); diff --git a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java index 009a5e2d6..9b3fd73d7 100644 --- a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java +++ b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java @@ -74,7 +74,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager { protected MasterSlaveServersConfig config; - protected NavigableMap entries = new ConcurrentSkipListMap(); + protected final NavigableMap entries = new ConcurrentSkipListMap(); MasterSlaveConnectionManager() { } @@ -185,6 +185,13 @@ public class MasterSlaveConnectionManager implements ConnectionManager { }); } + public Future writeAsync(String key, AsyncOperation asyncOperation) { + Promise mainPromise = getGroup().next().newPromise(); + int slot = calcSlot(key); + writeAsync(slot, asyncOperation, mainPromise, 0); + return mainPromise; + } + public Future writeAsync(AsyncOperation asyncOperation) { Promise mainPromise = getGroup().next().newPromise(); writeAsync(-1, asyncOperation, mainPromise, 0); @@ -215,6 +222,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager { try { RedisConnection connection = connectionWriteOp(slot); RedisAsyncConnection async = connection.getAsync(); + log.debug("writeAsync for slot {} using {}", slot, connection.getRedisClient().getAddr()); asyncOperation.execute(promise, async); ex.set(new RedisTimeoutException()); @@ -246,6 +254,11 @@ public class MasterSlaveConnectionManager implements ConnectionManager { }); } + public R write(String key, SyncOperation operation) { + int slot = calcSlot(key); + return write(slot, operation, 0); + } + public R write(SyncOperation operation) { return write(-1, operation, 0); } @@ -280,6 +293,11 @@ public class MasterSlaveConnectionManager implements ConnectionManager { } } + public R read(String key, SyncOperation operation) { + int slot = calcSlot(key); + return read(slot, operation, 0); + } + public R read(SyncOperation operation) { return read(-1, operation, 0); } @@ -314,6 +332,22 @@ public class MasterSlaveConnectionManager implements ConnectionManager { } } + private int calcSlot(String key) { + if (entries.size() == 1) { + return -1; + } + int result = CRC16.crc16(key.getBytes()) % 16384; + log.debug("slot {} for {}", result, key); + return result; + } + + public R write(String key, AsyncOperation asyncOperation) { + Promise mainPromise = getGroup().next().newPromise(); + int slot = calcSlot(key); + writeAsync(slot, asyncOperation, mainPromise, 0); + return mainPromise.awaitUninterruptibly().getNow(); + } + public R write(AsyncOperation asyncOperation) { return writeAsync(asyncOperation).awaitUninterruptibly().getNow(); } @@ -326,10 +360,24 @@ public class MasterSlaveConnectionManager implements ConnectionManager { throw ((RedisException)future.cause()); } + public T read(String key, AsyncOperation asyncOperation) { + Promise mainPromise = getGroup().next().newPromise(); + int slot = calcSlot(key); + readAsync(slot, asyncOperation, mainPromise, 0); + return mainPromise.awaitUninterruptibly().getNow(); + } + public T read(AsyncOperation asyncOperation) { return readAsync(asyncOperation).awaitUninterruptibly().getNow(); } + public Future readAsync(String key, AsyncOperation asyncOperation) { + Promise mainPromise = getGroup().next().newPromise(); + int slot = calcSlot(key); + readAsync(slot, asyncOperation, mainPromise, 0); + return mainPromise; + } + public Future readAsync(AsyncOperation asyncOperation) { Promise mainPromise = getGroup().next().newPromise(); readAsync(-1, asyncOperation, mainPromise, 0); @@ -360,6 +408,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager { try { RedisConnection connection = connectionReadOp(slot); RedisAsyncConnection async = connection.getAsync(); + log.debug("readAsync for slot {} using {}", slot, connection.getRedisClient().getAddr()); asyncOperation.execute(promise, async); ex.set(new RedisTimeoutException());