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

Performance boost up to 30% for RSortedSet.add method

Browse Source
pull/520/head
Nikita 9 years ago
parent ba987a6c59
commit 1f8a2e09c3
1 changed files with 18 additions and 87 deletions
Show Stats Download Patch File Download Diff File

99
src/main/java/org/redisson/RedissonSortedSet.java
Unescape Escape View File

@ -16,6 +16,7 @@
package org.redisson; package org.redisson;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -101,8 +102,6 @@ public class RedissonSortedSet<V> extends RedissonObject implements RSortedSet<V
this.commandExecutor = commandExecutor; this.commandExecutor = commandExecutor;
loadComparator(); loadComparator();
commandExecutor.write(getName(), StringCodec.INSTANCE, RedisCommands.SETNX, getCurrentVersionKey(), 0L);
} }
public RedissonSortedSet(Codec codec, CommandExecutor commandExecutor, String name) { public RedissonSortedSet(Codec codec, CommandExecutor commandExecutor, String name) {
@ -110,8 +109,6 @@ public class RedissonSortedSet<V> extends RedissonObject implements RSortedSet<V
this.commandExecutor = commandExecutor; this.commandExecutor = commandExecutor;
loadComparator(); loadComparator();
commandExecutor.write(getName(), StringCodec.INSTANCE, RedisCommands.SETNX, getCurrentVersionKey(), 0L);
} }
private void loadComparator() { private void loadComparator() {
@ -292,14 +289,6 @@ public class RedissonSortedSet<V> extends RedissonObject implements RSortedSet<V
return res.toArray(a); return res.toArray(a);
} }
private String getCurrentVersionKey() {
return "redisson__sortedset__version__{" + getName() + "}";
}
private Long getCurrentVersion(Codec codec, RedisConnection simpleConnection) {
return simpleConnection.sync(LongCodec.INSTANCE, RedisCommands.GET, getCurrentVersionKey());
}
@Override @Override
public boolean add(final V value) { public boolean add(final V value) {
return commandExecutor.write(getName(), codec, new SyncOperation<Boolean>() { return commandExecutor.write(getName(), codec, new SyncOperation<Boolean>() {
@ -332,83 +321,29 @@ public class RedissonSortedSet<V> extends RedissonObject implements RSortedSet<V
checkComparator(connection); checkComparator(connection);
Long version = getCurrentVersion(codec, connection);
BinarySearchResult<V> res = binarySearch(value, codec, connection); BinarySearchResult<V> res = binarySearch(value, codec, connection);
if (res.getIndex() < 0) { if (res.getIndex() < 0) {
// System.out.println("index: " + res.getIndex() + " value: " + value);
if (!version.equals(getCurrentVersion(codec, connection))) {
connection.sync(RedisCommands.UNWATCH);
continue;
}
// NewScore newScore = calcNewScore(res.getIndex(), connection);
// if (!version.equals(getCurrentVersion(simpleConnection))) {
// connection.unwatch();
// continue;
// }
//
// String leftScoreKey = getScoreKeyName(newScore.getLeftScore());
// String rightScoreKey = getScoreKeyName(newScore.getRightScore());
//
// if (simpleConnection.setnx(leftScoreKey, 1)) {
// if (!version.equals(getCurrentVersion(simpleConnection))) {
// connection.unwatch();
//
// connection.del(leftScoreKey);
// continue;
// }
// if (rightScoreKey != null) {
//
// if (!simpleConnection.setnx(rightScoreKey, 1)) {
// connection.unwatch();
//
// connection.del(leftScoreKey);
// continue;
// }
// }
// } else {
// connection.unwatch();
// continue;
// }
V pivot = null;
boolean before = false;
int index = -(res.getIndex() + 1); int index = -(res.getIndex() + 1);
if (index < size()) { byte[] encodedValue = null;
before = true; try {
pivot = connection.sync(codec, RedisCommands.LINDEX, getName(), index); encodedValue = codec.getValueEncoder().encode(value);
} catch (IOException e) {
throw new IllegalArgumentException(e);
} }
connection.sync(RedisCommands.MULTI); connection.sync(RedisCommands.MULTI);
if (index >= size()) { connection.sync(RedisCommands.EVAL_VOID,
connection.sync(codec, RedisCommands.RPUSH, getName(), value); "local len = redis.call('llen', KEYS[1]);"
} else { + "if tonumber(ARGV[1]) < len then "
connection.sync(codec, RedisCommands.LINSERT, getName(), before ? "BEFORE" : "AFTER", pivot, value); + "local pivot = redis.call('lindex', KEYS[1], ARGV[1]);"
} + "redis.call('linsert', KEYS[1], 'before', pivot, ARGV[2]);"
// System.out.println("adding: " + newScore.getScore() + " " + value); + "return;"
// connection.zadd(getName(), newScore.getScore(), value); + "end;"
// if (rightScoreKey != null) { + "redis.call('rpush', KEYS[1], ARGV[2]);", 1, getName(), index, encodedValue);
// connection.del(leftScoreKey, rightScoreKey);
// } else {
// connection.del(leftScoreKey);
// }
connection.sync(RedisCommands.INCR, getCurrentVersionKey());
List<Object> re = connection.sync(codec, RedisCommands.EXEC); List<Object> re = connection.sync(codec, RedisCommands.EXEC);
if (re.size() == 2) { if (re.size() == 1) {
// System.out.println("index: " + index + " value: " + value + " pivot: " + pivot);
return true; return true;
// Number val = (Number) re.get(0);
// Long delCount = (Long) re.get(1);
// if (rightScoreKey != null) {
// if (delCount != 2) {
// throw new IllegalStateException();
// }
// } else {
// if (delCount != 1) {
// throw new IllegalStateException();
// }
// }
// return val != null && val.intValue() > 0;
} }
} else { } else {
connection.sync(RedisCommands.UNWATCH); connection.sync(RedisCommands.UNWATCH);
@ -423,11 +358,7 @@ public class RedissonSortedSet<V> extends RedissonObject implements RSortedSet<V
String[] vals = comparatorSign.split(":"); String[] vals = comparatorSign.split(":");
String className = vals[0]; String className = vals[0];
if (!comparator.getClass().getName().equals(className)) { if (!comparator.getClass().getName().equals(className)) {
// try {
loadComparator(connection); loadComparator(connection);
// } finally {
// connection.sync(RedisCommands.UNWATCH);
// }
} }
} }
} }

Write Preview
Loading…
Cancel
Save