@remit/drizzle-service 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Drizzle ORM service over SQLite",
   "type": "module",
   "main": "src/index.ts",

package/src/search/thread-message-search.sqlite.test.ts

@@ -161,6 +161,29 @@ describe("the thread-message search index in its own database", () => {
 		assert.deepEqual(await found("receipt"), [created.threadMessageId]);
 	});
 
+	test("rebuilds while a live writer indexes a message the rebuild has yet to reach", async () => {
+		const created = await repo.create(input({ subject: "Raced reminder" }));
+		const store = syncStore(search.db, BETTER_SQLITE3_LIMITS);
+		let raced = false;
+		const migrator = new SearchIndex(mail.db, {
+			...store,
+			batch: async (items) => {
+				if (!raced) {
+					raced = true;
+					await index.sync([created.threadMessageId]);
+				}
+				return store.batch(items);
+			},
+		});
+
+		await migrator.rebuild();
+		await migrator.rebuild();
+
+		assert.equal(raced, true);
+		assert.equal(await index.needsRebuild(), false);
+		assert.deepEqual(await found("reminder"), [created.threadMessageId]);
+	});
+
 	test("matches the body text past the snippet, through a rewrite and a rebuild", async () => {
 		const created = await repo.create(
 			input({ subject: "Long letter", snippet: "Dear reader, a preview" }),

package/src/search/thread-message-search.ts

@@ -267,13 +267,24 @@ export class SearchIndex {
 				.limit(DOCUMENTS_PER_REBUILD_PAGE);
 			const last = rows.at(-1);
 			if (!last) return indexed;
+			// A live writer may index one of these messages after the delete
+			// above, so each page replaces its documents the way sync does.
 			await this.batch(
-				chunkRows(threadMessageSearchTable, rows, this.maxBoundParameters).map(
-					(slice) =>
-						this.search
-							.insert(threadMessageSearchTable)
-							.values(slice.map(toDocument)),
-				),
+				chunkRows(
+					threadMessageSearchTable,
+					rows,
+					this.maxBoundParameters,
+				).flatMap((slice) => [
+					this.search.delete(threadMessageSearchTable).where(
+						inArray(
+							threadMessageSearchTable.rowid,
+							slice.map((row) => searchRowid(row.threadMessageId)),
+						),
+					),
+					this.search
+						.insert(threadMessageSearchTable)
+						.values(slice.map(toDocument)),
+				]),
 			);
 			indexed += rows.length;
 			after = last.threadMessageId;