DATAREDIS-513 - Fix RedisServerCommands.time() failure when in pipeline mode.

We fixed a glitch in Jedis/Lettuce RedisConneciton TIME command when used in pipeline or transaction mode.

Original pull request: #199.

Author: christophstrobl

src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2015 the original author or authors.
+ * Copyright 2011-2016 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -786,8 +786,8 @@ public Boolean expire(byte[] key, long seconds) {
 
 		/*
 		 *  @see DATAREDIS-286 to avoid overflow in Jedis
-		 *  
-		 *  TODO Remove this workaround when we upgrade to a Jedis version that contains a 
+		 *
+		 *  TODO Remove this workaround when we upgrade to a Jedis version that contains a
 		 *  fix for: https://github.com/xetorthio/jedis/pull/575
 		 */
 		if (seconds > Integer.MAX_VALUE) {
@@ -973,8 +973,8 @@ public Boolean pExpire(byte[] key, long millis) {
 
 		/*
 		 *  @see DATAREDIS-286 to avoid overflow in Jedis
-		 *  
-		 *  TODO Remove this workaround when we upgrade to a Jedis version that contains a 
+		 *
+		 *  TODO Remove this workaround when we upgrade to a Jedis version that contains a
 		 *  fix for: https://github.com/xetorthio/jedis/pull/575
 		 */
 		if (millis > Integer.MAX_VALUE) {
@@ -3090,13 +3090,21 @@ public <T> T evalSha(byte[] scriptSha1, ReturnType returnType, int numKeys, byte
 	@Override
 	public Long time() {
 
-		List<String> serverTimeInformation = this.jedis.time();
+		try {
 
-		Assert.notEmpty(serverTimeInformation, "Received invalid result from server. Expected 2 items in collection.");
-		Assert.isTrue(serverTimeInformation.size() == 2,
-				"Received invalid nr of arguments from redis server. Expected 2 received " + serverTimeInformation.size());
+			if (isPipelined()) {
+				pipeline(new JedisResult(pipeline.time(), JedisConverters.toTimeConverter()));
+				return null;
+			}
 
-		return Converters.toTimeMillis(serverTimeInformation.get(0), serverTimeInformation.get(1));
+			if (isQueueing()) {
+				transaction(new JedisResult(transaction.time(), JedisConverters.toTimeConverter()));
+				return null;
+			}
+			return JedisConverters.toTimeConverter().convert(jedis.time());
+		} catch (Exception ex) {
+			throw convertJedisAccessException(ex);
+		}
 	}
 
 	/*

src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java

@@ -67,6 +67,7 @@ abstract public class JedisConverters extends Converters {
 	private static final Converter<String[], List<RedisClientInfo>> STRING_TO_CLIENT_INFO_CONVERTER = new StringToRedisClientInfoConverter();
 	private static final Converter<redis.clients.jedis.Tuple, Tuple> TUPLE_CONVERTER;
 	private static final ListConverter<redis.clients.jedis.Tuple, Tuple> TUPLE_LIST_TO_TUPLE_LIST_CONVERTER;
+	private static final Converter<List<String>, Long> STRING_LIST_TO_TIME_CONVERTER;
 
 	public static final byte[] PLUS_BYTES;
 	public static final byte[] MINUS_BYTES;
@@ -96,6 +97,19 @@ public Tuple convert(redis.clients.jedis.Tuple source) {
 		MINUS_BYTES = toBytes("-");
 		POSITIVE_INFINITY_BYTES = toBytes("+inf");
 		NEGATIVE_INFINITY_BYTES = toBytes("-inf");
+
+		STRING_LIST_TO_TIME_CONVERTER = new Converter<List<String>, Long>() {
+
+			@Override
+			public Long convert(List<String> source) {
+
+				Assert.notEmpty(source, "Received invalid result from server. Expected 2 items in collection.");
+				Assert.isTrue(source.size() == 2,
+						"Received invalid nr of arguments from redis server. Expected 2 received " + source.size());
+
+				return toTimeMillis(source.get(0), source.get(1));
+			}
+		};
 	}
 
 	public static Converter<String, byte[]> stringToBytes() {
@@ -320,4 +334,8 @@ private static byte[] boundaryToBytes(Boundary boundary, byte[] inclPrefix, byte
 		return buffer.array();
 
 	}
+
+	static Converter<List<String>, Long> toTimeConverter() {
+		return STRING_LIST_TO_TIME_CONVERTER;
+	}
 }

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java

@@ -3060,16 +3060,19 @@ public void subscribe(MessageListener listener, byte[]... channels) {
 	 */
 	@Override
 	public Long time() {
-		try {
-
-			List<byte[]> result = getConnection().time();
 
-			Assert.notEmpty(result, "Received invalid result from server. Expected 2 items in collection.");
-			Assert.isTrue(result.size() == 2, "Received invalid nr of arguments from redis server. Expected 2 received "
-					+ result.size());
+		try {
 
-			return Converters.toTimeMillis(new String(result.get(0)), new String(result.get(1)));
+			if (isPipelined()) {
+				pipeline(new LettuceResult(getAsyncConnection().time(), LettuceConverters.toTimeConverter()));
+				return null;
+			}
+			if (isQueueing()) {
+				transaction(new LettuceTxResult(getConnection().time(), LettuceConverters.toTimeConverter()));
+				return null;
+			}
 
+			return LettuceConverters.toTimeConverter().convert(getConnection().time());
 		} catch (Exception ex) {
 			throw convertLettuceAccessException(ex);
 		}

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java

@@ -78,6 +78,7 @@ abstract public class LettuceConverters extends Converters {
 	private static final Converter<List<byte[]>, Map<byte[], byte[]>> BYTES_LIST_TO_MAP;
 	private static final Converter<List<byte[]>, List<Tuple>> BYTES_LIST_TO_TUPLE_LIST_CONVERTER;
 	private static final Converter<String[], List<RedisClientInfo>> STRING_TO_LIST_OF_CLIENT_INFO = new StringToRedisClientInfoConverter();
+	private static final Converter<List<byte[]>, Long> BYTES_LIST_TO_TIME_CONVERTER;
 
 	public static final byte[] PLUS_BYTES;
 	public static final byte[] MINUS_BYTES;
@@ -203,6 +204,19 @@ public List<Tuple> convert(List<byte[]> source) {
 		MINUS_BYTES = toBytes("-");
 		POSITIVE_INFINITY_BYTES = toBytes("+inf");
 		NEGATIVE_INFINITY_BYTES = toBytes("-inf");
+
+		BYTES_LIST_TO_TIME_CONVERTER = new Converter<List<byte[]>, Long>() {
+
+			@Override
+			public Long convert(List<byte[]> source) {
+
+				Assert.notEmpty(source, "Received invalid result from server. Expected 2 items in collection.");
+				Assert.isTrue(source.size() == 2,
+						"Received invalid nr of arguments from redis server. Expected 2 received " + source.size());
+
+				return toTimeMillis(LettuceConverters.toString(source.get(0)), LettuceConverters.toString(source.get(1)));
+			}
+		};
 	}
 
 	public static List<Tuple> toTuple(List<byte[]> list) {
@@ -523,4 +537,7 @@ private static String boundaryToBytes(Boundary boundary, byte[] inclPrefix, byte
 		return toString(buffer.array());
 	}
 
+	static Converter<List<byte[]>, Long> toTimeConverter() {
+		return BYTES_LIST_TO_TIME_CONVERTER;
+	}
 }

src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.redis.connection;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 import static org.junit.Assume.*;
 import static org.springframework.data.redis.SpinBarrier.*;
@@ -1919,13 +1919,17 @@ public void testLastSave() {
 
 	/**
 	 * @see DATAREDIS-206
+	 * @see DATAREDIS-513
 	 */
 	@Test
 	public void testGetTimeShouldRequestServerTime() {
 
-		Long time = connectionFactory.getConnection().time();
-		assertThat(time, notNullValue());
-		assertThat(time > 0, equalTo(true));
+		actual.add(connection.time());
+
+		List<Object> results = getResults();
+		assertThat(results, is(not(empty())));
+		assertThat(results.get(0), notNullValue());
+		assertThat((Long) results.get(0) > 0, equalTo(true));
 	}
 
 	/**