MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move MRM content parsing outside of “withBinaryClusterReactive”

This commit is contained in:
Chris Eager 2024-09-24 11:27:19 -05:00 committed by Chris Eager
parent 0e552bd602
commit e25291c74c
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
View File

@ -441,27 +441,27 @@ public class MessagesCache extends RedisClusterPubSubAdapter<String, String> imp
ServiceIdentifier.valueOf(mrmMessage.getDestinationServiceId()), destinationDevice); ServiceIdentifier.valueOf(mrmMessage.getDestinationServiceId()), destinationDevice);
final Mono<MessageProtos.Envelope> mrmMessageMono = Mono.from(redisCluster.withBinaryClusterReactive( final Mono<MessageProtos.Envelope> mrmMessageMono = Mono.from(redisCluster.withBinaryClusterReactive(
conn -> conn.reactive().hmget(key, "data".getBytes(StandardCharsets.UTF_8), sharedMrmViewKey) conn -> conn.reactive().hmget(key, "data".getBytes(StandardCharsets.UTF_8), sharedMrmViewKey)
.collectList() .collectList()
.publishOn(messageDeliveryScheduler) .publishOn(messageDeliveryScheduler)))
.handle((mrmDataAndView, sink) -> { .handle((mrmDataAndView, sink) -> {
try { try {
assert mrmDataAndView.size() == 2; assert mrmDataAndView.size() == 2;
final byte[] content = SealedSenderMultiRecipientMessage.messageForRecipient( final byte[] content = SealedSenderMultiRecipientMessage.messageForRecipient(
mrmDataAndView.getFirst().getValue(), mrmDataAndView.getFirst().getValue(),
mrmDataAndView.getLast().getValue()); mrmDataAndView.getLast().getValue());
sink.next(mrmMessage.toBuilder() sink.next(mrmMessage.toBuilder()
.clearSharedMrmKey() .clearSharedMrmKey()
.setContent(ByteString.copyFrom(content)) .setContent(ByteString.copyFrom(content))
.build()); .build());
mrmContentRetrievedCounter.increment(); mrmContentRetrievedCounter.increment();
} catch (Exception e) { } catch (Exception e) {
sink.error(e); sink.error(e);
} }
}))); });
experiment.compareFutureResult(mrmMessage.toBuilder().clearSharedMrmKey().build(), experiment.compareFutureResult(mrmMessage.toBuilder().clearSharedMrmKey().build(),
mrmMessageMono.toFuture()); mrmMessageMono.toFuture());