Refactoring

pull/1025/head
Nikita 8 years ago
parent 7158820fe7
commit 85b53234b3

@ -231,14 +231,10 @@ public class RedissonListMultimapValues<V> extends RedissonExpirable implements
@Override
public RFuture<Boolean> containsAllAsync(Collection<?> c) {
List<Object> args = new ArrayList<Object>(c.size() + 2);
try {
byte[] keyState = codec.getMapKeyEncoder().encode(key);
byte[] keyState = encodeMapKey(key);
args.add(System.currentTimeMillis());
args.add(keyState);
args.addAll(c);
} catch (IOException e) {
throw new RuntimeException(e);
}
return commandExecutor.evalReadAsync(getName(), codec, EVAL_CONTAINS_ALL_WITH_VALUES,
"local expireDate = 92233720368547758; " +
@ -289,14 +285,10 @@ public class RedissonListMultimapValues<V> extends RedissonExpirable implements
@Override
public RFuture<Boolean> removeAllAsync(Collection<?> c) {
List<Object> args = new ArrayList<Object>(c.size() + 2);
try {
byte[] keyState = codec.getMapKeyEncoder().encode(key);
byte[] keyState = encodeMapKey(key);
args.add(System.currentTimeMillis());
args.add(keyState);
args.addAll(c);
} catch (IOException e) {
throw new RuntimeException(e);
}
return commandExecutor.evalWriteAsync(getName(), codec, EVAL_CONTAINS_ALL_WITH_VALUES,
"local expireDate = 92233720368547758; " +
@ -330,14 +322,10 @@ public class RedissonListMultimapValues<V> extends RedissonExpirable implements
@Override
public RFuture<Boolean> retainAllAsync(Collection<?> c) {
List<Object> args = new ArrayList<Object>(c.size() + 2);
try {
byte[] keyState = codec.getMapKeyEncoder().encode(key);
byte[] keyState = encodeMapKey(key);
args.add(System.currentTimeMillis());
args.add(keyState);
args.addAll(c);
} catch (IOException e) {
throw new RuntimeException(e);
}
return commandExecutor.evalWriteAsync(getName(), codec, EVAL_CONTAINS_ALL_WITH_VALUES,
"local expireDate = 92233720368547758; " +

@ -118,12 +118,8 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
}
private String getLockName(Object key) {
try {
byte[] keyState = codec.getMapKeyEncoder().encode(key);
byte[] keyState = encodeMapKey(key);
return suffixName(getName(), Hash.hashToBase64(keyState) + ":key");
} catch (IOException e) {
throw new IllegalStateException(e);
}
}
@Override

@ -15,7 +15,6 @@
*/
package org.redisson;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.AbstractCollection;
import java.util.AbstractSet;
@ -79,12 +78,8 @@ public abstract class RedissonMultimap<K, V> extends RedissonExpirable implement
}
private String getLockName(Object key) {
try {
byte[] keyState = codec.getMapKeyEncoder().encode(key);
return "{" + getName() + "}:" + Hash.hashToBase64(keyState) + ":key";
} catch (IOException e) {
throw new IllegalStateException(e);
}
byte[] keyState = encodeMapKey(key);
return suffixName(getName(), Hash.hashToBase64(keyState) + ":key");
}
protected String hash(byte[] objectState) {

@ -15,7 +15,6 @@
*/
package org.redisson;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.InetSocketAddress;
import java.util.ArrayList;
@ -25,8 +24,8 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import java.util.Set;
import org.redisson.api.RFuture;
import org.redisson.api.RScoredSortedSet;
@ -182,13 +181,9 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
}
List<Object> params = new ArrayList<Object>(objects.size()*2+1);
params.add(getName());
try {
for (Entry<V, Double> entry : objects.entrySet()) {
params.add(BigDecimal.valueOf(entry.getValue()).toPlainString());
params.add(codec.getValueEncoder().encode(entry.getKey()));
}
} catch (IOException e) {
throw new IllegalArgumentException(e);
params.add(encode(entry.getKey()));
}
return commandExecutor.writeAsync(getName(), codec, RedisCommands.ZADD, params.toArray());

@ -312,14 +312,10 @@ public class RedissonSetMultimapValues<V> extends RedissonExpirable implements R
@Override
public RFuture<Boolean> containsAllAsync(Collection<?> c) {
List<Object> args = new ArrayList<Object>(c.size() + 2);
try {
byte[] keyState = codec.getMapKeyEncoder().encode(key);
byte[] keyState = encodeMapKey(key);
args.add(System.currentTimeMillis());
args.add(keyState);
args.addAll(c);
} catch (IOException e) {
throw new RuntimeException(e);
}
return commandExecutor.evalReadAsync(getName(), codec, EVAL_CONTAINS_ALL_WITH_VALUES,
"local expireDate = 92233720368547758; " +
@ -366,14 +362,10 @@ public class RedissonSetMultimapValues<V> extends RedissonExpirable implements R
@Override
public RFuture<Boolean> retainAllAsync(Collection<?> c) {
List<Object> args = new ArrayList<Object>(c.size() + 2);
try {
byte[] keyState = codec.getMapKeyEncoder().encode(key);
byte[] keyState = encodeMapKey(key);
args.add(System.currentTimeMillis());
args.add(keyState);
args.addAll(c);
} catch (IOException e) {
throw new RuntimeException(e);
}
return commandExecutor.evalWriteAsync(getName(), codec, EVAL_CONTAINS_ALL_WITH_VALUES,
"local expireDate = 92233720368547758; " +
@ -410,14 +402,10 @@ public class RedissonSetMultimapValues<V> extends RedissonExpirable implements R
@Override
public RFuture<Boolean> removeAllAsync(Collection<?> c) {
List<Object> args = new ArrayList<Object>(c.size() + 2);
try {
byte[] keyState = codec.getMapKeyEncoder().encode(key);
byte[] keyState = encodeMapKey(key);
args.add(System.currentTimeMillis());
args.add(keyState);
args.addAll(c);
} catch (IOException e) {
throw new RuntimeException(e);
}
return commandExecutor.evalWriteAsync(getName(), codec, EVAL_CONTAINS_ALL_WITH_VALUES,
"local expireDate = 92233720368547758; " +

@ -17,6 +17,11 @@ package org.redisson.client.protocol;
import java.io.IOException;
/**
*
* @author Nikita Koksharov
*
*/
public interface Encoder {
byte[] encode(Object in) throws IOException;

Loading…
Cancel
Save