webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reformat sql statements in MessageSendLogStore

Browse source
This commit is contained in:
AsamK 2022-06-07 15:26:42 +02:00
parent 5afe9c5337
commit 1757e939e1
1 changed files with 42 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

67
lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
View file

@ -93,13 +93,16 @@ public class MessageSendLogStore implements AutoCloseable {
public List<MessageSendLogEntry> findMessages( public List<MessageSendLogEntry> findMessages(
final RecipientId recipientId, final int deviceId, final long timestamp, final boolean isSenderKey final RecipientId recipientId, final int deviceId, final long timestamp, final boolean isSenderKey
) { ) {
final var sql = """
SELECT group_id, content, content_hint
FROM %s l
INNER JOIN %s lc ON l.content_id = lc._id
WHERE l.recipient_id = ? AND l.device_id = ? AND lc.timestamp = ?
""".formatted(TABLE_MESSAGE_SEND_LOG, TABLE_MESSAGE_SEND_LOG_CONTENT);
try (final var connection = database.getConnection()) { try (final var connection = database.getConnection()) {
deleteOutdatedEntries(connection); deleteOutdatedEntries(connection);
try (final var statement = connection.prepareStatement( try (final var statement = connection.prepareStatement(sql)) {
"SELECT group_id, content, content_hint FROM %s l INNER JOIN %s lc ON l.content_id = lc._id WHERE l.recipient_id = ? AND l.device_id = ? AND lc.timestamp = ?".formatted(
TABLE_MESSAGE_SEND_LOG,
TABLE_MESSAGE_SEND_LOG_CONTENT))) {
statement.setLong(1, recipientId.id()); statement.setLong(1, recipientId.id());
statement.setInt(2, deviceId); statement.setInt(2, deviceId);
statement.setLong(3, timestamp); statement.setLong(3, timestamp);
@ -185,10 +188,12 @@ public class MessageSendLogStore implements AutoCloseable {
} }
public void deleteEntryForGroup(long sentTimestamp, GroupId groupId) { public void deleteEntryForGroup(long sentTimestamp, GroupId groupId) {
final var sql = """
DELETE FROM %s AS lc
WHERE lc.timestamp = ? AND lc.group_id = ?
""".formatted(TABLE_MESSAGE_SEND_LOG_CONTENT);
try (final var connection = database.getConnection()) { try (final var connection = database.getConnection()) {
try (final var statement = connection.prepareStatement( try (final var statement = connection.prepareStatement(sql)) {
"DELETE FROM %s AS lc WHERE lc.timestamp = ? AND lc.group_id = ?".formatted(
TABLE_MESSAGE_SEND_LOG_CONTENT))) {
statement.setLong(1, sentTimestamp); statement.setLong(1, sentTimestamp);
statement.setBytes(2, groupId.serialize()); statement.setBytes(2, groupId.serialize());
statement.executeUpdate(); statement.executeUpdate();
@ -199,12 +204,13 @@ public class MessageSendLogStore implements AutoCloseable {
} }
public void deleteEntryForRecipientNonGroup(long sentTimestamp, RecipientId recipientId) { public void deleteEntryForRecipientNonGroup(long sentTimestamp, RecipientId recipientId) {
final var sql = """
DELETE FROM %s AS lc
WHERE lc.timestamp = ? AND lc.group_id IS NULL AND lc._id IN (SELECT content_id FROM %s l WHERE l.recipient_id = ?)
""".formatted(TABLE_MESSAGE_SEND_LOG_CONTENT, TABLE_MESSAGE_SEND_LOG);
try (final var connection = database.getConnection()) { try (final var connection = database.getConnection()) {
connection.setAutoCommit(false); connection.setAutoCommit(false);
try (final var statement = connection.prepareStatement( try (final var statement = connection.prepareStatement(sql)) {
"DELETE FROM %s AS lc WHERE lc.timestamp = ? AND lc.group_id IS NULL AND lc._id IN (SELECT content_id FROM %s l WHERE l.recipient_id = ?)".formatted(
TABLE_MESSAGE_SEND_LOG_CONTENT,
TABLE_MESSAGE_SEND_LOG))) {
statement.setLong(1, sentTimestamp); statement.setLong(1, sentTimestamp);
statement.setLong(2, recipientId.id()); statement.setLong(2, recipientId.id());
statement.executeUpdate(); statement.executeUpdate();
@ -222,12 +228,13 @@ public class MessageSendLogStore implements AutoCloseable {
} }
public void deleteEntriesForRecipient(List<Long> sentTimestamps, RecipientId recipientId, int deviceId) { public void deleteEntriesForRecipient(List<Long> sentTimestamps, RecipientId recipientId, int deviceId) {
final var sql = """
DELETE FROM %s AS l
WHERE l.content_id IN (SELECT _id FROM %s lc WHERE lc.timestamp = ?) AND l.recipient_id = ? AND l.device_id = ?
""".formatted(TABLE_MESSAGE_SEND_LOG, TABLE_MESSAGE_SEND_LOG_CONTENT);
try (final var connection = database.getConnection()) { try (final var connection = database.getConnection()) {
connection.setAutoCommit(false); connection.setAutoCommit(false);
try (final var statement = connection.prepareStatement( try (final var statement = connection.prepareStatement(sql)) {
"DELETE FROM %s AS l WHERE l.content_id IN (SELECT _id FROM %s lc WHERE lc.timestamp = ?) AND l.recipient_id = ? AND l.device_id = ?".formatted(
TABLE_MESSAGE_SEND_LOG,
TABLE_MESSAGE_SEND_LOG_CONTENT))) {
for (final var sentTimestamp : sentTimestamps) { for (final var sentTimestamp : sentTimestamps) {
statement.setLong(1, sentTimestamp); statement.setLong(1, sentTimestamp);
statement.setLong(2, recipientId.id()); statement.setLong(2, recipientId.id());
@ -269,12 +276,14 @@ public class MessageSendLogStore implements AutoCloseable {
) { ) {
byte[] groupId = getGroupId(content); byte[] groupId = getGroupId(content);
final var sql = """
INSERT INTO %s (timestamp, group_id, content, content_hint)
VALUES (?,?,?,?)
""".formatted(TABLE_MESSAGE_SEND_LOG_CONTENT);
try (final var connection = database.getConnection()) { try (final var connection = database.getConnection()) {
connection.setAutoCommit(false); connection.setAutoCommit(false);
final long contentId; final long contentId;
try (final var statement = connection.prepareStatement( try (final var statement = connection.prepareStatement(sql)) {
"INSERT INTO %s (timestamp, group_id, content, content_hint) VALUES (?,?,?,?)".formatted(
TABLE_MESSAGE_SEND_LOG_CONTENT))) {
statement.setLong(1, sentTimestamp); statement.setLong(1, sentTimestamp);
statement.setBytes(2, groupId); statement.setBytes(2, groupId);
statement.setBytes(3, content.toByteArray()); statement.setBytes(3, content.toByteArray());
@ -334,8 +343,11 @@ public class MessageSendLogStore implements AutoCloseable {
private void insertRecipientsForExistingContent( private void insertRecipientsForExistingContent(
final long contentId, final List<RecipientDevices> recipientDevices, final Connection connection final long contentId, final List<RecipientDevices> recipientDevices, final Connection connection
) throws SQLException { ) throws SQLException {
try (final var statement = connection.prepareStatement( final var sql = """
"INSERT INTO %s (recipient_id, device_id, content_id) VALUES (?,?,?)".formatted(TABLE_MESSAGE_SEND_LOG))) { INSERT INTO %s (recipient_id, device_id, content_id)
VALUES (?,?,?)
""".formatted(TABLE_MESSAGE_SEND_LOG);
try (final var statement = connection.prepareStatement(sql)) {
for (final var recipientDevice : recipientDevices) { for (final var recipientDevice : recipientDevices) {
for (final var deviceId : recipientDevice.deviceIds()) { for (final var deviceId : recipientDevice.deviceIds()) {
statement.setLong(1, recipientDevice.recipientId().id()); statement.setLong(1, recipientDevice.recipientId().id());
@ -348,8 +360,11 @@ public class MessageSendLogStore implements AutoCloseable {
} }
private void deleteOutdatedEntries(final Connection connection) throws SQLException { private void deleteOutdatedEntries(final Connection connection) throws SQLException {
try (final var statement = connection.prepareStatement("DELETE FROM %s WHERE timestamp < ?".formatted( final var sql = """
TABLE_MESSAGE_SEND_LOG_CONTENT))) { DELETE FROM %s
WHERE timestamp < ?
""".formatted(TABLE_MESSAGE_SEND_LOG_CONTENT);
try (final var statement = connection.prepareStatement(sql)) {
statement.setLong(1, System.currentTimeMillis() - LOG_DURATION.toMillis()); statement.setLong(1, System.currentTimeMillis() - LOG_DURATION.toMillis());
final var rowCount = statement.executeUpdate(); final var rowCount = statement.executeUpdate();
if (rowCount > 0) { if (rowCount > 0) {
@ -361,9 +376,11 @@ public class MessageSendLogStore implements AutoCloseable {
} }
private void deleteOrphanedLogContents(final Connection connection) throws SQLException { private void deleteOrphanedLogContents(final Connection connection) throws SQLException {
try (final var statement = connection.prepareStatement( final var sql = """
"DELETE FROM %s WHERE _id NOT IN (SELECT content_id FROM %s)".formatted(TABLE_MESSAGE_SEND_LOG_CONTENT, DELETE FROM %s
TABLE_MESSAGE_SEND_LOG))) { WHERE _id NOT IN (SELECT content_id FROM %s)
""".formatted(TABLE_MESSAGE_SEND_LOG_CONTENT, TABLE_MESSAGE_SEND_LOG);
try (final var statement = connection.prepareStatement(sql)) {
statement.executeUpdate(); statement.executeUpdate();
} }
} }