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

Fix change counter check in fts optimization

Browse source
This commit is contained in:
Fedor Indutny 2023-02-21 14:06:35 -08:00 • committed by GitHub
parent a4b5968579
commit 287d7e70e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ts/sql/Interface.ts
View file

@ -362,7 +362,6 @@ export type GetAllStoriesResultType = ReadonlyArray<
>; >;
export type FTSOptimizationStateType = Readonly<{ export type FTSOptimizationStateType = Readonly<{
changes: number;
steps: number; steps: number;
done?: boolean; done?: boolean;
}>; }>;

45
ts/sql/Server.ts
View file

@ -5435,9 +5435,7 @@ async function removeKnownDraftAttachments(
return Object.keys(lookup); return Object.keys(lookup);
} }
// Default value of 'automerge'. const OPTIMIZE_FTS_PAGE_COUNT = 64;
// See: https://www.sqlite.org/fts5.html#the_automerge_configuration_option
const OPTIMIZE_FTS_PAGE_COUNT = 4;
// This query is incremental. It gets the `state` from the return value of // This query is incremental. It gets the `state` from the return value of
// previous `optimizeFTS` call. When `state.done` is `true` - optimization is // previous `optimizeFTS` call. When `state.done` is `true` - optimization is
@ -5450,30 +5448,33 @@ async function optimizeFTS(
if (state === undefined) { if (state === undefined) {
pageCount = -pageCount; pageCount = -pageCount;
} }
const db = getInstance(); const db = getInstance();
const { changes } = prepare( const getChanges = prepare(db, 'SELECT total_changes() as changes;', {
db, pluck: true,
` });
INSERT INTO messages_fts(messages_fts, rank) VALUES ('merge', $pageCount);
`
).run({ pageCount });
if (state === undefined) { const changeDifference = db.transaction(() => {
return { const before: number = getChanges.get({});
changes,
steps: 1,
};
}
const { changes: prevChanges, steps } = state; prepare(
db,
`
INSERT INTO messages_fts(messages_fts, rank) VALUES ('merge', $pageCount);
`
).run({ pageCount });
if (Math.abs(changes - prevChanges) < 2) { const after: number = getChanges.get({});
return { changes, steps, done: true };
}
// More work is needed. return after - before;
return { changes, steps: steps + 1 }; })();
const nextSteps = (state?.steps ?? 0) + 1;
// From documentation:
// "If the difference is less than 2, then the 'merge' command was a no-op"
const done = changeDifference < 2;
return { steps: nextSteps, done };
} }
async function getJobsInQueue(queueType: string): Promise<Array<StoredJob>> { async function getJobsInQueue(queueType: string): Promise<Array<StoredJob>> {