@rocicorp/zero 1.11.0-canary.7 → 1.11.0-canary.9

package/out/zero-cache/src/server/inspector-delegate.d.ts

@@ -15,6 +15,11 @@ export type ServerMetrics = {
     'query-update-server': TDigest;
 };
 type ClientGroupID = string;
+/**
+ * The service that established a client group's authentication, i.e. the
+ * ViewSyncer serving it. See {@link InspectorDelegate.clearAuthenticated}.
+ */
+type AuthOwner = object;
 export declare class InspectorDelegate implements MetricsDelegate {
     #private;
     constructor(customQueryTransformer: CustomQueryTransformer | undefined);
@@ -32,8 +37,19 @@ export declare class InspectorDelegate implements MetricsDelegate {
      * per "worker".
      */
     isAuthenticated(clientGroupID: ClientGroupID): boolean;
-    setAuthenticated(clientGroupID: ClientGroupID): void;
-    clearAuthenticated(clientGroupID: ClientGroupID): void;
+    /**
+     * Marks the client group as authenticated on behalf of `owner`, the service
+     * (ViewSyncer) that handled the authentication.
+     */
+    setAuthenticated(clientGroupID: ClientGroupID, owner?: AuthOwner): void;
+    /**
+     * Clears the client group's authentication. When `owner` is given, the
+     * authentication is only cleared if it was established by that owner: a
+     * replacement ViewSyncer can start for the same client group while the
+     * previous one is still shutting down, and the previous one's cleanup must
+     * not revoke what the replacement has since authenticated.
+     */
+    clearAuthenticated(clientGroupID: ClientGroupID, owner?: AuthOwner): void;
     /**
      * Transforms a single custom query by name and args using the configured
      * CustomQueryTransformer. This is primarily used by the inspector to transform

package/out/zero-cache/src/server/inspector-delegate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inspector-delegate.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/inspector-delegate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAEnE,OAAO,EAAC,OAAO,EAAC,MAAM,gCAAgC,CAAC;AACvD,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,kBAAkB,IAAI,sBAAsB,EAAC,MAAM,4CAA4C,CAAC;AAE7G,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,eAAe,EACrB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AACjF,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,uDAAuD,CAAC;AAI7F;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,8BAA8B,EAAE,OAAO,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,KAAK,aAAa,GAAG,MAAM,CAAC;AAQ5B,qBAAa,iBAAkB,YAAW,eAAe;;IAOvD,YAAY,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,EAErE;IAED,SAAS,CAAC,CAAC,SAAS,MAAM,SAAS,EACjC,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,MAAM,EACb,GAAG,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GACpB,IAAI,CAcN;IAED,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,sBAAsB,GAAG,IAAI,CAUrE;IAED,cAAc;;;MAEb;IAED,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAE/C;IAED,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAIjC;IAED,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAExC;IAED;;;OAGG;IACH,eAAe,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAIrD;IAED,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI,CAEnD;IAED,kBAAkB,CAAC,aAAa,EAAE,aAAa,QAE9C;IAED;;;;OAIG;IACG,oBAAoB,CACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,iBAAiB,EAAE,EAClC,GAAG,EAAE,iBAAiB,GACrB,OAAO,CAAC,GAAG,CAAC,CAsCd;CACF"}
+{"version":3,"file":"inspector-delegate.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/inspector-delegate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAEnE,OAAO,EAAC,OAAO,EAAC,MAAM,gCAAgC,CAAC;AACvD,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,kBAAkB,IAAI,sBAAsB,EAAC,MAAM,4CAA4C,CAAC;AAE7G,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,eAAe,EACrB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AACjF,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,uDAAuD,CAAC;AAI7F;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,8BAA8B,EAAE,OAAO,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,KAAK,aAAa,GAAG,MAAM,CAAC;AAE5B;;;GAGG;AACH,KAAK,SAAS,GAAG,MAAM,CAAC;AAWxB,qBAAa,iBAAkB,YAAW,eAAe;;IAOvD,YAAY,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,EAErE;IAED,SAAS,CAAC,CAAC,SAAS,MAAM,SAAS,EACjC,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,MAAM,EACb,GAAG,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GACpB,IAAI,CAcN;IAED,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,sBAAsB,GAAG,IAAI,CAUrE;IAED,cAAc;;;MAEb;IAED,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAE/C;IAED,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAIjC;IAED,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAExC;IAED;;;OAGG;IACH,eAAe,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAIrD;IAED;;;OAGG;IACH,gBAAgB,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,GAAE,SAAoB,GAC1B,IAAI,CAEN;IAED;;;;;;OAMG;IACH,kBAAkB,CAAC,aAAa,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE,SAAS,QAOjE;IAED;;;;OAIG;IACG,oBAAoB,CACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,iBAAiB,EAAE,EAClC,GAAG,EAAE,iBAAiB,GACrB,OAAO,CAAC,GAAG,CAAC,CAsCd;CACF"}

package/out/zero-cache/src/server/inspector-delegate.js

@@ -7,11 +7,13 @@ import { TDigest } from "../../../shared/src/tdigest.js";
 import { isDevelopmentMode } from "../config/normalize.js";
 import { ProtocolErrorWithLevel } from "../types/error-with-level.js";
 //#region ../zero-cache/src/server/inspector-delegate.ts
+var NO_OWNER = {};
 /**
-* Set of authenticated client group IDs. We keep this outside of the class to
-* share this state across all instances of the InspectorDelegate.
+* Authenticated client group IDs, each mapped to the owner that authenticated
+* it. We keep this outside of the class to share this state across all
+* instances of the InspectorDelegate.
 */
-var authenticatedClientGroupIDs = /* @__PURE__ */ new Set();
+var authenticatedClientGroupIDs = /* @__PURE__ */ new Map();
 var InspectorDelegate = class {
 	#globalMetrics = newMetrics();
 	#perQueryHydrateMs = /* @__PURE__ */ new Map();
@@ -65,11 +67,22 @@ var InspectorDelegate = class {
 	isAuthenticated(clientGroupID) {
 		return isDevelopmentMode() || authenticatedClientGroupIDs.has(clientGroupID);
 	}
-	setAuthenticated(clientGroupID) {
-		authenticatedClientGroupIDs.add(clientGroupID);
+	/**
+	* Marks the client group as authenticated on behalf of `owner`, the service
+	* (ViewSyncer) that handled the authentication.
+	*/
+	setAuthenticated(clientGroupID, owner = NO_OWNER) {
+		authenticatedClientGroupIDs.set(clientGroupID, owner);
 	}
-	clearAuthenticated(clientGroupID) {
-		authenticatedClientGroupIDs.delete(clientGroupID);
+	/**
+	* Clears the client group's authentication. When `owner` is given, the
+	* authentication is only cleared if it was established by that owner: a
+	* replacement ViewSyncer can start for the same client group while the
+	* previous one is still shutting down, and the previous one's cleanup must
+	* not revoke what the replacement has since authenticated.
+	*/
+	clearAuthenticated(clientGroupID, owner) {
+		if (owner === void 0 || authenticatedClientGroupIDs.get(clientGroupID) === owner) authenticatedClientGroupIDs.delete(clientGroupID);
 	}
 	/**
 	* Transforms a single custom query by name and args using the configured

package/out/zero-cache/src/server/inspector-delegate.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspector-delegate.js","names":["#globalMetrics","#perQueryHydrateMs","#perQueryUpdateMetrics","#queryIDToAST","#customQueryTransformer"],"sources":["../../../../../zero-cache/src/server/inspector-delegate.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {mapValues} from '../../../shared/src/objects.ts';\nimport {TDigest} from '../../../shared/src/tdigest.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {QueryServerMetrics as QueryServerMetricsJSON} from '../../../zero-protocol/src/inspect-down.ts';\nimport {hashOfNameAndArgs} from '../../../zero-protocol/src/query-hash.ts';\nimport {\n  isServerMetric,\n  type MetricMap,\n  type MetricsDelegate,\n} from '../../../zql/src/query/metrics-delegate.ts';\nimport {isDevelopmentMode} from '../config/normalize.ts';\nimport type {CustomQueryTransformer} from '../custom-queries/transform-query.ts';\nimport type {ConnectionContext} from '../services/view-syncer/connection-context-manager.ts';\nimport type {CustomQueryRecord} from '../services/view-syncer/schema/types.ts';\nimport {ProtocolErrorWithLevel} from '../types/error-with-level.ts';\n\n/**\n * Server-side metrics collected for queries during materialization and update.\n * These metrics are reported via the inspector and complement client-side metrics.\n * Used for the global aggregate (all queries combined).\n */\nexport type ServerMetrics = {\n  'query-materialization-server': TDigest;\n  'query-update-server': TDigest;\n};\n\ntype ClientGroupID = string;\n\n/**\n * Set of authenticated client group IDs. We keep this outside of the class to\n * share this state across all instances of the InspectorDelegate.\n */\nconst authenticatedClientGroupIDs = new Set<ClientGroupID>();\n\nexport class InspectorDelegate implements MetricsDelegate {\n  readonly #globalMetrics: ServerMetrics = newMetrics();\n  readonly #perQueryHydrateMs = new Map<string, number>();\n  readonly #perQueryUpdateMetrics = new Map<string, TDigest>();\n  readonly #queryIDToAST: Map<string, AST> = new Map();\n  readonly #customQueryTransformer: CustomQueryTransformer | undefined;\n\n  constructor(customQueryTransformer: CustomQueryTransformer | undefined) {\n    this.#customQueryTransformer = customQueryTransformer;\n  }\n\n  addMetric<K extends keyof MetricMap>(\n    metric: K,\n    value: number,\n    ...args: MetricMap[K]\n  ): void {\n    assert(isServerMetric(metric), `Invalid server metric: ${metric}`);\n    const queryID = args[0];\n    if (metric === 'query-materialization-server') {\n      this.#perQueryHydrateMs.set(queryID, value);\n    } else {\n      let digest = this.#perQueryUpdateMetrics.get(queryID);\n      if (!digest) {\n        digest = new TDigest();\n        this.#perQueryUpdateMetrics.set(queryID, digest);\n      }\n      digest.add(value);\n    }\n    this.#globalMetrics[metric].add(value);\n  }\n\n  getMetricsJSONForQuery(queryID: string): QueryServerMetricsJSON | null {\n    const hydrateMs = this.#perQueryHydrateMs.get(queryID);\n    const updateMetrics = this.#perQueryUpdateMetrics.get(queryID);\n    if (hydrateMs === undefined && updateMetrics === undefined) {\n      return null;\n    }\n    return {\n      'query-hydration-server-ms': hydrateMs,\n      'query-update-server': (updateMetrics ?? new TDigest()).toJSON(),\n    };\n  }\n\n  getMetricsJSON() {\n    return mapValues(this.#globalMetrics, v => v.toJSON());\n  }\n\n  getASTForQuery(queryID: string): AST | undefined {\n    return this.#queryIDToAST.get(queryID);\n  }\n\n  removeQuery(queryID: string): void {\n    this.#perQueryHydrateMs.delete(queryID);\n    this.#perQueryUpdateMetrics.delete(queryID);\n    this.#queryIDToAST.delete(queryID);\n  }\n\n  addQuery(queryID: string, ast: AST): void {\n    this.#queryIDToAST.set(queryID, ast);\n  }\n\n  /**\n   * Check if the client is authenticated. We only require authentication once\n   * per \"worker\".\n   */\n  isAuthenticated(clientGroupID: ClientGroupID): boolean {\n    return (\n      isDevelopmentMode() || authenticatedClientGroupIDs.has(clientGroupID)\n    );\n  }\n\n  setAuthenticated(clientGroupID: ClientGroupID): void {\n    authenticatedClientGroupIDs.add(clientGroupID);\n  }\n\n  clearAuthenticated(clientGroupID: ClientGroupID) {\n    authenticatedClientGroupIDs.delete(clientGroupID);\n  }\n\n  /**\n   * Transforms a single custom query by name and args using the configured\n   * CustomQueryTransformer. This is primarily used by the inspector to transform\n   * queries for analysis.\n   */\n  async transformCustomQuery(\n    name: string,\n    args: readonly ReadonlyJSONValue[],\n    ctx: ConnectionContext,\n  ): Promise<AST> {\n    assert(\n      this.#customQueryTransformer,\n      'Custom query transformation requested but no CustomQueryTransformer is configured',\n    );\n\n    // Create a fake CustomQueryRecord for the single query\n    const queryID = hashOfNameAndArgs(name, args);\n    const queries: CustomQueryRecord[] = [\n      {\n        id: queryID,\n        type: 'custom',\n        name,\n        args,\n        clientState: {},\n      },\n    ];\n\n    const results = await this.#customQueryTransformer.transform(ctx, queries);\n\n    if ('kind' in results.result) {\n      throw new ProtocolErrorWithLevel(results.result, 'warn');\n    }\n\n    const result = results.result[0];\n    if (!result) {\n      throw new Error('No transformation result returned');\n    }\n\n    if ('error' in result) {\n      const message =\n        result.message ?? 'Unknown application error from custom query';\n      throw new Error(\n        `Error transforming custom query ${name} (${result.error}): ${message} ${JSON.stringify(result.details)}`,\n      );\n    }\n\n    return result.transformedAst;\n  }\n}\n\nfunction newMetrics(): ServerMetrics {\n  return {\n    'query-materialization-server': new TDigest(),\n    'query-update-server': new TDigest(),\n  };\n}\n"],"mappings":";;;;;;;;;;;;;AAkCA,IAAM,8CAA8B,IAAI,IAAmB;AAE3D,IAAa,oBAAb,MAA0D;CACxD,iBAAyC,WAAW;CACpD,qCAA8B,IAAI,IAAoB;CACtD,yCAAkC,IAAI,IAAqB;CAC3D,gCAA2C,IAAI,IAAI;CACnD;CAEA,YAAY,wBAA4D;EACtE,KAAKI,0BAA0B;CACjC;CAEA,UACE,QACA,OACA,GAAG,MACG;EACN,OAAO,eAAe,MAAM,GAAG,0BAA0B,QAAQ;EACjE,MAAM,UAAU,KAAK;EACrB,IAAI,WAAW,gCACb,KAAKH,mBAAmB,IAAI,SAAS,KAAK;OACrC;GACL,IAAI,SAAS,KAAKC,uBAAuB,IAAI,OAAO;GACpD,IAAI,CAAC,QAAQ;IACX,SAAS,IAAI,QAAQ;IACrB,KAAKA,uBAAuB,IAAI,SAAS,MAAM;GACjD;GACA,OAAO,IAAI,KAAK;EAClB;EACA,KAAKF,eAAe,QAAQ,IAAI,KAAK;CACvC;CAEA,uBAAuB,SAAgD;EACrE,MAAM,YAAY,KAAKC,mBAAmB,IAAI,OAAO;EACrD,MAAM,gBAAgB,KAAKC,uBAAuB,IAAI,OAAO;EAC7D,IAAI,cAAc,KAAA,KAAa,kBAAkB,KAAA,GAC/C,OAAO;EAET,OAAO;GACL,6BAA6B;GAC7B,wBAAwB,iBAAiB,IAAI,QAAQ,GAAG,OAAO;EACjE;CACF;CAEA,iBAAiB;EACf,OAAO,UAAU,KAAKF,iBAAgB,MAAK,EAAE,OAAO,CAAC;CACvD;CAEA,eAAe,SAAkC;EAC/C,OAAO,KAAKG,cAAc,IAAI,OAAO;CACvC;CAEA,YAAY,SAAuB;EACjC,KAAKF,mBAAmB,OAAO,OAAO;EACtC,KAAKC,uBAAuB,OAAO,OAAO;EAC1C,KAAKC,cAAc,OAAO,OAAO;CACnC;CAEA,SAAS,SAAiB,KAAgB;EACxC,KAAKA,cAAc,IAAI,SAAS,GAAG;CACrC;;;;;CAMA,gBAAgB,eAAuC;EACrD,OACE,kBAAkB,KAAK,4BAA4B,IAAI,aAAa;CAExE;CAEA,iBAAiB,eAAoC;EACnD,4BAA4B,IAAI,aAAa;CAC/C;CAEA,mBAAmB,eAA8B;EAC/C,4BAA4B,OAAO,aAAa;CAClD;;;;;;CAOA,MAAM,qBACJ,MACA,MACA,KACc;EACd,OACE,KAAKC,yBACL,mFACF;EAIA,MAAM,UAA+B,CACnC;GACE,IAHY,gBAAkB,MAAM,IAGhC;GACJ,MAAM;GACN;GACA;GACA,aAAa,CAAC;EAChB,CACF;EAEA,MAAM,UAAU,MAAM,KAAKA,wBAAwB,UAAU,KAAK,OAAO;EAEzE,IAAI,UAAU,QAAQ,QACpB,MAAM,IAAI,uBAAuB,QAAQ,QAAQ,MAAM;EAGzD,MAAM,SAAS,QAAQ,OAAO;EAC9B,IAAI,CAAC,QACH,MAAM,IAAI,MAAM,mCAAmC;EAGrD,IAAI,WAAW,QAAQ;GACrB,MAAM,UACJ,OAAO,WAAW;GACpB,MAAM,IAAI,MACR,mCAAmC,KAAK,IAAI,OAAO,MAAM,KAAK,QAAQ,GAAG,KAAK,UAAU,OAAO,OAAO,GACxG;EACF;EAEA,OAAO,OAAO;CAChB;AACF;AAEA,SAAS,aAA4B;CACnC,OAAO;EACL,gCAAgC,IAAI,QAAQ;EAC5C,uBAAuB,IAAI,QAAQ;CACrC;AACF"}
+{"version":3,"file":"inspector-delegate.js","names":["#globalMetrics","#perQueryHydrateMs","#perQueryUpdateMetrics","#queryIDToAST","#customQueryTransformer"],"sources":["../../../../../zero-cache/src/server/inspector-delegate.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {mapValues} from '../../../shared/src/objects.ts';\nimport {TDigest} from '../../../shared/src/tdigest.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {QueryServerMetrics as QueryServerMetricsJSON} from '../../../zero-protocol/src/inspect-down.ts';\nimport {hashOfNameAndArgs} from '../../../zero-protocol/src/query-hash.ts';\nimport {\n  isServerMetric,\n  type MetricMap,\n  type MetricsDelegate,\n} from '../../../zql/src/query/metrics-delegate.ts';\nimport {isDevelopmentMode} from '../config/normalize.ts';\nimport type {CustomQueryTransformer} from '../custom-queries/transform-query.ts';\nimport type {ConnectionContext} from '../services/view-syncer/connection-context-manager.ts';\nimport type {CustomQueryRecord} from '../services/view-syncer/schema/types.ts';\nimport {ProtocolErrorWithLevel} from '../types/error-with-level.ts';\n\n/**\n * Server-side metrics collected for queries during materialization and update.\n * These metrics are reported via the inspector and complement client-side metrics.\n * Used for the global aggregate (all queries combined).\n */\nexport type ServerMetrics = {\n  'query-materialization-server': TDigest;\n  'query-update-server': TDigest;\n};\n\ntype ClientGroupID = string;\n\n/**\n * The service that established a client group's authentication, i.e. the\n * ViewSyncer serving it. See {@link InspectorDelegate.clearAuthenticated}.\n */\ntype AuthOwner = object;\n\nconst NO_OWNER: AuthOwner = {};\n\n/**\n * Authenticated client group IDs, each mapped to the owner that authenticated\n * it. We keep this outside of the class to share this state across all\n * instances of the InspectorDelegate.\n */\nconst authenticatedClientGroupIDs = new Map<ClientGroupID, AuthOwner>();\n\nexport class InspectorDelegate implements MetricsDelegate {\n  readonly #globalMetrics: ServerMetrics = newMetrics();\n  readonly #perQueryHydrateMs = new Map<string, number>();\n  readonly #perQueryUpdateMetrics = new Map<string, TDigest>();\n  readonly #queryIDToAST: Map<string, AST> = new Map();\n  readonly #customQueryTransformer: CustomQueryTransformer | undefined;\n\n  constructor(customQueryTransformer: CustomQueryTransformer | undefined) {\n    this.#customQueryTransformer = customQueryTransformer;\n  }\n\n  addMetric<K extends keyof MetricMap>(\n    metric: K,\n    value: number,\n    ...args: MetricMap[K]\n  ): void {\n    assert(isServerMetric(metric), `Invalid server metric: ${metric}`);\n    const queryID = args[0];\n    if (metric === 'query-materialization-server') {\n      this.#perQueryHydrateMs.set(queryID, value);\n    } else {\n      let digest = this.#perQueryUpdateMetrics.get(queryID);\n      if (!digest) {\n        digest = new TDigest();\n        this.#perQueryUpdateMetrics.set(queryID, digest);\n      }\n      digest.add(value);\n    }\n    this.#globalMetrics[metric].add(value);\n  }\n\n  getMetricsJSONForQuery(queryID: string): QueryServerMetricsJSON | null {\n    const hydrateMs = this.#perQueryHydrateMs.get(queryID);\n    const updateMetrics = this.#perQueryUpdateMetrics.get(queryID);\n    if (hydrateMs === undefined && updateMetrics === undefined) {\n      return null;\n    }\n    return {\n      'query-hydration-server-ms': hydrateMs,\n      'query-update-server': (updateMetrics ?? new TDigest()).toJSON(),\n    };\n  }\n\n  getMetricsJSON() {\n    return mapValues(this.#globalMetrics, v => v.toJSON());\n  }\n\n  getASTForQuery(queryID: string): AST | undefined {\n    return this.#queryIDToAST.get(queryID);\n  }\n\n  removeQuery(queryID: string): void {\n    this.#perQueryHydrateMs.delete(queryID);\n    this.#perQueryUpdateMetrics.delete(queryID);\n    this.#queryIDToAST.delete(queryID);\n  }\n\n  addQuery(queryID: string, ast: AST): void {\n    this.#queryIDToAST.set(queryID, ast);\n  }\n\n  /**\n   * Check if the client is authenticated. We only require authentication once\n   * per \"worker\".\n   */\n  isAuthenticated(clientGroupID: ClientGroupID): boolean {\n    return (\n      isDevelopmentMode() || authenticatedClientGroupIDs.has(clientGroupID)\n    );\n  }\n\n  /**\n   * Marks the client group as authenticated on behalf of `owner`, the service\n   * (ViewSyncer) that handled the authentication.\n   */\n  setAuthenticated(\n    clientGroupID: ClientGroupID,\n    owner: AuthOwner = NO_OWNER,\n  ): void {\n    authenticatedClientGroupIDs.set(clientGroupID, owner);\n  }\n\n  /**\n   * Clears the client group's authentication. When `owner` is given, the\n   * authentication is only cleared if it was established by that owner: a\n   * replacement ViewSyncer can start for the same client group while the\n   * previous one is still shutting down, and the previous one's cleanup must\n   * not revoke what the replacement has since authenticated.\n   */\n  clearAuthenticated(clientGroupID: ClientGroupID, owner?: AuthOwner) {\n    if (\n      owner === undefined ||\n      authenticatedClientGroupIDs.get(clientGroupID) === owner\n    ) {\n      authenticatedClientGroupIDs.delete(clientGroupID);\n    }\n  }\n\n  /**\n   * Transforms a single custom query by name and args using the configured\n   * CustomQueryTransformer. This is primarily used by the inspector to transform\n   * queries for analysis.\n   */\n  async transformCustomQuery(\n    name: string,\n    args: readonly ReadonlyJSONValue[],\n    ctx: ConnectionContext,\n  ): Promise<AST> {\n    assert(\n      this.#customQueryTransformer,\n      'Custom query transformation requested but no CustomQueryTransformer is configured',\n    );\n\n    // Create a fake CustomQueryRecord for the single query\n    const queryID = hashOfNameAndArgs(name, args);\n    const queries: CustomQueryRecord[] = [\n      {\n        id: queryID,\n        type: 'custom',\n        name,\n        args,\n        clientState: {},\n      },\n    ];\n\n    const results = await this.#customQueryTransformer.transform(ctx, queries);\n\n    if ('kind' in results.result) {\n      throw new ProtocolErrorWithLevel(results.result, 'warn');\n    }\n\n    const result = results.result[0];\n    if (!result) {\n      throw new Error('No transformation result returned');\n    }\n\n    if ('error' in result) {\n      const message =\n        result.message ?? 'Unknown application error from custom query';\n      throw new Error(\n        `Error transforming custom query ${name} (${result.error}): ${message} ${JSON.stringify(result.details)}`,\n      );\n    }\n\n    return result.transformedAst;\n  }\n}\n\nfunction newMetrics(): ServerMetrics {\n  return {\n    'query-materialization-server': new TDigest(),\n    'query-update-server': new TDigest(),\n  };\n}\n"],"mappings":";;;;;;;;;AAoCA,IAAM,WAAsB,CAAC;;;;;;AAO7B,IAAM,8CAA8B,IAAI,IAA8B;AAEtE,IAAa,oBAAb,MAA0D;CACxD,iBAAyC,WAAW;CACpD,qCAA8B,IAAI,IAAoB;CACtD,yCAAkC,IAAI,IAAqB;CAC3D,gCAA2C,IAAI,IAAI;CACnD;CAEA,YAAY,wBAA4D;EACtE,KAAKI,0BAA0B;CACjC;CAEA,UACE,QACA,OACA,GAAG,MACG;EACN,OAAO,eAAe,MAAM,GAAG,0BAA0B,QAAQ;EACjE,MAAM,UAAU,KAAK;EACrB,IAAI,WAAW,gCACb,KAAKH,mBAAmB,IAAI,SAAS,KAAK;OACrC;GACL,IAAI,SAAS,KAAKC,uBAAuB,IAAI,OAAO;GACpD,IAAI,CAAC,QAAQ;IACX,SAAS,IAAI,QAAQ;IACrB,KAAKA,uBAAuB,IAAI,SAAS,MAAM;GACjD;GACA,OAAO,IAAI,KAAK;EAClB;EACA,KAAKF,eAAe,QAAQ,IAAI,KAAK;CACvC;CAEA,uBAAuB,SAAgD;EACrE,MAAM,YAAY,KAAKC,mBAAmB,IAAI,OAAO;EACrD,MAAM,gBAAgB,KAAKC,uBAAuB,IAAI,OAAO;EAC7D,IAAI,cAAc,KAAA,KAAa,kBAAkB,KAAA,GAC/C,OAAO;EAET,OAAO;GACL,6BAA6B;GAC7B,wBAAwB,iBAAiB,IAAI,QAAQ,GAAG,OAAO;EACjE;CACF;CAEA,iBAAiB;EACf,OAAO,UAAU,KAAKF,iBAAgB,MAAK,EAAE,OAAO,CAAC;CACvD;CAEA,eAAe,SAAkC;EAC/C,OAAO,KAAKG,cAAc,IAAI,OAAO;CACvC;CAEA,YAAY,SAAuB;EACjC,KAAKF,mBAAmB,OAAO,OAAO;EACtC,KAAKC,uBAAuB,OAAO,OAAO;EAC1C,KAAKC,cAAc,OAAO,OAAO;CACnC;CAEA,SAAS,SAAiB,KAAgB;EACxC,KAAKA,cAAc,IAAI,SAAS,GAAG;CACrC;;;;;CAMA,gBAAgB,eAAuC;EACrD,OACE,kBAAkB,KAAK,4BAA4B,IAAI,aAAa;CAExE;;;;;CAMA,iBACE,eACA,QAAmB,UACb;EACN,4BAA4B,IAAI,eAAe,KAAK;CACtD;;;;;;;;CASA,mBAAmB,eAA8B,OAAmB;EAClE,IACE,UAAU,KAAA,KACV,4BAA4B,IAAI,aAAa,MAAM,OAEnD,4BAA4B,OAAO,aAAa;CAEpD;;;;;;CAOA,MAAM,qBACJ,MACA,MACA,KACc;EACd,OACE,KAAKC,yBACL,mFACF;EAIA,MAAM,UAA+B,CACnC;GACE,IAHY,gBAAkB,MAAM,IAGhC;GACJ,MAAM;GACN;GACA;GACA,aAAa,CAAC;EAChB,CACF;EAEA,MAAM,UAAU,MAAM,KAAKA,wBAAwB,UAAU,KAAK,OAAO;EAEzE,IAAI,UAAU,QAAQ,QACpB,MAAM,IAAI,uBAAuB,QAAQ,QAAQ,MAAM;EAGzD,MAAM,SAAS,QAAQ,OAAO;EAC9B,IAAI,CAAC,QACH,MAAM,IAAI,MAAM,mCAAmC;EAGrD,IAAI,WAAW,QAAQ;GACrB,MAAM,UACJ,OAAO,WAAW;GACpB,MAAM,IAAI,MACR,mCAAmC,KAAK,IAAI,OAAO,MAAM,KAAK,QAAQ,GAAG,KAAK,UAAU,OAAO,OAAO,GACxG;EACF;EAEA,OAAO,OAAO;CAChB;AACF;AAEA,SAAS,aAA4B;CACnC,OAAO;EACL,gCAAgC,IAAI,QAAQ;EAC5C,uBAAuB,IAAI,QAAQ;CACrC;AACF"}

package/out/zero-cache/src/services/change-source/pg/backfill-resume.d.ts

@@ -0,0 +1,156 @@
+import type { PublishedTableSpec } from '../../../db/specs.ts';
+import type { PostgresDB, PostgresTransaction } from '../../../types/pg.ts';
+/**
+ * The subset of a column spec needed to decide whether the column can
+ * participate in a resumable row key, and to render its values as SQL
+ * literals.
+ *
+ * `collationIsDeterministic` is not part of {@link PublishedTableSpec} (it is
+ * stripped when the published schema is canonicalized); it is fetched
+ * separately with {@link getKeyCollations}.
+ */
+export type ResumeColumnSpec = {
+    readonly typeOID: number;
+    readonly pgTypeClass?: string | null | undefined;
+    readonly elemPgTypeClass?: string | null | undefined;
+    readonly collationIsDeterministic?: boolean | null | undefined;
+};
+/**
+ * A **mark** is the Postgres text form of a row key's values, in
+ * `relation.rowKey.columns` order. It is computed by the change source (which
+ * knows the column types), stored and returned opaquely by subscribers, and
+ * compared only for equality outside of Postgres.
+ */
+export type Mark = readonly string[];
+/**
+ * Whether a single column's values have an exact text form whose literal is
+ * trivially safe to inline into a `COPY (query) TO STDOUT` (which accepts no
+ * bind parameters).
+ *
+ * Types whose text form is lossy (`numeric`, the timestamp family, floats) and
+ * columns with a non-deterministic collation are excluded. Excluding the latter
+ * is conservatism rather than necessity: a unique index under a
+ * non-deterministic collation enforces uniqueness by the same equality that
+ * orders it.
+ */
+export declare function isResumableColumn(spec: ResumeColumnSpec): boolean;
+/**
+ * Whether every column of the row key is resumable. When this is false the
+ * change source never attaches a `lastKey` to its `backfill` messages, so no
+ * subscriber ever holds a mark for the table and every run starts from the
+ * beginning.
+ */
+export declare function isResumableKey(specs: readonly ResumeColumnSpec[]): boolean;
+/**
+ * Renders one mark value as a SQL literal.
+ *
+ * The literal must be a *constant* expression so that Postgres can use it as
+ * an index condition. (This rules out, e.g.,
+ * `convert_from(decode(...), 'UTF8')`, which is `STABLE` and therefore
+ * degrades a resume seek into a filtered full index scan.)
+ *
+ * @throws if `text` is not a valid value for the column's type, which
+ *   indicates a corrupt or forged mark.
+ */
+export declare function keyLiteral(spec: ResumeColumnSpec, text: string): string;
+export declare class InvalidMarkError extends Error {
+    readonly name = "InvalidMarkError";
+}
+/**
+ * The `ORDER BY` clause for an ordered backfill: the row key columns in
+ * `relation.rowKey.columns` order, each in its own (native) collation.
+ *
+ * Ordering in the column's native collation — rather than `COLLATE "C"` —
+ * keeps the key's btree usable for both the ordering and the resume seek. Any
+ * total, snapshot-stable order suffices, because keys are only ever compared
+ * by Postgres.
+ */
+export declare function orderByRowKey(rowKeyColumns: readonly string[]): string;
+/**
+ * A boolean SQL expression selecting rows whose key sorts strictly after
+ * `mark`, using a row-constructor comparison so that it is index-optimizable
+ * on the key's btree.
+ */
+export declare function resumeWhere(rowKeyColumns: readonly string[], specs: readonly ResumeColumnSpec[], mark: Mark): string;
+/**
+ * The row filter of the table's publications, as a parenthesized boolean
+ * expression, or `null` if the table is published without a filter.
+ */
+export declare function publicationRowFilter(table: PublishedTableSpec): string | null;
+/**
+ * Returns whether any row of `table` has a key in `(from, to]`, under the
+ * table's publication row filter. `from === null` means "from the beginning",
+ * in which case the answer is whether any row exists up to and including `to`.
+ *
+ * This is the only key comparison the system performs outside of the backfill
+ * COPY itself, and it is what the {@link BackfillManager} asks in order to
+ * decide whether a declaring subscriber needs rows that the running run has
+ * already passed.
+ */
+export declare function rowsExist(sql: PostgresDB | PostgresTransaction, table: PublishedTableSpec, rowKeyColumns: readonly string[], specs: readonly ResumeColumnSpec[], from: Mark | null, to: Mark): Promise<boolean>;
+/**
+ * Converts a decoded row key value to its mark (Postgres text) form.
+ *
+ * Accepts the shapes produced by both the binary COPY decoders
+ * (`pg-copy-binary.ts`) and the text COPY type parsers.
+ */
+export declare function textKey(spec: ResumeColumnSpec, value: unknown): string;
+/**
+ * Computes the mark of the last row of a batch of `rowValues`, whose leading
+ * values are the row key values (see the `backfill` message).
+ */
+export declare function markOfLastRow(specs: readonly ResumeColumnSpec[], rowValues: readonly (readonly unknown[])[]): string[];
+/**
+ * Reads the collation determinism of the specified columns.
+ *
+ * `PublishedTableSpec` does not carry this (the published schema strips it
+ * during canonicalization), so it is read directly. `null` means the column
+ * has no collation, e.g. an integer or uuid column.
+ */
+export declare function getKeyCollations(sql: PostgresDB | PostgresTransaction, relationOID: number, columns: readonly string[]): Promise<Map<string, boolean | null>>;
+/**
+ * The minimum `pg_stats.correlation` of a row key's leading column for its
+ * table's backfill to be ordered (and therefore resumable).
+ *
+ * Ordering a backfill COPY by the row key means walking the key's index in
+ * order and fetching each row from the heap. When the heap's physical order
+ * matches the key order the fetches are sequential and ordering is nearly
+ * free; when it does not, each of N rows is a scattered visit into the same
+ * pages, and throughput collapses.
+ *
+ * Measured on 1M rows (~155MB, warm cache, PG 17) with
+ * `backfill-resume.bench.pg.ts`, ordered COPY as a fraction of unordered:
+ *
+ * | correlation | ordered / unordered |
+ * | ----------- | ------------------- |
+ * | 1.0         | 82%                 |
+ * | 0.99995     | 51%                 |
+ * | 0.995       | 32%                 |
+ * | 0.70        | 22%                 |
+ * | 0.0 (uuid)  | 18%                 |
+ * | 0.0 (text)  | 17%                 |
+ *
+ * Correlation saturates near 1, so the threshold has to be tight to hold
+ * ordering within ~2x of an unordered COPY. In practice this admits
+ * append-mostly tables with a monotonic key, and `CLUSTER`ed tables; a table
+ * with a random key (uuid, nanoid) is not ordered, and so is not resumable,
+ * and keeps exactly today's behavior.
+ */
+export declare const MIN_KEY_CORRELATION = 0.9999;
+/**
+ * Reads `pg_stats.correlation` for the leading column of the row key: the
+ * statistical correlation between the column's value order and the physical
+ * row order.
+ *
+ * Returns `null` if the table has never been analyzed, or if the column has
+ * no correlation statistic. Both are treated as "do not order" by
+ * {@link isCheaplyOrderable}, which keeps today's behavior for a table whose
+ * cost is unknown.
+ */
+export declare function getKeyCorrelation(sql: PostgresDB | PostgresTransaction, relationOID: number, leadingKeyColumn: string): Promise<number | null>;
+/**
+ * Whether ordering a backfill of the table by its row key is cheap enough to
+ * be worth doing, based on {@link getKeyCorrelation}.
+ */
+export declare function isCheaplyOrderable(correlation: number | null, minCorrelation?: number): boolean;
+//# sourceMappingURL=backfill-resume.d.ts.map

package/out/zero-cache/src/services/change-source/pg/backfill-resume.d.ts.map

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

package/out/zero-cache/src/services/change-source/pg/backfill-resume.js

@@ -0,0 +1,15 @@
+//#region ../zero-cache/src/services/change-source/pg/backfill-resume.ts
+/**
+* The row filter of the table's publications, as a parenthesized boolean
+* expression, or `null` if the table is published without a filter.
+*/
+function publicationRowFilter(table) {
+	const rowFilters = Object.values(table.publications).map(({ rowFilter }) => rowFilter);
+	if (rowFilters.some((filter) => filter === null)) return null;
+	const filters = rowFilters.filter((filter) => !!filter);
+	return filters.length === 0 ? null : `(${filters.join(" OR ")})`;
+}
+//#endregion
+export { publicationRowFilter };
+
+//# sourceMappingURL=backfill-resume.js.map

package/out/zero-cache/src/services/change-source/pg/backfill-resume.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backfill-resume.js","names":[],"sources":["../../../../../../../zero-cache/src/services/change-source/pg/backfill-resume.ts"],"sourcesContent":["import {must} from '../../../../../shared/src/must.ts';\nimport * as PostgresTypeClass from '../../../db/postgres-type-class-enum.ts';\nimport type {PublishedTableSpec} from '../../../db/specs.ts';\nimport {\n  BOOL,\n  INT2,\n  INT4,\n  INT8,\n  TEXT,\n  UUID,\n  VARCHAR,\n} from '../../../types/pg-types.ts';\nimport type {PostgresDB, PostgresTransaction} from '../../../types/pg.ts';\nimport {id} from '../../../types/sql.ts';\n\n/**\n * The subset of a column spec needed to decide whether the column can\n * participate in a resumable row key, and to render its values as SQL\n * literals.\n *\n * `collationIsDeterministic` is not part of {@link PublishedTableSpec} (it is\n * stripped when the published schema is canonicalized); it is fetched\n * separately with {@link getKeyCollations}.\n */\nexport type ResumeColumnSpec = {\n  readonly typeOID: number;\n  readonly pgTypeClass?: string | null | undefined;\n  readonly elemPgTypeClass?: string | null | undefined;\n  readonly collationIsDeterministic?: boolean | null | undefined;\n};\n\n/**\n * A **mark** is the Postgres text form of a row key's values, in\n * `relation.rowKey.columns` order. It is computed by the change source (which\n * knows the column types), stored and returned opaquely by subscribers, and\n * compared only for equality outside of Postgres.\n */\nexport type Mark = readonly string[];\n\nconst INT_TYPES: ReadonlySet<number> = new Set([INT2, INT4, INT8]);\nconst TEXT_TYPES: ReadonlySet<number> = new Set([TEXT, VARCHAR]);\n\nconst INT_RE = /^-?[0-9]+$/;\nconst UUID_RE =\n  /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;\n\n/**\n * Whether a single column's values have an exact text form whose literal is\n * trivially safe to inline into a `COPY (query) TO STDOUT` (which accepts no\n * bind parameters).\n *\n * Types whose text form is lossy (`numeric`, the timestamp family, floats) and\n * columns with a non-deterministic collation are excluded. Excluding the latter\n * is conservatism rather than necessity: a unique index under a\n * non-deterministic collation enforces uniqueness by the same equality that\n * orders it.\n */\nexport function isResumableColumn(spec: ResumeColumnSpec): boolean {\n  if (spec.elemPgTypeClass !== null && spec.elemPgTypeClass !== undefined) {\n    return false; // array types\n  }\n  if (spec.pgTypeClass === PostgresTypeClass.Enum) {\n    return false; // enum sort order is by attnum, not by text\n  }\n  const {typeOID} = spec;\n  if (TEXT_TYPES.has(typeOID)) {\n    // A non-deterministic collation is excluded; no collation at all\n    // (`null`/`undefined`) is not expected for a text column, but is treated\n    // conservatively as unknown.\n    return spec.collationIsDeterministic === true;\n  }\n  return INT_TYPES.has(typeOID) || typeOID === UUID || typeOID === BOOL;\n}\n\n/**\n * Whether every column of the row key is resumable. When this is false the\n * change source never attaches a `lastKey` to its `backfill` messages, so no\n * subscriber ever holds a mark for the table and every run starts from the\n * beginning.\n */\nexport function isResumableKey(specs: readonly ResumeColumnSpec[]): boolean {\n  return specs.length > 0 && specs.every(isResumableColumn);\n}\n\n/**\n * Escapes a string as a Postgres `E'...'` literal, which has the same meaning\n * whether or not `standard_conforming_strings` is on.\n *\n * A plain `'...'` literal would suffice under the default (and, since PG 9.1,\n * only supported) setting, but the `E` form makes the escaping explicit and\n * independent of server configuration.\n */\nfunction escapeString(value: string): string {\n  return `E'${value.replace(/\\\\/g, '\\\\\\\\').replace(/'/g, \"\\\\'\")}'`;\n}\n\n/**\n * Renders one mark value as a SQL literal.\n *\n * The literal must be a *constant* expression so that Postgres can use it as\n * an index condition. (This rules out, e.g.,\n * `convert_from(decode(...), 'UTF8')`, which is `STABLE` and therefore\n * degrades a resume seek into a filtered full index scan.)\n *\n * @throws if `text` is not a valid value for the column's type, which\n *   indicates a corrupt or forged mark.\n */\nexport function keyLiteral(spec: ResumeColumnSpec, text: string): string {\n  const {typeOID} = spec;\n  if (INT_TYPES.has(typeOID)) {\n    if (!INT_RE.test(text)) {\n      throw new InvalidMarkError(`${text} is not an integer`);\n    }\n    return text;\n  }\n  if (typeOID === UUID) {\n    if (!UUID_RE.test(text)) {\n      throw new InvalidMarkError(`${text} is not a uuid`);\n    }\n    return `'${text.toLowerCase()}'::uuid`;\n  }\n  if (typeOID === BOOL) {\n    if (text !== 'true' && text !== 'false') {\n      throw new InvalidMarkError(`${text} is not a boolean`);\n    }\n    return text;\n  }\n  if (TEXT_TYPES.has(typeOID)) {\n    return escapeString(text);\n  }\n  throw new InvalidMarkError(`type OID ${typeOID} is not resumable`);\n}\n\nexport class InvalidMarkError extends Error {\n  readonly name = 'InvalidMarkError';\n}\n\n/**\n * The `ORDER BY` clause for an ordered backfill: the row key columns in\n * `relation.rowKey.columns` order, each in its own (native) collation.\n *\n * Ordering in the column's native collation — rather than `COLLATE \"C\"` —\n * keeps the key's btree usable for both the ordering and the resume seek. Any\n * total, snapshot-stable order suffices, because keys are only ever compared\n * by Postgres.\n */\nexport function orderByRowKey(rowKeyColumns: readonly string[]): string {\n  return rowKeyColumns.map(id).join(',');\n}\n\n/**\n * A boolean SQL expression selecting rows whose key sorts strictly after\n * `mark`, using a row-constructor comparison so that it is index-optimizable\n * on the key's btree.\n */\nexport function resumeWhere(\n  rowKeyColumns: readonly string[],\n  specs: readonly ResumeColumnSpec[],\n  mark: Mark,\n): string {\n  return rowComparison(rowKeyColumns, specs, mark, '>');\n}\n\nfunction rowComparison(\n  rowKeyColumns: readonly string[],\n  specs: readonly ResumeColumnSpec[],\n  mark: Mark,\n  op: '>' | '<=',\n): string {\n  if (rowKeyColumns.length !== mark.length) {\n    throw new InvalidMarkError(\n      `mark has ${mark.length} values for a ${rowKeyColumns.length} column key`,\n    );\n  }\n  const cols = rowKeyColumns.map(id).join(',');\n  const vals = mark.map((text, i) => keyLiteral(specs[i], text)).join(',');\n  return `(${cols}) ${op} (${vals})`;\n}\n\n/**\n * The row filter of the table's publications, as a parenthesized boolean\n * expression, or `null` if the table is published without a filter.\n */\nexport function publicationRowFilter(table: PublishedTableSpec): string | null {\n  const rowFilters = Object.values(table.publications).map(\n    ({rowFilter}) => rowFilter,\n  );\n  // PostgreSQL publishes the union of all publications. An unfiltered\n  // publication therefore makes every row eligible, regardless of filters on\n  // any other publication containing the table.\n  if (rowFilters.some(filter => filter === null)) {\n    return null;\n  }\n  const filters = rowFilters.filter((filter): filter is string => !!filter);\n  return filters.length === 0 ? null : `(${filters.join(' OR ')})`;\n}\n\n/**\n * Returns whether any row of `table` has a key in `(from, to]`, under the\n * table's publication row filter. `from === null` means \"from the beginning\",\n * in which case the answer is whether any row exists up to and including `to`.\n *\n * This is the only key comparison the system performs outside of the backfill\n * COPY itself, and it is what the {@link BackfillManager} asks in order to\n * decide whether a declaring subscriber needs rows that the running run has\n * already passed.\n */\nexport async function rowsExist(\n  sql: PostgresDB | PostgresTransaction,\n  table: PublishedTableSpec,\n  rowKeyColumns: readonly string[],\n  specs: readonly ResumeColumnSpec[],\n  from: Mark | null,\n  to: Mark,\n): Promise<boolean> {\n  const conditions = [\n    publicationRowFilter(table),\n    from === null ? null : rowComparison(rowKeyColumns, specs, from, '>'),\n    rowComparison(rowKeyColumns, specs, to, '<='),\n  ].filter(c => c !== null);\n  const rows = await sql.unsafe(\n    /*sql*/ `SELECT 1 FROM ${id(table.schema)}.${id(table.name)} ` +\n      `WHERE ${conditions.join(' AND ')} LIMIT 1`,\n  );\n  return rows.length > 0;\n}\n\n/**\n * Converts a decoded row key value to its mark (Postgres text) form.\n *\n * Accepts the shapes produced by both the binary COPY decoders\n * (`pg-copy-binary.ts`) and the text COPY type parsers.\n */\nexport function textKey(spec: ResumeColumnSpec, value: unknown): string {\n  const {typeOID} = spec;\n  if (value === null || value === undefined) {\n    // Row key columns are `NOT NULL` (see `db/lite-tables.ts`), so this\n    // indicates a bug rather than data.\n    throw new InvalidMarkError(`null value in a row key`);\n  }\n  if (typeOID === BOOL) {\n    switch (typeof value) {\n      case 'boolean':\n        return value ? 'true' : 'false';\n      case 'number':\n      case 'bigint':\n        return value ? 'true' : 'false';\n      case 'string':\n        return value === 't' || value === 'true' ? 'true' : 'false';\n    }\n  }\n  const text = typeof value === 'string' ? value : String(value);\n  if (typeOID === UUID) {\n    return text.toLowerCase();\n  }\n  return text;\n}\n\n/**\n * Computes the mark of the last row of a batch of `rowValues`, whose leading\n * values are the row key values (see the `backfill` message).\n */\nexport function markOfLastRow(\n  specs: readonly ResumeColumnSpec[],\n  rowValues: readonly (readonly unknown[])[],\n): string[] {\n  const last = must(rowValues.at(-1), `no rows`);\n  return specs.map((spec, i) => textKey(spec, last[i]));\n}\n\n/**\n * Reads the collation determinism of the specified columns.\n *\n * `PublishedTableSpec` does not carry this (the published schema strips it\n * during canonicalization), so it is read directly. `null` means the column\n * has no collation, e.g. an integer or uuid column.\n */\nexport async function getKeyCollations(\n  sql: PostgresDB | PostgresTransaction,\n  relationOID: number,\n  columns: readonly string[],\n): Promise<Map<string, boolean | null>> {\n  const rows = await sql<{col: string; deterministic: boolean | null}[]>`\n    SELECT attname AS \"col\", coll.collisdeterministic AS \"deterministic\"\n      FROM pg_attribute\n      LEFT JOIN pg_collation coll ON coll.oid = attcollation\n      WHERE attrelid = ${relationOID} AND attname IN ${sql(columns as string[])}`;\n  return new Map(rows.map(({col, deterministic}) => [col, deterministic]));\n}\n\n/**\n * The minimum `pg_stats.correlation` of a row key's leading column for its\n * table's backfill to be ordered (and therefore resumable).\n *\n * Ordering a backfill COPY by the row key means walking the key's index in\n * order and fetching each row from the heap. When the heap's physical order\n * matches the key order the fetches are sequential and ordering is nearly\n * free; when it does not, each of N rows is a scattered visit into the same\n * pages, and throughput collapses.\n *\n * Measured on 1M rows (~155MB, warm cache, PG 17) with\n * `backfill-resume.bench.pg.ts`, ordered COPY as a fraction of unordered:\n *\n * | correlation | ordered / unordered |\n * | ----------- | ------------------- |\n * | 1.0         | 82%                 |\n * | 0.99995     | 51%                 |\n * | 0.995       | 32%                 |\n * | 0.70        | 22%                 |\n * | 0.0 (uuid)  | 18%                 |\n * | 0.0 (text)  | 17%                 |\n *\n * Correlation saturates near 1, so the threshold has to be tight to hold\n * ordering within ~2x of an unordered COPY. In practice this admits\n * append-mostly tables with a monotonic key, and `CLUSTER`ed tables; a table\n * with a random key (uuid, nanoid) is not ordered, and so is not resumable,\n * and keeps exactly today's behavior.\n */\nexport const MIN_KEY_CORRELATION = 0.9999;\n\n/**\n * Reads `pg_stats.correlation` for the leading column of the row key: the\n * statistical correlation between the column's value order and the physical\n * row order.\n *\n * Returns `null` if the table has never been analyzed, or if the column has\n * no correlation statistic. Both are treated as \"do not order\" by\n * {@link isCheaplyOrderable}, which keeps today's behavior for a table whose\n * cost is unknown.\n */\nexport async function getKeyCorrelation(\n  sql: PostgresDB | PostgresTransaction,\n  relationOID: number,\n  leadingKeyColumn: string,\n): Promise<number | null> {\n  const rows = await sql<{correlation: number | null}[]>`\n    SELECT s.correlation\n      FROM pg_stats s, pg_class c, pg_namespace n\n     WHERE c.oid = ${relationOID}\n       AND n.oid = c.relnamespace\n       AND s.schemaname = n.nspname\n       AND s.tablename = c.relname\n       AND s.attname = ${leadingKeyColumn}`;\n  return rows[0]?.correlation ?? null;\n}\n\n/**\n * Whether ordering a backfill of the table by its row key is cheap enough to\n * be worth doing, based on {@link getKeyCorrelation}.\n */\nexport function isCheaplyOrderable(\n  correlation: number | null,\n  minCorrelation: number = MIN_KEY_CORRELATION,\n): boolean {\n  return correlation !== null && Math.abs(correlation) >= minCorrelation;\n}\n"],"mappings":";;;;;AAuLA,SAAgB,qBAAqB,OAA0C;CAC7E,MAAM,aAAa,OAAO,OAAO,MAAM,YAAY,EAAE,KAClD,EAAC,gBAAe,SACnB;CAIA,IAAI,WAAW,MAAK,WAAU,WAAW,IAAI,GAC3C,OAAO;CAET,MAAM,UAAU,WAAW,QAAQ,WAA6B,CAAC,CAAC,MAAM;CACxE,OAAO,QAAQ,WAAW,IAAI,OAAO,IAAI,QAAQ,KAAK,MAAM,EAAE;AAChE"}

package/out/zero-cache/src/services/change-source/pg/change-source-init.d.ts

@@ -0,0 +1,15 @@
+import type { LogContext } from '@rocicorp/logger';
+import { type ShardConfig } from '../../../types/shards.ts';
+import { type InitializeResult, type RestoreOptions } from '../common/replica-restore.ts';
+import { type InitialSyncOptions, type ReplicaOptions, type ServerContext } from './initial-sync.ts';
+interface PurgeLock {
+    release(): Promise<void>;
+}
+/**
+ * Initializes a Postgres change source, including the initial sync of the
+ * replica, before streaming changes from the corresponding logical replication
+ * stream.
+ */
+export declare function initializePostgresChangeSource(lc: LogContext, upstreamURI: string, shard: ShardConfig, replicaDbFile: string, syncOptions: InitialSyncOptions, context: ServerContext, lagReportIntervalMs?: number, restoreOptions?: RestoreOptions, { backupV5 }?: ReplicaOptions, purgeLock?: PurgeLock | null, streamInboundTimeoutMs?: number | undefined): Promise<InitializeResult>;
+export {};
+//# sourceMappingURL=change-source-init.d.ts.map

package/out/zero-cache/src/services/change-source/pg/change-source-init.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-source-init.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/pg/change-source-init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAKjD,OAAO,EAAC,KAAK,WAAW,EAAe,MAAM,0BAA0B,CAAC;AAMxE,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,mBAAmB,CAAC;AAW3B,UAAU,SAAS;IACjB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED;;;;GAIG;AACH,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,UAAU,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,WAAW,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,kBAAkB,EAC/B,OAAO,EAAE,aAAa,EACtB,mBAAmB,SAAI,EACvB,cAAc,GAAE,cAAmB,EACnC,EAAC,QAAQ,EAAC,GAAE,cAAiC,EAC7C,SAAS,CAAC,EAAE,SAAS,GAAG,IAAI,EAC5B,sBAAsB,CAAC,EAAE,MAAM,GAAG,SAAS,GAC1C,OAAO,CAAC,gBAAgB,CAAC,CAwG3B"}

package/out/zero-cache/src/services/change-source/pg/change-source-init.js

@@ -0,0 +1,99 @@
+import { deepEqual } from "../../../../../shared/src/json.js";
+import { Database } from "../../../../../zqlite/src/db.js";
+import { getSubscriptionStateAndContext } from "../../replicator/schema/replication-state.js";
+import { StatementRunner } from "../../../db/statements.js";
+import { connectPgClient } from "../../../types/pg.js";
+import { dropShard, getActiveReplicas, getReplicaAtVersion, internalPublicationPrefix } from "./schema/shard.js";
+import { AutoResetSignal } from "../../change-streamer/schema/tables.js";
+import { restoreReplica } from "../common/replica-restore.js";
+import { initReplica } from "../common/replica-schema.js";
+import { ensureShardSchema } from "./schema/init.js";
+import { initialSync } from "./initial-sync.js";
+import { PostgresChangeSource } from "./change-source.js";
+//#region ../zero-cache/src/services/change-source/pg/change-source-init.ts
+/**
+* Initializes a Postgres change source, including the initial sync of the
+* replica, before streaming changes from the corresponding logical replication
+* stream.
+*/
+async function initializePostgresChangeSource(lc, upstreamURI, shard, replicaDbFile, syncOptions, context, lagReportIntervalMs = 0, restoreOptions = {}, { backupV5 } = { backupV5: true }, purgeLock, streamInboundTimeoutMs) {
+	const db = await connectPgClient(lc, upstreamURI, "change-source-init");
+	try {
+		await ensureShardSchema(lc, db, shard, syncOptions.installPartialIndexTriggers);
+		const restoredReplica = await selectAndRestoreReplica(lc, db, shard, replicaDbFile, restoreOptions);
+		let initialSyncedReplica;
+		await initReplica(lc, `replica-${shard.appID}-${shard.shardNum}`, replicaDbFile, async (log, tx) => {
+			purgeLock?.release();
+			initialSyncedReplica = await initialSync(log, shard, tx, upstreamURI, syncOptions, context, { backupV5 });
+		});
+		const replica = new Database(lc, replicaDbFile);
+		const subscriptionState = getSubscriptionStateAndContext(new StatementRunner(replica));
+		replica.close();
+		const { upstreamReplica, pgVersion } = await checkAndUpdateUpstream(lc, db, shard, subscriptionState, (initialSyncedReplica ?? restoredReplica)?.id);
+		const backupPath = initialSyncedReplica ? initialSyncedReplica.backupPath : backupV5 ? String(Date.now()) : restoredReplica?.backupPath ?? null;
+		return {
+			subscriptionState,
+			changeSource: new PostgresChangeSource(lc, upstreamURI, shard, upstreamReplica, pgVersion, {
+				backupPath,
+				backupV5
+			}, context, lagReportIntervalMs, syncOptions.textCopy, streamInboundTimeoutMs),
+			destinationBackupURL: backupPath && restoreOptions.litestream?.backupURL ? new URL(backupPath, restoreOptions.litestream.backupURL).toString() : restoreOptions.litestream?.backupURL,
+			replicaID: upstreamReplica.id,
+			waitForBackupBeforeServing: initialSyncedReplica !== void 0 || backupPath !== (restoredReplica?.backupPath ?? null)
+		};
+	} finally {
+		await db.end();
+	}
+}
+async function selectAndRestoreReplica(lc, sql, shard, replicaFile, { litestream, constraints }) {
+	const replicas = (await getActiveReplicas(lc, sql, shard)).filter(({ generation }) => generation === (constraints?.replicaVersion ?? generation));
+	if (replicas.length === 0) {
+		lc.info?.(`no suitable replicas to restore from`, { replicas });
+		return;
+	}
+	const [replica] = replicas;
+	if (litestream?.backupURL) {
+		const { backupURL: backupBaseURL } = litestream;
+		const { slot, backupPath, confirmedFlushLsn } = replica;
+		const backupURL = new URL(backupPath ?? "", backupBaseURL).toString();
+		lc.info?.(`restoring replica from ${backupURL} (${slot}@${confirmedFlushLsn})`, { replicas });
+		await restoreReplica(lc, {
+			...litestream,
+			backupURL
+		}, replicaFile, constraints);
+	}
+	return replica;
+}
+async function checkAndUpdateUpstream(lc, sql, shard, { replicaVersion, publications: subscribed, initialSyncContext }, replicaID) {
+	const upstreamReplica = await getReplicaAtVersion(lc, sql, shard, replicaVersion, replicaID, initialSyncContext);
+	if (!upstreamReplica) throw new AutoResetSignal(`No replication slot for replica at version ${replicaVersion} and id ${replicaID}}`);
+	const requested = shard.publications.toSorted();
+	const replicated = upstreamReplica.publications.filter((p) => !p.startsWith(internalPublicationPrefix(shard))).sort();
+	if (!deepEqual(requested, replicated)) {
+		lc.warn?.(`Dropping shard to change publications to: [${requested}]`);
+		await sql.unsafe(dropShard(shard.appID, shard.shardNum));
+		throw new AutoResetSignal(`Requested publications [${requested}] do not match configured publications: [${replicated}]`);
+	}
+	if (!deepEqual(upstreamReplica.publications, subscribed)) throw new AutoResetSignal(`Upstream publications [${upstreamReplica.publications}] do not match subscribed publications [${subscribed}]`);
+	const exists = await sql`
+    SELECT pubname FROM pg_publication WHERE pubname IN ${sql(subscribed)};
+  `.values();
+	if (exists.length !== subscribed.length) throw new AutoResetSignal(`Upstream publications [${exists.flat()}] do not contain all subscribed publications [${subscribed}]`);
+	const { slot } = upstreamReplica;
+	const result = await sql`
+    SELECT restart_lsn as "restartLSN", wal_status as "walStatus" FROM pg_replication_slots
+      WHERE slot_name = ${slot}`;
+	if (result.length === 0) throw new AutoResetSignal(`replication slot ${slot} is missing`);
+	const [{ restartLSN, walStatus }] = result;
+	if (restartLSN === null || walStatus === "lost") throw new AutoResetSignal(`replication slot ${slot} has been invalidated for exceeding the max_slot_wal_keep_size`);
+	const [{ pgVersion }] = await sql`
+    SELECT current_setting('server_version_num')::int as "pgVersion"`;
+	return {
+		upstreamReplica,
+		pgVersion
+	};
+}
+//#endregion
+export { initializePostgresChangeSource };
+
+//# sourceMappingURL=change-source-init.js.map

package/out/zero-cache/src/services/change-source/pg/change-source-init.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-source-init.js","names":[],"sources":["../../../../../../../zero-cache/src/services/change-source/pg/change-source-init.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {deepEqual} from '../../../../../shared/src/json.ts';\nimport {Database} from '../../../../../zqlite/src/db.ts';\nimport {StatementRunner} from '../../../db/statements.ts';\nimport {connectPgClient, type PostgresDB} from '../../../types/pg.ts';\nimport {type ShardConfig, type ShardID} from '../../../types/shards.ts';\nimport {AutoResetSignal} from '../../change-streamer/schema/tables.ts';\nimport {\n  getSubscriptionStateAndContext,\n  type SubscriptionStateAndContext,\n} from '../../replicator/schema/replication-state.ts';\nimport {\n  restoreReplica,\n  type InitializeResult,\n  type RestoreOptions,\n} from '../common/replica-restore.ts';\nimport {initReplica} from '../common/replica-schema.ts';\nimport {PostgresChangeSource} from './change-source.ts';\nimport {\n  initialSync,\n  type InitialSyncOptions,\n  type ReplicaOptions,\n  type ServerContext,\n} from './initial-sync.ts';\nimport {type LSN} from './lsn.ts';\nimport {ensureShardSchema} from './schema/init.ts';\nimport {\n  dropShard,\n  getActiveReplicas,\n  getReplicaAtVersion,\n  internalPublicationPrefix,\n  type ReplicaState,\n} from './schema/shard.ts';\n\ninterface PurgeLock {\n  release(): Promise<void>;\n}\n\n/**\n * Initializes a Postgres change source, including the initial sync of the\n * replica, before streaming changes from the corresponding logical replication\n * stream.\n */\nexport async function initializePostgresChangeSource(\n  lc: LogContext,\n  upstreamURI: string,\n  shard: ShardConfig,\n  replicaDbFile: string,\n  syncOptions: InitialSyncOptions,\n  context: ServerContext,\n  lagReportIntervalMs = 0,\n  restoreOptions: RestoreOptions = {},\n  {backupV5}: ReplicaOptions = {backupV5: true},\n  purgeLock?: PurgeLock | null,\n  streamInboundTimeoutMs?: number | undefined,\n): Promise<InitializeResult> {\n  const db = await connectPgClient(lc, upstreamURI, 'change-source-init');\n  try {\n    await ensureShardSchema(\n      lc,\n      db,\n      shard,\n      syncOptions.installPartialIndexTriggers,\n    );\n\n    const restoredReplica = await selectAndRestoreReplica(\n      lc,\n      db,\n      shard,\n      replicaDbFile,\n      restoreOptions,\n    );\n\n    let initialSyncedReplica: ReplicaState | undefined;\n    await initReplica(\n      lc,\n      `replica-${shard.appID}-${shard.shardNum}`,\n      replicaDbFile,\n      async (log, tx) => {\n        // In RMv1, the purge lock on the change-db must be released before performing\n        // initial sync; if the change-db and upstream are the same db, a lock-holding\n        // transaction will prevent a replication slot from being created. This awkward\n        // dependency can go away with RMv2.\n        void purgeLock?.release();\n        initialSyncedReplica = await initialSync(\n          log,\n          shard,\n          tx,\n          upstreamURI,\n          syncOptions,\n          context,\n          {backupV5},\n        );\n      },\n    );\n\n    const replica = new Database(lc, replicaDbFile);\n    const subscriptionState = getSubscriptionStateAndContext(\n      new StatementRunner(replica),\n    );\n    replica.close();\n\n    // Check that upstream is properly setup, and throw an AutoReset to re-run\n    // initial sync if not.\n    const {upstreamReplica, pgVersion} = await checkAndUpdateUpstream(\n      lc,\n      db,\n      shard,\n      subscriptionState,\n      (initialSyncedReplica ?? restoredReplica)?.id,\n    );\n\n    const backupPath = initialSyncedReplica\n      ? // If initial sync was performed, use that initial backupPath.\n        initialSyncedReplica.backupPath\n      : // Otherwise, use a new, unique path when backing up with litestream v5. This will be\n        // recorded in the replicas table by the PostgresChangeSource.\n        backupV5\n        ? String(Date.now())\n        : (restoredReplica?.backupPath ?? null);\n\n    const changeSource = new PostgresChangeSource(\n      lc,\n      upstreamURI,\n      shard,\n      upstreamReplica,\n      pgVersion,\n      {backupPath, backupV5},\n      context,\n      lagReportIntervalMs,\n      syncOptions.textCopy,\n      streamInboundTimeoutMs,\n    );\n\n    const destinationBackupURL =\n      backupPath && restoreOptions.litestream?.backupURL\n        ? new URL(backupPath, restoreOptions.litestream.backupURL).toString()\n        : // For legacy RMv1 replicas (on litestream-v3), backup to the same location\n          restoreOptions.litestream?.backupURL;\n\n    return {\n      subscriptionState,\n      changeSource,\n      destinationBackupURL,\n      // The replica this change stream belongs to. It is part of the identity\n      // the SQLite change log records, because a generation (i.e.\n      // `replicaVersion`) is shared by every sibling of a forked replica and so\n      // cannot distinguish two siblings' logs.\n      replicaID: upstreamReplica.id,\n      waitForBackupBeforeServing:\n        // Wait for the first backup if there was an initial sync,\n        initialSyncedReplica !== undefined ||\n        // or if the destination differs from where it was restored\n        // (i.e. backupV5).\n        backupPath !== (restoredReplica?.backupPath ?? null),\n    };\n  } finally {\n    await db.end();\n  }\n}\n\nasync function selectAndRestoreReplica(\n  lc: LogContext,\n  sql: PostgresDB,\n  shard: ShardID,\n  replicaFile: string,\n  {litestream, constraints}: RestoreOptions,\n): Promise<ReplicaState | undefined> {\n  const replicas = (await getActiveReplicas(lc, sql, shard)).filter(\n    // filter to the generation specified by the constraints, if present\n    ({generation}) =>\n      generation === (constraints?.replicaVersion ?? generation),\n  );\n  if (replicas.length === 0) {\n    lc.info?.(`no suitable replicas to restore from`, {replicas});\n    return undefined;\n  }\n  const [replica] = replicas;\n\n  if (litestream?.backupURL) {\n    const {backupURL: backupBaseURL} = litestream;\n    const {slot, backupPath, confirmedFlushLsn} = replica;\n    const backupURL = new URL(backupPath ?? '', backupBaseURL).toString();\n    lc.info?.(\n      `restoring replica from ${backupURL} (${slot}@${confirmedFlushLsn})`,\n      {replicas},\n    );\n    await restoreReplica(\n      lc,\n      {...litestream, backupURL}, // includes the replica's backup sub-path\n      replicaFile,\n      constraints,\n    );\n  }\n  return replica;\n}\n\nasync function checkAndUpdateUpstream(\n  lc: LogContext,\n  sql: PostgresDB,\n  shard: ShardConfig,\n  {\n    replicaVersion,\n    publications: subscribed,\n    initialSyncContext,\n  }: SubscriptionStateAndContext,\n  replicaID: string | undefined,\n) {\n  const upstreamReplica = await getReplicaAtVersion(\n    lc,\n    sql,\n    shard,\n    replicaVersion,\n    replicaID,\n    initialSyncContext,\n  );\n  if (!upstreamReplica) {\n    throw new AutoResetSignal(\n      `No replication slot for replica at version ${replicaVersion} and id ${replicaID}}`,\n    );\n  }\n\n  // Verify that the publications match what is being replicated.\n  const requested = shard.publications.toSorted();\n  const replicated = upstreamReplica.publications\n    .filter(p => !p.startsWith(internalPublicationPrefix(shard)))\n    .sort();\n  if (!deepEqual(requested, replicated)) {\n    lc.warn?.(`Dropping shard to change publications to: [${requested}]`);\n    await sql.unsafe(dropShard(shard.appID, shard.shardNum));\n    throw new AutoResetSignal(\n      `Requested publications [${requested}] do not match configured ` +\n        `publications: [${replicated}]`,\n    );\n  }\n\n  // Sanity check: The subscription state on the replica should have the\n  // same publications. This should be guaranteed by the equivalence of the\n  // replicaVersion, but it doesn't hurt to verify.\n  if (!deepEqual(upstreamReplica.publications, subscribed)) {\n    throw new AutoResetSignal(\n      `Upstream publications [${upstreamReplica.publications}] do not ` +\n        `match subscribed publications [${subscribed}]`,\n    );\n  }\n\n  // Verify that the publications exist.\n  const exists = await sql`\n    SELECT pubname FROM pg_publication WHERE pubname IN ${sql(subscribed)};\n  `.values();\n  if (exists.length !== subscribed.length) {\n    throw new AutoResetSignal(\n      `Upstream publications [${exists.flat()}] do not contain ` +\n        `all subscribed publications [${subscribed}]`,\n    );\n  }\n\n  const {slot} = upstreamReplica;\n  const result = await sql<{restartLSN: LSN | null; walStatus: string | null}[]>\n  /*sql*/ `\n    SELECT restart_lsn as \"restartLSN\", wal_status as \"walStatus\" FROM pg_replication_slots\n      WHERE slot_name = ${slot}`;\n  if (result.length === 0) {\n    throw new AutoResetSignal(`replication slot ${slot} is missing`);\n  }\n  const [{restartLSN, walStatus}] = result;\n  if (restartLSN === null || walStatus === 'lost') {\n    throw new AutoResetSignal(\n      `replication slot ${slot} has been invalidated for exceeding the max_slot_wal_keep_size`,\n    );\n  }\n  const [{pgVersion}] = await sql<{pgVersion: number}[]> /*sql*/ `\n    SELECT current_setting('server_version_num')::int as \"pgVersion\"`;\n  return {upstreamReplica, pgVersion};\n}\n"],"mappings":"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"}

package/out/zero-cache/src/services/change-source/pg/change-source.d.ts

@@ -3,35 +3,25 @@ import * as v from '../../../../../shared/src/valita.ts';
 import type { PublishedIndexSpec, PublishedTableSpec } from '../../../db/specs.ts';
 import { type LexiVersion } from '../../../types/lexi-version.ts';
 import { type PostgresDB } from '../../../types/pg.ts';
-import { type ShardConfig, type ShardID } from '../../../types/shards.ts';
+import { type ShardID } from '../../../types/shards.ts';
 import type { Sink } from '../../../types/streams.ts';
 import type { ChangeSource, ChangeStream } from '../change-source.ts';
 import { type Listener } from '../common/change-stream-multiplexer.ts';
-import { type InitializeResult, type RestoreOptions } from '../common/replica-restore.ts';
 import type { BackfillRequest, DownstreamStatusMessage } from '../protocol/current.ts';
 import type { ChangeStreamMessage } from '../protocol/current/downstream.ts';
 import { streamBackfill } from './backfill-stream.ts';
-import { type InitialSyncOptions, type ReplicaOptions, type ServerContext } from './initial-sync.ts';
+import { type ServerContext } from './initial-sync.ts';
 import type { MessageMessage, MessageRelation as PostgresRelation } from './logical-replication/pgoutput.types.ts';
 import { subscribe } from './logical-replication/stream.ts';
 import { type PublishedTableWithReplicaIdentity } from './schema/published.ts';
 import { type BackupOptions, type InternalShardConfig, type Replica } from './schema/shard.ts';
-interface PurgeLock {
-    release(): Promise<void>;
-}
-/**
- * Initializes a Postgres change source, including the initial sync of the
- * replica, before streaming changes from the corresponding logical replication
- * stream.
- */
-export declare function initializePostgresChangeSource(lc: LogContext, upstreamURI: string, shard: ShardConfig, replicaDbFile: string, syncOptions: InitialSyncOptions, context: ServerContext, lagReportIntervalMs?: number, restoreOptions?: RestoreOptions, { backupV5 }?: ReplicaOptions, purgeLock?: PurgeLock | null, streamInboundTimeoutMs?: number | undefined): Promise<InitializeResult>;
 /**
  * Postgres implementation of a {@link ChangeSource} backed by a logical
  * replication stream.
  */
 export declare class PostgresChangeSource implements ChangeSource {
     #private;
-    constructor(lc: LogContext, upstreamUri: string, shard: ShardID, replica: Replica, backupOptions: BackupOptions, context: ServerContext, lagReportIntervalMs: number, textCopy?: boolean | undefined, streamInboundTimeoutMs?: number | undefined, deps?: {
+    constructor(lc: LogContext, upstreamUri: string, shard: ShardID, replica: Replica, pgVersion: number, backupOptions: BackupOptions, context: ServerContext, lagReportIntervalMs: number, textCopy?: boolean | undefined, streamInboundTimeoutMs?: number | undefined, deps?: {
         subscribe?: typeof subscribe;
         streamBackfill?: typeof streamBackfill;
     });
@@ -45,7 +35,15 @@ export declare class PostgresChangeSource implements ChangeSource {
 }
 export declare class Acker implements Listener {
     #private;
-    constructor(acks: Sink<bigint>);
+    /**
+     * @param resumeWatermark the watermark the stream resumes after. What came
+     *     before it was received on an earlier connection, and only the
+     *     change-streamer knows whether it has persisted it, so keepalives are
+     *     not acked until the change-streamer has acked it. A change-streamer
+     *     whose SQLite change log is ahead of its backup would otherwise have
+     *     the slot moved past transactions that only that log holds.
+     */
+    constructor(acks: Sink<bigint>, resumeWatermark: string | null);
     onChange(change: ChangeStreamMessage): void;
     ack(watermark: LexiVersion): void;
 }
@@ -59,8 +57,8 @@ export declare class LagReporter {
     #private;
     static readonly MESSAGE_SUFFIX = "/lag-report/v1";
     readonly messagePrefix: string;
-    constructor(lc: LogContext, shard: ShardID, db: PostgresDB, lagIntervalMs: number);
-    get pgVersion(): number | undefined;
+    constructor(lc: LogContext, shard: ShardID, db: PostgresDB, pgVersion: number, lagIntervalMs: number);
+    get pgVersion(): number;
     initiateLagReport(log?: boolean): Promise<{
         firstCommitTimeMs: number;
         nextSendTimeMs: number;

package/out/zero-cache/src/services/change-source/pg/change-source.d.ts.map

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