mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Optimize getAdjacentMessagesByConversationSync

Browse source
This commit is contained in:
Fedor Indutny 2023-05-17 10:35:21 -07:00 • committed by GitHub
parent 0032d49e23
commit 6e5d9f5dd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

39
ts/sql/Server.ts
View file

@ -2435,26 +2435,27 @@ function getAdjacentMessagesByConversationSync(
): Array<MessageTypeUnhydrated> { ): Array<MessageTypeUnhydrated> {
const db = getInstance(); const db = getInstance();
const timeFilter = let timeFilters: { first: QueryFragment; second: QueryFragment };
direction === AdjacentDirection.Older let timeOrder: QueryFragment;
? sqlFragment`
(received_at = ${receivedAt} AND sent_at < ${sentAt}) OR
received_at < ${receivedAt}
`
: sqlFragment`
(received_at = ${receivedAt} AND sent_at > ${sentAt}) OR
received_at > ${receivedAt}
`;
const timeOrder = if (direction === AdjacentDirection.Older) {
direction === AdjacentDirection.Older timeFilters = {
? sqlFragment`DESC` first: sqlFragment`received_at = ${receivedAt} AND sent_at < ${sentAt}`,
: sqlFragment`ASC`; second: sqlFragment`received_at < ${receivedAt}`,
};
timeOrder = sqlFragment`DESC`;
} else {
timeFilters = {
first: sqlFragment`received_at = ${receivedAt} AND sent_at > ${sentAt}`,
second: sqlFragment`received_at > ${receivedAt}`,
};
timeOrder = sqlFragment`ASC`;
}
const requireDifferentMessage = const requireDifferentMessage =
direction === AdjacentDirection.Older || requireVisualMediaAttachments; direction === AdjacentDirection.Older || requireVisualMediaAttachments;
let template = sqlFragment` const createQuery = (timeFilter: QueryFragment): QueryFragment => sqlFragment`
SELECT json FROM messages WHERE SELECT json FROM messages WHERE
conversationId = ${conversationId} AND conversationId = ${conversationId} AND
${ ${
@ -2472,7 +2473,13 @@ function getAdjacentMessagesByConversationSync(
( (
${timeFilter} ${timeFilter}
) )
ORDER BY received_at ${timeOrder}, sent_at ${timeOrder} ORDER BY received_at ${timeOrder}, sent_at ${timeOrder}
`;
let template = sqlFragment`
SELECT first.json FROM (${createQuery(timeFilters.first)}) as first
UNION ALL
SELECT second.json FROM (${createQuery(timeFilters.second)}) as second
`; `;
// See `filterValidAttachments` in ts/state/ducks/lightbox.ts // See `filterValidAttachments` in ts/state/ducks/lightbox.ts