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

DATAREDIS-1005 - Polishing.

Browse Source 
Implement cluster-wide scriptFlush(), scriptKill(), and scriptLoad(). Add method argument assertions and author tags. Adapt and fix tests.

Original pull request: #460.
This commit is contained in:
Mark Paluch
2019-07-02 10:53:52 +02:00
parent 988a7e71b7
commit e9b5e6ee8e
6 changed files with 108 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/redis/connection/ClusterCommandExecutor.java
View File

@@ -587,7 +587,8 @@ public class ClusterCommandExecutor implements DisposableBean {
if (CollectionUtils.isEmpty((Map<?, ?>) nodeResult.getValue())) {
return nodeResult.getValue();
}
} else if (CollectionUtils.isEmpty((Collection<?>) nodeResult.getValue())) {
} else if (nodeResult.getValue() instanceof Collection
&& CollectionUtils.isEmpty((Collection<?>) nodeResult.getValue())) {
return nodeResult.getValue();
} else {
return nodeResult.getValue();

1
src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java
View File

@@ -69,6 +69,7 @@ import org.springframework.util.Assert;
* @author Ninad Divadkar
* @author Tao Chen
* @author Chen Guanqun
* @author Pavel Khokhlov
* @since 1.7
*/
public class JedisClusterConnection implements DefaultedRedisClusterConnection {

76
src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterScriptingCommands.java
View File

@@ -15,24 +15,28 @@
*/
package org.springframework.data.redis.connection.jedis;
import java.util.List;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.springframework.dao.DataAccessException;
import redis.clients.jedis.BinaryJedis;
import redis.clients.jedis.JedisCluster;
import java.util.List;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.redis.connection.ClusterCommandExecutor;
import org.springframework.data.redis.connection.RedisScriptingCommands;
import org.springframework.data.redis.connection.ReturnType;
import redis.clients.jedis.JedisCluster;
import org.springframework.util.Assert;
/**
* @author Mark Paluch
* @author Pavel Khokhlov
* @since 2.0
*/
@RequiredArgsConstructor
class JedisClusterScriptingCommands implements RedisScriptingCommands {
private final @NonNull JedisClusterConnection clusterConnection;
private final @NonNull JedisClusterConnection connection;
/*
* (non-Javadoc)
@@ -40,7 +44,13 @@ class JedisClusterScriptingCommands implements RedisScriptingCommands {
*/
@Override
public void scriptFlush() {
throw new InvalidDataAccessApiUsageException("ScriptFlush is not supported in cluster environment.");
try {
connection.getClusterCommandExecutor().executeCommandOnAllNodes(
(JedisClusterConnection.JedisClusterCommandCallback<String>) BinaryJedis::scriptFlush);
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}
}
/*
@@ -49,7 +59,13 @@ class JedisClusterScriptingCommands implements RedisScriptingCommands {
*/
@Override
public void scriptKill() {
throw new InvalidDataAccessApiUsageException("ScriptKill is not supported in cluster environment.");
try {
connection.getClusterCommandExecutor().executeCommandOnAllNodes(
(JedisClusterConnection.JedisClusterCommandCallback<String>) BinaryJedis::scriptKill);
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}
}
/*
@@ -58,7 +74,18 @@ class JedisClusterScriptingCommands implements RedisScriptingCommands {
*/
@Override
public String scriptLoad(byte[] script) {
throw new InvalidDataAccessApiUsageException("ScriptLoad is not supported in cluster environment.");
Assert.notNull(script, "Script must not be null!");
try {
ClusterCommandExecutor.MultiNodeResult<byte[]> multiNodeResult = connection.getClusterCommandExecutor()
.executeCommandOnAllNodes(
(JedisClusterConnection.JedisClusterCommandCallback<byte[]>) client -> client.scriptLoad(script));
return JedisConverters.toString(multiNodeResult.getFirstNonNullNotEmptyOrDefault(new byte[0]));
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}
}
/*
@@ -77,7 +104,9 @@ class JedisClusterScriptingCommands implements RedisScriptingCommands {
@Override
@SuppressWarnings("unchecked")
public <T> T eval(byte[] script, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
checkConnection();
Assert.notNull(script, "Script must not be null!");
try {
return (T) new JedisScriptReturnConverter(returnType)
.convert(getCluster().eval(script, JedisConverters.toBytes(numKeys), keysAndArgs));
@@ -102,7 +131,9 @@ class JedisClusterScriptingCommands implements RedisScriptingCommands {
@Override
@SuppressWarnings("unchecked")
public <T> T evalSha(byte[] scriptSha, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
checkConnection();
Assert.notNull(scriptSha, "Script digest must not be null!");
try {
return (T) new JedisScriptReturnConverter(returnType)
.convert(getCluster().evalsha(scriptSha, numKeys, keysAndArgs));
@@ -111,32 +142,11 @@ class JedisClusterScriptingCommands implements RedisScriptingCommands {
}
}
public JedisClusterConnection getClusterConnection() {
return clusterConnection;
}
protected RuntimeException convertJedisAccessException(Exception ex) {
return clusterConnection.convertJedisAccessException(ex);
return connection.convertJedisAccessException(ex);
}
private JedisCluster getCluster() {
return clusterConnection.getCluster();
}
protected void checkConnection() {
if (isQueueing()) {
throw new UnsupportedOperationException();
}
if (isPipelined()) {
throw new UnsupportedOperationException();
}
}
private boolean isPipelined() {
return clusterConnection.isPipelined();
}
private boolean isQueueing() {
return clusterConnection.isQueueing();
return connection.getCluster();
}
}

6
src/main/java/org/springframework/data/redis/connection/jedis/JedisScriptingCommands.java
View File

@@ -147,9 +147,9 @@ class JedisScriptingCommands implements RedisScriptingCommands {
*/
@Override
@SuppressWarnings("unchecked")
public <T> T evalSha(byte[] scriptSha1, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
public <T> T evalSha(byte[] scriptSha, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
Assert.notNull(scriptSha1, "Script digest must not be null!");
Assert.notNull(scriptSha, "Script digest must not be null!");
if (isQueueing() || isPipelined()) {
throw new UnsupportedOperationException();
@@ -157,7 +157,7 @@ class JedisScriptingCommands implements RedisScriptingCommands {
try {
return (T) new JedisScriptReturnConverter(returnType)
.convert(connection.getJedis().evalsha(scriptSha1, numKeys, keysAndArgs));
.convert(connection.getJedis().evalsha(scriptSha, numKeys, keysAndArgs));
} catch (Exception ex) {
throw convertJedisAccessException(ex);
}