@rocicorp/zero 0.23.2025081401 → 0.23.2025081901

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

@@ -23,6 +23,10 @@ CREATE TABLE ${schema(shard)}.instances (
   "grantedAt"      TIMESTAMPTZ,               -- The time at which the current owner was last granted ownership (most recent connection time).
   "clientSchema"   JSONB                      -- ClientSchema of the client group
 );
+
+-- For garbage collection.
+CREATE INDEX instances_last_active
+  ON ${schema(shard)}.instances ("lastActive");
 `;
 }
 export function compareInstancesRows(a, b) {
@@ -39,6 +43,7 @@ CREATE TABLE ${schema(shard)}.clients (
   CONSTRAINT fk_clients_client_group
     FOREIGN KEY("clientGroupID")
     REFERENCES ${schema(shard)}.instances("clientGroupID")
+    ON DELETE CASCADE
 );
 
 `;
@@ -69,6 +74,7 @@ CREATE TABLE ${schema(shard)}.queries (
   CONSTRAINT fk_queries_client_group
     FOREIGN KEY("clientGroupID")
     REFERENCES ${schema(shard)}.instances("clientGroupID")
+    ON DELETE CASCADE
 );
 
 -- For catchup patches.
@@ -163,11 +169,33 @@ export function compareRowsRows(a, b) {
     return stringCompare(stringifySorted(a.rowKey), stringifySorted(b.rowKey));
 }
 /**
+ * The version of the data in the `cvr.rows` table. This may lag
+ * `version` in `cvr.instances` but eventually catches up, modulo
+ * exceptional circumstances like a server crash.
+ *
+ * The `rowsVersion` is tracked in a separate table (as opposed to
+ * a column in the `cvr.instances` table) so that general `cvr` updates
+ * and `row` updates can be executed independently without serialization
+ * conflicts.
+ *
  * Note: Although `clientGroupID` logically references the same column in
  * `cvr.instances`, a FOREIGN KEY constraint must not be declared as the
  * `cvr.rows` TABLE needs to be updated without affecting the
  * `SELECT ... FOR UPDATE` lock when `cvr.instances` is updated.
  */
+export function createRowsVersionTable(shard) {
+    return `
+CREATE TABLE ${schema(shard)}."rowsVersion" (
+  "clientGroupID" TEXT PRIMARY KEY,
+  "version"       TEXT NOT NULL
+);
+`;
+}
+/**
+ * CVR `rows` are updated asynchronously from the CVR metadata
+ * (i.e. `instances`). The `rowsVersion` table is updated atomically with
+ * updates to the `rows` data.
+ */
 function createRowsTable(shard) {
     return `
 CREATE TABLE ${schema(shard)}.rows (
@@ -179,7 +207,12 @@ CREATE TABLE ${schema(shard)}.rows (
   "patchVersion"     TEXT NOT NULL,
   "refCounts"        JSONB,  -- {[queryHash: string]: number}, NULL for tombstone
 
-  PRIMARY KEY ("clientGroupID", "schema", "table", "rowKey")
+  PRIMARY KEY ("clientGroupID", "schema", "table", "rowKey"),
+
+  CONSTRAINT fk_rows_client_group
+    FOREIGN KEY("clientGroupID")
+    REFERENCES ${schema(shard)}."rowsVersion" ("clientGroupID")
+    ON DELETE CASCADE
 );
 
 -- For catchup patches.
@@ -192,37 +225,14 @@ CREATE INDEX row_ref_counts ON ${schema(shard)}.rows
   USING GIN ("refCounts");
 `;
 }
