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

Fix RedisUtils to detect UNLINK per RedisOps

Browse Source 
This might be a fact that application doesn't use a single
`RedisOperations`.
Also the same JVM may be shared between several applications with
different connections to different Redis servers

* change plain `Boolean unlinkAvailable` property to the
`Map<RedisOperations<?, ?>, Boolean>` and `computeIfAbsent()` per
provided `RedisOperations`
This commit is contained in:
Artem Bilan
2018-07-26 14:07:51 -04:00
committed by Gary Russell
parent da977941f8
commit 3ab037f1eb
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisUtils.java
View File

@@ -16,6 +16,8 @@
package org.springframework.integration.redis.util;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
import org.springframework.data.redis.core.RedisCallback;
@@ -34,9 +36,15 @@ public final class RedisUtils {
private static final String VERSION_PROPERTY = "redis_version";
private static final int MAJOR_VERSION_TO_COMPARE = 4;
private static final Map<RedisOperations<?, ?>, Boolean> unlinkAvailable =
new LinkedHashMap<RedisOperations<?, ?>, Boolean>() {
private static Boolean unlinkAvailable;
@Override
protected boolean removeEldestEntry(Map.Entry eldest) {
return size() > 100;
}
};
/**
* Perform an {@code INFO} command on the provided {@link RedisOperations} to check
@@ -46,18 +54,17 @@ public final class RedisUtils {
* @throws IllegalStateException when {@code INFO} returns null from the Redis.
*/
public static boolean isUnlinkAvailable(RedisOperations<?, ?> redisOperations) {
if (unlinkAvailable == null) {
return unlinkAvailable.computeIfAbsent(redisOperations, key -> {
Properties info = redisOperations.execute(
(RedisCallback<Properties>) connection -> connection.serverCommands().info(SECTION));
if (info != null) {
int majorVersion = Integer.parseInt(info.getProperty(VERSION_PROPERTY).split("\\.")[0]);
unlinkAvailable = majorVersion >= MAJOR_VERSION_TO_COMPARE;
return majorVersion >= 4;
}
else {
throw new IllegalStateException("The INFO command cannot be used in pipeline/transaction.");
}
}
return unlinkAvailable;
});
}
private RedisUtils() {