Use Long.parseUnsignedLong/toUnsignedString for SCAN cursor id parsing.

Redis uses an unsigned 64bit value for its cursor id which is now captured via parseUnsignedLong. Closes: #2796
spring-projects · Dec 13, 2023 · b9f2e4c · b9f2e4c
1 parent 966dc05
commit b9f2e4c
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 23 deletions.
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterHashCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterHashCommands.java
@@ -279,9 +279,10 @@ protected ScanIteration<Entry<byte[], byte[]>> doScan(long cursorId, ScanOptions
 
 				ScanParams params = JedisConverters.toScanParams(options);
 
-				ScanResult<Entry<byte[], byte[]>> result = connection.getCluster().hscan(key, JedisConverters.toBytes(cursorId),
+				ScanResult<Entry<byte[], byte[]>> result = connection.getCluster().hscan(key,
+						JedisConverters.toBytes(Long.toUnsignedString(cursorId)),
 						params);
-				return new ScanIteration<>(Long.valueOf(result.getCursor()), result.getResult());
+				return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()), result.getResult());
 			}
 		}.open();
 	}

diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterKeyCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterKeyCommands.java
@@ -180,8 +180,8 @@ Cursor<byte[]> scan(RedisClusterNode node, ScanOptions options) {
 						protected ScanIteration<byte[]> doScan(long cursorId, ScanOptions options) {
 
 							ScanParams params = JedisConverters.toScanParams(options);
-							ScanResult<String> result = client.scan(Long.toString(cursorId), params);
-							return new ScanIteration<>(Long.valueOf(result.getCursor()),
+							ScanResult<String> result = client.scan(Long.toUnsignedString(cursorId), params);
+							return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()),
 									JedisConverters.stringListToByteList().convert(result.getResult()));
 						}
 					}.open();

diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterSetCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterSetCommands.java
@@ -397,8 +397,9 @@ public Cursor<byte[]> sScan(byte[] key, ScanOptions options) {
 			protected ScanIteration<byte[]> doScan(long cursorId, ScanOptions options) {
 
 				ScanParams params = JedisConverters.toScanParams(options);
-				ScanResult<byte[]> result = connection.getCluster().sscan(key, JedisConverters.toBytes(cursorId), params);
-				return new ScanIteration<>(Long.parseLong(result.getCursor()), result.getResult());
+				ScanResult<byte[]> result = connection.getCluster().sscan(key,
+						JedisConverters.toBytes(Long.toUnsignedString(cursorId)), params);
+				return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()), result.getResult());
 			}
 		}.open();
 	}

diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
@@ -1084,8 +1084,8 @@ protected ScanIteration<Tuple> doScan(long cursorId, ScanOptions options) {
 				ScanParams params = JedisConverters.toScanParams(options);
 
 				ScanResult<redis.clients.jedis.resps.Tuple> result = connection.getCluster().zscan(key,
-						JedisConverters.toBytes(cursorId), params);
-				return new ScanIteration<>(Long.valueOf(result.getCursor()),
+						JedisConverters.toBytes(Long.toUnsignedString(cursorId)), params);
+				return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()),
 						JedisConverters.tuplesToTuples().convert(result.getResult()));
 			}
 		}.open();

diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisHashCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisHashCommands.java
@@ -244,9 +244,10 @@ protected ScanIteration<Entry<byte[], byte[]>> doScan(byte[] key, long cursorId,
 
 				ScanParams params = JedisConverters.toScanParams(options);
 
-				ScanResult<Entry<byte[], byte[]>> result = connection.getJedis().hscan(key, JedisConverters.toBytes(cursorId),
+				ScanResult<Entry<byte[], byte[]>> result = connection.getJedis().hscan(key,
+						JedisConverters.toBytes(Long.toUnsignedString(cursorId)),
 						params);
-				return new ScanIteration<>(Long.valueOf(result.getCursor()), result.getResult());
+				return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()), result.getResult());
 			}
 
 			@Override

diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisKeyCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisKeyCommands.java
@@ -165,12 +165,12 @@ protected ScanIteration<byte[]> doScan(long cursorId, ScanOptions options) {
 				}
 
 				if (type != null) {
-					result = connection.getJedis().scan(Long.toString(cursorId).getBytes(), params, type);
+					result = connection.getJedis().scan(Long.toUnsignedString(cursorId).getBytes(), params, type);
 				} else {
-					result = connection.getJedis().scan(Long.toString(cursorId).getBytes(), params);
+					result = connection.getJedis().scan(Long.toUnsignedString(cursorId).getBytes(), params);
 				}
 