-/**
- * The version of the data in the `cvr.rows` table. This may lag
- * `version` in `cvr.instances` but eventually catches up, modulo
- * exceptional circumstances like a server crash.
- *
- * The `rowsVersion` is tracked in a separate table (as opposed to
- * a column in the `cvr.instances` table) so that general `cvr` updates
- * and `row` updates can be executed independently without serialization
- * conflicts.
- *
- * Note: Although `clientGroupID` logically references the same column in
- * `cvr.instances`, a FOREIGN KEY constraint must not be declared as the
- * `cvr.rows` TABLE needs to be updated without affecting the
- * `SELECT ... FOR UPDATE` lock when `cvr.instances` is updated.
- */
-export function createRowsVersionTable(shard) {
-    return `
-CREATE TABLE ${schema(shard)}."rowsVersion" (
-  "clientGroupID" TEXT PRIMARY KEY,
-  "version"       TEXT NOT NULL
-);
-`;
-}
 function createTables(shard) {
     return (createSchema(shard) +
         createInstancesTable(shard) +
         createClientsTable(shard) +
         createQueriesTable(shard) +
         createDesiresTable(shard) +
-        createRowsTable(shard) +
-        createRowsVersionTable(shard));
+        createRowsVersionTable(shard) +
+        createRowsTable(shard));
 }
 export async function setupCVRTables(lc, db, shard) {
     lc.info?.(`Setting up CVR tables`);

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,0BAA0B,CAAC;AAGjE,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,UAAU,EACf,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC,CAuJf"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,0BAA0B,CAAC;AAGjE,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,UAAU,EACf,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC,CAoLf"}

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

@@ -92,6 +92,29 @@ export async function initViewSyncerSchema(log, db, shard) {
             await tx `ALTER TABLE ${tx(schema)}.instances ADD COLUMN "ttlClock" DOUBLE PRECISION NOT NULL DEFAULT 0`;
         },
     };
+    const migratedV13ToV14 = {
+        migrateSchema: async (_, sql) => {
+            await sql `
+        CREATE INDEX instances_last_active ON ${sql(schema)}.instances ("lastActive");
+      `;
+            // Update / add foreign key constraints to cascade deletes.
+            for (const [table, reference] of [
+                ['clients', 'instances'],
+                ['queries', 'instances'],
+                ['rows', 'rowsVersion'],
+            ]) {
+                const constraint = sql(`fk_${table}_client_group`);
+                await sql `
+          ALTER TABLE ${sql(schema)}.${sql(table)} DROP CONSTRAINT IF EXISTS ${constraint}`;
+                await sql `
+          ALTER TABLE ${sql(schema)}.${sql(table)} ADD CONSTRAINT ${constraint}
+            FOREIGN KEY("clientGroupID")
+            REFERENCES ${sql(schema)}.${sql(reference)} ("clientGroupID")
+            ON DELETE CASCADE;
+        `;
+            }
+        },
+    };
     const schemaVersionMigrationMap = {
         2: migrateV1toV2,
         3: migrateV2ToV3,
@@ -113,6 +136,10 @@ export async function initViewSyncerSchema(log, db, shard) {
         12: migratedV11ToV12,
         // V13 adds instances."ttlClock"
         13: migratedV12ToV13,
+        // V14 adds an index on instances."lastActive" and a FK constraint
+        // from rows."clientGroupID" to rowsVersion."clientGroupID" for
+        // garbage collection
+        14: migratedV13ToV14,
     };
     await runSchemaMigrations(log, 'view-syncer', cvrSchema(shard), db, setupMigration, schemaVersionMigrationMap);
 }

