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

Use Mono.share() for mrmMessageMono

This commit is contained in:
Chris Eager 2024-09-26 10:39:45 -05:00 committed by Chris Eager
parent 513f19370a
commit ab2e6bb9a3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,7 +444,7 @@ public class MessagesCache extends RedisClusterPubSubAdapter<String, String> imp
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) -> { .<MessageProtos.Envelope>handle((mrmDataAndView, sink) -> {
try { try {
assert mrmDataAndView.size() == 2; assert mrmDataAndView.size() == 2;
@ -461,7 +461,8 @@ public class MessagesCache extends RedisClusterPubSubAdapter<String, String> imp
} catch (Exception e) { } catch (Exception e) {
sink.error(e); sink.error(e);
} }
}); })
.share();
experiment.compareMonoResult(mrmMessage.toBuilder().clearSharedMrmKey().build(), mrmMessageMono); experiment.compareMonoResult(mrmMessage.toBuilder().clearSharedMrmKey().build(), mrmMessageMono);

2
service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java
View File

@ -575,7 +575,7 @@ class MessagesCacheTest {
if (sharedMrmKeyPresent) { if (sharedMrmKeyPresent) {
sharedMrmDataKey = messagesCache.insertSharedMultiRecipientMessagePayload(mrm); sharedMrmDataKey = messagesCache.insertSharedMultiRecipientMessagePayload(mrm);
} else { } else {
sharedMrmDataKey = new byte[]{1}; sharedMrmDataKey = "{1}".getBytes(StandardCharsets.UTF_8);
} }
final UUID guid = UUID.randomUUID(); final UUID guid = UUID.randomUUID();