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

mp911de · christophstrobl · commit d58cca49c78d · 2023-12-13T14:55:53.000+01:00
Redis uses an unsigned 64bit value for its cursor id which is now captured via parseUnsignedLong. Closes: #2796
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
@@ -278,9 +278,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
@@ -1077,8 +1077,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
@@ -237,9 +237,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
@@ -582,8 +582,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
@@ -1015,7 +1015,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

Original file line number	Diff line number	Diff line change
`@@ -278,9 +278,10 @@ protected ScanIteration<Entry<byte[], byte[]>> doScan(long cursorId, ScanOptions`
`278`	`278`
`279`	`279`	`ScanParams params = JedisConverters.toScanParams(options);`
`280`	`280`
`281`		`- ScanResult<Entry<byte[], byte[]>> result = connection.getCluster().hscan(key, JedisConverters.toBytes(cursorId),`
	`281`	`+ ScanResult<Entry<byte[], byte[]>> result = connection.getCluster().hscan(key,`
	`282`	`+ JedisConverters.toBytes(Long.toUnsignedString(cursorId)),`
`282`	`283`	`params);`
`283`		`- return new ScanIteration<>(Long.valueOf(result.getCursor()), result.getResult());`
	`284`	`+ return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()), result.getResult());`
`284`	`285`	`}`
`285`	`286`	`}.open();`
`286`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -397,8 +397,9 @@ public Cursor<byte[]> sScan(byte[] key, ScanOptions options) {`
`397`	`397`	`protected ScanIteration<byte[]> doScan(long cursorId, ScanOptions options) {`
`398`	`398`
`399`	`399`	`ScanParams params = JedisConverters.toScanParams(options);`
`400`		`- ScanResult<byte[]> result = connection.getCluster().sscan(key, JedisConverters.toBytes(cursorId), params);`
`401`		`- return new ScanIteration<>(Long.parseLong(result.getCursor()), result.getResult());`
	`400`	`+ ScanResult<byte[]> result = connection.getCluster().sscan(key,`
	`401`	`+ JedisConverters.toBytes(Long.toUnsignedString(cursorId)), params);`
	`402`	`+ return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()), result.getResult());`
`402`	`403`	`}`
`403`	`404`	`}.open();`
`404`	`405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,12 +165,12 @@ protected ScanIteration<byte[]> doScan(long cursorId, ScanOptions options) {`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`if (type != null) {`
`168`		`- result = connection.getJedis().scan(Long.toString(cursorId).getBytes(), params, type);`
	`168`	`+ result = connection.getJedis().scan(Long.toUnsignedString(cursorId).getBytes(), params, type);`
`169`	`169`	`} else {`
`170`		`- result = connection.getJedis().scan(Long.toString(cursorId).getBytes(), params);`
	`170`	`+ result = connection.getJedis().scan(Long.toUnsignedString(cursorId).getBytes(), params);`
`171`	`171`	`}`
`172`	`172`
`173`		`- return new ScanIteration<>(Long.parseLong(result.getCursor()), result.getResult());`
	`173`	`+ return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()), result.getResult());`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`protected void doClose() {`
Original file line number	Diff line number	Diff line change
`@@ -231,8 +231,9 @@ protected ScanIteration<byte[]> doScan(byte[] key, long cursorId, ScanOptions op`
`231`	`231`
`232`	`232`	`ScanParams params = JedisConverters.toScanParams(options);`
`233`	`233`
`234`		`- ScanResult<byte[]> result = connection.getJedis().sscan(key, JedisConverters.toBytes(cursorId), params);`
`235`		`- return new ScanIteration<>(Long.valueOf(result.getCursor()), result.getResult());`
	`234`	`+ ScanResult<byte[]> result = connection.getJedis().sscan(key,`
	`235`	`+ JedisConverters.toBytes(Long.toUnsignedString(cursorId)), params);`
	`236`	`+ return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()), result.getResult());`
`236`	`237`	`}`
`237`	`238`
`238`	`239`	`protected void doClose() {`
Original file line number	Diff line number	Diff line change
`@@ -582,8 +582,8 @@ protected ScanIteration<Tuple> doScan(byte[] key, long cursorId, ScanOptions opt`
`582`	`582`	`ScanParams params = JedisConverters.toScanParams(options);`
`583`	`583`
`584`	`584`	`ScanResult<redis.clients.jedis.resps.Tuple> result = connection.getJedis().zscan(key,`
`585`		`- JedisConverters.toBytes(cursorId), params);`
`586`		`- return new ScanIteration<>(Long.valueOf(result.getCursor()),`
	`585`	`+ JedisConverters.toBytes(Long.toUnsignedString(cursorId)), params);`
	`586`	`+ return new ScanIteration<>(Long.parseUnsignedLong(result.getCursor()),`
`587`	`587`	`JedisConverters.tuplesToTuples().convert(result.getResult()));`
`588`	`588`	`}`
`589`	`589`
Original file line number	Diff line number	Diff line change
`@@ -1015,7 +1015,7 @@ private void potentiallySelectDatabase(int dbIndex) {`
`1015`	`1015`	`}`
`1016`	`1016`
`1017`	`1017`	`io.lettuce.core.ScanCursor getScanCursor(long cursorId) {`
`1018`		`- return io.lettuce.core.ScanCursor.of(Long.toString(cursorId));`
	`1018`	`+ return io.lettuce.core.ScanCursor.of(Long.toUnsignedString(cursorId));`
`1019`	`1019`	`}`
`1020`	`1020`
`1021`	`1021`	`private void validateCommandIfRunningInTransactionMode(ProtocolKeyword cmd, byte[]... args) {`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ protected ScanIteration<Entry<byte[], byte[]>> doScan(byte[] key, long cursorId,`
`235`	`235`	`String nextCursorId = mapScanCursor.getCursor();`
`236`	`236`
`237`	`237`	`Map<byte[], byte[]> values = mapScanCursor.getMap();`
`238`		`- return new ScanIteration<>(Long.valueOf(nextCursorId), values.entrySet());`
	`238`	`+ return new ScanIteration<>(Long.parseUnsignedLong(nextCursorId), values.entrySet());`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private ScanIteration<T> scanAndProcessState(io.lettuce.core.ScanCursor scanCurs`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`private boolean isMatchingCursor(long cursorId) {`
`80`		`- return state != null && state.getCursor().equals(Long.toString(cursorId));`
	`80`	`+ return state != null && state.getCursor().equals(Long.toUnsignedString(cursorId));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`/**`
`@@ -101,7 +101,7 @@ static class LettuceScanIteration<T> extends ScanIteration<T> {`
`101`	`101`
`102`	`102`	`LettuceScanIteration(io.lettuce.core.ScanCursor cursor, Collection<T> items) {`
`103`	`103`
`104`		`- super(Long.parseLong(cursor.getCursor()), items);`
	`104`	`+ super(Long.parseUnsignedLong(cursor.getCursor()), items);`
`105`	`105`	`this.cursor = cursor;`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ protected ScanIteration<byte[]> doScan(byte[] key, long cursorId, ScanOptions op`
`232`	`232`	`String nextCursorId = valueScanCursor.getCursor();`
`233`	`233`
`234`	`234`	`List<byte[]> values = connection.failsafeReadScanValues(valueScanCursor.getValues(), null);`
`235`		`- return new ScanIteration<>(Long.valueOf(nextCursorId), values);`
	`235`	`+ return new ScanIteration<>(Long.parseUnsignedLong(nextCursorId), values);`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`protected void doClose() {`
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ protected ScanIteration<Tuple> doScan(byte[] key, long cursorId, ScanOptions opt`
`559`	`559`	`List<ScoredValue<byte[]>> result = scoredValueScanCursor.getValues();`
`560`	`560`
`561`	`561`	`List<Tuple> values = connection.failsafeReadScanValues(result, LettuceConverters.scoredValuesToTupleList());`
`562`		`- return new ScanIteration<>(Long.valueOf(nextCursorId), values);`
	`562`	`+ return new ScanIteration<>(Long.parseUnsignedLong(nextCursorId), values);`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`@Override`