package/out/zero-cache/src/services/view-syncer/schema/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/init.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,GAGpB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAC,SAAS,EAAe,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAC,sBAAsB,EAAE,cAAc,EAAC,MAAM,UAAU,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAe,EACf,EAAc,EACd,KAAc;IAEd,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAEhC,MAAM,cAAc,GAAc;QAChC,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC;QACxD,cAAc,EAAE,CAAC;KAClB,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,sCAAsC,CAAC;QAC1E,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC;QAED,4EAA4E;QAC5E,WAAW,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;YAC5B,MAAM,OAAO,GAA0B,EAAE,CAAC;YAC1C,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,EAAE,CAE9B;+CACwC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CACpE,IAAI,CACL,EAAE,CAAC;gBACF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;oBAC/B,OAAO,CAAC,IAAI,CACV,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC;;+BAErC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAC3C,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,EAAE,CAAC,IAAI,EAAE,CAAC,gCAAgC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC;YACjE,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,6BAA6B,CAAC;YAC/D,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,wCAAwC,CAAC;QAC5E,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA;oBACM,EAAE,CAAC,MAAM,CAAC;6CACe,CAAC;YACxC,MAAM,EAAE,CAAA;oBACM,EAAE,CAAC,MAAM,CAAC;qDACuB,CAAC;QAClD,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,sCAAsC,CAAC;YACxE,MAAM,EAAE,CAAA,eAAe,EAAE,CACvB,MAAM,CACP,0CAA0C,CAAC;YAC5C,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,6BAA6B,CAAC;YAE/D,MAAM,EAAE,CAAA,sCAAsC,EAAE,CAC9C,MAAM,CACP,wBAAwB,CAAC;YAC1B,MAAM,EAAE,CAAA,0CAA0C,EAAE,CAClD,MAAM,CACP,4BAA4B,CAAC;QAChC,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CACvB,MAAM,CACP,8CAA8C,CAAC;QAClD,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,qCAAqC,CAAC;QACzE,CAAC;KACF,CAAC;IAEF,MAAM,cAAc,GAAc;QAChC,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,+BAA+B,CAAC;YACjE,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,gCAAgC,CAAC;YAClE,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,iDAAiD,CAAC;QACrF,CAAC;KACF,CAAC;IAEF,MAAM,eAAe,GAAc;QACjC,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,wBAAwB,EAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC;YAChE,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,kCAAkC,CAAC;YACpE,MAAM,EAAE,CAAA,wBAAwB,EAAE,CAAC,MAAM,CAAC,uBAAuB,CAAC;YAClE,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,qCAAqC,CAAC;YACvE,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,gCAAgC,CAAC;QACpE,CAAC;KACF,CAAC;IAEF,MAAM,gBAAgB,GAAc;QAClC,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,qEAAqE,CAAC;QACzG,CAAC;KACF,CAAC;IAEF,MAAM,gBAAgB,GAAc;QAClC,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,sEAAsE,CAAC;QAC1G,CAAC;KACF,CAAC;IAEF,MAAM,gBAAgB,GAAc;QAClC,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE;YAC9B,MAAM,GAAG,CAAA;gDACiC,GAAG,CAAC,MAAM,CAAC;OACpD,CAAC;YAEF,2DAA2D;YAC3D,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI;gBAC/B,CAAC,SAAS,EAAE,WAAW,CAAC;gBACxB,CAAC,SAAS,EAAE,WAAW,CAAC;gBACxB,CAAC,MAAM,EAAE,aAAa,CAAC;aACF,EAAE,CAAC;gBACxB,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,KAAK,eAAe,CAAC,CAAC;gBACnD,MAAM,GAAG,CAAA;wBACO,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,8BAA8B,UAAU,EAAE,CAAC;gBACpF,MAAM,GAAG,CAAA;wBACO,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,mBAAmB,UAAU;;yBAErD,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC;;SAE7C,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC;IAEF,MAAM,yBAAyB,GAA4B;QACzD,CAAC,EAAE,aAAa;QAChB,CAAC,EAAE,aAAa;QAChB,CAAC,EAAE,aAAa;QAChB,kEAAkE;QAClE,iEAAiE;QACjE,CAAC,EAAE,EAAC,cAAc,EAAE,CAAC,EAAC;QACtB,CAAC,EAAE,aAAa;QAChB,CAAC,EAAE,aAAa;QAChB,CAAC,EAAE,aAAa;QAChB,CAAC,EAAE,aAAa;QAChB,mEAAmE;QACnE,iEAAiE;QACjE,sBAAsB;QACtB,EAAE,EAAE,cAAc;QAClB,0EAA0E;QAC1E,6BAA6B;QAC7B,EAAE,EAAE,eAAe;QACnB,EAAE,EAAE,gBAAgB;QACpB,gCAAgC;QAChC,EAAE,EAAE,gBAAgB;QACpB,kEAAkE;QAClE,+DAA+D;QAC/D,qBAAqB;QACrB,EAAE,EAAE,gBAAgB;KACrB,CAAC;IAEF,MAAM,mBAAmB,CACvB,GAAG,EACH,aAAa,EACb,SAAS,CAAC,KAAK,CAAC,EAChB,EAAE,EACF,cAAc,EACd,yBAAyB,CAC1B,CAAC;AACJ,CAAC"}

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

