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

Polishing.

Browse Source 
Move reading shadow copy to dedicated method, update GH issue references, add test and fix formatting.

Original Pull Request: #2955
This commit is contained in:
Christoph Strobl
2024-08-06 09:44:34 +02:00
parent 3e8081926d
commit 57c294e508
2 changed files with 114 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/org/springframework/data/redis/core/RedisKeyValueAdapter.java
View File

@@ -572,8 +572,7 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
* Convert given source to binary representation using the underlying {@link ConversionService}.
*/
public byte[] toBytes(Object source) {
return source instanceof byte[] bytes ? bytes
: getConverter().getConversionService().convert(source, byte[].class);
return source instanceof byte[] bytes ? bytes : getConverter().getConversionService().convert(source, byte[].class);
}
private String toString(Object value) {
@@ -764,6 +763,7 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
private final RedisOperations<?, ?> ops;
private final RedisConverter converter;
private final ShadowCopy shadowCopy;
/**
* Creates new {@link MappingExpirationListener}.
*/
@@ -784,26 +784,7 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
}
byte[] key = message.getBody();
Object value = null;
if (shadowCopy != ShadowCopy.OFF) {
byte[] phantomKey = ByteUtils.concat(key,
converter.getConversionService().convert(KeyspaceIdentifier.PHANTOM_SUFFIX, byte[].class));
Map<byte[], byte[]> hash = ops.execute((RedisCallback<Map<byte[], byte[]>>) connection -> {
Map<byte[], byte[]> phantomValue = connection.hGetAll(phantomKey);
if (!CollectionUtils.isEmpty(phantomValue)) {
connection.del(phantomKey);
}
return phantomValue;
});
value = CollectionUtils.isEmpty(hash) ? null : converter.read(Object.class, new RedisData(hash));
}
Object value = readShadowCopyIfEnabled(key);
byte[] channelAsBytes = message.getChannel();
String channel = !ObjectUtils.isEmpty(channelAsBytes)
@@ -825,6 +806,35 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
private boolean isKeyExpirationMessage(Message message) {
return BinaryKeyspaceIdentifier.isValid(message.getBody());
}
@Nullable
private Object readShadowCopyIfEnabled(byte[] key) {
if (shadowCopy == ShadowCopy.OFF) {
return null;
}
return readShadowCopy(key);
}
@Nullable
private Object readShadowCopy(byte[] key) {
byte[] phantomKey = ByteUtils.concat(key,
converter.getConversionService().convert(KeyspaceIdentifier.PHANTOM_SUFFIX, byte[].class));
Map<byte[], byte[]> hash = ops.execute((RedisCallback<Map<byte[], byte[]>>) connection -> {
Map<byte[], byte[]> phantomValue = connection.hGetAll(phantomKey);
if (!CollectionUtils.isEmpty(phantomValue)) {
connection.del(phantomKey);
}
return phantomValue;
});
return CollectionUtils.isEmpty(hash) ? null : converter.read(Object.class, new RedisData(hash));
}
}
private boolean keepShadowCopy() {