Short-circuit storyId predicate to optimize query

This commit is contained in:
Fedor Indutny 2022-03-21 14:21:35 -07:00 committed by GitHub
parent bddd55d574
commit 35b5087dc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 130 additions and 10 deletions

View file

@ -2056,6 +2056,16 @@ async function getMessageBySender({
return jsonToObject(rows[0].json);
}
export function _storyIdPredicate(storyId: string | undefined): string {
if (storyId === undefined) {
// We could use 'TRUE' here, but it is better to require `$storyId`
// parameter
return '$storyId IS NULL';
}
return 'storyId IS $storyId';
}
async function getUnreadByConversationAndMarkRead({
conversationId,
newestUnreadAt,
@ -2086,7 +2096,7 @@ async function getUnreadByConversationAndMarkRead({
) AND
expireTimer > 0 AND
conversationId = $conversationId AND
($storyId IS NULL OR storyId IS $storyId) AND
(${_storyIdPredicate(storyId)}) AND
received_at <= $newestUnreadAt;
`
).run({
@ -2105,7 +2115,7 @@ async function getUnreadByConversationAndMarkRead({
WHERE
readStatus = ${ReadStatus.Unread} AND
conversationId = $conversationId AND
($storyId IS NULL OR storyId IS $storyId) AND
(${_storyIdPredicate(storyId)}) AND
received_at <= $newestUnreadAt
ORDER BY received_at DESC, sent_at DESC;
`
@ -2125,7 +2135,7 @@ async function getUnreadByConversationAndMarkRead({
WHERE
readStatus = ${ReadStatus.Unread} AND
conversationId = $conversationId AND
($storyId IS NULL OR storyId IS $storyId) AND
(${_storyIdPredicate(storyId)}) AND
received_at <= $newestUnreadAt;
`
).run({
@ -2360,7 +2370,7 @@ function getOlderMessagesByConversationSync(
conversationId = $conversationId AND
($messageId IS NULL OR id IS NOT $messageId) AND
isStory IS 0 AND
($storyId IS NULL OR storyId IS $storyId) AND
(${_storyIdPredicate(storyId)}) AND
(
(received_at = $received_at AND sent_at < $sent_at) OR
received_at < $received_at
@ -2453,7 +2463,7 @@ function getNewerMessagesByConversationSync(
SELECT json FROM messages WHERE
conversationId = $conversationId AND
isStory IS 0 AND
($storyId IS NULL OR storyId IS $storyId) AND
(${_storyIdPredicate(storyId)}) AND
(
(received_at = $received_at AND sent_at > $sent_at) OR
received_at > $received_at
@ -2483,7 +2493,7 @@ function getOldestMessageForConversation(
SELECT * FROM messages WHERE
conversationId = $conversationId AND
isStory IS 0 AND
($storyId IS NULL OR storyId IS $storyId)
(${_storyIdPredicate(storyId)})
ORDER BY received_at ASC, sent_at ASC
LIMIT 1;
`
@ -2510,7 +2520,7 @@ function getNewestMessageForConversation(
SELECT * FROM messages WHERE
conversationId = $conversationId AND
isStory IS 0 AND
($storyId IS NULL OR storyId IS $storyId)
(${_storyIdPredicate(storyId)})
ORDER BY received_at DESC, sent_at DESC
LIMIT 1;
`
@ -2651,7 +2661,7 @@ function getOldestUnreadMessageForConversation(
conversationId = $conversationId AND
readStatus = ${ReadStatus.Unread} AND
isStory IS 0 AND
($storyId IS NULL OR storyId IS $storyId)
(${_storyIdPredicate(storyId)})
ORDER BY received_at ASC, sent_at ASC
LIMIT 1;
`
@ -2688,7 +2698,7 @@ function getTotalUnreadForConversationSync(
conversationId = $conversationId AND
readStatus = ${ReadStatus.Unread} AND
isStory IS 0 AND
($storyId IS NULL OR storyId IS $storyId);
(${_storyIdPredicate(storyId)})
`
)
.get({

View file

@ -0,0 +1,38 @@
// Copyright 2022 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import type { Database } from 'better-sqlite3';
import type { LoggerType } from '../../types/Logging';
export default function updateToSchemaVersion52(
currentVersion: number,
db: Database,
logger: LoggerType
): void {
if (currentVersion >= 52) {
return;
}
db.transaction(() => {
db.exec(
`
-- Create indices that don't have storyId in them so that
-- '_storyIdPredicate' could be optimized.
-- See migration 47
CREATE INDEX messages_conversation_no_story_id ON messages
(conversationId, isStory, received_at, sent_at);
-- See migration 50
CREATE INDEX messages_unread_no_story_id ON messages
(conversationId, readStatus, isStory, received_at, sent_at)
WHERE readStatus IS NOT NULL;
`
);
db.pragma('user_version = 52');
})();
logger.info('updateToSchemaVersion52: success!');
}

View file

@ -27,6 +27,7 @@ import updateToSchemaVersion48 from './48-fix-user-initiated-index';
import updateToSchemaVersion49 from './49-fix-preview-index';
import updateToSchemaVersion50 from './50-fix-messages-unread-index';
import updateToSchemaVersion51 from './51-centralize-conversation-jobs';
import updateToSchemaVersion52 from './52-optimize-stories';
function updateToSchemaVersion1(
currentVersion: number,
@ -1917,6 +1918,7 @@ export const SCHEMA_VERSIONS = [
updateToSchemaVersion49,
updateToSchemaVersion50,
updateToSchemaVersion51,
updateToSchemaVersion52,
];
export function updateSchema(db: Database, logger: LoggerType): void {