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

DATAREDIS-468 - Guard multi/exec bocks in RedisCache to allow usage with cluster.

Browse Source 
We now guard multi/exec blocks by checking the connection type. This allows to skip those commands when running in cluster.

Original pull request: #173.
This commit is contained in:
Christoph Strobl
2016-02-24 08:30:13 +01:00
committed by Mark Paluch
parent 02742e3b49
commit 7024ef33e0
2 changed files with 68 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/test/java/org/springframework/data/redis/cache/RedisCacheUnitTests.java vendored
View File

@@ -31,6 +31,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.data.redis.RedisSystemException;
import org.springframework.data.redis.connection.RedisClusterConnection;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.ReturnType;
@@ -217,4 +218,52 @@ public class RedisCacheUnitTests {
verifyZeroInteractions(callableMock);
}
/**
* @see DATAREDIS-468
*/
@Test
public void noMultiExecForCluster() {
RedisClusterConnection clusterConnectionMock = mock(RedisClusterConnection.class);
when(connectionFactoryMock.getConnection()).thenReturn(clusterConnectionMock);
cache = new RedisCache(CACHE_NAME, NO_PREFIX_BYTES, templateSpy, 0L);
when(connectionMock.exists(KEY_BYTES)).thenReturn(true);
when(connectionMock.get(KEY_BYTES)).thenReturn(null).thenReturn(VALUE_BYTES);
cache.put(KEY, VALUE);
verify(clusterConnectionMock, times(1)).set(eq(KEY_BYTES), eq(VALUE_BYTES));
verify(clusterConnectionMock, never()).multi();
verify(clusterConnectionMock, never()).exec();
verifyZeroInteractions(connectionMock);
}
/**
* @see DATAREDIS-468
*/
@Test
public void getWithCallableForCluster() {
RedisClusterConnection clusterConnectionMock = mock(RedisClusterConnection.class);
when(connectionFactoryMock.getConnection()).thenReturn(clusterConnectionMock);
cache = new RedisCache(CACHE_NAME, NO_PREFIX_BYTES, templateSpy, 0L);
cache.get(KEY, new Callable<Object>() {
@Override
public Object call() throws Exception {
return VALUE;
}
});
verify(clusterConnectionMock, times(2)).get(eq(KEY_BYTES));
verify(clusterConnectionMock, times(1)).set(eq(KEY_BYTES), eq(VALUE_BYTES));
verify(clusterConnectionMock, never()).multi();
verify(clusterConnectionMock, never()).exec();
verifyZeroInteractions(connectionMock);
}
}