@@ -1,12 +1,12 @@
 import type { LogContext } from '@rocicorp/logger';
 import type { JWTPayload } from 'jose';
-import { TDigest } from '../../../../shared/src/tdigest.ts';
 import type { ChangeDesiredQueriesMessage } from '../../../../zero-protocol/src/change-desired-queries.ts';
 import type { InitConnectionMessage } from '../../../../zero-protocol/src/connect.ts';
 import type { DeleteClientsMessage } from '../../../../zero-protocol/src/delete-clients.ts';
 import type { Downstream } from '../../../../zero-protocol/src/down.ts';
 import type { InspectUpMessage } from '../../../../zero-protocol/src/inspect-up.ts';
 import { type ZeroConfig } from '../../config/zero-config.ts';
+import { InspectMetricsDelegate } from '../../server/inspect-metrics-delegate.ts';
 import type { PostgresDB } from '../../types/pg.ts';
 import type { ShardID } from '../../types/shards.ts';
 import type { Source } from '../../types/streams.ts';
@@ -28,13 +28,6 @@ export type SyncContext = {
     readonly tokenData: TokenData | undefined;
     readonly httpCookie: string | undefined;
 };
-/**
- * Server-side metrics collected for queries during materialization.
- * These metrics are reported via the inspector and complement client-side metrics.
- */
-export type ServerMetrics = {
-    'query-materialization-server': TDigest;
-};
 export interface ViewSyncer {
     initConnection(ctx: SyncContext, msg: InitConnectionMessage): Source<Downstream>;
     changeDesiredQueries(ctx: SyncContext, msg: ChangeDesiredQueriesMessage): Promise<void>;
@@ -59,7 +52,7 @@ type PartialZeroConfig = Pick<ZeroConfig, 'query' | 'serverVersion'>;
 export declare class ViewSyncerService implements ViewSyncer, ActivityBasedService {
     #private;
     readonly id: string;
-    constructor(config: PartialZeroConfig, lc: LogContext, shard: ShardID, taskID: string, clientGroupID: string, cvrDb: PostgresDB, upstreamDb: PostgresDB | undefined, pipelineDriver: PipelineDriver, versionChanges: Subscription<ReplicaState>, drainCoordinator: DrainCoordinator, slowHydrateThreshold: number, keepaliveMs?: number, setTimeoutFn?: SetTimeout);
+    constructor(config: PartialZeroConfig, lc: LogContext, shard: ShardID, taskID: string, clientGroupID: string, cvrDb: PostgresDB, upstreamDb: PostgresDB | undefined, pipelineDriver: PipelineDriver, versionChanges: Subscription<ReplicaState>, drainCoordinator: DrainCoordinator, slowHydrateThreshold: number, inspectMetricsDelegate: InspectMetricsDelegate, keepaliveMs?: number, setTimeoutFn?: SetTimeout);
     run(): Promise<void>;
     /**
      * Guarantees that the ViewSyncer will remain running for at least

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

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

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

@@ -7,15 +7,14 @@ import { assert, unreachable } from "../../../../shared/src/asserts.js";
 import { stringify } from "../../../../shared/src/bigint-json.js";
 import { CustomKeyMap } from "../../../../shared/src/custom-key-map.js";
 import { must } from "../../../../shared/src/must.js";
-import { mapValues } from "../../../../shared/src/objects.js";
 import { randInt } from "../../../../shared/src/rand.js";
-import { TDigest } from "../../../../shared/src/tdigest.js";
 import { ErrorKind } from "../../../../zero-protocol/src/error-kind.js";
 import { clampTTL, MAX_TTL_MS } from "../../../../zql/src/query/ttl.js";
 import { transformAndHashQuery, } from "../../auth/read-authorizer.js";
 import { getServerVersion } from "../../config/zero-config.js";
 import { CustomQueryTransformer } from "../../custom-queries/transform-query.js";
 import { getOrCreateCounter, getOrCreateHistogram, getOrCreateUpDownCounter, } from "../../observability/metrics.js";
+import { InspectMetricsDelegate } from "../../server/inspect-metrics-delegate.js";
 import { ErrorForClient, getLogLevel } from "../../types/error-for-client.js";
 import { rowIDString } from "../../types/row-key.js";
 import { Subscription } from "../../types/subscription.js";
@@ -27,6 +26,7 @@ import { PipelineDriver } from "./pipeline-driver.js";
 import { cmpVersions, EMPTY_CVR_VERSION, versionFromString, versionString, versionToCookie, } from "./schema/types.js";
 import { ResetPipelinesSignal } from "./snapshotter.js";
 import { ttlClockAsNumber, ttlClockFromNumber, } from "./ttl-clock.js";
+import { wrapIterable } from "../../../../shared/src/iterables.js";
 const tracer = trace.getTracer('view-syncer', version);
 const PROTOCOL_VERSION_ATTR = 'protocol.version';
 const DEFAULT_KEEPALIVE_MS = 5_000;
@@ -112,13 +112,9 @@ export class ViewSyncerService {
         description: 'Time to advance all queries for a given client group after applying a new transaction to the replica.',
         unit: 's',
     });
-    // Store per-query server-side materialization metrics for inspector
-    #perQueryServerMetrics = new Map();
-    #serverMetrics = {
-        'query-materialization-server': new TDigest(),
-    };
+    #inspectMetricsDelegate;
     #config;
-    constructor(config, lc, shard, taskID, clientGroupID, cvrDb, upstreamDb, pipelineDriver, versionChanges, drainCoordinator, slowHydrateThreshold, keepaliveMs = DEFAULT_KEEPALIVE_MS, setTimeoutFn = setTimeout.bind(globalThis)) {
+    constructor(config, lc, shard, taskID, clientGroupID, cvrDb, upstreamDb, pipelineDriver, versionChanges, drainCoordinator, slowHydrateThreshold, inspectMetricsDelegate, keepaliveMs = DEFAULT_KEEPALIVE_MS, setTimeoutFn = setTimeout.bind(globalThis)) {
         const { query: pullConfig } = config;
         this.#config = config;
         this.id = clientGroupID;
@@ -130,6 +126,7 @@ export class ViewSyncerService {
         this.#drainCoordinator = drainCoordinator;
         this.#keepaliveMs = keepaliveMs;
         this.#slowHydrateThreshold = slowHydrateThreshold;
+        this.#inspectMetricsDelegate = inspectMetricsDelegate;
         this.#cvrStore = new CVRStore(lc, cvrDb, upstreamDb, shard, taskID, clientGroupID, 
         // On failure, cancel the #stateChanges subscription. The run()
         // loop will then await #cvrStore.flushed() which rejects if necessary.
@@ -627,7 +624,7 @@ export class ViewSyncerService {
             return; // hydration needs to be run with the CVR updater.
         }
         const gotQueries = Object.entries(cvr.queries).filter(([_, state]) => state.transformationHash !== undefined);
-        const customQueries = [];
+        const customQueries = new Map();
         const otherQueries = [];
         for (const [, query] of gotQueries) {
             if (query.type !== 'internal' &&
@@ -635,38 +632,27 @@ export class ViewSyncerService {
                 continue; // No longer desired.
             }
             if (query.type === 'custom') {
-                customQueries.push(query);
+                customQueries.set(query.id, query);
             }
             else {
                 otherQueries.push(query);
             }
         }
         const transformedQueries = [];
-        if (customQueries.length > 0 && !this.#customQueryTransformer) {
+        if (customQueries.size > 0 && !this.#customQueryTransformer) {
             lc.error?.('Custom/named queries were requested but no `ZERO_QUERY_URL` is configured for Zero Cache.');
         }
-        if (this.#customQueryTransformer && customQueries.length > 0) {
+        const [_, byOriginalHash] = this.#pipelines.addedQueries();
+        if (this.#customQueryTransformer && customQueries.size > 0) {
+            const filteredCustomQueries = this.#filterCustomQueries(customQueries.values(), byOriginalHash, undefined);
             const transformedCustomQueries = await this.#customQueryTransformer.transform({
                 apiKey: this.#queryConfig.apiKey,
                 token: this.#authData?.raw,
                 cookie: this.#queryConfig.forwardCookies
                     ? this.#httpCookie
                     : undefined,
-            }, customQueries);
-            // TODO: collected errors need to make it downstream to the client.
-            if (Array.isArray(transformedCustomQueries)) {
-                for (const q of transformedCustomQueries) {
-                    if ('error' in q) {
-                        lc.error?.(`Error transforming custom query ${q.name}: ${q.error}`);
-                        continue;
-                    }
-                    transformedQueries.push(q);
-                }
-            }
-            else {
-                // If the result is not an array, it is an error.
-                lc.error?.('Error calling API server to transform custom queries', transformedCustomQueries);
-            }
+            }, filteredCustomQueries);
+            this.#processTransformedCustomQueries(lc, transformedCustomQueries, (q) => transformedQueries.push(q), customQueries);
         }
         for (const q of otherQueries) {
             const transformed = transformAndHashQuery(lc, q.id, q.ast, must(this.#pipelines.currentPermissions()).permissions ?? {
@@ -684,7 +670,7 @@ export class ViewSyncerService {
                 span.setAttribute('queryHash', hash);
                 span.setAttribute('transformationHash', transformationHash);
                 span.setAttribute('table', transformedAst.table);
-                for (const _ of this.#pipelines.addQuery(transformationHash, transformedAst, timer.start())) {
+                for (const _ of this.#pipelines.addQuery(transformationHash, hash, transformedAst, timer.start())) {
                     if (++count % TIME_SLICE_CHECK_SIZE === 0) {
                         if (timer.elapsedLap() > TIME_SLICE_MS) {
                             timer.stopLap();
@@ -697,19 +683,45 @@ export class ViewSyncerService {
             const elapsed = timer.totalElapsed();
             this.#hydrations.add(1);
             this.#hydrationTime.record(elapsed / 1000);
-            this.#addQueryMaterializationServerMetric(hash, elapsed);
+            this.#addQueryMaterializationServerMetric(transformationHash, elapsed);
             lc.debug?.(`hydrated ${count} rows for ${hash} (${elapsed} ms)`);
         }
     }
-    #addQueryMaterializationServerMetric(queryID, elapsed) {
-        let perQueryMetrics = this.#perQueryServerMetrics.get(queryID);
-        if (!perQueryMetrics) {
-            this.#perQueryServerMetrics.set(queryID, (perQueryMetrics = {
-                'query-materialization-server': new TDigest(),
-            }));
+    #processTransformedCustomQueries(lc, transformedCustomQueries, cb, customQueryMap) {
+        const errors = [];
+        for (const q of transformedCustomQueries) {
+            if ('error' in q) {
+                lc.error?.(`Error transforming custom query ${q.name}: ${q.error}`);
+                errors.push(q);
+                continue;
+            }
+            cb(q);
+        }
+        // todo: fan errors out to connected clients
+        // based on the client data from queries
+        this.#sendQueryTransformErrorToClients(customQueryMap, errors);
+    }
+    #sendQueryTransformErrorToClients(customQueryMap, errors) {
+        const errorGroups = new Map();
+        for (const err of errors) {
+            const q = customQueryMap.get(err.id);
+            assert(q, 'got an error that does not map back to a custom query');
+            const clientIds = Object.keys(q.clientState);
+            for (const clientId of clientIds) {
+                const group = errorGroups.get(clientId) ?? [];
+                group.push(err);
+                errorGroups.set(clientId, group);
+            }
+        }
+        for (const [clientId, errors] of errorGroups) {
+            const client = this.#clients.get(clientId);
+            if (client) {
+                client.sendQueryTransformErrors(errors);
+            }
         }
-        perQueryMetrics['query-materialization-server'].add(elapsed);
-        this.#serverMetrics['query-materialization-server'].add(elapsed);
+    }
+    #addQueryMaterializationServerMetric(transformationHash, elapsed) {
+        this.#inspectMetricsDelegate.addMetric('query-materialization-server', elapsed, transformationHash);
     }
     /**
      * Adds and/or removes queries to/from the PipelineDriver to bring it
@@ -722,7 +734,7 @@ export class ViewSyncerService {
     #syncQueryPipelineSet(lc, cvr) {
         return startAsyncSpan(tracer, 'vs.#syncQueryPipelineSet', async () => {
             assert(this.#pipelines.initialized(), 'pipelines must be initialized (syncQueryPipelineSet)');
-            const hydratedQueries = this.#pipelines.addedQueries();
+            const [hydratedQueries, byOriginalHash] = this.#pipelines.addedQueries();
             // Convert queries to their transformed ast's and hashes
             const hashToIDs = new Map();
             if (this.#ttlClock === undefined) {
@@ -766,29 +778,29 @@ export class ViewSyncerService {
                 lc.error?.('Custom/named queries were requested but no `ZERO_QUERY_URL` is configured for Zero Cache.');
             }
             if (this.#customQueryTransformer && customQueries.size > 0) {
+                const filteredCustomQueries = this.#filterCustomQueries(customQueries.values(), byOriginalHash, (origQuery, existing) => {
+                    for (const transformed of existing) {
+                        transformedQueries.push({
+                            id: origQuery.id,
+                            origQuery,
+                            transformed: {
+                                id: origQuery.id,
+                                transformationHash: transformed.transformationHash,
+                                transformedAst: transformed.transformedAst,
+                            },
+                        });
+                    }
+                });
                 const transformedCustomQueries = await this.#customQueryTransformer.transform({
                     apiKey: this.#queryConfig.apiKey,
                     token: this.#authData?.raw,
                     cookie: this.#httpCookie,
-                }, customQueries.values());
-                // TODO: collected errors need to make it downstream to the client.
-                if (Array.isArray(transformedCustomQueries)) {
-                    for (const q of transformedCustomQueries) {
-                        if ('error' in q) {
-                            lc.error?.(`Error transforming custom query ${q.name}: ${q.error}`);
-                            continue;
-                        }
-                        transformedQueries.push({
-                            id: q.id,
-                            origQuery: must(customQueries.get(q.id)),
-                            transformed: q,
-                        });
-                    }
-                }
-                else {
-                    // If the result is not an array, it is an error.
-                    lc.error?.('Error calling API server to transform custom queries', transformedCustomQueries);
-                }
+                }, filteredCustomQueries);
+                this.#processTransformedCustomQueries(lc, transformedCustomQueries, (q) => transformedQueries.push({
+                    id: q.id,
+                    origQuery: must(customQueries.get(q.id)),
+                    transformed: q,
+                }), customQueries);
             }
             const serverQueries = transformedQueries.map(({ id, origQuery, transformed }) => {
                 const ids = hashToIDs.get(transformed.transformationHash);
@@ -823,6 +835,21 @@ export class ViewSyncerService {
             }
         });
     }
+    // Removes queries from `customQueries` that are already
+    // transformed and in the pipelines. We do not want to re-transform
+    // a query that has already been transformed. The reason is that
+    // we do not want a query that is already running to suddenly flip
+    // to error due to re-calling transform.
+    #filterCustomQueries(customQueries, byOriginalHash, onExisting) {
+        return wrapIterable(customQueries).filter(origQuery => {
+            const existing = byOriginalHash.get(origQuery.id);
+            if (existing) {
+                onExisting?.(origQuery, existing);
+                return false;
+            }
+            return true;
+        });
+    }
     // This must be called from within the #lock.
     #addAndRemoveQueries(lc, cvr, addQueries, removeQueries, unhydrateQueries, hashToIDs) {
         return startAsyncSpan(tracer, 'vs.#addAndRemoveQueries', async () => {
@@ -847,7 +874,7 @@ export class ViewSyncerService {
             for (const q of removeQueries) {
                 this.#pipelines.removeQuery(q.transformationHash);
                 // Remove per-query server metrics when query is deleted
-                this.#perQueryServerMetrics.delete(q.id);
+                this.#inspectMetricsDelegate.deleteMetricsForQuery(q.id);
             }
             for (const hash of unhydrateQueries) {
                 this.#pipelines.removeQuery(hash);
@@ -855,7 +882,7 @@ export class ViewSyncerService {
                 const ids = hashToIDs.get(hash);
                 if (ids) {
                     for (const id of ids) {
-                        this.#perQueryServerMetrics.delete(id);
+                        this.#inspectMetricsDelegate.deleteMetricsForQuery(id);
                     }
                 }
             }
@@ -872,10 +899,10 @@ export class ViewSyncerService {
                         .withContext('hash', q.id)
                         .withContext('transformationHash', q.transformationHash);
                     lc.debug?.(`adding pipeline for query`, q.ast);
-                    yield* pipelines.addQuery(q.transformationHash, q.ast, timer.start());
+                    yield* pipelines.addQuery(q.transformationHash, q.id, q.ast, timer.start());
                     const elapsed = timer.stop();
                     totalProcessTime += elapsed;
-                    self.#addQueryMaterializationServerMetric(q.id, elapsed);
+                    self.#addQueryMaterializationServerMetric(q.transformationHash, elapsed);
                     if (elapsed > slowHydrateThreshold) {
                         lc.warn?.('Slow query materialization', elapsed, q.ast);
                     }
@@ -1093,18 +1120,10 @@ export class ViewSyncerService {
             case 'queries': {
                 const queryRows = await this.#cvrStore.inspectQueries(lc, cvr.ttlClock, body.clientID);
                 // Enhance query rows with server-side materialization metrics
-                const enhancedRows = queryRows.map(row => {
-                    const serverMetrics = this.#perQueryServerMetrics.get(row.queryID);
-                    const metrics = serverMetrics
-                        ? {
-                            'query-materialization-server': serverMetrics['query-materialization-server'].toJSON(),
-                        }
-                        : null;
-                    return {
-                        ...row,
-                        metrics,
-                    };
-                });
+                const enhancedRows = queryRows.map(row => ({
+                    ...row,
+                    metrics: this.#inspectMetricsDelegate.getMetricsJSONForQuery(row.queryID),
+                }));
                 client.sendInspectResponse(lc, {
                     op: 'queries',
                     id: body.id,
@@ -1113,11 +1132,10 @@ export class ViewSyncerService {
                 break;
             }
             case 'metrics': {
-                const serverMetrics = mapValues(this.#serverMetrics, metric => metric.toJSON());
                 client.sendInspectResponse(lc, {
                     op: 'metrics',
                     id: body.id,
-                    value: serverMetrics,
+                    value: this.#inspectMetricsDelegate.getMetricsJSON(),
                 });
                 break;
             }