Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply time to idle in RedisCache.retrieve(…).

Browse Source 
We now correctly apply time to idle on retrievals.

Original Pull Request: #2948
This commit is contained in:
Mark Paluch
2024-07-29 09:33:55 +02:00
committed by Christoph Strobl
parent 06bbd3dcab
commit 49542eccee
3 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/springframework/data/redis/cache/RedisCache.java vendored
View File

@@ -423,7 +423,12 @@ public class RedisCache extends AbstractValueAdaptingCache {
}
private CompletableFuture<ValueWrapper> retrieveValue(Object key) {
return getCacheWriter().retrieve(getName(), createAndConvertCacheKey(key)) //
CompletableFuture<byte[]> retrieve = getCacheConfiguration().isTimeToIdleEnabled()
? getCacheWriter().retrieve(getName(), createAndConvertCacheKey(key), getTimeToLive(key))
: getCacheWriter().retrieve(getName(), createAndConvertCacheKey(key));
return retrieve //
.thenApply(binaryValue -> binaryValue != null ? deserializeCacheValue(binaryValue) : null) //
.thenApply(this::toValueWrapper);
}

32
src/main/java/org/springframework/data/redis/cache/RedisCacheWriter.java vendored
View File

@@ -213,10 +213,10 @@ public interface RedisCacheWriter extends CacheStatisticsProvider {
/**
* Write the given key/value pair to Redis and set the expiration time if defined.
*
* @param name The cache name must not be {@literal null}.
* @param key The key for the cache entry. Must not be {@literal null}.
* @param value The value stored for the key. Must not be {@literal null}.
* @param ttl Optional expiration time. Can be {@literal null}.
* @param name cache name must not be {@literal null}.
* @param key key for the cache entry. Must not be {@literal null}.
* @param value value stored for the key. Must not be {@literal null}.
* @param ttl optional expiration time. Can be {@literal null}.
*/
void put(String name, byte[] key, byte[] value, @Nullable Duration ttl);
@@ -225,10 +225,10 @@ public interface RedisCacheWriter extends CacheStatisticsProvider {
* <p>
* This operation is non-blocking.
*
* @param name The cache name must not be {@literal null}.
* @param key The key for the cache entry. Must not be {@literal null}.
* @param value The value stored for the key. Must not be {@literal null}.
* @param ttl Optional expiration time. Can be {@literal null}.
* @param name cache name must not be {@literal null}.
* @param key key for the cache entry. Must not be {@literal null}.
* @param value value stored for the key. Must not be {@literal null}.
* @param ttl optional expiration time. Can be {@literal null}.
* @since 3.2
*/
CompletableFuture<Void> store(String name, byte[] key, byte[] value, @Nullable Duration ttl);
@@ -236,10 +236,10 @@ public interface RedisCacheWriter extends CacheStatisticsProvider {
/**
* Write the given value to Redis if the key does not already exist.
*
* @param name The cache name must not be {@literal null}.
* @param key The key for the cache entry. Must not be {@literal null}.
* @param value The value stored for the key. Must not be {@literal null}.
* @param ttl Optional expiration time. Can be {@literal null}.
* @param name cache name must not be {@literal null}.
* @param key key for the cache entry. Must not be {@literal null}.
* @param value value stored for the key. Must not be {@literal null}.
* @param ttl optional expiration time. Can be {@literal null}.
* @return {@literal null} if the value has been written, the value stored for the key if it already exists.
*/
@Nullable
@@ -248,16 +248,16 @@ public interface RedisCacheWriter extends CacheStatisticsProvider {
/**
* Remove the given key from Redis.
*
* @param name The cache name must not be {@literal null}.
* @param key The key for the cache entry. Must not be {@literal null}.
* @param name cache name must not be {@literal null}.
* @param key key for the cache entry. Must not be {@literal null}.
*/
void remove(String name, byte[] key);
/**
* Remove all keys following the given pattern.
*
* @param name The cache name must not be {@literal null}.
* @param pattern The pattern for the keys to remove. Must not be {@literal null}.
* @param name cache name must not be {@literal null}.
* @param pattern pattern for the keys to remove. Must not be {@literal null}.
*/
void clean(String name, byte[] pattern);