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/5099/head
Nikita Koksharov 2 years ago
parent cd4c603de5
commit 4663fcdba8
1 changed files with 68 additions and 44 deletions
Show Stats Download Patch File Download Diff File

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

@ -122,14 +122,18 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
} }
private <T> RFuture<T> poll(int from, int to, RedisCommand<?> command) { private <T> RFuture<T> poll(int from, int to, RedisCommand<?> command) {
return commandExecutor.evalWriteAsync(getRawName(), codec, command, return poll(getRawName(), from, to, command);
}
protected <T> RFuture<T> poll(String name, int from, int to, RedisCommand<?> command) {
return commandExecutor.evalWriteAsync(name, codec, command,
"local v = redis.call('zrange', KEYS[1], ARGV[1], ARGV[2]); " "local v = redis.call('zrange', KEYS[1], ARGV[1], ARGV[2]); "
+ "if #v > 0 then " + "if #v > 0 then "
+ "redis.call('zremrangebyrank', KEYS[1], ARGV[1], ARGV[2]); " + "redis.call('zremrangebyrank', KEYS[1], ARGV[1], ARGV[2]); "
+ "return v; " + "return v; "
+ "end " + "end "
+ "return v;", + "return v;",
Collections.<Object>singletonList(getRawName()), from, to); Collections.<Object>singletonList(name), from, to);
} }
@Override @Override
@ -180,14 +184,18 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
} }
private <T> RFuture<T> pollEntry(int from, int to, RedisCommand<?> command) { private <T> RFuture<T> pollEntry(int from, int to, RedisCommand<?> command) {
return commandExecutor.evalWriteAsync(getRawName(), codec, command, return pollEntry(getRawName(), from, to, command);
}
protected final <T> RFuture<T> pollEntry(String name, int from, int to, RedisCommand<?> command) {
return commandExecutor.evalWriteAsync(name, codec, command,
"local v = redis.call('zrange', KEYS[1], ARGV[1], ARGV[2], 'withscores'); " "local v = redis.call('zrange', KEYS[1], ARGV[1], ARGV[2], 'withscores'); "
+ "if #v > 0 then " + "if #v > 0 then "
+ "redis.call('zremrangebyrank', KEYS[1], ARGV[1], ARGV[2]); " + "redis.call('zremrangebyrank', KEYS[1], ARGV[1], ARGV[2]); "
+ "return v; " + "return v; "
+ "end " + "end "
+ "return v;", + "return v;",
Collections.singletonList(getRawName()), from, to); Collections.singletonList(name), from, to);
} }
@Override @Override
@ -216,12 +224,12 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
public V pollFirst(long timeout, TimeUnit unit) { public V pollFirst(long timeout, TimeUnit unit) {
return get(pollFirstAsync(timeout, unit)); return get(pollFirstAsync(timeout, unit));
} }
@Override @Override
public RFuture<V> pollFirstAsync(long timeout, TimeUnit unit) { public RFuture<V> pollFirstAsync(long timeout, TimeUnit unit) {
return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.BZPOPMIN_VALUE, getRawName(), toSeconds(timeout, unit)); return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.BZPOPMIN_VALUE, getRawName(), toSeconds(timeout, unit));
} }
@Override @Override
public V pollFirstFromAny(long timeout, TimeUnit unit, String... queueNames) { public V pollFirstFromAny(long timeout, TimeUnit unit, String... queueNames) {
return get(pollFirstFromAnyAsync(timeout, unit, queueNames)); return get(pollFirstFromAnyAsync(timeout, unit, queueNames));
@ -386,7 +394,7 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
public V pollLast(long timeout, TimeUnit unit) { public V pollLast(long timeout, TimeUnit unit) {
return get(pollLastAsync(timeout, unit)); return get(pollLastAsync(timeout, unit));
} }
@Override @Override
public RFuture<V> pollLastAsync(long timeout, TimeUnit unit) { public RFuture<V> pollLastAsync(long timeout, TimeUnit unit) {
return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.BZPOPMAX_VALUE, getRawName(), toSeconds(timeout, unit)); return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.BZPOPMAX_VALUE, getRawName(), toSeconds(timeout, unit));
@ -456,10 +464,11 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Integer> addAndGetRankAsync(double score, V object) { public RFuture<Integer> addAndGetRankAsync(double score, V object) {
return commandExecutor.evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_INTEGER, String name = getRawName(object);
return commandExecutor.evalWriteAsync(name, LongCodec.INSTANCE, RedisCommands.EVAL_INTEGER,
"redis.call('zadd', KEYS[1], ARGV[1], ARGV[2]);" + "redis.call('zadd', KEYS[1], ARGV[1], ARGV[2]);" +
"return redis.call('zrank', KEYS[1], ARGV[2]); ", "return redis.call('zrank', KEYS[1], ARGV[2]); ",
Collections.<Object>singletonList(getRawName()), new BigDecimal(score).toPlainString(), encode(object)); Collections.<Object>singletonList(name), new BigDecimal(score).toPlainString(), encode(object));
} }
@Override @Override
@ -474,10 +483,11 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Integer> addAndGetRevRankAsync(double score, V object) { public RFuture<Integer> addAndGetRevRankAsync(double score, V object) {
return commandExecutor.evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_INTEGER, String name = getRawName(object);
return commandExecutor.evalWriteAsync(name, LongCodec.INSTANCE, RedisCommands.EVAL_INTEGER,
"redis.call('zadd', KEYS[1], ARGV[1], ARGV[2]);" + "redis.call('zadd', KEYS[1], ARGV[1], ARGV[2]);" +
"return redis.call('zrevrank', KEYS[1], ARGV[2]); ", "return redis.call('zrevrank', KEYS[1], ARGV[2]); ",
Collections.<Object>singletonList(getRawName()), new BigDecimal(score).toPlainString(), encode(object)); Collections.<Object>singletonList(name), new BigDecimal(score).toPlainString(), encode(object));
} }
@Override @Override
@ -522,7 +532,8 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Boolean> addIfExistsAsync(double score, V object) { public RFuture<Boolean> addIfExistsAsync(double score, V object) {
return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZADD_BOOL, getRawName(), "XX", "CH", BigDecimal.valueOf(score).toPlainString(), encode(object)); String name = getRawName(object);
return commandExecutor.writeAsync(name, codec, RedisCommands.ZADD_BOOL, name, "XX", "CH", BigDecimal.valueOf(score).toPlainString(), encode(object));
} }
@Override @Override
@ -537,14 +548,16 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Boolean> addIfLessAsync(double score, V object) { public RFuture<Boolean> addIfLessAsync(double score, V object) {
return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZADD_BOOL, String name = getRawName(object);
getRawName(), "LT", "CH", BigDecimal.valueOf(score).toPlainString(), encode(object)); return commandExecutor.writeAsync(name, codec, RedisCommands.ZADD_BOOL,
name, "LT", "CH", BigDecimal.valueOf(score).toPlainString(), encode(object));
} }
@Override @Override
public RFuture<Boolean> addIfGreaterAsync(double score, V object) { public RFuture<Boolean> addIfGreaterAsync(double score, V object) {
return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZADD_BOOL, String name = getRawName(object);
getRawName(), "GT", "CH", BigDecimal.valueOf(score).toPlainString(), encode(object)); return commandExecutor.writeAsync(name, codec, RedisCommands.ZADD_BOOL,
name, "GT", "CH", BigDecimal.valueOf(score).toPlainString(), encode(object));
} }
@Override @Override
@ -596,7 +609,7 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
public RFuture<Double> firstScoreAsync() { public RFuture<Double> firstScoreAsync() {
return commandExecutor.readAsync(getRawName(), codec, RedisCommands.ZRANGE_SINGLE_SCORE, getRawName(), 0, 0, "WITHSCORES"); return commandExecutor.readAsync(getRawName(), codec, RedisCommands.ZRANGE_SINGLE_SCORE, getRawName(), 0, 0, "WITHSCORES");
} }
@Override @Override
public Double lastScore() { public Double lastScore() {
return get(lastScoreAsync()); return get(lastScoreAsync());
@ -610,7 +623,8 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Boolean> addAsync(double score, V object) { public RFuture<Boolean> addAsync(double score, V object) {
return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZADD_BOOL, getRawName(), BigDecimal.valueOf(score).toPlainString(), encode(object)); String name = getRawName(object);
return commandExecutor.writeAsync(name, codec, RedisCommands.ZADD_BOOL, name, BigDecimal.valueOf(score).toPlainString(), encode(object));
} }
@Override @Override
@ -664,7 +678,7 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
if (objects.isEmpty()) { if (objects.isEmpty()) {
return new CompletableFutureWrapper<>(0); return new CompletableFutureWrapper<>(0);
} }
List<Object> params = new ArrayList<>(objects.size()*2+1); List<Object> params = new ArrayList<>(objects.size()*2+3);
params.add(getRawName()); params.add(getRawName());
params.add("XX"); params.add("XX");
params.add("CH"); params.add("CH");
@ -722,7 +736,8 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Boolean> tryAddAsync(double score, V object) { public RFuture<Boolean> tryAddAsync(double score, V object) {
return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZADD_BOOL, getRawName(), "NX", BigDecimal.valueOf(score).toPlainString(), encode(object)); String name = getRawName(object);
return commandExecutor.writeAsync(name, codec, RedisCommands.ZADD_BOOL, name, "NX", BigDecimal.valueOf(score).toPlainString(), encode(object));
} }
@Override @Override
@ -732,7 +747,8 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Boolean> addIfAbsentAsync(double score, V object) { public RFuture<Boolean> addIfAbsentAsync(double score, V object) {
return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZADD_BOOL, getRawName(), "NX", BigDecimal.valueOf(score).toPlainString(), encode(object)); String name = getRawName(object);
return commandExecutor.writeAsync(name, codec, RedisCommands.ZADD_BOOL, name, "NX", BigDecimal.valueOf(score).toPlainString(), encode(object));
} }
@Override @Override
@ -786,7 +802,8 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Boolean> removeAsync(Object object) { public RFuture<Boolean> removeAsync(Object object) {
return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZREM, getRawName(), encode(object)); String name = getRawName(object);
return commandExecutor.writeAsync(name, codec, RedisCommands.ZREM, name, encode(object));
} }
@Override @Override
@ -829,7 +846,8 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Boolean> containsAsync(Object o) { public RFuture<Boolean> containsAsync(Object o) {
return commandExecutor.readAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.ZSCORE_CONTAINS, getRawName(), encode(o)); String name = getRawName(o);
return commandExecutor.readAsync(name, StringCodec.INSTANCE, RedisCommands.ZSCORE_CONTAINS, name, encode(o));
} }
@Override @Override
@ -844,7 +862,8 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Double> getScoreAsync(V o) { public RFuture<Double> getScoreAsync(V o) {
return commandExecutor.readAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.ZSCORE, getRawName(), encode(o)); String name = getRawName(o);
return commandExecutor.readAsync(name, StringCodec.INSTANCE, RedisCommands.ZSCORE, name, encode(o));
} }
@Override @Override
@ -865,7 +884,8 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Integer> rankAsync(V o) { public RFuture<Integer> rankAsync(V o) {
return commandExecutor.readAsync(getRawName(), codec, RedisCommands.ZRANK_INT, getRawName(), encode(o)); String name = getRawName(o);
return commandExecutor.readAsync(name, codec, RedisCommands.ZRANK_INT, name, encode(o));
} }
@Override @Override
@ -875,14 +895,15 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<RankedEntry<V>> rankEntryAsync(V o) { public RFuture<RankedEntry<V>> rankEntryAsync(V o) {
return commandExecutor.readAsync(getRawName(), codec, RedisCommands.ZRANK_ENTRY, getRawName(), encode(o), "WITHSCORE"); String name = getRawName(o);
return commandExecutor.readAsync(name, codec, RedisCommands.ZRANK_ENTRY, name, encode(o), "WITHSCORE");
} }
private ScanResult<Object> scanIterator(RedisClient client, long startPos, String pattern, int count) { private ScanResult<Object> scanIterator(RedisClient client, long startPos, String pattern, int count) {
RFuture<ScanResult<Object>> f = scanIteratorAsync(client, startPos, pattern, count); RFuture<ScanResult<Object>> f = scanIteratorAsync(client, startPos, pattern, count);
return get(f); return get(f);
} }
public RFuture<ScanResult<Object>> scanIteratorAsync(RedisClient client, long startPos, String pattern, int count) { public RFuture<ScanResult<Object>> scanIteratorAsync(RedisClient client, long startPos, String pattern, int count) {
if (pattern == null) { if (pattern == null) {
RFuture<ScanResult<Object>> f = commandExecutor.readAsync(client, getRawName(), codec, RedisCommands.ZSCAN, getRawName(), startPos, "COUNT", count); RFuture<ScanResult<Object>> f = commandExecutor.readAsync(client, getRawName(), codec, RedisCommands.ZSCAN, getRawName(), startPos, "COUNT", count);
@ -896,12 +917,12 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
public Iterator<V> iterator() { public Iterator<V> iterator() {
return iterator(null, 10); return iterator(null, 10);
} }
@Override @Override
public Iterator<V> iterator(String pattern) { public Iterator<V> iterator(String pattern) {
return iterator(pattern, 10); return iterator(pattern, 10);
} }
@Override @Override
public Iterator<V> iterator(int count) { public Iterator<V> iterator(int count) {
return iterator(null, count); return iterator(null, count);
@ -920,7 +941,7 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
protected void remove(Object value) { protected void remove(Object value) {
RedissonScoredSortedSet.this.remove(value); RedissonScoredSortedSet.this.remove(value);
} }
}; };
} }
@ -1062,7 +1083,7 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
if (c.isEmpty()) { if (c.isEmpty()) {
return new CompletableFutureWrapper<>(true); return new CompletableFutureWrapper<>(true);
} }
return commandExecutor.evalReadAsync(getRawName(), codec, RedisCommands.EVAL_BOOLEAN, return commandExecutor.evalReadAsync(getRawName(), codec, RedisCommands.EVAL_BOOLEAN,
"for j = 1, #ARGV, 1 do " "for j = 1, #ARGV, 1 do "
+ "local expireDateScore = redis.call('zscore', KEYS[1], ARGV[j]) " + "local expireDateScore = redis.call('zscore', KEYS[1], ARGV[j]) "
@ -1079,7 +1100,7 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
if (c.isEmpty()) { if (c.isEmpty()) {
return new CompletableFutureWrapper<>(false); return new CompletableFutureWrapper<>(false);
} }
List<Object> params = new ArrayList<Object>(c.size()+1); List<Object> params = new ArrayList<Object>(c.size()+1);
params.add(getRawName()); params.add(getRawName());
encode(params, c); encode(params, c);
@ -1096,19 +1117,19 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
public boolean retainAll(Collection<?> c) { public boolean retainAll(Collection<?> c) {
return get(retainAllAsync(c)); return get(retainAllAsync(c));
} }
@Override @Override
public RFuture<Boolean> retainAllAsync(Collection<?> c) { public RFuture<Boolean> retainAllAsync(Collection<?> c) {
if (c.isEmpty()) { if (c.isEmpty()) {
return deleteAsync(); return deleteAsync();
} }
List<Object> params = new ArrayList<>(c.size() * 2); List<Object> params = new ArrayList<>(c.size() * 2);
for (Object object : c) { for (Object object : c) {
params.add(0); params.add(0);
encode(params, object); encode(params, object);
} }
return commandExecutor.evalWriteAsync(getRawName(), codec, RedisCommands.EVAL_BOOLEAN, return commandExecutor.evalWriteAsync(getRawName(), codec, RedisCommands.EVAL_BOOLEAN,
"redis.call('zadd', KEYS[2], unpack(ARGV)); " "redis.call('zadd', KEYS[2], unpack(ARGV)); "
+ "local prevSize = redis.call('zcard', KEYS[1]); " + "local prevSize = redis.call('zcard', KEYS[1]); "
@ -1125,34 +1146,37 @@ public class RedissonScoredSortedSet<V> extends RedissonExpirable implements RSc
@Override @Override
public RFuture<Double> addScoreAsync(V object, Number value) { public RFuture<Double> addScoreAsync(V object, Number value) {
return commandExecutor.writeAsync(getRawName(), DoubleCodec.INSTANCE, RedisCommands.ZINCRBY, String name = getRawName(object);
getRawName(), new BigDecimal(value.toString()).toPlainString(), encode(object)); return commandExecutor.writeAsync(name, DoubleCodec.INSTANCE, RedisCommands.ZINCRBY,
name, new BigDecimal(value.toString()).toPlainString(), encode(object));
} }
@Override @Override
public Integer addScoreAndGetRank(V object, Number value) { public Integer addScoreAndGetRank(V object, Number value) {
return get(addScoreAndGetRankAsync(object, value)); return get(addScoreAndGetRankAsync(object, value));
} }
@Override @Override
public RFuture<Integer> addScoreAndGetRankAsync(V object, Number value) { public RFuture<Integer> addScoreAndGetRankAsync(V object, Number value) {
return commandExecutor.evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_INTEGER, String name = getRawName(object);
return commandExecutor.evalWriteAsync(name, LongCodec.INSTANCE, RedisCommands.EVAL_INTEGER,
"redis.call('zincrby', KEYS[1], ARGV[1], ARGV[2]); " "redis.call('zincrby', KEYS[1], ARGV[1], ARGV[2]); "
+"return redis.call('zrank', KEYS[1], ARGV[2]); ", +"return redis.call('zrank', KEYS[1], ARGV[2]); ",
Collections.singletonList(getRawName()), new BigDecimal(value.toString()).toPlainString(), encode(object)); Collections.singletonList(name), new BigDecimal(value.toString()).toPlainString(), encode(object));
} }
@Override @Override
public Integer addScoreAndGetRevRank(V object, Number value) { public Integer addScoreAndGetRevRank(V object, Number value) {
return get(addScoreAndGetRevRankAsync(object, value)); return get(addScoreAndGetRevRankAsync(object, value));
} }
@Override @Override
public RFuture<Integer> addScoreAndGetRevRankAsync(V object, Number value) { public RFuture<Integer> addScoreAndGetRevRankAsync(V object, Number value) {
return commandExecutor.evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_INTEGER, String name = getRawName(object);
return commandExecutor.evalWriteAsync(name, LongCodec.INSTANCE, RedisCommands.EVAL_INTEGER,
"redis.call('zincrby', KEYS[1], ARGV[1], ARGV[2]); " "redis.call('zincrby', KEYS[1], ARGV[1], ARGV[2]); "
+"return redis.call('zrevrank', KEYS[1], ARGV[2]); ", +"return redis.call('zrevrank', KEYS[1], ARGV[2]); ",
Collections.singletonList(getRawName()), new BigDecimal(value.toString()).toPlainString(), encode(object)); Collections.singletonList(name), new BigDecimal(value.toString()).toPlainString(), encode(object));
} }
@Override @Override

Write Preview
Loading…
Cancel
Save