@rocicorp/zero 1.11.0-canary.4 → 1.11.0-canary.40

package/out/zero-cache/src/services/view-syncer/cvr.d.ts

@@ -59,6 +59,10 @@ export declare class CVRUpdater {
      * @param cvr The current CVR
      */
     constructor(cvrStore: CVRStore, cvr: CVRSnapshot, replicaVersion: string | null);
+    protected _mutableClients(): Record<string, ClientRecord>;
+    protected _mutableClient(id: string): ClientRecord;
+    protected _mutableQueries(): Record<string, QueryRecord>;
+    protected _mutableQuery(id: string): QueryRecord;
     protected _setVersion(version: CVRVersion): {
         stateVersion: string;
         configVersion?: number | undefined;
@@ -69,7 +73,11 @@ export declare class CVRUpdater {
      * (possibly bumped) version.
      */
     protected _ensureNewVersion(): CVRVersion;
-    flush(lc: LogContext, lastConnectTime: number, lastActive: number, ttlClock: TTLClock): Promise<{
+    /**
+     * @param verifyNoop Check that the original CVR is still current even if
+     *     there is nothing to write. See {@link CVRStore.flush}.
+     */
+    flush(lc: LogContext, lastConnectTime: number, lastActive: number, ttlClock: TTLClock, verifyNoop?: boolean): Promise<{
         cvr: CVRSnapshot;
         flushed: CVRFlushStats | false;
     }>;
@@ -101,12 +109,25 @@ type Hash = string;
 export type Column = string;
 export type RefCounts = Record<Hash, number>;
 /**
- * Callback used by {@link CVRQueryDrivenUpdater.flush} to retrieve the
- * current row-set signature maintained by the pipeline driver for a given
- * query. Returning `undefined` means "no pipeline for this query right now" —
- * the stored signature on disk is left alone.
+ * The row-set signatures maintained by the pipeline driver, used by
+ * {@link CVRQueryDrivenUpdater.flush} to persist the ones that changed.
+ * Implemented by `PipelineDriver`.
  */
-export type RowSetSignatureProvider = (queryID: string) => bigint | undefined;
+export interface RowSetSignatureProvider {
+    /**
+     * IDs of the queries whose signature changed since the last
+     * {@link clearChangedRowSetSignatures}. Queries not in this set are not
+     * looked at, so that a flush does not have to visit every query.
+     */
+    changedRowSetSignatures(): Iterable<string>;
+    /**
+     * The current signature for the query. `undefined` means "no pipeline for
+     * this query right now" — the stored signature on disk is left alone.
+     */
+    rowSetSignature(queryID: string): bigint | undefined;
+    /** Called after the changed signatures have been flushed. */
+    clearChangedRowSetSignatures(): void;
+}
 /**
  * A {@link CVRQueryDrivenUpdater} is used for updating a CVR after making queries.
  * The caller should invoke:
@@ -126,10 +147,9 @@ export declare class CVRQueryDrivenUpdater extends CVRUpdater {
     #private;
     /**
      * @param stateVersion The `stateVersion` at which the queries were executed.
-     * @param rowSetSignature Optional callback that returns the current row-set
-     *        signature for a query, typically backed by
-     *        `PipelineDriver.rowSetSignature`. When provided, {@link flush}
-     *        persists any signature deltas it observes.
+     * @param rowSetSignature Optional source of the current row-set
+     *        signatures, typically the `PipelineDriver`. When provided,
+     *        {@link flush} persists the signatures that changed.
      */
     constructor(cvrStore: CVRStore, cvr: CVRSnapshot, stateVersion: LexiVersion, replicaVersion: string, rowSetSignature?: RowSetSignatureProvider);
     /**
@@ -167,6 +187,49 @@ export declare class CVRQueryDrivenUpdater extends CVRUpdater {
      * cannot be restored.
      */
     removeTrackedQueries(queryIDs: Iterable<string>): PatchToVersion[];
+    /**
+     * Aborts queries that were tracked as executed but whose hydration was cut
+     * short (see the view-syncer's hydration circuit breaker).
+     *
+     * Rows received for an aborted query in this update have that query's
+     * references stripped: a row left with no references is deleted, and the
+     * 'del' patch cancels the 'put' the client has already received, while a
+     * row still referenced by other queries keeps its patch version. The query
+     * is then removed from the CVR. It stays tracked as executed, so
+     * {@link deleteUnreferencedRows} also drops the references held by rows that
+     * were synced for it before this update, exactly as for a removed query.
+     *
+     * Like {@link removeTrackedQueries}, this must be called after
+     * {@link trackQueries} has established the final version, and after all
+     * rows of the aborted queries have been {@link received}.
+     */
+    abortExecutedQueries(lc: LogContext, queryIDs: readonly string[]): Promise<PatchToVersion[]>;
+    /**
+     * Retracts what queries have contributed to this update, so that they can
+     * be executed again from scratch in the same update. This is for a query
+     * whose changes were being received incrementally (see
+     * `PipelineDriver.advance()`) until its pipeline was abandoned in favor of
+     * hydrating it again.
+     *
+     * Rows received so far in this update have the queries' references
+     * stripped, as in {@link abortExecutedQueries}, except that a row left
+     * with no references is only deleted by {@link deleteUnreferencedRows}, if
+     * it is still unreferenced by then. Until then the clients keep the row
+     * and the patches they received for it in this update, so a row that is
+     * received again unchanged needs no patch at all. The queries are then
+     * tracked as executed, without changing them in the CVR: the references
+     * they held before this update are replaced, rather than adjusted, by the
+     * rows subsequently {@link received} for them, and
+     * {@link deleteUnreferencedRows} drops the references of rows that are not
+     * received again.
+     *
+     * Unlike {@link trackQueries}, this can be called on an updater that has
+     * not tracked any queries, and after rows have been received. All rows
+     * that the queries' pipelines have output must have been {@link received}
+     * first, and {@link deleteUnreferencedRows} must be called once the
+     * queries' rows have been received again.
+     */
+    retractQueries(lc: LogContext, queryIDs: readonly string[]): Promise<PatchToVersion[]>;
     updatedVersion(): CVRVersion;
     /**
      * Public alias for {@link _ensureNewVersion}. Forces a `configVersion` bump
@@ -174,7 +237,7 @@ export declare class CVRQueryDrivenUpdater extends CVRUpdater {
      * tracking (e.g. rowSetSignature drift re-execution).
      */
     ensureNewVersion(): CVRVersion;
-    flush(lc: LogContext, lastConnectTime: number, lastActive: number, ttlClock: TTLClock): Promise<{
+    flush(lc: LogContext, lastConnectTime: number, lastActive: number, ttlClock: TTLClock, verifyNoop?: boolean): Promise<{
         cvr: CVRSnapshot;
         flushed: CVRFlushStats | false;
     }>;
@@ -184,7 +247,7 @@ export declare class CVRQueryDrivenUpdater extends CVRUpdater {
      * returns (put) patches to be returned to update their state, versioned by
      * patchVersion so that only the patches new to the clients are sent.
      */
-    received(_lc: LogContext, rows: Map<RowID, RowUpdate>): Promise<PatchToVersion[]>;
+    received(lc: LogContext, rows: Map<RowID, RowUpdate>): Promise<PatchToVersion[]>;
     /**
      * Computes and updates the row records based on:
      * * The {@link #executed} queries

package/out/zero-cache/src/services/view-syncer/cvr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cvr.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/cvr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cvr.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/cvr.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/services/view-syncer/cvr.js

@@ -11,7 +11,6 @@ import "../../../../shared/src/bigint-json.js";
 import { upstreamSchema } from "../../types/shards.js";
 import { startAsyncSpan, startSpan } from "../../../../otel/src/span.js";
 import { rowIDString } from "../../types/row-key.js";
-import { formatSignature, parseSignature } from "./row-set-signature.js";
 import { CustomKeyMap } from "../../../../shared/src/custom-key-map.js";
 import { recordQuery } from "../../server/anonymous-otel-start.js";
 import { ttlClockAsNumber } from "./ttl-clock.js";
@@ -74,8 +73,44 @@ var CVRUpdater = class {
 	constructor(cvrStore, cvr, replicaVersion) {
 		this._cvrStore = cvrStore;
 		this._orig = cvr;
-		this._cvr = structuredClone(cvr);
-		this._cvr.replicaVersion = replicaVersion;
+		this._cvr = {
+			...cvr,
+			replicaVersion
+		};
+	}
+	_mutableClients() {
+		if (this._cvr.clients === this._orig.clients) this._cvr.clients = { ...this._orig.clients };
+		return this._cvr.clients;
+	}
+	_mutableClient(id) {
+		const clients = this._mutableClients();
+		let client = clients[id];
+		assert(client !== void 0, () => `Client ${id} not found in CVR`);
+		if (client === this._orig.clients[id]) {
+			client = {
+				...client,
+				desiredQueryIDs: [...client.desiredQueryIDs]
+			};
+			clients[id] = client;
+		}
+		return client;
+	}
+	_mutableQueries() {
+		if (this._cvr.queries === this._orig.queries) this._cvr.queries = { ...this._orig.queries };
+		return this._cvr.queries;
+	}
+	_mutableQuery(id) {
+		const queries = this._mutableQueries();
+		let query = queries[id];
+		assert(query !== void 0, () => `Query ${id} not found in CVR`);
+		if (query === this._orig.queries[id]) {
+			query = {
+				...query,
+				...query.type !== "internal" ? { clientState: { ...query.clientState } } : {}
+			};
+			queries[id] = query;
+		}
+		return query;
 	}
 	_setVersion(version) {
 		assert(cmpVersions(this._cvr.version, version) < 0, "Expected new version to be greater than current version");
@@ -91,10 +126,14 @@ var CVRUpdater = class {
 		if (cmpVersions(this._orig.version, this._cvr.version) === 0) this._setVersion(oneAfter(this._cvr.version));
 		return this._cvr.version;
 	}
-	async flush(lc, lastConnectTime, lastActive, ttlClock) {
+	/**
+	* @param verifyNoop Check that the original CVR is still current even if
+	*     there is nothing to write. See {@link CVRStore.flush}.
+	*/
+	async flush(lc, lastConnectTime, lastActive, ttlClock, verifyNoop = false) {
 		this._cvr.ttlClock = ttlClock;
 		this._cvr.lastActive = lastActive;
-		const flushed = await this._cvrStore.flush(lc, this._orig.version, this._cvr, lastConnectTime);
+		const flushed = await this._cvrStore.flush(lc, this._orig.version, this._cvr, lastConnectTime, verifyNoop);
 		if (!flushed) return {
 			cvr: this._orig,
 			flushed: false
@@ -124,7 +163,7 @@ var CVRConfigDrivenUpdater = class extends CVRUpdater {
 				id,
 				desiredQueryIDs: []
 			};
-			this._cvr.clients[id] = client;
+			this._mutableClients()[id] = client;
 			this._ensureNewVersion();
 			this._cvrStore.insertClient(client);
 			if (!this._cvr.queries[CLIENT_LMID_QUERY_ID]) {
@@ -149,12 +188,12 @@ var CVRConfigDrivenUpdater = class extends CVRUpdater {
 					},
 					type: "internal"
 				};
-				this._cvr.queries[CLIENT_LMID_QUERY_ID] = lmidsQuery;
+				this._mutableQueries()[CLIENT_LMID_QUERY_ID] = lmidsQuery;
 				this._cvrStore.putQuery(lmidsQuery);
 			}
 			if (!this._cvr.queries[CLIENT_MUTATION_RESULTS_QUERY_ID]) {
 				const mutationResultsQuery = getMutationResultsQuery(upstreamSchema(this.#shard), this._cvr.id);
-				this._cvr.queries[CLIENT_MUTATION_RESULTS_QUERY_ID] = mutationResultsQuery;
+				this._mutableQueries()[CLIENT_MUTATION_RESULTS_QUERY_ID] = mutationResultsQuery;
 				this._cvrStore.putQuery(mutationResultsQuery);
 			}
 			return client;
@@ -212,12 +251,13 @@ var CVRConfigDrivenUpdater = class extends CVRUpdater {
 			}
 			if (needed.size === 0) return patches;
 			const newVersion = this._ensureNewVersion();
-			client.desiredQueryIDs = toSorted(union(current, needed), stringCompare);
+			const mutableClient = this._mutableClient(clientID);
+			mutableClient.desiredQueryIDs = toSorted(union(current, needed), stringCompare);
 			for (const id of needed) {
 				const q = must(queries.find(({ hash }) => hash === id));
 				const { ast, name, args } = q;
 				const ttl = clampTTL(q.ttl ?? 3e5);
-				const query = this._cvr.queries[id] ?? newQueryRecord(id, ast, name, args);
+				const query = this._cvr.queries[id] ? this._mutableQuery(id) : newQueryRecord(id, ast, name, args);
 				assertNotInternal(query);
 				const inactivatedAt = void 0;
 				query.clientState[clientID] = {
@@ -225,7 +265,7 @@ var CVRConfigDrivenUpdater = class extends CVRUpdater {
 					ttl,
 					version: newVersion
 				};
-				this._cvr.queries[id] = query;
+				this._mutableQueries()[id] = query;
 				patches.push({
 					toVersion: newVersion,
 					patch: {
@@ -236,7 +276,7 @@ var CVRConfigDrivenUpdater = class extends CVRUpdater {
 					}
 				});
 				this._cvrStore.putQuery(query);
-				this._cvrStore.putDesiredQuery(newVersion, query, client, false, inactivatedAt, ttl);
+				this._cvrStore.putDesiredQuery(newVersion, query, mutableClient, false, inactivatedAt, ttl);
 			}
 			return patches;
 		});
@@ -255,10 +295,11 @@ var CVRConfigDrivenUpdater = class extends CVRUpdater {
 			const remove = intersection(new Set(queryHashes), current);
 			if (remove.size === 0) return patches;
 			const newVersion = this._ensureNewVersion();
-			client.desiredQueryIDs = toSorted(difference(current, remove), stringCompare);
+			const mutableClient = this._mutableClient(clientID);
+			mutableClient.desiredQueryIDs = toSorted(difference(current, remove), stringCompare);
 			for (const id of remove) {
-				const query = this._cvr.queries[id];
-				if (!query) continue;
+				if (!this._cvr.queries[id]) continue;
+				const query = this._mutableQuery(id);
 				assertNotInternal(query);
 				let ttl = DEFAULT_TTL_MS;
 				if (inactivatedAt === void 0) delete query.clientState[clientID];
@@ -275,7 +316,7 @@ var CVRConfigDrivenUpdater = class extends CVRUpdater {
 					}
 				}
 				this._cvrStore.putQuery(query);
-				this._cvrStore.putDesiredQuery(newVersion, query, client, true, inactivatedAt, ttl);
+				this._cvrStore.putDesiredQuery(newVersion, query, mutableClient, true, inactivatedAt, ttl);
 				patches.push({
 					toVersion: newVersion,
 					patch: {
@@ -298,7 +339,7 @@ var CVRConfigDrivenUpdater = class extends CVRUpdater {
 			const client = this._cvr.clients[clientID];
 			if (!client) return [];
 			const patches = this.markDesiredQueriesAsInactive(clientID, client.desiredQueryIDs, ttlClock);
-			delete this._cvr.clients[clientID];
+			delete this._mutableClients()[clientID];
 			this._cvrStore.deleteClient(clientID);
 			return patches;
 		});
@@ -324,14 +365,20 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 	#executedQueryIDs = /* @__PURE__ */ new Set();
 	#receivedRows = new CustomKeyMap(rowIDString);
 	#lastPatches = new CustomKeyMap(rowIDString);
+	/**
+	* Rows that {@link retractQueries} left without references, and the patch
+	* version of their deletion. The 'del' patches are held back until
+	* {@link deleteUnreferencedRows}, because the retracted queries are
+	* executed again and usually reference most of these rows again.
+	*/
+	#retractedRows = new CustomKeyMap(rowIDString);
 	#rowSetSignature;
 	#existingRows = void 0;
 	/**
 	* @param stateVersion The `stateVersion` at which the queries were executed.
-	* @param rowSetSignature Optional callback that returns the current row-set
-	*        signature for a query, typically backed by
-	*        `PipelineDriver.rowSetSignature`. When provided, {@link flush}
-	*        persists any signature deltas it observes.
+	* @param rowSetSignature Optional source of the current row-set
+	*        signatures, typically the `PipelineDriver`. When provided,
+	*        {@link flush} persists the signatures that changed.
 	*/
 	constructor(cvrStore, cvr, stateVersion, replicaVersion, rowSetSignature) {
 		super(cvrStore, cvr, replicaVersion);
@@ -358,7 +405,7 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 			assert(this.#existingRows === void 0, `trackQueries already called`);
 			const queryPatches = [executed.map((q) => this.#trackExecuted(q.id, q.transformationHash)), removed.map((q) => this.#trackRemoved(q.id))].flat(2);
 			this.#existingRows = this.#lookupRowsForExecutedAndRemovedQueries(lc);
-			this.#existingRows.then(() => {});
+			this.#existingRows.catch(() => {});
 			const versionBumped = cmpVersions(this._orig.version, this._cvr.version) < 0;
 			lc.info?.(`trackQueries: ${executed.length} executed, ${removed.length} removed, version ${versionBumped ? "bumped" : "unchanged"}`);
 			return {
@@ -400,20 +447,20 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 			this.#removedOrExecutedQueryIDs.add(queryID);
 			this.#executedQueryIDs.add(queryID);
 			let gotQueryPatch;
-			const query = this._cvr.queries[queryID];
-			if (query.transformationHash !== transformationHash) {
+			if (this._cvr.queries[queryID].transformationHash !== transformationHash) {
+				const mutableQuery = this._mutableQuery(queryID);
 				const transformationVersion = this._ensureNewVersion();
-				if (query.type !== "internal" && query.patchVersion === void 0) {
-					query.patchVersion = transformationVersion;
+				if (mutableQuery.type !== "internal" && mutableQuery.patchVersion === void 0) {
+					mutableQuery.patchVersion = transformationVersion;
 					gotQueryPatch = {
 						type: "query",
 						op: "put",
-						id: query.id
+						id: mutableQuery.id
 					};
 				}
-				query.transformationHash = transformationHash;
-				query.transformationVersion = transformationVersion;
-				this._cvrStore.updateQuery(query);
+				mutableQuery.transformationHash = transformationHash;
+				mutableQuery.transformationVersion = transformationVersion;
+				this._cvrStore.updateQuery(mutableQuery);
 			}
 			return gotQueryPatch ? [gotQueryPatch] : [];
 		});
@@ -440,7 +487,47 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 			assertNotInternal(query);
 			assert(Object.values(query.clientState).every(({ inactivatedAt }) => inactivatedAt !== void 0), () => `Query ${queryID} is active`);
 			assert(query.patchVersion !== void 0, `Query ${queryID} is not gotten`);
-			delete this._cvr.queries[queryID];
+			delete this._mutableQueries()[queryID];
+			const patch = {
+				type: "query",
+				op: "del",
+				id: queryID
+			};
+			this._cvrStore.markQueryAsDeleted(this._cvr.version, patch);
+			patches.push({
+				patch,
+				toVersion: this._cvr.version
+			});
+		}
+		return patches;
+	}
+	/**
+	* Aborts queries that were tracked as executed but whose hydration was cut
+	* short (see the view-syncer's hydration circuit breaker).
+	*
+	* Rows received for an aborted query in this update have that query's
+	* references stripped: a row left with no references is deleted, and the
+	* 'del' patch cancels the 'put' the client has already received, while a
+	* row still referenced by other queries keeps its patch version. The query
+	* is then removed from the CVR. It stays tracked as executed, so
+	* {@link deleteUnreferencedRows} also drops the references held by rows that
+	* were synced for it before this update, exactly as for a removed query.
+	*
+	* Like {@link removeTrackedQueries}, this must be called after
+	* {@link trackQueries} has established the final version, and after all
+	* rows of the aborted queries have been {@link received}.
+	*/
+	async abortExecutedQueries(lc, queryIDs) {
+		assert(this.#existingRows !== void 0, "trackQueries() was not called");
+		assert(cmpVersions(this._orig.version, this._cvr.version) < 0, "A final CVR version must be set before aborting executed queries");
+		const aborted = new Set(queryIDs);
+		for (const queryID of aborted) {
+			assert(this.#executedQueryIDs.has(queryID), `Query ${queryID} was not tracked as executed`);
+			assertNotInternal(must(this._cvr.queries[queryID]));
+		}
+		const patches = await this.#unrefReceivedRows(lc, aborted);
+		for (const queryID of aborted) {
+			delete this._mutableQueries()[queryID];
 			const patch = {
 				type: "query",
 				op: "del",
@@ -455,6 +542,81 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 		return patches;
 	}
 	/**
+	* Strips the references of `queryIDs` from every row received so far in
+	* this update. A row left with no references is deleted, and the 'del'
+	* patch cancels the 'put' the client has already received in this poke. The
+	* version of each unref is the version the row currently has in this
+	* update, so a row that stays referenced does not get a spurious patch
+	* version bump.
+	*/
+	async #unrefReceivedRows(lc, queryIDs, holdDeletes = false) {
+		const existingRows = await this._cvrStore.getRowRecords();
+		const unrefs = new CustomKeyMap(rowIDString);
+		for (const [id, refCounts] of this.#receivedRows) {
+			if (refCounts === null) continue;
+			let unref;
+			for (const queryID of queryIDs) {
+				const count = refCounts[queryID];
+				if (!count) continue;
+				if (!unref) {
+					const version = this.#lastPatches.get(id)?.rowVersion ?? existingRows.get(id)?.rowVersion;
+					unref = {
+						refCounts: {},
+						...version && { version }
+					};
+					unrefs.set(id, unref);
+				}
+				unref.refCounts[queryID] = -count;
+			}
+		}
+		return unrefs.size > 0 ? this.#receive(lc, unrefs, holdDeletes) : [];
+	}
+	/**
+	* Retracts what queries have contributed to this update, so that they can
+	* be executed again from scratch in the same update. This is for a query
+	* whose changes were being received incrementally (see
+	* `PipelineDriver.advance()`) until its pipeline was abandoned in favor of
+	* hydrating it again.
+	*
+	* Rows received so far in this update have the queries' references
+	* stripped, as in {@link abortExecutedQueries}, except that a row left
+	* with no references is only deleted by {@link deleteUnreferencedRows}, if
+	* it is still unreferenced by then. Until then the clients keep the row
+	* and the patches they received for it in this update, so a row that is
+	* received again unchanged needs no patch at all. The queries are then
+	* tracked as executed, without changing them in the CVR: the references
+	* they held before this update are replaced, rather than adjusted, by the
+	* rows subsequently {@link received} for them, and
+	* {@link deleteUnreferencedRows} drops the references of rows that are not
+	* received again.
+	*
+	* Unlike {@link trackQueries}, this can be called on an updater that has
+	* not tracked any queries, and after rows have been received. All rows
+	* that the queries' pipelines have output must have been {@link received}
+	* first, and {@link deleteUnreferencedRows} must be called once the
+	* queries' rows have been received again.
+	*/
+	async retractQueries(lc, queryIDs) {
+		assert(cmpVersions(this._orig.version, this._cvr.version) < 0, "A final CVR version must be set before retracting queries");
+		const retracted = new Set(queryIDs);
+		for (const queryID of retracted) {
+			assert(this._cvr.queries[queryID] !== void 0, () => `Query ${queryID} is not in the CVR`);
+			assert(this.#executedQueryIDs.has(queryID) || !this.#removedOrExecutedQueryIDs.has(queryID), () => `Query ${queryID} was tracked as removed`);
+		}
+		const patches = await this.#unrefReceivedRows(lc, retracted, true);
+		let tracked = false;
+		for (const queryID of retracted) if (!this.#executedQueryIDs.has(queryID)) {
+			this.#removedOrExecutedQueryIDs.add(queryID);
+			this.#executedQueryIDs.add(queryID);
+			tracked = true;
+		}
+		if (tracked) {
+			this.#existingRows = this.#lookupRowsForExecutedAndRemovedQueries(lc);
+			this.#existingRows.then(() => {});
+		}
+		return patches;
+	}
+	/**
 	* Tracks a query removed from the "gotten" set. In addition to producing the
 	* appropriate patches for deleting the query, the removed query is taken into
 	* account when computing the final row records in
@@ -470,7 +632,7 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 			assertNotInternal(query);
 			assert(!this.#removedOrExecutedQueryIDs.has(queryID), () => `Query ${queryID} already tracked as executed or removed`);
 			this.#removedOrExecutedQueryIDs.add(queryID);
-			delete this._cvr.queries[queryID];
+			delete this._mutableQueries()[queryID];
 			const newVersion = this._ensureNewVersion();
 			const queryPatch = {
 				type: "query",
@@ -504,16 +666,18 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 	ensureNewVersion() {
 		return this._ensureNewVersion();
 	}
-	flush(lc, lastConnectTime, lastActive, ttlClock) {
-		if (this.#rowSetSignature) for (const [queryID, query] of Object.entries(this._cvr.queries)) {
-			const sig = this.#rowSetSignature(queryID);
+	async flush(lc, lastConnectTime, lastActive, ttlClock, verifyNoop = false) {
+		const signatures = this.#rowSetSignature;
+		if (signatures) for (const queryID of signatures.changedRowSetSignatures()) {
+			if (this._cvr.queries[queryID] === void 0) continue;
+			const sig = signatures.rowSetSignature(queryID);
 			if (sig === void 0) continue;
-			if (parseSignature(query.rowSetSignature) === sig) continue;
-			const hex = formatSignature(sig);
-			query.rowSetSignature = hex;
-			this._cvrStore.updateRowSetSignature(queryID, hex);
+			if ((this._cvrStore.rowSetSignature(queryID) ?? 0n) === sig) continue;
+			this._cvrStore.updateRowSetSignature(queryID, sig);
 		}
-		return super.flush(lc, lastConnectTime, lastActive, ttlClock);
+		const result = await super.flush(lc, lastConnectTime, lastActive, ttlClock, verifyNoop);
+		signatures?.clearChangedRowSetSignatures();
+		return result;
 	}
 	/**
 	* Tracks rows received from executing queries. This will update row records
@@ -521,7 +685,14 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 	* returns (put) patches to be returned to update their state, versioned by
 	* patchVersion so that only the patches new to the clients are sent.
 	*/
-	received(_lc, rows) {
+	received(lc, rows) {
+		return this.#receive(lc, rows, false);
+	}
+	/**
+	* @param holdDeletes Whether to hold back the 'del' patches of rows that
+	*        are left without references until {@link deleteUnreferencedRows}.
+	*/
+	#receive(_lc, rows, holdDeletes) {
 		return startAsyncSpan(tracer, "CVRQueryDrivenUpdater.received", async () => {
 			const patches = [];
 			const existingRows = await this._cvrStore.getRowRecords();
@@ -531,6 +702,7 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 				const previouslyReceived = this.#receivedRows.get(id);
 				const merged = previouslyReceived !== void 0 ? mergeRefCounts(previouslyReceived, refCounts) : mergeRefCounts(existing?.refCounts, refCounts, this.#removedOrExecutedQueryIDs);
 				this.#receivedRows.set(id, merged);
+				if (merged !== null) this.#retractedRows.delete(id);
 				const newRowVersion = merged === null ? void 0 : version;
 				const patchVersion = existing && existing.rowVersion === newRowVersion ? existing.patchVersion : this.#assertNewVersion(id, existing?.rowVersion, newRowVersion, refCounts);
 				const rowVersion = version ?? existing?.rowVersion;
@@ -545,7 +717,8 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 				const toVersion = maxVersion(patchVersion, lastPatch?.toVersion);
 				if (merged === null) {
 					if (existing || previouslyReceived) {
-						if (lastPatch?.rowVersion !== null) {
+						if (holdDeletes) this.#retractedRows.set(id, toVersion);
+						else if (lastPatch?.rowVersion !== null) {
 							patches.push({
 								patch: {
 									type: "row",
@@ -603,6 +776,24 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 			const patches = [];
 			const start = Date.now();
 			assert(this.#existingRows, `trackQueries() was not called`);
+			for (const [id, deletedVersion] of this.#retractedRows) {
+				const lastPatch = this.#lastPatches.get(id);
+				if (lastPatch?.rowVersion === null) continue;
+				const toVersion = maxVersion(deletedVersion, lastPatch?.toVersion);
+				patches.push({
+					toVersion,
+					patch: {
+						type: "row",
+						op: "del",
+						id
+					}
+				});
+				this.#lastPatches.set(id, {
+					rowVersion: null,
+					toVersion
+				});
+			}
+			this.#retractedRows.clear();
 			for (const existing of await this.#existingRows) {
 				const deletedID = this.#deleteUnreferencedRow(existing);
 				if (deletedID === null) continue;
@@ -628,7 +819,7 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 	}
 	#deleteUnreferencedRow(existing) {
 		return startSpan(tracer, "CVRQueryDrivenUpdater.#deleteUnreferencedRow", () => {
-			if (this.#receivedRows.get(existing.id)) return null;
+			if (this.#receivedRows.has(existing.id)) return null;
 			const newRefCounts = mergeRefCounts(existing.refCounts, void 0, this.#removedOrExecutedQueryIDs);
 			const patchVersion = newRefCounts ? existing.patchVersion : this.#assertNewVersion(existing.id, existing.rowVersion, void 0, existing.refCounts ?? {});
 			const rowRecord = {