github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactoring

Browse Source
pull/1025/head
Nikita 8 years ago
parent 7158820fe7
commit 85b53234b3
6 changed files with 37 additions and 70 deletions
Show Stats Download Patch File Download Diff File

36
redisson/src/main/java/org/redisson/RedissonListMultimapValues.java
Unescape Escape View File

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

8
redisson/src/main/java/org/redisson/RedissonMap.java
Unescape Escape View File

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

9
redisson/src/main/java/org/redisson/RedissonMultimap.java
Unescape Escape View File

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

13
redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java
Unescape Escape View File

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

36
redisson/src/main/java/org/redisson/RedissonSetMultimapValues.java
Unescape Escape View File

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

5
redisson/src/main/java/org/redisson/client/protocol/Encoder.java
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save