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

Revert "Insert messages individually." 

This reverts commit 158bfe4816.
This commit is contained in:
Jon Chambers 2020-10-03 16:05:53 -04:00 committed by Jon Chambers
parent 1f34569ddc
commit 10b3af2947
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
service/src/main/java/org/whispersystems/textsecuregcm/storage/Messages.java
View File

@ -67,14 +67,15 @@ public class Messages {
public void store(final List<Envelope> messages, final String destination, final long destinationDevice) { public void store(final List<Envelope> messages, final String destination, final long destinationDevice) {
database.use(jdbi -> jdbi.useHandle(handle -> { database.use(jdbi -> jdbi.useHandle(handle -> {
try (final Timer.Context ignored = storeTimer.time()) { try (final Timer.Context ignored = storeTimer.time()) {
final PreparedBatch batch = handle.prepareBatch("INSERT INTO messages (" + GUID + ", " + TYPE + ", " + RELAY + ", " + TIMESTAMP + ", " + SERVER_TIMESTAMP + ", " + SOURCE + ", " + SOURCE_UUID + ", " + SOURCE_DEVICE + ", " + DESTINATION + ", " + DESTINATION_DEVICE + ", " + MESSAGE + ", " + CONTENT + ") " +
"VALUES (:guid, :type, :relay, :timestamp, :server_timestamp, :source, :source_uuid, :source_device, :destination, :destination_device, :message, :content)");
for (final Envelope message : messages) { for (final Envelope message : messages) {
if (message.getServerGuid() == null) { if (message.getServerGuid() == null) {
insertNullGuidMeter.mark(); insertNullGuidMeter.mark();
} }
handle.createUpdate("INSERT INTO messages (" + GUID + ", " + TYPE + ", " + RELAY + ", " + TIMESTAMP + ", " + SERVER_TIMESTAMP + ", " + SOURCE + ", " + SOURCE_UUID + ", " + SOURCE_DEVICE + ", " + DESTINATION + ", " + DESTINATION_DEVICE + ", " + MESSAGE + ", " + CONTENT + ") " + batch.bind("guid", UUID.fromString(message.getServerGuid()))
"VALUES (:guid, :type, :relay, :timestamp, :server_timestamp, :source, :source_uuid, :source_device, :destination, :destination_device, :message, :content)")
.bind("guid", UUID.fromString(message.getServerGuid()))
.bind("destination", destination) .bind("destination", destination)
.bind("destination_device", destinationDevice) .bind("destination_device", destinationDevice)
.bind("type", message.getType().getNumber()) .bind("type", message.getType().getNumber())
@ -86,11 +87,12 @@ public class Messages {
.bind("source_device", message.hasSourceDevice() ? message.getSourceDevice() : null) .bind("source_device", message.hasSourceDevice() ? message.getSourceDevice() : null)
.bind("message", message.hasLegacyMessage() ? message.getLegacyMessage().toByteArray() : null) .bind("message", message.hasLegacyMessage() ? message.getLegacyMessage().toByteArray() : null)
.bind("content", message.hasContent() ? message.getContent().toByteArray() : null) .bind("content", message.hasContent() ? message.getContent().toByteArray() : null)
.execute(); .add();
}
} }
batch.execute();
storeSizeHistogram.update(messages.size()); storeSizeHistogram.update(messages.size());
}
})); }));
} }