Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-848 - Use Lettuce's RestoreArgs to restore a key with replace option.

Browse Source 
We now use RestoreArgs instead of constructing a custom command.

Original Pull Request: #382
This commit is contained in:
Mark Paluch
2019-02-07 14:56:36 +01:00
committed by Christoph Strobl
parent c4d93870d4
commit cd05e5c0b9
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceKeyCommands.java
View File

@@ -16,15 +16,13 @@
package org.springframework.data.redis.connection.lettuce;
import io.lettuce.core.KeyScanCursor;
import io.lettuce.core.RestoreArgs;
import io.lettuce.core.RestoreArgs.Builder;
import io.lettuce.core.ScanArgs;
import io.lettuce.core.ScanCursor;
import io.lettuce.core.SortArgs;
import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
import io.lettuce.core.codec.ByteArrayCodec;
import io.lettuce.core.output.StatusOutput;
import io.lettuce.core.protocol.CommandArgs;
import io.lettuce.core.protocol.CommandType;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
@@ -685,24 +683,23 @@ class LettuceKeyCommands implements RedisKeyCommands {
try {
if (replace) {
RestoreArgs restoreArgs = Builder.ttl(ttlInMillis);
this.connection.execute("RESTORE", new byte[][] { key, LettuceConverters.toBytes(ttlInMillis), serializedValue,
LettuceConverters.toBytes("REPLACE") });
return;
if (replace) {
restoreArgs = restoreArgs.replace();
}
if (isPipelined()) {
pipeline(connection.newLettuceStatusResult(getAsyncConnection().restore(key, ttlInMillis, serializedValue)));
pipeline(connection.newLettuceStatusResult(getAsyncConnection().restore(key, serializedValue, restoreArgs)));
return;
}
if (isQueueing()) {
transaction(connection.newLettuceStatusResult(getAsyncConnection().restore(key, ttlInMillis, serializedValue)));
transaction(connection.newLettuceStatusResult(getAsyncConnection().restore(key, serializedValue, restoreArgs)));
return;
}
getConnection().restore(key, ttlInMillis, serializedValue);
getConnection().restore(key, serializedValue, restoreArgs);
} catch (Exception ex) {
throw convertLettuceAccessException(ex);
}