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

We now guard multi/exec blocks by checking the connection type. This allows to skip those commands when running in cluster. Original pull request: spring-projects#173.

Author: christophstrobl

src/main/java/org/springframework/data/redis/cache/RedisCache.java

@@ -28,6 +28,7 @@
 import org.springframework.cache.support.SimpleValueWrapper;
 import org.springframework.dao.DataAccessException;
 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.ReturnType;
 import org.springframework.data.redis.core.RedisCallback;
@@ -670,14 +671,18 @@ public RedisCachePutCallback(BinaryRedisCacheElement element, RedisCacheMetadata
 @Override
 public Void doInRedis(BinaryRedisCacheElement element, RedisConnection connection) throws DataAccessException {
 
-connection.multi();
+if (!isClusterConnection(connection)) {
+connection.multi();
+}
 
 connection.set(element.getKeyBytes(), element.get());
 
 processKeyExpiration(element, connection);
 maintainKnownKeys(element, connection);
 
-connection.exec();
+if (!isClusterConnection(connection)) {
+connection.exec();
+}
 return null;
 }
 }
@@ -742,16 +747,21 @@ public byte[] doInRedis(BinaryRedisCacheElement element, RedisConnection connect
 return value;
 }
 
-connection.watch(element.getKeyBytes());
-connection.multi();
+if (!isClusterConnection(connection)) {
+
+connection.watch(element.getKeyBytes());
+connection.multi();
+}
 
 value = element.get();
 connection.set(element.getKeyBytes(), value);
 
 processKeyExpiration(element, connection);
 maintainKnownKeys(element, connection);
 
-connection.exec();
+if (!isClusterConnection(connection)) {
+connection.exec();
+}
 
 return value;
 } catch (RuntimeException e) {
@@ -799,4 +809,8 @@ public RuntimeException create(Object key, Callable<?> valueLoader, Throwable ca
 }
 }
 
+private static boolean isClusterConnection(RedisConnection connection) {
+return connection instanceof RedisClusterConnection;
+}
+
 }

src/test/java/org/springframework/data/redis/cache/RedisCacheUnitTests.java

@@ -31,6 +31,7 @@
 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 void getWithCallableShouldNotReadValueFromCallableWhenAlreadyPresent() {
 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);
+}
+
 }