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

INT-3355 Improve Redis Tests, RedisLockReg.list()

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3355

Previously, the RedisAvailableTests unconditionally
flushed Redis; this is not appropriate and could affect
other builds on the CI server (as well as wiping out the
developer's Redis DB).

Change the tests to clean up their own redis data.

Also, improve `RedisLockRegistry.listLocks()` to use mget.
This commit is contained in:
Gary Russell
2014-04-07 09:11:18 -04:00
committed by Artem Bilan
parent 6b81fb1e0c
commit 8a0d3803d9
12 changed files with 236 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
View File

@@ -34,7 +34,10 @@ import java.util.concurrent.locks.Lock;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.SerializationException;
@@ -93,6 +96,8 @@ public final class RedisLockRegistry implements LockRegistry {
private final LockRegistry localRegistry = new DefaultLockRegistry();
private final LockSerializer lockSerializer = new LockSerializer();
static {
String host;
try {
@@ -176,15 +181,21 @@ public final class RedisLockRegistry implements LockRegistry {
}
public Collection<Lock> listLocks() {
Set<String> keys = this.redisTemplate.keys(this.registryKey + ":*");
List<Lock> locks = new ArrayList<Lock>(keys.size());
for (String key : keys) {
RedisLock lock = this.redisTemplate.boundValueOps(key).get();
if (lock != null) {
locks.add(lock);
return this.redisTemplate.execute(new RedisCallback<Collection<Lock>>() {
@Override
public Collection<Lock> doInRedis(RedisConnection connection) throws DataAccessException {
Set<byte[]> keys = connection.keys((registryKey + ":*").getBytes());
ArrayList<Lock> list = new ArrayList<Lock>(keys.size());
if (keys.size() > 0) {
List<byte[]> locks = connection.mGet(keys.toArray(new byte[keys.size()][]));
for (byte[] lock : locks) {
list.add(lockSerializer.deserialize(lock));
}
}
return list;
}
}
return locks;
});
}
private class RedisLock implements Lock {