From 24d132cbec17181d2d15f7656919ff6138c86acb Mon Sep 17 00:00:00 2001 From: bert82503 Date: Sat, 11 May 2024 10:02:56 +0800 Subject: [PATCH] Adjust BatchStrategies.keys() to BatchStrategies.scan(10) in RedisCacheWriter --- .../springframework/data/redis/cache/RedisCacheWriter.java | 4 ++-- .../data/redis/cache/DefaultRedisCacheWriterTests.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/cache/RedisCacheWriter.java b/src/main/java/org/springframework/data/redis/cache/RedisCacheWriter.java index 04dd0e3507..26db6d1c8d 100644 --- a/src/main/java/org/springframework/data/redis/cache/RedisCacheWriter.java +++ b/src/main/java/org/springframework/data/redis/cache/RedisCacheWriter.java @@ -47,7 +47,7 @@ public interface RedisCacheWriter extends CacheStatisticsProvider { * @return new instance of {@link DefaultRedisCacheWriter}. */ static RedisCacheWriter nonLockingRedisCacheWriter(RedisConnectionFactory connectionFactory) { - return nonLockingRedisCacheWriter(connectionFactory, BatchStrategies.keys()); + return nonLockingRedisCacheWriter(connectionFactory, BatchStrategies.scan(10)); } /** @@ -74,7 +74,7 @@ static RedisCacheWriter nonLockingRedisCacheWriter(RedisConnectionFactory connec * @return new instance of {@link DefaultRedisCacheWriter}. */ static RedisCacheWriter lockingRedisCacheWriter(RedisConnectionFactory connectionFactory) { - return lockingRedisCacheWriter(connectionFactory, BatchStrategies.keys()); + return lockingRedisCacheWriter(connectionFactory, BatchStrategies.scan(10)); } /** diff --git a/src/test/java/org/springframework/data/redis/cache/DefaultRedisCacheWriterTests.java b/src/test/java/org/springframework/data/redis/cache/DefaultRedisCacheWriterTests.java index 1f07ea6110..28c8d19d21 100644 --- a/src/test/java/org/springframework/data/redis/cache/DefaultRedisCacheWriterTests.java +++ b/src/test/java/org/springframework/data/redis/cache/DefaultRedisCacheWriterTests.java @@ -18,7 +18,6 @@ import static org.assertj.core.api.Assertions.*; import static org.springframework.data.redis.cache.RedisCacheWriter.*; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.ArrayList; @@ -268,7 +267,7 @@ void cleanShouldRemoveAllKeysByPattern() { RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory) .withStatisticsCollector(CacheStatisticsCollector.create()); - writer.clean(CACHE_NAME, (CACHE_NAME + "::*").getBytes(Charset.forName("UTF-8"))); + writer.clean(CACHE_NAME, (CACHE_NAME + "::*").getBytes(StandardCharsets.UTF_8)); doWithConnection(connection -> { assertThat(connection.exists(binaryCacheKey)).isFalse();