-				return new ScanIteration<>(Long.parseLong(result.getCursor()), result.getResult());
+				return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()), result.getResult());
 			}
 
 			protected void doClose() {

diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisSetCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisSetCommands.java
@@ -231,8 +231,9 @@ protected ScanIteration<byte[]> doScan(byte[] key, long cursorId, ScanOptions op
 
 				ScanParams params = JedisConverters.toScanParams(options);
 
-				ScanResult<byte[]> result = connection.getJedis().sscan(key, JedisConverters.toBytes(cursorId), params);
-				return new ScanIteration<>(Long.valueOf(result.getCursor()), result.getResult());
+				ScanResult<byte[]> result = connection.getJedis().sscan(key,
+						JedisConverters.toBytes(Long.toUnsignedString(cursorId)), params);
+				return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()), result.getResult());
 			}
 
 			protected void doClose() {

diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java
@@ -587,8 +587,8 @@ protected ScanIteration<Tuple> doScan(byte[] key, long cursorId, ScanOptions opt
 				ScanParams params = JedisConverters.toScanParams(options);
 
 				ScanResult<redis.clients.jedis.resps.Tuple> result = connection.getJedis().zscan(key,
-						JedisConverters.toBytes(cursorId), params);
-				return new ScanIteration<>(Long.valueOf(result.getCursor()),
+						JedisConverters.toBytes(Long.toUnsignedString(cursorId)), params);
+				return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()),
 						JedisConverters.tuplesToTuples().convert(result.getResult()));
 			}
 

diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
@@ -1061,7 +1061,7 @@ private void potentiallySelectDatabase(int dbIndex) {
 	}
 
 	io.lettuce.core.ScanCursor getScanCursor(long cursorId) {
-		return io.lettuce.core.ScanCursor.of(Long.toString(cursorId));
+		return io.lettuce.core.ScanCursor.of(Long.toUnsignedString(cursorId));
 	}
 
 	private void validateCommandIfRunningInTransactionMode(ProtocolKeyword cmd, byte[]... args) {

diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceHashCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceHashCommands.java
@@ -235,7 +235,7 @@ protected ScanIteration<Entry<byte[], byte[]>> doScan(byte[] key, long cursorId,
 				String nextCursorId = mapScanCursor.getCursor();
 
 				Map<byte[], byte[]> values = mapScanCursor.getMap();
-				return new ScanIteration<>(Long.valueOf(nextCursorId), values.entrySet());
+				return new ScanIteration<>(Long.parseUnsignedLong(nextCursorId), values.entrySet());
 			}
 
 			@Override

diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceScanCursor.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceScanCursor.java
@@ -77,7 +77,7 @@ private ScanIteration<T> scanAndProcessState(io.lettuce.core.ScanCursor scanCurs
 	}
 
 	private boolean isMatchingCursor(long cursorId) {
-		return state != null && state.getCursor().equals(Long.toString(cursorId));
+		return state != null && state.getCursor().equals(Long.toUnsignedString(cursorId));
 	}
 
 	/**
@@ -101,7 +101,7 @@ static class LettuceScanIteration<T> extends ScanIteration<T> {
 
 		LettuceScanIteration(io.lettuce.core.ScanCursor cursor, Collection<T> items) {
 
-			super(Long.parseLong(cursor.getCursor()), items);
+			super(Long.parseUnsignedLong(cursor.getCursor()), items);
 			this.cursor = cursor;
 		}
 	}

diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSetCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSetCommands.java
@@ -232,7 +232,7 @@ protected ScanIteration<byte[]> doScan(byte[] key, long cursorId, ScanOptions op
 				String nextCursorId = valueScanCursor.getCursor();
 
 				List<byte[]> values = connection.failsafeReadScanValues(valueScanCursor.getValues(), null);
-				return new ScanIteration<>(Long.valueOf(nextCursorId), values);
+				return new ScanIteration<>(Long.parseUnsignedLong(nextCursorId), values);
 			}
 
 			protected void doClose() {

diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java
@@ -559,7 +559,7 @@ protected ScanIteration<Tuple> doScan(byte[] key, long cursorId, ScanOptions opt
 				List<ScoredValue<byte[]>> result = scoredValueScanCursor.getValues();
 
 				List<Tuple> values = connection.failsafeReadScanValues(result, LettuceConverters.scoredValuesToTupleList());
-				return new ScanIteration<>(Long.valueOf(nextCursorId), values);
+				return new ScanIteration<>(Long.parseUnsignedLong(nextCursorId), values);
 			}
 
 			@Override