@rocicorp/zero 1.12.0-canary.1 → 1.12.0-canary.11

package/out/zero-cache/src/services/change-source/protocol/current.js

@@ -52,6 +52,6 @@ var current_exports = /* @__PURE__ */ __exportAll({
 	upstreamStatusMessageSchema: () => upstreamStatusMessageSchema
 });
 //#endregion
-export { current_exports };
+export { CHANGE_SOURCE_PATH, addColumnSchema, backfillCompletedSchema, backfillIDSchema, backfillProgressMarkSchema, backfillRequestSchema, backfillSchema, beginSchema, changeSourceUpstreamSchema, changeStreamControlSchema, changeStreamDataSchema, changeStreamMessageSchema, commitSchema, createIndexSchema, createTableSchema, current_exports, dataChangeSchema, deleteSchema, downloadStatusSchema, downstreamStatusMessageSchema, downstreamStatusSchema, dropColumnSchema, dropIndexSchema, dropTableSchema, identifierSchema, insertSchema, isDataChange, isSchemaChange, jsonObjectSchema, jsonValueSchema, newRelationSchema, relationSchema, renameTableSchema, resetRequiredSchema, rollbackSchema, rowSchema, schemaChangeSchema, tableMetadataSchema, truncateSchema, updateColumnSchema, updateSchema, updateTableMetadataSchema, upstreamStatusMessageSchema };
 
 //# sourceMappingURL=current.js.map

package/out/zero-cache/src/services/change-source/protocol/mod.js

@@ -1,2 +1 @@
-import "./current.js";
-export {};
+export { current_exports as v0 } from "./current.js";

package/out/zero-cache/src/services/change-streamer/backfill-state-tracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"backfill-state-tracker.js","names":["#lc","#subscribers","#restarts","#unexpectedIgnores","#restartReason","#logBackfills","#sessionBackfills","#checkCoverage"],"sources":["../../../../../../zero-cache/src/services/change-streamer/backfill-state-tracker.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {must} from '../../../../shared/src/must.ts';\nimport {getOrCreateCounter} from '../../observability/metrics.ts';\nimport type {Subscription} from '../../types/subscription.ts';\nimport {\n  getSuperset,\n  withResumePoint,\n} from '../change-source/protocol/backfill-progress.ts';\nimport type {ChangeStreamData} from '../change-source/protocol/current/downstream.ts';\nimport type {BackfillRequest} from '../change-source/protocol/current/upstream.ts';\nimport {BackfillState} from './backfill-state.ts';\nimport type {PreSerializedBatch} from './broadcast.ts';\nimport type {SubscriberContext} from './change-streamer.ts';\nimport type {Subscriber, SubscriberOptions} from './subscriber.ts';\n\nexport type SubscriberBackfillOptions = Pick<\n  SubscriberOptions,\n  'backfills' | 'onAligned' | 'onBackfillIgnored'\n>;\n\n/**\n * Tracks the pending backfills (and their progress) of the change log, the\n * subscribers, and the current change stream, in order to determine:\n *\n * * the BackfillRequests with which to start a change stream, i.e. the\n *   superset of the pending backfills of the change log and all aligned\n *   subscribers, starting from the earliest progress, and\n * * whether (and why) the change stream must be restarted, i.e. when a\n *   newly aligned subscriber's pending backfills are not covered by the\n *   current stream.\n *\n * The change-streamer calls {@link startStream()} whenever it starts a change\n * stream, {@link track()} for every change that it forwards, and restarts\n * the stream at the next transaction boundary whenever a\n * {@link restartReason} is set.\n */\nexport class BackfillStateTracker {\n  readonly #lc: LogContext;\n\n  /**\n   * The pending backfills of the change log itself, i.e. those of a\n   * (hypothetical) subscriber that has applied every change in the log.\n   * Whenever a stream is started, it is reset from the change log's cookie\n   * jar (which is consistent with the stream's starting watermark), carrying\n   * over the progress tracked in memory (as the cookie jar is\n   * progress-agnostic). It stands in for subscribers that do not report their\n   * pending backfills (i.e. protocol < v8), and ensures that backfills that\n   * are pending in the change log continue to be requested.\n   */\n  #logBackfills = new BackfillState();\n\n  /**\n   * The backfill progress of the current change stream (i.e. \"session\"),\n   * seeded from the BackfillRequests with which the stream was started.\n   * This determines whether a (newly aligned) subscriber's pending backfills\n   * are covered by the stream.\n   */\n  #sessionBackfills = new BackfillState();\n\n  /** Subscribers that report their pending backfills (protocol v8+). */\n  readonly #subscribers = new Set<Subscriber>();\n\n  /**\n   * Set (to the reason) when the change stream must be restarted with\n   * new BackfillRequests.\n   */\n  #restartReason: string | null = null;\n\n  readonly #restarts = getOrCreateCounter(\n    'replication',\n    'backfill_stream_restarts',\n    'Count of change stream restarts initiated to rewind backfills for ' +\n      'subscribers whose pending backfills were not covered by the stream',\n  );\n  readonly #unexpectedIgnores = getOrCreateCounter(\n    'replication',\n    'backfill_unexpected_ignores',\n    'Count of backfill messages unexpectedly ignored (for some columns) by ' +\n      'an aligned subscriber. The expected count is 0.',\n  );\n\n  constructor(lc: LogContext) {\n    this.#lc = lc;\n  }\n\n  /**\n   * The reason for which the change stream must be restarted, or `null` if\n   * it need not be. The restart should happen at the next transaction\n   * boundary, i.e. upon the next `commit`, or `status` message outside of a\n   * transaction.\n   */\n  get restartReason(): string | null {\n    return this.#restartReason;\n  }\n\n  /**\n   * Computes the BackfillRequests with which to start a new change stream:\n   * the superset of the pending backfills of the change log and of all\n   * aligned subscribers, all of which are consistent with the stream's\n   * starting watermark since streams are (re)started at transaction\n   * boundaries.\n   *\n   * @param logBackfillRequests The BackfillRequests from the change log's\n   *        cookie jar, consistent with the stream's starting watermark.\n   */\n  startStream(logBackfillRequests: BackfillRequest[]): BackfillRequest[] {\n    // The cookie jar can be behind #logBackfills (e.g. if the storer failed\n    // to persist a forwarded commit), in which case the new stream\n    // re-delivers those changes.\n    this.#logBackfills = new BackfillState(\n      this.#logBackfills.withProgress(logBackfillRequests),\n    );\n\n    const aligned = [...this.#subscribers].filter(s => s.aligned);\n    const requests = getSuperset(\n      this.#logBackfills.requests(),\n      ...aligned.map(s => must(s.backfills).requests()),\n    ).map(withResumePoint);\n\n    this.#sessionBackfills = new BackfillState(requests);\n    // Aligned subscribers are accounted for in the requests.\n    this.#restartReason = null;\n    if (requests.length) {\n      this.#lc.info?.(\n        `starting change stream with ${requests.length} backfill requests ` +\n          `(from the change log and ${aligned.length} subscribers)`,\n        {requests},\n      );\n    }\n    return requests;\n  }\n\n  /**\n   * Tracks a change that is forwarded to subscribers. This must be called\n   * (synchronously) before the change is forwarded, so that the stream's\n   * state is never ahead of that of aligned subscribers.\n   */\n  track(change: ChangeStreamData) {\n    this.#sessionBackfills.apply(change);\n    this.#logBackfills.apply(change);\n  }\n\n  /**\n   * Requests a restart of the change stream (at the next transaction\n   * boundary), e.g. to start it with BackfillRequests that it was not\n   * started with.\n   */\n  requestRestart(reason: string) {\n    this.#restartReason ??= reason;\n  }\n\n  /** Logs and records a (planned) restart for the {@link restartReason}. */\n  recordRestart() {\n    this.#lc.info?.(`restarting change stream: ${this.#restartReason}`);\n    this.#restarts.add(1);\n  }\n\n  /**\n   * Returns the backfill-related {@link SubscriberOptions} for a new\n   * subscriber, which must subsequently be passed to {@link register()}.\n   */\n  subscriberOptions(\n    lc: LogContext,\n    ctx: SubscriberContext,\n  ): SubscriberBackfillOptions {\n    const backfills = newBackfillState(lc, ctx);\n    if (!backfills) {\n      return {};\n    }\n    return {\n      backfills,\n      onAligned: subscriber => {\n        if (this.#subscribers.has(subscriber)) {\n          this.#checkCoverage(subscriber);\n        }\n      },\n      onBackfillIgnored: columns => {\n        if (this.#restartReason === null) {\n          lc.warn?.(\n            `aligned subscriber ignored backfill data for ${columns.join(', ')}`,\n          );\n          this.#unexpectedIgnores.add(1);\n        }\n      },\n    };\n  }\n\n  /**\n   * Registers a subscriber (created with {@link subscriberOptions()}) until\n   * its `downstream` is closed. This is a no-op for subscribers that do not\n   * report their pending backfills.\n   */\n  register(\n    subscriber: Subscriber,\n    downstream: Subscription<string | PreSerializedBatch>,\n  ) {\n    if (subscriber.backfills) {\n      this.#subscribers.add(subscriber);\n      downstream.addCloseHandler(() => this.#subscribers.delete(subscriber));\n    }\n  }\n\n  /**\n   * Checks whether the pending backfills of a newly aligned subscriber are\n   * covered by the current stream, requesting a restart of the stream if not.\n   *\n   * This can be checked as soon as the subscriber is aligned (even in the\n   * middle of a transaction), since both the subscriber's and the stream's\n   * BackfillStates compare their committed state, and the stream's state is\n   * never updated with a change before the change is forwarded to (aligned)\n   * subscribers. The restart itself happens at the next transaction boundary.\n   */\n  #checkCoverage(subscriber: Subscriber) {\n    const uncovered = must(subscriber.backfills).uncovered(\n      this.#sessionBackfills,\n    );\n    if (uncovered.length) {\n      this.#restartReason ??=\n        `subscriber ${subscriber.id} needs backfills that are not ` +\n        `covered by the current stream: ${uncovered.join(', ')}`;\n    }\n  }\n}\n\nfunction newBackfillState(\n  lc: LogContext,\n  ctx: SubscriberContext,\n): BackfillState | undefined {\n  if (ctx.backfills === undefined) {\n    return undefined; // protocol < v8\n  }\n  try {\n    return new BackfillState(ctx.backfills);\n  } catch (e) {\n    lc.warn?.(`invalid backfills from subscriber ${ctx.id}`, e);\n    return undefined;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAoCA,IAAa,uBAAb,MAAkC;CAChC;;;;;;;;;;;CAYA,gBAAgB,IAAI,cAAc;;;;;;;CAQlC,oBAAoB,IAAI,cAAc;;CAGtC,+BAAwB,IAAI,IAAgB;;;;;CAM5C,iBAAgC;CAEhC,YAAqB,mBACnB,eACA,4BACA,sIAEF;CACA,qBAA8B,mBAC5B,eACA,+BACA,uHAEF;CAEA,YAAY,IAAgB;EAC1B,KAAKA,MAAM;CACb;;;;;;;CAQA,IAAI,gBAA+B;EACjC,OAAO,KAAKI;CACd;;;;;;;;;;;CAYA,YAAY,qBAA2D;EAIrE,KAAKC,gBAAgB,IAAI,cACvB,KAAKA,cAAc,aAAa,mBAAmB,CACrD;EAEA,MAAM,UAAU,CAAC,GAAG,KAAKJ,YAAY,EAAE,QAAO,MAAK,EAAE,OAAO;EAC5D,MAAM,WAAW,YACf,KAAKI,cAAc,SAAS,GAC5B,GAAG,QAAQ,KAAI,MAAK,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,CAClD,EAAE,IAAI,eAAe;EAErB,KAAKC,oBAAoB,IAAI,cAAc,QAAQ;EAEnD,KAAKF,iBAAiB;EACtB,IAAI,SAAS,QACX,KAAKJ,IAAI,OACP,+BAA+B,SAAS,OAAO,8CACjB,QAAQ,OAAO,gBAC7C,EAAC,SAAQ,CACX;EAEF,OAAO;CACT;;;;;;CAOA,MAAM,QAA0B;EAC9B,KAAKM,kBAAkB,MAAM,MAAM;EACnC,KAAKD,cAAc,MAAM,MAAM;CACjC;;;;;;CAOA,eAAe,QAAgB;EAC7B,KAAKD,mBAAmB;CAC1B;;CAGA,gBAAgB;EACd,KAAKJ,IAAI,OAAO,6BAA6B,KAAKI,gBAAgB;EAClE,KAAKF,UAAU,IAAI,CAAC;CACtB;;;;;CAMA,kBACE,IACA,KAC2B;EAC3B,MAAM,YAAY,iBAAiB,IAAI,GAAG;EAC1C,IAAI,CAAC,WACH,OAAO,CAAC;EAEV,OAAO;GACL;GACA,YAAW,eAAc;IACvB,IAAI,KAAKD,aAAa,IAAI,UAAU,GAClC,KAAKM,eAAe,UAAU;GAElC;GACA,oBAAmB,YAAW;IAC5B,IAAI,KAAKH,mBAAmB,MAAM;KAChC,GAAG,OACD,gDAAgD,QAAQ,KAAK,IAAI,GACnE;KACA,KAAKD,mBAAmB,IAAI,CAAC;IAC/B;GACF;EACF;CACF;;;;;;CAOA,SACE,YACA,YACA;EACA,IAAI,WAAW,WAAW;GACxB,KAAKF,aAAa,IAAI,UAAU;GAChC,WAAW,sBAAsB,KAAKA,aAAa,OAAO,UAAU,CAAC;EACvE;CACF;;;;;;;;;;;CAYA,eAAe,YAAwB;EACrC,MAAM,YAAY,KAAK,WAAW,SAAS,EAAE,UAC3C,KAAKK,iBACP;EACA,IAAI,UAAU,QACZ,KAAKF,mBACH,cAAc,WAAW,GAAG,+DACM,UAAU,KAAK,IAAI;CAE3D;AACF;AAEA,SAAS,iBACP,IACA,KAC2B;CAC3B,IAAI,IAAI,cAAc,KAAA,GACpB;CAEF,IAAI;EACF,OAAO,IAAI,cAAc,IAAI,SAAS;CACxC,SAAS,GAAG;EACV,GAAG,OAAO,qCAAqC,IAAI,MAAM,CAAC;EAC1D;CACF;AACF"}
+{"version":3,"file":"backfill-state-tracker.js","names":[],"sources":["../../../../../../zero-cache/src/services/change-streamer/backfill-state-tracker.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {must} from '../../../../shared/src/must.ts';\nimport {getOrCreateCounter} from '../../observability/metrics.ts';\nimport type {Subscription} from '../../types/subscription.ts';\nimport {\n  getSuperset,\n  withResumePoint,\n} from '../change-source/protocol/backfill-progress.ts';\nimport type {ChangeStreamData} from '../change-source/protocol/current/downstream.ts';\nimport type {BackfillRequest} from '../change-source/protocol/current/upstream.ts';\nimport {BackfillState} from './backfill-state.ts';\nimport type {PreSerializedBatch} from './broadcast.ts';\nimport type {SubscriberContext} from './change-streamer.ts';\nimport type {Subscriber, SubscriberOptions} from './subscriber.ts';\n\nexport type SubscriberBackfillOptions = Pick<\n  SubscriberOptions,\n  'backfills' | 'onAligned' | 'onBackfillIgnored'\n>;\n\n/**\n * Tracks the pending backfills (and their progress) of the change log, the\n * subscribers, and the current change stream, in order to determine:\n *\n * * the BackfillRequests with which to start a change stream, i.e. the\n *   superset of the pending backfills of the change log and all aligned\n *   subscribers, starting from the earliest progress, and\n * * whether (and why) the change stream must be restarted, i.e. when a\n *   newly aligned subscriber's pending backfills are not covered by the\n *   current stream.\n *\n * The change-streamer calls {@link startStream()} whenever it starts a change\n * stream, {@link track()} for every change that it forwards, and restarts\n * the stream at the next transaction boundary whenever a\n * {@link restartReason} is set.\n */\nexport class BackfillStateTracker {\n  readonly #lc: LogContext;\n\n  /**\n   * The pending backfills of the change log itself, i.e. those of a\n   * (hypothetical) subscriber that has applied every change in the log.\n   * Whenever a stream is started, it is reset from the change log's cookie\n   * jar (which is consistent with the stream's starting watermark), carrying\n   * over the progress tracked in memory (as the cookie jar is\n   * progress-agnostic). It stands in for subscribers that do not report their\n   * pending backfills (i.e. protocol < v8), and ensures that backfills that\n   * are pending in the change log continue to be requested.\n   */\n  #logBackfills = new BackfillState();\n\n  /**\n   * The backfill progress of the current change stream (i.e. \"session\"),\n   * seeded from the BackfillRequests with which the stream was started.\n   * This determines whether a (newly aligned) subscriber's pending backfills\n   * are covered by the stream.\n   */\n  #sessionBackfills = new BackfillState();\n\n  /** Subscribers that report their pending backfills (protocol v8+). */\n  readonly #subscribers = new Set<Subscriber>();\n\n  /**\n   * Set (to the reason) when the change stream must be restarted with\n   * new BackfillRequests.\n   */\n  #restartReason: string | null = null;\n\n  readonly #restarts = getOrCreateCounter(\n    'replication',\n    'backfill_stream_restarts',\n    'Count of change stream restarts initiated to rewind backfills for ' +\n      'subscribers whose pending backfills were not covered by the stream',\n  );\n  readonly #unexpectedIgnores = getOrCreateCounter(\n    'replication',\n    'backfill_unexpected_ignores',\n    'Count of backfill messages unexpectedly ignored (for some columns) by ' +\n      'an aligned subscriber. The expected count is 0.',\n  );\n\n  constructor(lc: LogContext) {\n    this.#lc = lc;\n  }\n\n  /**\n   * The reason for which the change stream must be restarted, or `null` if\n   * it need not be. The restart should happen at the next transaction\n   * boundary, i.e. upon the next `commit`, or `status` message outside of a\n   * transaction.\n   */\n  get restartReason(): string | null {\n    return this.#restartReason;\n  }\n\n  /**\n   * Computes the BackfillRequests with which to start a new change stream:\n   * the superset of the pending backfills of the change log and of all\n   * aligned subscribers, all of which are consistent with the stream's\n   * starting watermark since streams are (re)started at transaction\n   * boundaries.\n   *\n   * @param logBackfillRequests The BackfillRequests from the change log's\n   *        cookie jar, consistent with the stream's starting watermark.\n   */\n  startStream(logBackfillRequests: BackfillRequest[]): BackfillRequest[] {\n    // The cookie jar can be behind #logBackfills (e.g. if the storer failed\n    // to persist a forwarded commit), in which case the new stream\n    // re-delivers those changes.\n    this.#logBackfills = new BackfillState(\n      this.#logBackfills.withProgress(logBackfillRequests),\n    );\n\n    const aligned = [...this.#subscribers].filter(s => s.aligned);\n    const requests = getSuperset(\n      this.#logBackfills.requests(),\n      ...aligned.map(s => must(s.backfills).requests()),\n    ).map(withResumePoint);\n\n    this.#sessionBackfills = new BackfillState(requests);\n    // Aligned subscribers are accounted for in the requests.\n    this.#restartReason = null;\n    if (requests.length) {\n      this.#lc.info?.(\n        `starting change stream with ${requests.length} backfill requests ` +\n          `(from the change log and ${aligned.length} subscribers)`,\n        {requests},\n      );\n    }\n    return requests;\n  }\n\n  /**\n   * Tracks a change that is forwarded to subscribers. This must be called\n   * (synchronously) before the change is forwarded, so that the stream's\n   * state is never ahead of that of aligned subscribers.\n   */\n  track(change: ChangeStreamData) {\n    this.#sessionBackfills.apply(change);\n    this.#logBackfills.apply(change);\n  }\n\n  /**\n   * Requests a restart of the change stream (at the next transaction\n   * boundary), e.g. to start it with BackfillRequests that it was not\n   * started with.\n   */\n  requestRestart(reason: string) {\n    this.#restartReason ??= reason;\n  }\n\n  /** Logs and records a (planned) restart for the {@link restartReason}. */\n  recordRestart() {\n    this.#lc.info?.(`restarting change stream: ${this.#restartReason}`);\n    this.#restarts.add(1);\n  }\n\n  /**\n   * Returns the backfill-related {@link SubscriberOptions} for a new\n   * subscriber, which must subsequently be passed to {@link register()}.\n   */\n  subscriberOptions(\n    lc: LogContext,\n    ctx: SubscriberContext,\n  ): SubscriberBackfillOptions {\n    const backfills = newBackfillState(lc, ctx);\n    if (!backfills) {\n      return {};\n    }\n    return {\n      backfills,\n      onAligned: subscriber => {\n        if (this.#subscribers.has(subscriber)) {\n          this.#checkCoverage(subscriber);\n        }\n      },\n      onBackfillIgnored: columns => {\n        if (this.#restartReason === null) {\n          lc.warn?.(\n            `aligned subscriber ignored backfill data for ${columns.join(', ')}`,\n          );\n          this.#unexpectedIgnores.add(1);\n        }\n      },\n    };\n  }\n\n  /**\n   * Registers a subscriber (created with {@link subscriberOptions()}) until\n   * its `downstream` is closed. This is a no-op for subscribers that do not\n   * report their pending backfills.\n   */\n  register(\n    subscriber: Subscriber,\n    downstream: Subscription<string | PreSerializedBatch>,\n  ) {\n    if (subscriber.backfills) {\n      this.#subscribers.add(subscriber);\n      downstream.addCloseHandler(() => this.#subscribers.delete(subscriber));\n    }\n  }\n\n  /**\n   * Checks whether the pending backfills of a newly aligned subscriber are\n   * covered by the current stream, requesting a restart of the stream if not.\n   *\n   * This can be checked as soon as the subscriber is aligned (even in the\n   * middle of a transaction), since both the subscriber's and the stream's\n   * BackfillStates compare their committed state, and the stream's state is\n   * never updated with a change before the change is forwarded to (aligned)\n   * subscribers. The restart itself happens at the next transaction boundary.\n   */\n  #checkCoverage(subscriber: Subscriber) {\n    const uncovered = must(subscriber.backfills).uncovered(\n      this.#sessionBackfills,\n    );\n    if (uncovered.length) {\n      this.#restartReason ??=\n        `subscriber ${subscriber.id} needs backfills that are not ` +\n        `covered by the current stream: ${uncovered.join(', ')}`;\n    }\n  }\n}\n\nfunction newBackfillState(\n  lc: LogContext,\n  ctx: SubscriberContext,\n): BackfillState | undefined {\n  if (ctx.backfills === undefined) {\n    return undefined; // protocol < v8\n  }\n  try {\n    return new BackfillState(ctx.backfills);\n  } catch (e) {\n    lc.warn?.(`invalid backfills from subscriber ${ctx.id}`, e);\n    return undefined;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAoCA,IAAa,uBAAb,MAAkC;CAChC;;;;;;;;;;;CAYA,gBAAgB,IAAI,cAAc;;;;;;;CAQlC,oBAAoB,IAAI,cAAc;;CAGtC,+BAAwB,IAAI,IAAgB;;;;;CAM5C,iBAAgC;CAEhC,YAAqB,mBACnB,eACA,4BACA,sIAEF;CACA,qBAA8B,mBAC5B,eACA,+BACA,uHAEF;CAEA,YAAY,IAAgB;EAC1B,KAAK,MAAM;CACb;;;;;;;CAQA,IAAI,gBAA+B;EACjC,OAAO,KAAK;CACd;;;;;;;;;;;CAYA,YAAY,qBAA2D;EAIrE,KAAK,gBAAgB,IAAI,cACvB,KAAK,cAAc,aAAa,mBAAmB,CACrD;EAEA,MAAM,UAAU,CAAC,GAAG,KAAK,YAAY,CAAC,CAAC,QAAO,MAAK,EAAE,OAAO;EAC5D,MAAM,WAAW,YACf,KAAK,cAAc,SAAS,GAC5B,GAAG,QAAQ,KAAI,MAAK,KAAK,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC,CAClD,CAAC,CAAC,IAAI,eAAe;EAErB,KAAK,oBAAoB,IAAI,cAAc,QAAQ;EAEnD,KAAK,iBAAiB;EACtB,IAAI,SAAS,QACX,KAAK,IAAI,OACP,+BAA+B,SAAS,OAAO,8CACjB,QAAQ,OAAO,gBAC7C,EAAC,SAAQ,CACX;EAEF,OAAO;CACT;;;;;;CAOA,MAAM,QAA0B;EAC9B,KAAK,kBAAkB,MAAM,MAAM;EACnC,KAAK,cAAc,MAAM,MAAM;CACjC;;;;;;CAOA,eAAe,QAAgB;EAC7B,KAAK,mBAAmB;CAC1B;;CAGA,gBAAgB;EACd,KAAK,IAAI,OAAO,6BAA6B,KAAK,gBAAgB;EAClE,KAAK,UAAU,IAAI,CAAC;CACtB;;;;;CAMA,kBACE,IACA,KAC2B;EAC3B,MAAM,YAAY,iBAAiB,IAAI,GAAG;EAC1C,IAAI,CAAC,WACH,OAAO,CAAC;EAEV,OAAO;GACL;GACA,YAAW,eAAc;IACvB,IAAI,KAAK,aAAa,IAAI,UAAU,GAClC,KAAK,eAAe,UAAU;GAElC;GACA,oBAAmB,YAAW;IAC5B,IAAI,KAAK,mBAAmB,MAAM;KAChC,GAAG,OACD,gDAAgD,QAAQ,KAAK,IAAI,GACnE;KACA,KAAK,mBAAmB,IAAI,CAAC;IAC/B;GACF;EACF;CACF;;;;;;CAOA,SACE,YACA,YACA;EACA,IAAI,WAAW,WAAW;GACxB,KAAK,aAAa,IAAI,UAAU;GAChC,WAAW,sBAAsB,KAAK,aAAa,OAAO,UAAU,CAAC;EACvE;CACF;;;;;;;;;;;CAYA,eAAe,YAAwB;EACrC,MAAM,YAAY,KAAK,WAAW,SAAS,CAAC,CAAC,UAC3C,KAAK,iBACP;EACA,IAAI,UAAU,QACZ,KAAK,mBACH,cAAc,WAAW,GAAG,+DACM,UAAU,KAAK,IAAI;CAE3D;AACF;AAEA,SAAS,iBACP,IACA,KAC2B;CAC3B,IAAI,IAAI,cAAc,KAAA,GACpB;CAEF,IAAI;EACF,OAAO,IAAI,cAAc,IAAI,SAAS;CACxC,SAAS,GAAG;EACV,GAAG,OAAO,qCAAqC,IAAI,MAAM,CAAC;EAC1D;CACF;AACF"}

package/out/zero-cache/src/services/change-streamer/backfill-state.js

@@ -18,7 +18,7 @@ function clone(state) {
 * Tags of messages that affect the backfill state. Other messages need not be
 * parsed.
 */
-var RELEVANT_TAGS = new Set(["backfill", ...schemaChangeTags.filter((t) => t !== "create-index" && t !== "drop-index")]);
+var RELEVANT_TAGS = /* @__PURE__ */ new Set(["backfill", ...schemaChangeTags.filter((t) => t !== "create-index" && t !== "drop-index")]);
 var lastParsed;
 function parse(json) {
 	if (lastParsed?.json !== json) lastParsed = {

package/out/zero-cache/src/services/change-streamer/backfill-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"backfill-state.js","names":["#state","#committed","#beforeTx","#begin","#commit","#rollback","#applyBackfill","#applySchemaChange"],"sources":["../../../../../../zero-cache/src/services/change-streamer/backfill-state.ts"],"sourcesContent":["import {unreachable} from '../../../../shared/src/asserts.ts';\nimport {BigIntJSON} from '../../../../shared/src/bigint-json.ts';\nimport {deepEqual} from '../../../../shared/src/json.ts';\nimport {\n  acceptBackfill,\n  covers,\n} from '../change-source/protocol/backfill-progress.ts';\nimport type {\n  BackfillRequest,\n  ChangeStreamData,\n  Identifier,\n  SchemaChange,\n  TableMetadata,\n} from '../change-source/protocol/current.ts';\nimport {schemaChangeTags} from '../change-source/protocol/current/schema-change-tags.ts';\nimport {cookieOps} from '../replicator/change-log-cookies.ts';\nimport type {ChangeTag, WatermarkedChange} from './change-streamer.ts';\n\nfunction tableKey({schema, name}: Identifier) {\n  return JSON.stringify([schema, name]);\n}\n\ntype Column = BackfillRequest['columns'][string];\n\n/** A mutable BackfillRequest. */\ntype Backfill = {\n  table: {schema: string; name: string; metadata: TableMetadata | null};\n  columns: Record<string, Column>;\n};\n\ntype State = Map<string, Backfill>;\n\nfunction clone(state: State): State {\n  return new Map(\n    Array.from(state, ([key, {table, columns}]) => [\n      key,\n      {table: {...table}, columns: {...columns}},\n    ]),\n  );\n}\n\n/**\n * Tags of messages that affect the backfill state. Other messages need not be\n * parsed.\n */\nconst RELEVANT_TAGS = new Set<ChangeTag>([\n  'backfill',\n  ...schemaChangeTags.filter(t => t !== 'create-index' && t !== 'drop-index'),\n]);\n\n// Serialized changes are typically forwarded (as the same string) to every\n// subscriber, so a single entry cache avoids re-parsing the same message for\n// each subscriber.\nlet lastParsed: {json: string; change: ChangeStreamData} | undefined;\n\nfunction parse(json: string): ChangeStreamData {\n  if (lastParsed?.json !== json) {\n    lastParsed = {json, change: BigIntJSON.parse(json) as ChangeStreamData};\n  }\n  return lastParsed.change;\n}\n\n/**\n * Tracks the state of the pending backfills (and their progress) of a party\n * in the replication stream (e.g. a subscriber, or the change-log itself), by\n * applying the same policies that a subscriber applies to its replica:\n * schema changes are folded with the {@link cookieOps} shared by the\n * cookie jars, and `backfill` / `backfill-completed` messages are accepted\n * or ignored with the continuity policy of {@link acceptBackfill}.\n *\n * Changes are applied transactionally: the changes of a transaction are\n * discarded if it is rolled back, and {@link requests()} only reflects\n * committed transactions.\n */\nexport class BackfillState {\n  #state: State;\n  #beforeTx: State | null = null;\n\n  constructor(requests: readonly BackfillRequest[] = []) {\n    this.#state = new Map(\n      requests\n        .filter(req => Object.keys(req.columns).length > 0)\n        .map(({table, columns}) => [\n          tableKey(table),\n          {table: {...table}, columns: {...columns}},\n        ]),\n    );\n  }\n\n  get #committed(): State {\n    return this.#beforeTx ?? this.#state;\n  }\n\n  /** The (committed) pending backfills. */\n  requests(): BackfillRequest[] {\n    return [...clone(this.#committed).values()];\n  }\n\n  /**\n   * Returns the `requests` with the (committed) progress of this state\n   * applied to the columns that are pending in both, i.e. same table, column,\n   * and backfill ID. Other columns have no progress (i.e. from scratch).\n   */\n  withProgress(requests: readonly BackfillRequest[]): BackfillRequest[] {\n    const state = this.#committed;\n    return requests.map(({table, columns}) => {\n      const tracked = state.get(tableKey(table))?.columns;\n      return {\n        table,\n        columns: Object.fromEntries(\n          Object.entries(columns).map(([name, {id}]) => {\n            const col = tracked?.[name];\n            return [\n              name,\n              col?.progress && deepEqual(col.id, id)\n                ? {id, progress: col.progress}\n                : {id},\n            ];\n          }),\n        ),\n      };\n    });\n  }\n\n  /** Whether there are no (committed) pending backfills. */\n  get empty(): boolean {\n    return this.#committed.size === 0;\n  }\n\n  /**\n   * Returns the columns (as `schema.table.column` strings) with (committed)\n   * pending backfills that are not covered by the (committed) progress of the\n   * `stream`, i.e. columns for which the `stream` will not deliver all of the\n   * necessary data.\n   */\n  uncovered(stream: BackfillState): string[] {\n    const uncovered: string[] = [];\n    const streamState = stream.#committed;\n    for (const [key, {table, columns}] of this.#committed) {\n      const streamColumns = streamState.get(key)?.columns;\n      for (const [name, {id, progress}] of Object.entries(columns)) {\n        const s = streamColumns?.[name];\n        if (!s || !deepEqual(s.id, id) || !covers(s.progress, progress)) {\n          uncovered.push(`${table.schema}.${table.name}.${name}`);\n        }\n      }\n    }\n    return uncovered;\n  }\n\n  /**\n   * Applies a serialized change, parsing it only if it is relevant.\n   *\n   * @returns The columns (as `schema.table.column` strings) of a backfill\n   *          message that were ignored due to the continuity policy.\n   */\n  applySerialized([, tag, json]: WatermarkedChange): string[] {\n    switch (tag) {\n      case 'begin':\n        this.#begin();\n        return [];\n      case 'commit':\n        this.#commit();\n        return [];\n      case 'rollback':\n        this.#rollback();\n        return [];\n    }\n    if (!RELEVANT_TAGS.has(tag)) {\n      return [];\n    }\n    return this.apply(parse(json));\n  }\n\n  /**\n   * Applies a change.\n   *\n   * @returns The columns (as `schema.table.column` strings) of a backfill\n   *          message that were ignored due to the continuity policy.\n   */\n  apply(change: ChangeStreamData): string[] {\n    switch (change[0]) {\n      case 'begin':\n        this.#begin();\n        return [];\n      case 'commit':\n        this.#commit();\n        return [];\n      case 'rollback':\n        this.#rollback();\n        return [];\n    }\n    const msg = change[1];\n    switch (msg.tag) {\n      case 'backfill': {\n        const {relation, columns, progressMarks} = msg;\n        return this.#applyBackfill(relation, columns, (progress, col) => {\n          const result = acceptBackfill(progress, progressMarks);\n          if (result.accept) {\n            col.progress = result.progress;\n            if (col.progress === undefined) {\n              delete col.progress;\n            }\n          }\n          return result.accept;\n        });\n      }\n      case 'backfill-completed': {\n        const {relation, columns, progressMarks} = msg;\n        const backfill = this.#state.get(tableKey(relation));\n        const ignored = this.#applyBackfill(\n          relation,\n          columns,\n          (progress, _, name) => {\n            const {accept} = acceptBackfill(\n              progress,\n              progressMarks && {previous: progressMarks.previous},\n            );\n            if (accept && backfill) {\n              delete backfill.columns[name];\n            }\n            return accept;\n          },\n        );\n        if (backfill && Object.keys(backfill.columns).length === 0) {\n          this.#state.delete(tableKey(relation));\n        }\n        return ignored;\n      }\n      case 'create-table':\n      case 'rename-table':\n      case 'update-table-metadata':\n      case 'add-column':\n      case 'update-column':\n      case 'drop-column':\n      case 'drop-table':\n        this.#applySchemaChange(msg);\n        return [];\n    }\n    return [];\n  }\n\n  #applyBackfill(\n    relation: {schema: string; name: string; rowKey: {columns: string[]}},\n    columns: readonly string[],\n    apply: (progress: Column['progress'], col: Column, name: string) => boolean,\n  ): string[] {\n    const backfill = this.#state.get(tableKey(relation));\n    if (!backfill) {\n      return [];\n    }\n    const ignored: string[] = [];\n    // rowKey columns are excluded from `columns` but are backfilled with them\n    // (e.g. for a new table).\n    for (const name of [...relation.rowKey.columns, ...columns]) {\n      const col = backfill.columns[name];\n      if (!col) {\n        continue;\n      }\n      // Copy-on-write, since the column object may be shared with the\n      // pre-transaction state.\n      const updated = {...col};\n      if (apply(col.progress, updated, name)) {\n        if (name in backfill.columns) {\n          backfill.columns[name] = updated;\n        }\n      } else {\n        ignored.push(`${relation.schema}.${relation.name}.${name}`);\n      }\n    }\n    return ignored;\n  }\n\n  #applySchemaChange(change: SchemaChange) {\n    // Table metadata specified in the same change (e.g. a `create-table` or\n    // `add-column`), for backfills of tables that are not yet tracked.\n    const metadata = new Map<string, TableMetadata>();\n\n    for (const op of cookieOps(change)) {\n      switch (op.op) {\n        case 'upsert-metadata': {\n          const key = tableKey(op.table);\n          metadata.set(key, op.metadata);\n          const backfill = this.#state.get(key);\n          if (backfill) {\n            backfill.table.metadata = op.metadata;\n          }\n          break;\n        }\n        case 'upsert-backfill': {\n          const key = tableKey(op.table);\n          let backfill = this.#state.get(key);\n          if (!backfill) {\n            backfill = {\n              table: {\n                schema: op.table.schema,\n                name: op.table.name,\n                metadata: metadata.get(key) ?? null,\n              },\n              columns: {},\n            };\n            this.#state.set(key, backfill);\n          }\n          // A new backfill always starts from scratch.\n          backfill.columns[op.column] = {id: op.backfill};\n          break;\n        }\n        case 'rename-table': {\n          const backfill = this.#state.get(tableKey(op.old));\n          if (backfill) {\n            this.#state.delete(tableKey(op.old));\n            backfill.table.schema = op.new.schema;\n            backfill.table.name = op.new.name;\n            this.#state.set(tableKey(op.new), backfill);\n          }\n          break;\n        }\n        case 'drop-table':\n          this.#state.delete(tableKey(op.table));\n          break;\n        case 'rename-column': {\n          const backfill = this.#state.get(tableKey(op.table));\n          const col = backfill?.columns[op.old];\n          if (backfill && col) {\n            delete backfill.columns[op.old];\n            backfill.columns[op.new] = col;\n          }\n          break;\n        }\n        case 'drop-column': {\n          const key = tableKey(op.table);\n          const backfill = this.#state.get(key);\n          if (backfill) {\n            delete backfill.columns[op.column];\n            if (Object.keys(backfill.columns).length === 0) {\n              this.#state.delete(key);\n            }\n          }\n          break;\n        }\n        case 'complete-backfill':\n          // Only produced for `backfill-completed`, which is handled\n          // separately (with the continuity policy).\n          throw new Error(`unexpected ${op.op} op`);\n        default:\n          unreachable(op);\n      }\n    }\n  }\n\n  #begin() {\n    // Tolerate a missing commit/rollback, e.g. from an interrupted stream.\n    this.#beforeTx ??= clone(this.#state);\n  }\n\n  #commit() {\n    this.#beforeTx = null;\n  }\n\n  #rollback() {\n    if (this.#beforeTx) {\n      this.#state = this.#beforeTx;\n      this.#beforeTx = null;\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"backfill-state.js","names":[],"sources":["../../../../../../zero-cache/src/services/change-streamer/backfill-state.ts"],"sourcesContent":["import {unreachable} from '../../../../shared/src/asserts.ts';\nimport {BigIntJSON} from '../../../../shared/src/bigint-json.ts';\nimport {deepEqual} from '../../../../shared/src/json.ts';\nimport {\n  acceptBackfill,\n  covers,\n} from '../change-source/protocol/backfill-progress.ts';\nimport type {\n  BackfillRequest,\n  ChangeStreamData,\n  Identifier,\n  SchemaChange,\n  TableMetadata,\n} from '../change-source/protocol/current.ts';\nimport {schemaChangeTags} from '../change-source/protocol/current/schema-change-tags.ts';\nimport {cookieOps} from '../replicator/change-log-cookies.ts';\nimport type {ChangeTag, WatermarkedChange} from './change-streamer.ts';\n\nfunction tableKey({schema, name}: Identifier) {\n  return JSON.stringify([schema, name]);\n}\n\ntype Column = BackfillRequest['columns'][string];\n\n/** A mutable BackfillRequest. */\ntype Backfill = {\n  table: {schema: string; name: string; metadata: TableMetadata | null};\n  columns: Record<string, Column>;\n};\n\ntype State = Map<string, Backfill>;\n\nfunction clone(state: State): State {\n  return new Map(\n    Array.from(state, ([key, {table, columns}]) => [\n      key,\n      {table: {...table}, columns: {...columns}},\n    ]),\n  );\n}\n\n/**\n * Tags of messages that affect the backfill state. Other messages need not be\n * parsed.\n */\nconst RELEVANT_TAGS = new Set<ChangeTag>([\n  'backfill',\n  ...schemaChangeTags.filter(t => t !== 'create-index' && t !== 'drop-index'),\n]);\n\n// Serialized changes are typically forwarded (as the same string) to every\n// subscriber, so a single entry cache avoids re-parsing the same message for\n// each subscriber.\nlet lastParsed: {json: string; change: ChangeStreamData} | undefined;\n\nfunction parse(json: string): ChangeStreamData {\n  if (lastParsed?.json !== json) {\n    lastParsed = {json, change: BigIntJSON.parse(json) as ChangeStreamData};\n  }\n  return lastParsed.change;\n}\n\n/**\n * Tracks the state of the pending backfills (and their progress) of a party\n * in the replication stream (e.g. a subscriber, or the change-log itself), by\n * applying the same policies that a subscriber applies to its replica:\n * schema changes are folded with the {@link cookieOps} shared by the\n * cookie jars, and `backfill` / `backfill-completed` messages are accepted\n * or ignored with the continuity policy of {@link acceptBackfill}.\n *\n * Changes are applied transactionally: the changes of a transaction are\n * discarded if it is rolled back, and {@link requests()} only reflects\n * committed transactions.\n */\nexport class BackfillState {\n  #state: State;\n  #beforeTx: State | null = null;\n\n  constructor(requests: readonly BackfillRequest[] = []) {\n    this.#state = new Map(\n      requests\n        .filter(req => Object.keys(req.columns).length > 0)\n        .map(({table, columns}) => [\n          tableKey(table),\n          {table: {...table}, columns: {...columns}},\n        ]),\n    );\n  }\n\n  get #committed(): State {\n    return this.#beforeTx ?? this.#state;\n  }\n\n  /** The (committed) pending backfills. */\n  requests(): BackfillRequest[] {\n    return [...clone(this.#committed).values()];\n  }\n\n  /**\n   * Returns the `requests` with the (committed) progress of this state\n   * applied to the columns that are pending in both, i.e. same table, column,\n   * and backfill ID. Other columns have no progress (i.e. from scratch).\n   */\n  withProgress(requests: readonly BackfillRequest[]): BackfillRequest[] {\n    const state = this.#committed;\n    return requests.map(({table, columns}) => {\n      const tracked = state.get(tableKey(table))?.columns;\n      return {\n        table,\n        columns: Object.fromEntries(\n          Object.entries(columns).map(([name, {id}]) => {\n            const col = tracked?.[name];\n            return [\n              name,\n              col?.progress && deepEqual(col.id, id)\n                ? {id, progress: col.progress}\n                : {id},\n            ];\n          }),\n        ),\n      };\n    });\n  }\n\n  /** Whether there are no (committed) pending backfills. */\n  get empty(): boolean {\n    return this.#committed.size === 0;\n  }\n\n  /**\n   * Returns the columns (as `schema.table.column` strings) with (committed)\n   * pending backfills that are not covered by the (committed) progress of the\n   * `stream`, i.e. columns for which the `stream` will not deliver all of the\n   * necessary data.\n   */\n  uncovered(stream: BackfillState): string[] {\n    const uncovered: string[] = [];\n    const streamState = stream.#committed;\n    for (const [key, {table, columns}] of this.#committed) {\n      const streamColumns = streamState.get(key)?.columns;\n      for (const [name, {id, progress}] of Object.entries(columns)) {\n        const s = streamColumns?.[name];\n        if (!s || !deepEqual(s.id, id) || !covers(s.progress, progress)) {\n          uncovered.push(`${table.schema}.${table.name}.${name}`);\n        }\n      }\n    }\n    return uncovered;\n  }\n\n  /**\n   * Applies a serialized change, parsing it only if it is relevant.\n   *\n   * @returns The columns (as `schema.table.column` strings) of a backfill\n   *          message that were ignored due to the continuity policy.\n   */\n  applySerialized([, tag, json]: WatermarkedChange): string[] {\n    switch (tag) {\n      case 'begin':\n        this.#begin();\n        return [];\n      case 'commit':\n        this.#commit();\n        return [];\n      case 'rollback':\n        this.#rollback();\n        return [];\n    }\n    if (!RELEVANT_TAGS.has(tag)) {\n      return [];\n    }\n    return this.apply(parse(json));\n  }\n\n  /**\n   * Applies a change.\n   *\n   * @returns The columns (as `schema.table.column` strings) of a backfill\n   *          message that were ignored due to the continuity policy.\n   */\n  apply(change: ChangeStreamData): string[] {\n    switch (change[0]) {\n      case 'begin':\n        this.#begin();\n        return [];\n      case 'commit':\n        this.#commit();\n        return [];\n      case 'rollback':\n        this.#rollback();\n        return [];\n    }\n    const msg = change[1];\n    switch (msg.tag) {\n      case 'backfill': {\n        const {relation, columns, progressMarks} = msg;\n        return this.#applyBackfill(relation, columns, (progress, col) => {\n          const result = acceptBackfill(progress, progressMarks);\n          if (result.accept) {\n            col.progress = result.progress;\n            if (col.progress === undefined) {\n              delete col.progress;\n            }\n          }\n          return result.accept;\n        });\n      }\n      case 'backfill-completed': {\n        const {relation, columns, progressMarks} = msg;\n        const backfill = this.#state.get(tableKey(relation));\n        const ignored = this.#applyBackfill(\n          relation,\n          columns,\n          (progress, _, name) => {\n            const {accept} = acceptBackfill(\n              progress,\n              progressMarks && {previous: progressMarks.previous},\n            );\n            if (accept && backfill) {\n              delete backfill.columns[name];\n            }\n            return accept;\n          },\n        );\n        if (backfill && Object.keys(backfill.columns).length === 0) {\n          this.#state.delete(tableKey(relation));\n        }\n        return ignored;\n      }\n      case 'create-table':\n      case 'rename-table':\n      case 'update-table-metadata':\n      case 'add-column':\n      case 'update-column':\n      case 'drop-column':\n      case 'drop-table':\n        this.#applySchemaChange(msg);\n        return [];\n    }\n    return [];\n  }\n\n  #applyBackfill(\n    relation: {schema: string; name: string; rowKey: {columns: string[]}},\n    columns: readonly string[],\n    apply: (progress: Column['progress'], col: Column, name: string) => boolean,\n  ): string[] {\n    const backfill = this.#state.get(tableKey(relation));\n    if (!backfill) {\n      return [];\n    }\n    const ignored: string[] = [];\n    // rowKey columns are excluded from `columns` but are backfilled with them\n    // (e.g. for a new table).\n    for (const name of [...relation.rowKey.columns, ...columns]) {\n      const col = backfill.columns[name];\n      if (!col) {\n        continue;\n      }\n      // Copy-on-write, since the column object may be shared with the\n      // pre-transaction state.\n      const updated = {...col};\n      if (apply(col.progress, updated, name)) {\n        if (name in backfill.columns) {\n          backfill.columns[name] = updated;\n        }\n      } else {\n        ignored.push(`${relation.schema}.${relation.name}.${name}`);\n      }\n    }\n    return ignored;\n  }\n\n  #applySchemaChange(change: SchemaChange) {\n    // Table metadata specified in the same change (e.g. a `create-table` or\n    // `add-column`), for backfills of tables that are not yet tracked.\n    const metadata = new Map<string, TableMetadata>();\n\n    for (const op of cookieOps(change)) {\n      switch (op.op) {\n        case 'upsert-metadata': {\n          const key = tableKey(op.table);\n          metadata.set(key, op.metadata);\n          const backfill = this.#state.get(key);\n          if (backfill) {\n            backfill.table.metadata = op.metadata;\n          }\n          break;\n        }\n        case 'upsert-backfill': {\n          const key = tableKey(op.table);\n          let backfill = this.#state.get(key);\n          if (!backfill) {\n            backfill = {\n              table: {\n                schema: op.table.schema,\n                name: op.table.name,\n                metadata: metadata.get(key) ?? null,\n              },\n              columns: {},\n            };\n            this.#state.set(key, backfill);\n          }\n          // A new backfill always starts from scratch.\n          backfill.columns[op.column] = {id: op.backfill};\n          break;\n        }\n        case 'rename-table': {\n          const backfill = this.#state.get(tableKey(op.old));\n          if (backfill) {\n            this.#state.delete(tableKey(op.old));\n            backfill.table.schema = op.new.schema;\n            backfill.table.name = op.new.name;\n            this.#state.set(tableKey(op.new), backfill);\n          }\n          break;\n        }\n        case 'drop-table':\n          this.#state.delete(tableKey(op.table));\n          break;\n        case 'rename-column': {\n          const backfill = this.#state.get(tableKey(op.table));\n          const col = backfill?.columns[op.old];\n          if (backfill && col) {\n            delete backfill.columns[op.old];\n            backfill.columns[op.new] = col;\n          }\n          break;\n        }\n        case 'drop-column': {\n          const key = tableKey(op.table);\n          const backfill = this.#state.get(key);\n          if (backfill) {\n            delete backfill.columns[op.column];\n            if (Object.keys(backfill.columns).length === 0) {\n              this.#state.delete(key);\n            }\n          }\n          break;\n        }\n        case 'complete-backfill':\n          // Only produced for `backfill-completed`, which is handled\n          // separately (with the continuity policy).\n          throw new Error(`unexpected ${op.op} op`);\n        default:\n          unreachable(op);\n      }\n    }\n  }\n\n  #begin() {\n    // Tolerate a missing commit/rollback, e.g. from an interrupted stream.\n    this.#beforeTx ??= clone(this.#state);\n  }\n\n  #commit() {\n    this.#beforeTx = null;\n  }\n\n  #rollback() {\n    if (this.#beforeTx) {\n      this.#state = this.#beforeTx;\n      this.#beforeTx = null;\n    }\n  }\n}\n"],"mappings":"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"}

package/out/zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.js

@@ -4,17 +4,17 @@ import { LitestreamSyncRequester } from "./litestream-sync-requester.js";
 import { Litestream3PrometheusPoller } from "./litestream3-prometheus-poller.js";
 import { ReplicaPoller } from "./replica-poller.js";
 //#region ../zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.ts
-function createBackupCleanupMonitor({ lc, config, replicaFile, changeStreamer, verifyBackupState }) {
+function createBackupCleanupMonitor({ lc, config, replicaFile, verifyBackupState }) {
 	const { litestream, replica } = config;
 	const backupURL = backupDestinationURL(litestream);
-	let stream;
-	if (!backupURL) stream = new ReplicaPoller(lc, replicaFile).start();
-	else if (config.litestream.backupUsingV5) stream = new LitestreamSyncRequester(lc, replicaFile, { intervalMs: litestream.incrementalBackupIntervalSeconds * 1e3 }).start();
+	let poller;
+	if (!backupURL) poller = new ReplicaPoller(lc, replicaFile);
+	else if (config.litestream.backupUsingV5) poller = new LitestreamSyncRequester(lc, replicaFile, { intervalMs: litestream.incrementalBackupIntervalSeconds * 1e3 });
 	else {
 		const { port: metricsPort } = litestream;
-		stream = new Litestream3PrometheusPoller(lc, replicaFile, backupURL, `http://localhost:${metricsPort}/metrics`, verifyBackupState ?? (() => getLastBackupTime(lc, litestream, replica.file))).start();
+		poller = new Litestream3PrometheusPoller(lc, replicaFile, backupURL, `http://localhost:${metricsPort}/metrics`, verifyBackupState ?? (() => getLastBackupTime(lc, litestream, replica.file)));
 	}
-	return new BackupMonitor(lc, stream, changeStreamer, replicaFile);
+	return new BackupMonitor(lc, poller, replicaFile);
 }
 //#endregion
 export { createBackupCleanupMonitor };

package/out/zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"backup-cleanup-monitor-factory.js","names":[],"sources":["../../../../../../zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {NormalizedZeroConfig} from '../../config/normalize.ts';\nimport type {Source} from '../../types/streams.ts';\nimport {\n  backupDestinationURL,\n  getLastBackupTime,\n} from '../litestream/commands.ts';\nimport {type BackedUpWatermark, BackupMonitor} from './backup-monitor.ts';\nimport type {ChangeStreamerService} from './change-streamer.ts';\nimport {LitestreamSyncRequester} from './litestream-sync-requester.ts';\nimport {\n  type BackupStateVerifier,\n  Litestream3PrometheusPoller,\n} from './litestream3-prometheus-poller.ts';\nimport {ReplicaPoller} from './replica-poller.ts';\n\nexport type BackupCleanupMonitorFactoryOptions = {\n  lc: LogContext;\n  config: NormalizedZeroConfig;\n  replicaFile: string;\n  changeStreamer: ChangeStreamerService;\n  verifyBackupState?: BackupStateVerifier | undefined;\n};\n\nexport function createBackupCleanupMonitor({\n  lc,\n  config,\n  replicaFile,\n  changeStreamer,\n  verifyBackupState,\n}: BackupCleanupMonitorFactoryOptions): BackupMonitor {\n  const {litestream, replica} = config;\n  const backupURL = backupDestinationURL(litestream);\n\n  let stream: Source<BackedUpWatermark>;\n\n  if (!backupURL) {\n    stream = new ReplicaPoller(lc, replicaFile).start();\n  } else if (config.litestream.backupUsingV5) {\n    stream = new LitestreamSyncRequester(lc, replicaFile, {\n      intervalMs: litestream.incrementalBackupIntervalSeconds * 1000,\n    }).start();\n  } else {\n    const {port: metricsPort} = litestream;\n    stream = new Litestream3PrometheusPoller(\n      lc,\n      replicaFile,\n      backupURL,\n      `http://localhost:${metricsPort}/metrics`,\n      verifyBackupState ??\n        (() => getLastBackupTime(lc, litestream, replica.file)),\n    ).start();\n  }\n\n  return new BackupMonitor(lc, stream, changeStreamer, replicaFile);\n}\n"],"mappings":";;;;;;AAwBA,SAAgB,2BAA2B,EACzC,IACA,QACA,aACA,gBACA,qBACoD;CACpD,MAAM,EAAC,YAAY,YAAW;CAC9B,MAAM,YAAY,qBAAqB,UAAU;CAEjD,IAAI;CAEJ,IAAI,CAAC,WACH,SAAS,IAAI,cAAc,IAAI,WAAW,EAAE,MAAM;MAC7C,IAAI,OAAO,WAAW,eAC3B,SAAS,IAAI,wBAAwB,IAAI,aAAa,EACpD,YAAY,WAAW,mCAAmC,IAC5D,CAAC,EAAE,MAAM;MACJ;EACL,MAAM,EAAC,MAAM,gBAAe;EAC5B,SAAS,IAAI,4BACX,IACA,aACA,WACA,oBAAoB,YAAY,WAChC,4BACS,kBAAkB,IAAI,YAAY,QAAQ,IAAI,EACzD,EAAE,MAAM;CACV;CAEA,OAAO,IAAI,cAAc,IAAI,QAAQ,gBAAgB,WAAW;AAClE"}
+{"version":3,"file":"backup-cleanup-monitor-factory.js","names":[],"sources":["../../../../../../zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {NormalizedZeroConfig} from '../../config/normalize.ts';\nimport {\n  backupDestinationURL,\n  getLastBackupTime,\n} from '../litestream/commands.ts';\nimport {BackupMonitor, type BackupPoller} from './backup-monitor.ts';\nimport {LitestreamSyncRequester} from './litestream-sync-requester.ts';\nimport {\n  type BackupStateVerifier,\n  Litestream3PrometheusPoller,\n} from './litestream3-prometheus-poller.ts';\nimport {ReplicaPoller} from './replica-poller.ts';\n\nexport type BackupCleanupMonitorFactoryOptions = {\n  lc: LogContext;\n  config: NormalizedZeroConfig;\n  replicaFile: string;\n  verifyBackupState?: BackupStateVerifier | undefined;\n};\n\nexport function createBackupCleanupMonitor({\n  lc,\n  config,\n  replicaFile,\n  verifyBackupState,\n}: BackupCleanupMonitorFactoryOptions): BackupMonitor {\n  const {litestream, replica} = config;\n  const backupURL = backupDestinationURL(litestream);\n\n  let poller: BackupPoller;\n\n  if (!backupURL) {\n    poller = new ReplicaPoller(lc, replicaFile);\n  } else if (config.litestream.backupUsingV5) {\n    poller = new LitestreamSyncRequester(lc, replicaFile, {\n      intervalMs: litestream.incrementalBackupIntervalSeconds * 1000,\n    });\n  } else {\n    const {port: metricsPort} = litestream;\n    poller = new Litestream3PrometheusPoller(\n      lc,\n      replicaFile,\n      backupURL,\n      `http://localhost:${metricsPort}/metrics`,\n      verifyBackupState ??\n        (() => getLastBackupTime(lc, litestream, replica.file)),\n    );\n  }\n\n  return new BackupMonitor(lc, poller, replicaFile);\n}\n"],"mappings":";;;;;;AAqBA,SAAgB,2BAA2B,EACzC,IACA,QACA,aACA,qBACoD;CACpD,MAAM,EAAC,YAAY,YAAW;CAC9B,MAAM,YAAY,qBAAqB,UAAU;CAEjD,IAAI;CAEJ,IAAI,CAAC,WACH,SAAS,IAAI,cAAc,IAAI,WAAW;MACrC,IAAI,OAAO,WAAW,eAC3B,SAAS,IAAI,wBAAwB,IAAI,aAAa,EACpD,YAAY,WAAW,mCAAmC,IAC5D,CAAC;MACI;EACL,MAAM,EAAC,MAAM,gBAAe;EAC5B,SAAS,IAAI,4BACX,IACA,aACA,WACA,oBAAoB,YAAY,WAChC,4BACS,kBAAkB,IAAI,YAAY,QAAQ,IAAI,EACzD;CACF;CAEA,OAAO,IAAI,cAAc,IAAI,QAAQ,WAAW;AAClD"}

package/out/zero-cache/src/services/change-streamer/backup-monitor.js

@@ -1,15 +1,23 @@
 import { promiseVoid } from "../../../../shared/src/resolved-promises.js";
+import { resolver } from "../../../../shared/src/resolver.js";
 import { Database } from "../../../../zqlite/src/db.js";
 import { getOrCreateGauge } from "../../observability/metrics.js";
-import { resolver } from "@rocicorp/resolver";
+import { Subscription } from "../../types/subscription.js";
 //#region ../zero-cache/src/services/change-streamer/backup-monitor.ts
+/**
+* Relays the watermarks backed up by a {@link BackupPoller} to the
+* change-streamer, which consumes them (see {@link backups}) and requests
+* prompt backups (see {@link requestSync}) as needed.
+*/
 var BackupMonitor = class {
 	id = "backup-monitor";
 	#lc;
-	#watermarks;
-	#changeStreamer;
+	#poller;
 	#replicaFile;
 	#firstBackupReceived = resolver();
+	#backups = Subscription.create({ coalesce: (curr) => curr });
+	#watermarks;
+	#stopped = false;
 	#latestBackup;
 	#firstBackupResolved = false;
 	/**
@@ -19,36 +27,61 @@ var BackupMonitor = class {
 	* "any watermark" rather than hanging startup forever.
 	*/
 	#coverageTarget;
-	constructor(lc, watermarks, changeStreamer, replicaFile) {
+	constructor(lc, poller, replicaFile) {
 		this.#lc = lc;
-		this.#watermarks = watermarks;
-		this.#changeStreamer = changeStreamer;
+		this.#poller = poller;
 		this.#replicaFile = replicaFile;
 	}
 	firstBackupReceived() {
 		return this.#firstBackupReceived.promise;
 	}
+	/**
+	* The stream of backed-up watermarks, each later than the last, coalesced
+	* to the latest one that has not been consumed. It ends when the monitor
+	* stops.
+	*/
+	backups() {
+		return this.#backups;
+	}
+	/**
+	* Requests that the replica be backed up through `watermark` promptly, if
+	* the poller supports it (see {@link BackupPoller.requestSync}). A no-op
+	* unless the monitor is running.
+	*/
+	requestSync(watermark) {
+		if (!this.#watermarks || this.#stopped || this.#latestBackup && this.#latestBackup.watermark >= watermark) return;
+		if (this.#poller.requestSync) {
+			this.#lc.info?.(`requesting backup through ${watermark}`);
+			this.#poller.requestSync(watermark);
+		}
+	}
 	async run() {
+		if (this.#stopped) return;
 		this.#lc.info?.("starting backup monitor");
 		this.#initBackupLagMetric();
 		this.#coverageTarget = this.#readReplicaStateVersion();
-		for await (const backedUp of this.#watermarks) {
-			if (this.#latestBackup) {
-				if (backedUp.watermark < this.#latestBackup.watermark) {
-					this.#lc.warn?.(`ignoring earlier backup watermark ${backedUp.watermark}`, { backedUp });
-					continue;
-				}
-				if (backedUp.watermark === this.#latestBackup.watermark) {
-					this.#lc.debug?.(`ignoring redundant backup watermark ${backedUp.watermark}`, { backedUp });
-					continue;
+		this.#watermarks = this.#poller.start();
+		try {
+			for await (const backedUp of this.#watermarks) {
+				if (this.#latestBackup) {
+					if (backedUp.watermark < this.#latestBackup.watermark) {
+						this.#lc.warn?.(`ignoring earlier backup watermark ${backedUp.watermark}`, { backedUp });
+						continue;
+					}
+					if (backedUp.watermark === this.#latestBackup.watermark) {
+						this.#lc.debug?.(`ignoring redundant backup watermark ${backedUp.watermark}`, { backedUp });
+						continue;
+					}
 				}
+				this.#lc.info?.(`received backup watermark ${backedUp.watermark}`, { backedUp });
+				this.#latestBackup = backedUp;
+				this.#backups.push(backedUp);
+				this.#checkFirstBackupCovers(backedUp);
 			}
-			this.#lc.info?.(`received backup watermark ${backedUp.watermark}`, { backedUp });
-			this.#latestBackup = backedUp;
-			this.#changeStreamer.trackBackupWatermark(backedUp.watermark);
-			this.#checkFirstBackupCovers(backedUp);
+			this.#lc.info?.("watermark stream closed. BackupMonitor stopped.");
+		} finally {
+			this.#backups.cancel();
 		}
-		this.#lc.info?.("watermark stream closed. BackupMonitor stopped.");
 	}
 	/**
 	* Resolves {@link firstBackupReceived} once the backup actually covers the
@@ -90,7 +123,9 @@ var BackupMonitor = class {
 		}
 	}
 	stop() {
-		this.#watermarks.cancel();
+		this.#stopped = true;
+		this.#watermarks?.cancel();
+		this.#backups.cancel();
 		return promiseVoid;
 	}
 	#initBackupLagMetric() {

package/out/zero-cache/src/services/change-streamer/backup-monitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"backup-monitor.js","names":["#lc","#watermarks","#changeStreamer","#replicaFile","#firstBackupReceived","#initBackupLagMetric","#coverageTarget","#readReplicaStateVersion","#latestBackup","#checkFirstBackupCovers","#firstBackupResolved"],"sources":["../../../../../../zero-cache/src/services/change-streamer/backup-monitor.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {resolver} from '@rocicorp/resolver';\nimport {promiseVoid} from '../../../../shared/src/resolved-promises.ts';\nimport {Database} from '../../../../zqlite/src/db.ts';\nimport {getOrCreateGauge} from '../../observability/metrics.ts';\nimport type {Source} from '../../types/streams.ts';\nimport type {SingletonService} from '../service.ts';\nimport type {ChangeStreamerService} from './change-streamer.ts';\n\nexport type BackedUpWatermark = {\n  watermark: string;\n  writeTimeMs?: number | undefined; // optional for debugging; available on v5\n  backupTimeMs: number;\n};\n\nexport class BackupMonitor implements SingletonService {\n  readonly id = 'backup-monitor';\n  readonly #lc: LogContext;\n  readonly #watermarks: Source<BackedUpWatermark>;\n  readonly #changeStreamer: ChangeStreamerService;\n  readonly #replicaFile: string;\n  readonly #firstBackupReceived = resolver();\n\n  #latestBackup: BackedUpWatermark | undefined;\n  #firstBackupResolved = false;\n  /**\n   * The replica's `stateVersion` when the monitor started, i.e. the point the\n   * backup has to reach before it covers what this task is about to serve.\n   * `undefined` when the replica could not be read, which degrades the gate to\n   * \"any watermark\" rather than hanging startup forever.\n   */\n  #coverageTarget: string | undefined;\n\n  constructor(\n    lc: LogContext,\n    watermarks: Source<BackedUpWatermark>,\n    changeStreamer: ChangeStreamerService,\n    replicaFile: string,\n  ) {\n    this.#lc = lc;\n    this.#watermarks = watermarks;\n    this.#changeStreamer = changeStreamer;\n    this.#replicaFile = replicaFile;\n  }\n\n  firstBackupReceived() {\n    return this.#firstBackupReceived.promise;\n  }\n\n  async run() {\n    this.#lc.info?.('starting backup monitor');\n    this.#initBackupLagMetric();\n    this.#coverageTarget = this.#readReplicaStateVersion();\n\n    for await (const backedUp of this.#watermarks) {\n      if (this.#latestBackup) {\n        if (backedUp.watermark < this.#latestBackup.watermark) {\n          this.#lc.warn?.(\n            `ignoring earlier backup watermark ${backedUp.watermark}`,\n            {backedUp},\n          );\n          continue;\n        }\n        if (backedUp.watermark === this.#latestBackup.watermark) {\n          this.#lc.debug?.(\n            `ignoring redundant backup watermark ${backedUp.watermark}`,\n            {backedUp},\n          );\n          continue;\n        }\n      }\n      this.#lc.info?.(`received backup watermark ${backedUp.watermark}`, {\n        backedUp,\n      });\n      this.#latestBackup = backedUp;\n      this.#changeStreamer.trackBackupWatermark(backedUp.watermark);\n      this.#checkFirstBackupCovers(backedUp);\n    }\n    this.#lc.info?.('watermark stream closed. BackupMonitor stopped.');\n  }\n\n  /**\n   * Resolves {@link firstBackupReceived} once the backup actually covers the\n   * replica, rather than on the first watermark of any value.\n   *\n   * A new backup destination starts empty and is filled by re-uploading the\n   * local LTX chain, so the first watermarks read back out of it are real but\n   * far behind the replica. Releasing the readiness gate on one of those lets\n   * the task serve against a backup that does not yet cover it, which is what\n   * demotes a restoring view-syncer to Postgres catchup.\n   *\n   * The target is pinned at startup rather than compared against the replica's\n   * current position, which keeps the gate satisfiable under sustained writes.\n   */\n  #checkFirstBackupCovers(backedUp: BackedUpWatermark) {\n    if (this.#firstBackupResolved) {\n      return;\n    }\n    const target = this.#coverageTarget;\n    if (target !== undefined && backedUp.watermark < target) {\n      this.#lc.info?.(`backup does not yet cover the replica`, {\n        backedUp,\n        coverageTarget: target,\n      });\n      return;\n    }\n    this.#firstBackupResolved = true;\n    this.#firstBackupReceived.resolve();\n  }\n\n  #readReplicaStateVersion(): string | undefined {\n    let db;\n    try {\n      db = new Database(this.#lc, this.#replicaFile, {readonly: true});\n      const {stateVersion} = db\n        .prepare(/*sql*/ `SELECT stateVersion FROM \"_zero.replicationState\"`)\n        .get<{stateVersion: string}>();\n      return stateVersion;\n    } catch (e) {\n      // Without a target the gate degrades to its previous behavior. That is\n      // strictly better than blocking startup on a replica we cannot read.\n      this.#lc.warn?.(\n        `unable to read the replica's stateVersion; ` +\n          `the initial backup gate will accept the first watermark`,\n        e,\n      );\n      return undefined;\n    } finally {\n      db?.close();\n    }\n  }\n\n  stop(): Promise<void> {\n    this.#watermarks.cancel();\n    return promiseVoid;\n  }\n\n  #initBackupLagMetric() {\n    getOrCreateGauge('replica', 'backup_lag', {\n      description:\n        'Latency from when a change is written to the replica ' +\n        'to when it is backed up to litestream. It is expected to create a saw ' +\n        'pattern from 0 to the configured ZERO_LITESTREAM_INCREMENTAL_BACKUP_INTERVAL_MINUTES.',\n      unit: 'millisecond',\n    }).addCallback(o => {\n      const latestBackup = this.#latestBackup;\n      if (!latestBackup) {\n        this.#lc.warn?.(\n          `no backed up watermarks. unable to report replica.backup_lag`,\n        );\n        return;\n      }\n      const db = new Database(this.#lc, this.#replicaFile, {readonly: true});\n      try {\n        const {writeTimeMs} = db\n          .prepare(/*sql*/ `SELECT writeTimeMs FROM \"_zero.replicationState\"`)\n          .get<{writeTimeMs: number}>();\n        const backupLag = Math.max(0, writeTimeMs - latestBackup.backupTimeMs);\n        o.observe(backupLag);\n      } catch (e) {\n        this.#lc.warn?.(`error measuring replica.backup_lag metric`, e);\n      } finally {\n        db.close();\n      }\n    });\n  }\n}\n"],"mappings":";;;;;AAeA,IAAa,gBAAb,MAAuD;CACrD,KAAc;CACd;CACA;CACA;CACA;CACA,uBAAgC,SAAS;CAEzC;CACA,uBAAuB;;;;;;;CAOvB;CAEA,YACE,IACA,YACA,gBACA,aACA;EACA,KAAKA,MAAM;EACX,KAAKC,cAAc;EACnB,KAAKC,kBAAkB;EACvB,KAAKC,eAAe;CACtB;CAEA,sBAAsB;EACpB,OAAO,KAAKC,qBAAqB;CACnC;CAEA,MAAM,MAAM;EACV,KAAKJ,IAAI,OAAO,yBAAyB;EACzC,KAAKK,qBAAqB;EAC1B,KAAKC,kBAAkB,KAAKC,yBAAyB;EAErD,WAAW,MAAM,YAAY,KAAKN,aAAa;GAC7C,IAAI,KAAKO,eAAe;IACtB,IAAI,SAAS,YAAY,KAAKA,cAAc,WAAW;KACrD,KAAKR,IAAI,OACP,qCAAqC,SAAS,aAC9C,EAAC,SAAQ,CACX;KACA;IACF;IACA,IAAI,SAAS,cAAc,KAAKQ,cAAc,WAAW;KACvD,KAAKR,IAAI,QACP,uCAAuC,SAAS,aAChD,EAAC,SAAQ,CACX;KACA;IACF;GACF;GACA,KAAKA,IAAI,OAAO,6BAA6B,SAAS,aAAa,EACjE,SACF,CAAC;GACD,KAAKQ,gBAAgB;GACrB,KAAKN,gBAAgB,qBAAqB,SAAS,SAAS;GAC5D,KAAKO,wBAAwB,QAAQ;EACvC;EACA,KAAKT,IAAI,OAAO,iDAAiD;CACnE;;;;;;;;;;;;;;CAeA,wBAAwB,UAA6B;EACnD,IAAI,KAAKU,sBACP;EAEF,MAAM,SAAS,KAAKJ;EACpB,IAAI,WAAW,KAAA,KAAa,SAAS,YAAY,QAAQ;GACvD,KAAKN,IAAI,OAAO,yCAAyC;IACvD;IACA,gBAAgB;GAClB,CAAC;GACD;EACF;EACA,KAAKU,uBAAuB;EAC5B,KAAKN,qBAAqB,QAAQ;CACpC;CAEA,2BAA+C;EAC7C,IAAI;EACJ,IAAI;GACF,KAAK,IAAI,SAAS,KAAKJ,KAAK,KAAKG,cAAc,EAAC,UAAU,KAAI,CAAC;GAC/D,MAAM,EAAC,iBAAgB,GACpB,QAAgB,mDAAmD,EACnE,IAA4B;GAC/B,OAAO;EACT,SAAS,GAAG;GAGV,KAAKH,IAAI,OACP,sGAEA,CACF;GACA;EACF,UAAU;GACR,IAAI,MAAM;EACZ;CACF;CAEA,OAAsB;EACpB,KAAKC,YAAY,OAAO;EACxB,OAAO;CACT;CAEA,uBAAuB;EACrB,iBAAiB,WAAW,cAAc;GACxC,aACE;GAGF,MAAM;EACR,CAAC,EAAE,aAAY,MAAK;GAClB,MAAM,eAAe,KAAKO;GAC1B,IAAI,CAAC,cAAc;IACjB,KAAKR,IAAI,OACP,8DACF;IACA;GACF;GACA,MAAM,KAAK,IAAI,SAAS,KAAKA,KAAK,KAAKG,cAAc,EAAC,UAAU,KAAI,CAAC;GACrE,IAAI;IACF,MAAM,EAAC,gBAAe,GACnB,QAAgB,kDAAkD,EAClE,IAA2B;IAC9B,MAAM,YAAY,KAAK,IAAI,GAAG,cAAc,aAAa,YAAY;IACrE,EAAE,QAAQ,SAAS;GACrB,SAAS,GAAG;IACV,KAAKH,IAAI,OAAO,6CAA6C,CAAC;GAChE,UAAU;IACR,GAAG,MAAM;GACX;EACF,CAAC;CACH;AACF"}
+{"version":3,"file":"backup-monitor.js","names":[],"sources":["../../../../../../zero-cache/src/services/change-streamer/backup-monitor.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {promiseVoid} from '../../../../shared/src/resolved-promises.ts';\nimport {resolver} from '../../../../shared/src/resolver.ts';\nimport {Database} from '../../../../zqlite/src/db.ts';\nimport {getOrCreateGauge} from '../../observability/metrics.ts';\nimport type {Source} from '../../types/streams.ts';\nimport {Subscription} from '../../types/subscription.ts';\nimport type {SingletonService} from '../service.ts';\n\nexport type BackedUpWatermark = {\n  watermark: string;\n  writeTimeMs?: number | undefined; // optional for debugging; available on v5\n  backupTimeMs: number;\n};\n\n/**\n * Determines which watermarks of the replica are backed up, by whatever means\n * the backup (or its absence) allows.\n */\nexport interface BackupPoller {\n  /**\n   * Starts polling, returning the stream of backed-up watermarks. Must only\n   * be called once.\n   */\n  start(): Source<BackedUpWatermark>;\n\n  /**\n   * Requests that the replica be backed up through `watermark` promptly,\n   * rather than at the poller's regular cadence, once the replica has reached\n   * it. The resulting watermark is emitted on the stream as usual. Pollers\n   * that cannot initiate backups do not implement this.\n   */\n  requestSync?(watermark: string): void;\n}\n\n/**\n * The interface through which the change-streamer consumes backed-up\n * watermarks and requests prompt backups (see {@link BackupMonitor}).\n */\nexport type BackupSource = Pick<BackupMonitor, 'backups' | 'requestSync'>;\n\n/**\n * Relays the watermarks backed up by a {@link BackupPoller} to the\n * change-streamer, which consumes them (see {@link backups}) and requests\n * prompt backups (see {@link requestSync}) as needed.\n */\nexport class BackupMonitor implements SingletonService {\n  readonly id = 'backup-monitor';\n  readonly #lc: LogContext;\n  readonly #poller: BackupPoller;\n  readonly #replicaFile: string;\n  readonly #firstBackupReceived = resolver();\n  // Backed-up watermarks only move forward, so the consumer only needs the\n  // latest one. Coalescing keeps at most one outstanding, so that the monitor\n  // neither waits on, nor queues for, the consumer.\n  readonly #backups = Subscription.create<BackedUpWatermark>({\n    coalesce: curr => curr,\n  });\n\n  #watermarks: Source<BackedUpWatermark> | undefined;\n  #stopped = false;\n  #latestBackup: BackedUpWatermark | undefined;\n  #firstBackupResolved = false;\n  /**\n   * The replica's `stateVersion` when the monitor started, i.e. the point the\n   * backup has to reach before it covers what this task is about to serve.\n   * `undefined` when the replica could not be read, which degrades the gate to\n   * \"any watermark\" rather than hanging startup forever.\n   */\n  #coverageTarget: string | undefined;\n\n  constructor(lc: LogContext, poller: BackupPoller, replicaFile: string) {\n    this.#lc = lc;\n    this.#poller = poller;\n    this.#replicaFile = replicaFile;\n  }\n\n  firstBackupReceived() {\n    return this.#firstBackupReceived.promise;\n  }\n\n  /**\n   * The stream of backed-up watermarks, each later than the last, coalesced\n   * to the latest one that has not been consumed. It ends when the monitor\n   * stops.\n   */\n  backups(): Source<BackedUpWatermark> {\n    return this.#backups;\n  }\n\n  /**\n   * Requests that the replica be backed up through `watermark` promptly, if\n   * the poller supports it (see {@link BackupPoller.requestSync}). A no-op\n   * unless the monitor is running.\n   */\n  requestSync(watermark: string) {\n    if (\n      !this.#watermarks ||\n      this.#stopped ||\n      (this.#latestBackup && this.#latestBackup.watermark >= watermark)\n    ) {\n      return;\n    }\n    if (this.#poller.requestSync) {\n      this.#lc.info?.(`requesting backup through ${watermark}`);\n      this.#poller.requestSync(watermark);\n    }\n  }\n\n  async run() {\n    if (this.#stopped) {\n      return;\n    }\n    this.#lc.info?.('starting backup monitor');\n    this.#initBackupLagMetric();\n    this.#coverageTarget = this.#readReplicaStateVersion();\n\n    this.#watermarks = this.#poller.start();\n    try {\n      for await (const backedUp of this.#watermarks) {\n        if (this.#latestBackup) {\n          if (backedUp.watermark < this.#latestBackup.watermark) {\n            this.#lc.warn?.(\n              `ignoring earlier backup watermark ${backedUp.watermark}`,\n              {backedUp},\n            );\n            continue;\n          }\n          if (backedUp.watermark === this.#latestBackup.watermark) {\n            this.#lc.debug?.(\n              `ignoring redundant backup watermark ${backedUp.watermark}`,\n              {backedUp},\n            );\n            continue;\n          }\n        }\n        this.#lc.info?.(`received backup watermark ${backedUp.watermark}`, {\n          backedUp,\n        });\n        this.#latestBackup = backedUp;\n        this.#backups.push(backedUp);\n        this.#checkFirstBackupCovers(backedUp);\n      }\n      this.#lc.info?.('watermark stream closed. BackupMonitor stopped.');\n    } finally {\n      this.#backups.cancel();\n    }\n  }\n\n  /**\n   * Resolves {@link firstBackupReceived} once the backup actually covers the\n   * replica, rather than on the first watermark of any value.\n   *\n   * A new backup destination starts empty and is filled by re-uploading the\n   * local LTX chain, so the first watermarks read back out of it are real but\n   * far behind the replica. Releasing the readiness gate on one of those lets\n   * the task serve against a backup that does not yet cover it, which is what\n   * demotes a restoring view-syncer to Postgres catchup.\n   *\n   * The target is pinned at startup rather than compared against the replica's\n   * current position, which keeps the gate satisfiable under sustained writes.\n   */\n  #checkFirstBackupCovers(backedUp: BackedUpWatermark) {\n    if (this.#firstBackupResolved) {\n      return;\n    }\n    const target = this.#coverageTarget;\n    if (target !== undefined && backedUp.watermark < target) {\n      this.#lc.info?.(`backup does not yet cover the replica`, {\n        backedUp,\n        coverageTarget: target,\n      });\n      return;\n    }\n    this.#firstBackupResolved = true;\n    this.#firstBackupReceived.resolve();\n  }\n\n  #readReplicaStateVersion(): string | undefined {\n    let db;\n    try {\n      db = new Database(this.#lc, this.#replicaFile, {readonly: true});\n      const {stateVersion} = db\n        .prepare(/*sql*/ `SELECT stateVersion FROM \"_zero.replicationState\"`)\n        .get<{stateVersion: string}>();\n      return stateVersion;\n    } catch (e) {\n      // Without a target the gate degrades to its previous behavior. That is\n      // strictly better than blocking startup on a replica we cannot read.\n      this.#lc.warn?.(\n        `unable to read the replica's stateVersion; ` +\n          `the initial backup gate will accept the first watermark`,\n        e,\n      );\n      return undefined;\n    } finally {\n      db?.close();\n    }\n  }\n\n  stop(): Promise<void> {\n    this.#stopped = true;\n    this.#watermarks?.cancel();\n    this.#backups.cancel();\n    return promiseVoid;\n  }\n\n  #initBackupLagMetric() {\n    getOrCreateGauge('replica', 'backup_lag', {\n      description:\n        'Latency from when a change is written to the replica ' +\n        'to when it is backed up to litestream. It is expected to create a saw ' +\n        'pattern from 0 to the configured ZERO_LITESTREAM_INCREMENTAL_BACKUP_INTERVAL_MINUTES.',\n      unit: 'millisecond',\n    }).addCallback(o => {\n      const latestBackup = this.#latestBackup;\n      if (!latestBackup) {\n        this.#lc.warn?.(\n          `no backed up watermarks. unable to report replica.backup_lag`,\n        );\n        return;\n      }\n      const db = new Database(this.#lc, this.#replicaFile, {readonly: true});\n      try {\n        const {writeTimeMs} = db\n          .prepare(/*sql*/ `SELECT writeTimeMs FROM \"_zero.replicationState\"`)\n          .get<{writeTimeMs: number}>();\n        const backupLag = Math.max(0, writeTimeMs - latestBackup.backupTimeMs);\n        o.observe(backupLag);\n      } catch (e) {\n        this.#lc.warn?.(`error measuring replica.backup_lag metric`, e);\n      } finally {\n        db.close();\n      }\n    });\n  }\n}\n"],"mappings":"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"}

package/out/zero-cache/src/services/change-streamer/broadcast.js

@@ -1,6 +1,6 @@
+import { resolver } from "../../../../shared/src/resolver.js";
 import { must } from "../../../../shared/src/must.js";
 import "../../types/streams.js";
-import { resolver } from "@rocicorp/resolver";
 //#region ../zero-cache/src/services/change-streamer/broadcast.ts
 function preSerializeBatch(changes) {
 	const jsonList = changes.map((c) => c[2]);
@@ -182,6 +182,6 @@ function toBatch(change) {
 	return Array.isArray(change[0]) ? change : [change];
 }
 //#endregion
-export { Broadcast };
+export { Broadcast, preSerializeBatch };
 
 //# sourceMappingURL=broadcast.js.map

package/out/zero-cache/src/services/change-streamer/broadcast.js.map

@@ -1 +1 @@
-{"version":3,"file":"broadcast.js","names":["#lc","#pending","#completed","#done","#watermark","#majority","#start","#earlyReleaseTimeoutProportion","#setTimeout","#clearTimeout","#needsBackupResponse","#markCompleted","#setDone","#isDone","#earlyReleaseTimer","#logWithState","#releaseMode"],"sources":["../../../../../../zero-cache/src/services/change-streamer/broadcast.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {resolver} from '@rocicorp/resolver';\nimport {must} from '../../../../shared/src/must.ts';\nimport {isPreSerialized, type PreSerialized} from '../../types/streams.ts';\nimport type {WatermarkedChange} from './change-streamer.ts';\nimport type {Subscriber} from './subscriber.ts';\n\nexport type BroadcastReleaseMode = 'all-subscribers' | 'consensus-timeout';\n\nexport type PreSerializedBatch = PreSerialized & {\n  readonly changes: readonly WatermarkedChange[];\n};\n\nexport function isPreSerializedBatch(val: unknown): val is PreSerializedBatch {\n  return isPreSerialized(val) && 'changes' in val && Array.isArray(val.changes);\n}\n\nexport function preSerializeBatch(\n  changes: readonly WatermarkedChange[],\n): PreSerializedBatch {\n  const jsonList = changes.map(c => c[2]);\n  const joined = jsonList.join(',');\n  const payload = Buffer.from(\n    changes.length === 1 ? `,\"msg\":${jsonList[0]}}` : `,\"batch\":[${joined}]}`,\n    'utf8',\n  );\n  return {\n    changes,\n    payload,\n    byteLength: payload.length,\n  };\n}\n\n/**\n * Enables event-driven early release of a {@link Broadcast}. When provided and a\n * majority has acked, the broadcast schedules its own consensus-timeout release\n * proportional to how long the majority took to ack, instead of relying on the\n * Forwarder's periodic progress tick.\n */\nexport type EarlyReleaseOptions = {\n  /** Time to wait, proportional to majority completion, before releasing. */\n  consensusTimeoutProportion: number;\n  /** Injectable timer, for deterministic testing. */\n  setTimeoutFn?: typeof setTimeout;\n  /** Injectable timer cancellation, for deterministic testing. */\n  clearTimeoutFn?: typeof clearTimeout;\n};\n\n/**\n * Initiates and tracks the progress of a change broadcasted to\n * a set of subscribers, implementing **consensus-based timeouts**\n * to effect short-term graceful degradation when a minority of\n * subscribers are behind.\n *\n * ### Background\n *\n * The purpose of flow control is to pull upstream replication changes\n * no faster than the rate they are processed by downstream subscribers\n * in the steady state. In the change-streamer, this is done by occasionally\n * waiting for ACKs from subscribers before continuing; without doing so,\n * I/O buffers fill up and cause the system to spend most of its time in GC.\n *\n * However, the naive algorithm of always waiting for all subscribers (e.g.\n * `Promise.all()`) can behave poorly in scenarios where subscribers\n * are imbalanced:\n * * New subscribers may have a backlog of changes to catch up with.\n *   Having all subscribers wait for the new subscriber to catch up results\n *   in delaying the entire application.\n * * Broken TCP connections similarly require all subscribers to wait until\n *   connection liveness checks kick in and disconnect the subscriber.\n *\n * A simplistic approach is to add a limit to the amount of time waiting for\n * subscribers, i.e. an ack timeout. However, deciding what this timeout\n * should be is non-trivial because of the heterogeneous nature of changes;\n * while most changes operate on single rows and are relatively predictable\n * in terms of running time, some changes are table-wide operations and can\n * legitimately take an arbitrary amount of time. In such scenarios, a\n * timeout that is too short can stop progress on replication altogether.\n *\n * ### Consensus-based Timeout Algorithm\n *\n * To address these shortcomings, a \"consensus-based timeout\" algorithm is\n * used:\n * * Wait for more than half of the subscribers to finish. (In\n *   case of a single node, or the case of one replication-manager\n *   and one view-syncer, this reduces to waiting for all subscribers.)\n * * Once more than half of the subscribers have finished, proceed after\n *   the configured timeout, proportional to the time it took for the\n *   majority of subscribers to ack, even if not all subscribers have\n *   finished.\n *\n * In other words, the subscribers themselves are used to determine the\n * timeout of each batch of changes; the majority determines this when\n * they complete, upon which a timeout is logically started.\n *\n * In the common case, the remaining subscribers finish soon afterward and\n * the timeout never elapses. However, in pathological cases where a minority\n * of subscribers have a disproportionate amount of load, some will still\n * be processing (or otherwise unresponsive). These subscribers are given\n * a bounded amount of time to catch up at each flushed batch, up to the\n * timeout interval. This guarantees eventual catchup because the\n * subscribers with a backlog of changes necessarily have a higher\n * processing rate than the subscribers that finished (and are made to wait).\n */\nexport class Broadcast {\n  /**\n   * Sends the change to the subscribers without the tracking machinery.\n   * This is suitable for fire-and-forget (i.e. pipelined) sends.\n   */\n  static withoutTracking(\n    subscribers: Iterable<Subscriber>,\n    change: WatermarkedChange | readonly WatermarkedChange[],\n  ) {\n    const changes = toBatch(change);\n    const preSerialized = preSerializeBatch(changes);\n    for (const sub of subscribers) {\n      void sub.sendBatch(changes, preSerialized);\n    }\n  }\n\n  readonly #lc: LogContext;\n  readonly #pending: Set<Subscriber>;\n  readonly #completed: Completed[];\n  readonly #done = resolver();\n  #isDone = false;\n  #releaseMode: BroadcastReleaseMode | undefined;\n\n  readonly #watermark: string;\n  readonly #majority: number;\n\n  readonly #start = performance.now();\n\n  // When set, the broadcast schedules its own consensus-timeout release instead\n  // of waiting for the Forwarder's periodic progress tick.\n  readonly #earlyReleaseTimeoutProportion: number | undefined;\n  readonly #setTimeout: typeof setTimeout;\n  readonly #clearTimeout: typeof clearTimeout;\n  #earlyReleaseTimer: ReturnType<typeof setTimeout> | undefined;\n\n  // Tracks whether the backup-replicator responded. It is a required member\n  // of the consensus timeout since it cannot be dropped as a laggard (since\n  // that would shutdown the replication-manager itself).\n  #needsBackupResponse = false;\n\n  /**\n   * Broadcasts the `change` to the `subscribers` and tracks their\n   * completion.\n   */\n  constructor(\n    lc: LogContext,\n    subscribers: Iterable<Subscriber>,\n    change: WatermarkedChange | readonly WatermarkedChange[],\n    earlyRelease?: EarlyReleaseOptions,\n  ) {\n    const changes = toBatch(change);\n    const preSerialized = preSerializeBatch(changes);\n    this.#lc = lc;\n    this.#pending = new Set(subscribers);\n    this.#completed = [];\n    this.#watermark = must(changes.at(-1))[0];\n    this.#majority = Math.floor(this.#pending.size / 2) + 1;\n    this.#earlyReleaseTimeoutProportion =\n      earlyRelease?.consensusTimeoutProportion;\n    this.#setTimeout = earlyRelease?.setTimeoutFn ?? setTimeout;\n    this.#clearTimeout = earlyRelease?.clearTimeoutFn ?? clearTimeout;\n\n    for (const sub of this.#pending) {\n      const totalChanges = sub.numPending + changes.length;\n      if (sub.mode === 'backup') {\n        // Only gate consensus on the backup-replicator after it has finished\n        // its initial catchup.\n        this.#needsBackupResponse ||= !sub.isBacklogged();\n      }\n      void sub\n        .sendBatch(changes, preSerialized)\n        .catch(() => {})\n        .finally(() => this.#markCompleted(sub, totalChanges));\n    }\n\n    // set done if there are no subscribers (mainly for tests)\n    if (this.#pending.size === 0) {\n      this.#setDone('all-subscribers');\n    }\n  }\n\n  #markCompleted(sub: Subscriber, changes: number) {\n    if (this.#isDone) {\n      return;\n    }\n    const elapsed = performance.now() - this.#start;\n    sub.trackResponseResult('on-time');\n    if (sub.mode === 'backup') {\n      this.#needsBackupResponse = false;\n    }\n    this.#completed.push({sub, changes, elapsed});\n    this.#pending.delete(sub);\n    if (this.#pending.size === 0) {\n      this.#setDone('all-subscribers');\n      return;\n    }\n    // Event-driven consensus-timeout: the moment a majority acks, and it\n    // includes the backup-replicator, arm a single release timer\n    // proportional to how long the majority took to ack. The broadcast\n    // resolves when it fires, unless all subscribers ack first.\n    if (\n      this.#earlyReleaseTimeoutProportion !== undefined &&\n      this.#earlyReleaseTimer === undefined &&\n      this.#completed.length >= this.#majority &&\n      !this.#needsBackupResponse\n    ) {\n      const timeoutMs = Math.ceil(\n        elapsed * this.#earlyReleaseTimeoutProportion,\n      );\n      this.#earlyReleaseTimer = this.#setTimeout(\n        () => this.#setDone('consensus-timeout'),\n        timeoutMs,\n      );\n    }\n  }\n\n  #setDone(releaseMode: BroadcastReleaseMode) {\n    if (this.#isDone) {\n      return;\n    }\n    if (releaseMode === 'consensus-timeout') {\n      const elapsed = performance.now() - this.#start;\n      this.#logWithState(\n        `continuing with ${this.#pending.size} subscriber(s) still pending`,\n        elapsed,\n      );\n    }\n    this.#pending.forEach(sub => sub.trackResponseResult('timed-out'));\n    this.#isDone = true;\n    this.#releaseMode = releaseMode;\n    this.#clearTimeout(this.#earlyReleaseTimer);\n    this.#earlyReleaseTimer = undefined;\n    this.#done.resolve();\n  }\n\n  get isDone(): boolean {\n    return this.#isDone;\n  }\n\n  get done(): Promise<void> {\n    return this.#done.promise;\n  }\n\n  get releaseMode(): BroadcastReleaseMode {\n    return this.#releaseMode ?? 'all-subscribers';\n  }\n\n  logSlowRequests(now: number) {\n    if (this.#isDone || this.#pending.size === 0) {\n      return;\n    }\n    const elapsed = now - this.#start;\n    if (this.#completed.length < this.#majority) {\n      if (elapsed >= 1000) {\n        this.#logWithState(\n          `waiting for at least ${this.#majority} subscribers to finish`,\n          elapsed,\n        );\n      }\n    }\n  }\n\n  #logWithState(msg: string, elapsed: number) {\n    this.#lc\n      .withContext('watermark', this.#watermark)\n      .info?.(`${msg} (${elapsed.toFixed(3)} ms)`, {\n        completed: this.#completed.map(d => ({\n          id: d.sub.id,\n          processed: d.changes,\n          elapsed: d.elapsed,\n        })),\n        pending: Array.from(this.#pending, sub => ({\n          id: sub.id,\n          ...sub.getStats(),\n        })),\n      });\n  }\n}\n\n/** Tracks the completed result of a single subscriber. */\ntype Completed = {\n  sub: Subscriber;\n  /** The number of changes processed. */\n  changes: number;\n  /** The elapsed milliseconds. */\n  elapsed: number;\n};\n\nfunction toBatch(\n  change: WatermarkedChange | readonly WatermarkedChange[],\n): readonly WatermarkedChange[] {\n  if (change.length === 0) {\n    return [];\n  }\n  return Array.isArray(change[0])\n    ? (change as readonly WatermarkedChange[])\n    : [change as WatermarkedChange];\n}\n"],"mappings":"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"}
+{"version":3,"file":"broadcast.js","names":[],"sources":["../../../../../../zero-cache/src/services/change-streamer/broadcast.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {must} from '../../../../shared/src/must.ts';\nimport {resolver} from '../../../../shared/src/resolver.ts';\nimport {isPreSerialized, type PreSerialized} from '../../types/streams.ts';\nimport type {WatermarkedChange} from './change-streamer.ts';\nimport type {Subscriber} from './subscriber.ts';\n\nexport type BroadcastReleaseMode = 'all-subscribers' | 'consensus-timeout';\n\nexport type PreSerializedBatch = PreSerialized & {\n  readonly changes: readonly WatermarkedChange[];\n};\n\nexport function isPreSerializedBatch(val: unknown): val is PreSerializedBatch {\n  return isPreSerialized(val) && 'changes' in val && Array.isArray(val.changes);\n}\n\nexport function preSerializeBatch(\n  changes: readonly WatermarkedChange[],\n): PreSerializedBatch {\n  const jsonList = changes.map(c => c[2]);\n  const joined = jsonList.join(',');\n  const payload = Buffer.from(\n    changes.length === 1 ? `,\"msg\":${jsonList[0]}}` : `,\"batch\":[${joined}]}`,\n    'utf8',\n  );\n  return {\n    changes,\n    payload,\n    byteLength: payload.length,\n  };\n}\n\n/**\n * Enables event-driven early release of a {@link Broadcast}. When provided and a\n * majority has acked, the broadcast schedules its own consensus-timeout release\n * proportional to how long the majority took to ack, instead of relying on the\n * Forwarder's periodic progress tick.\n */\nexport type EarlyReleaseOptions = {\n  /** Time to wait, proportional to majority completion, before releasing. */\n  consensusTimeoutProportion: number;\n  /** Injectable timer, for deterministic testing. */\n  setTimeoutFn?: typeof setTimeout;\n  /** Injectable timer cancellation, for deterministic testing. */\n  clearTimeoutFn?: typeof clearTimeout;\n};\n\n/**\n * Initiates and tracks the progress of a change broadcasted to\n * a set of subscribers, implementing **consensus-based timeouts**\n * to effect short-term graceful degradation when a minority of\n * subscribers are behind.\n *\n * ### Background\n *\n * The purpose of flow control is to pull upstream replication changes\n * no faster than the rate they are processed by downstream subscribers\n * in the steady state. In the change-streamer, this is done by occasionally\n * waiting for ACKs from subscribers before continuing; without doing so,\n * I/O buffers fill up and cause the system to spend most of its time in GC.\n *\n * However, the naive algorithm of always waiting for all subscribers (e.g.\n * `Promise.all()`) can behave poorly in scenarios where subscribers\n * are imbalanced:\n * * New subscribers may have a backlog of changes to catch up with.\n *   Having all subscribers wait for the new subscriber to catch up results\n *   in delaying the entire application.\n * * Broken TCP connections similarly require all subscribers to wait until\n *   connection liveness checks kick in and disconnect the subscriber.\n *\n * A simplistic approach is to add a limit to the amount of time waiting for\n * subscribers, i.e. an ack timeout. However, deciding what this timeout\n * should be is non-trivial because of the heterogeneous nature of changes;\n * while most changes operate on single rows and are relatively predictable\n * in terms of running time, some changes are table-wide operations and can\n * legitimately take an arbitrary amount of time. In such scenarios, a\n * timeout that is too short can stop progress on replication altogether.\n *\n * ### Consensus-based Timeout Algorithm\n *\n * To address these shortcomings, a \"consensus-based timeout\" algorithm is\n * used:\n * * Wait for more than half of the subscribers to finish. (In\n *   case of a single node, or the case of one replication-manager\n *   and one view-syncer, this reduces to waiting for all subscribers.)\n * * Once more than half of the subscribers have finished, proceed after\n *   the configured timeout, proportional to the time it took for the\n *   majority of subscribers to ack, even if not all subscribers have\n *   finished.\n *\n * In other words, the subscribers themselves are used to determine the\n * timeout of each batch of changes; the majority determines this when\n * they complete, upon which a timeout is logically started.\n *\n * In the common case, the remaining subscribers finish soon afterward and\n * the timeout never elapses. However, in pathological cases where a minority\n * of subscribers have a disproportionate amount of load, some will still\n * be processing (or otherwise unresponsive). These subscribers are given\n * a bounded amount of time to catch up at each flushed batch, up to the\n * timeout interval. This guarantees eventual catchup because the\n * subscribers with a backlog of changes necessarily have a higher\n * processing rate than the subscribers that finished (and are made to wait).\n */\nexport class Broadcast {\n  /**\n   * Sends the change to the subscribers without the tracking machinery.\n   * This is suitable for fire-and-forget (i.e. pipelined) sends.\n   */\n  static withoutTracking(\n    subscribers: Iterable<Subscriber>,\n    change: WatermarkedChange | readonly WatermarkedChange[],\n  ) {\n    const changes = toBatch(change);\n    const preSerialized = preSerializeBatch(changes);\n    for (const sub of subscribers) {\n      void sub.sendBatch(changes, preSerialized);\n    }\n  }\n\n  readonly #lc: LogContext;\n  readonly #pending: Set<Subscriber>;\n  readonly #completed: Completed[];\n  readonly #done = resolver();\n  #isDone = false;\n  #releaseMode: BroadcastReleaseMode | undefined;\n\n  readonly #watermark: string;\n  readonly #majority: number;\n\n  readonly #start = performance.now();\n\n  // When set, the broadcast schedules its own consensus-timeout release instead\n  // of waiting for the Forwarder's periodic progress tick.\n  readonly #earlyReleaseTimeoutProportion: number | undefined;\n  readonly #setTimeout: typeof setTimeout;\n  readonly #clearTimeout: typeof clearTimeout;\n  #earlyReleaseTimer: ReturnType<typeof setTimeout> | undefined;\n\n  // Tracks whether the backup-replicator responded. It is a required member\n  // of the consensus timeout since it cannot be dropped as a laggard (since\n  // that would shutdown the replication-manager itself).\n  #needsBackupResponse = false;\n\n  /**\n   * Broadcasts the `change` to the `subscribers` and tracks their\n   * completion.\n   */\n  constructor(\n    lc: LogContext,\n    subscribers: Iterable<Subscriber>,\n    change: WatermarkedChange | readonly WatermarkedChange[],\n    earlyRelease?: EarlyReleaseOptions,\n  ) {\n    const changes = toBatch(change);\n    const preSerialized = preSerializeBatch(changes);\n    this.#lc = lc;\n    this.#pending = new Set(subscribers);\n    this.#completed = [];\n    this.#watermark = must(changes.at(-1))[0];\n    this.#majority = Math.floor(this.#pending.size / 2) + 1;\n    this.#earlyReleaseTimeoutProportion =\n      earlyRelease?.consensusTimeoutProportion;\n    this.#setTimeout = earlyRelease?.setTimeoutFn ?? setTimeout;\n    this.#clearTimeout = earlyRelease?.clearTimeoutFn ?? clearTimeout;\n\n    for (const sub of this.#pending) {\n      const totalChanges = sub.numPending + changes.length;\n      if (sub.mode === 'backup') {\n        // Only gate consensus on the backup-replicator after it has finished\n        // its initial catchup.\n        this.#needsBackupResponse ||= !sub.isBacklogged();\n      }\n      void sub\n        .sendBatch(changes, preSerialized)\n        .catch(() => {})\n        .finally(() => this.#markCompleted(sub, totalChanges));\n    }\n\n    // set done if there are no subscribers (mainly for tests)\n    if (this.#pending.size === 0) {\n      this.#setDone('all-subscribers');\n    }\n  }\n\n  #markCompleted(sub: Subscriber, changes: number) {\n    if (this.#isDone) {\n      return;\n    }\n    const elapsed = performance.now() - this.#start;\n    sub.trackResponseResult('on-time');\n    if (sub.mode === 'backup') {\n      this.#needsBackupResponse = false;\n    }\n    this.#completed.push({sub, changes, elapsed});\n    this.#pending.delete(sub);\n    if (this.#pending.size === 0) {\n      this.#setDone('all-subscribers');\n      return;\n    }\n    // Event-driven consensus-timeout: the moment a majority acks, and it\n    // includes the backup-replicator, arm a single release timer\n    // proportional to how long the majority took to ack. The broadcast\n    // resolves when it fires, unless all subscribers ack first.\n    if (\n      this.#earlyReleaseTimeoutProportion !== undefined &&\n      this.#earlyReleaseTimer === undefined &&\n      this.#completed.length >= this.#majority &&\n      !this.#needsBackupResponse\n    ) {\n      const timeoutMs = Math.ceil(\n        elapsed * this.#earlyReleaseTimeoutProportion,\n      );\n      this.#earlyReleaseTimer = this.#setTimeout(\n        () => this.#setDone('consensus-timeout'),\n        timeoutMs,\n      );\n    }\n  }\n\n  #setDone(releaseMode: BroadcastReleaseMode) {\n    if (this.#isDone) {\n      return;\n    }\n    if (releaseMode === 'consensus-timeout') {\n      const elapsed = performance.now() - this.#start;\n      this.#logWithState(\n        `continuing with ${this.#pending.size} subscriber(s) still pending`,\n        elapsed,\n      );\n    }\n    this.#pending.forEach(sub => sub.trackResponseResult('timed-out'));\n    this.#isDone = true;\n    this.#releaseMode = releaseMode;\n    this.#clearTimeout(this.#earlyReleaseTimer);\n    this.#earlyReleaseTimer = undefined;\n    this.#done.resolve();\n  }\n\n  get isDone(): boolean {\n    return this.#isDone;\n  }\n\n  get done(): Promise<void> {\n    return this.#done.promise;\n  }\n\n  get releaseMode(): BroadcastReleaseMode {\n    return this.#releaseMode ?? 'all-subscribers';\n  }\n\n  logSlowRequests(now: number) {\n    if (this.#isDone || this.#pending.size === 0) {\n      return;\n    }\n    const elapsed = now - this.#start;\n    if (this.#completed.length < this.#majority) {\n      if (elapsed >= 1000) {\n        this.#logWithState(\n          `waiting for at least ${this.#majority} subscribers to finish`,\n          elapsed,\n        );\n      }\n    }\n  }\n\n  #logWithState(msg: string, elapsed: number) {\n    this.#lc\n      .withContext('watermark', this.#watermark)\n      .info?.(`${msg} (${elapsed.toFixed(3)} ms)`, {\n        completed: this.#completed.map(d => ({\n          id: d.sub.id,\n          processed: d.changes,\n          elapsed: d.elapsed,\n        })),\n        pending: Array.from(this.#pending, sub => ({\n          id: sub.id,\n          ...sub.getStats(),\n        })),\n      });\n  }\n}\n\n/** Tracks the completed result of a single subscriber. */\ntype Completed = {\n  sub: Subscriber;\n  /** The number of changes processed. */\n  changes: number;\n  /** The elapsed milliseconds. */\n  elapsed: number;\n};\n\nfunction toBatch(\n  change: WatermarkedChange | readonly WatermarkedChange[],\n): readonly WatermarkedChange[] {\n  if (change.length === 0) {\n    return [];\n  }\n  return Array.isArray(change[0])\n    ? (change as readonly WatermarkedChange[])\n    : [change as WatermarkedChange];\n}\n"],"mappings":"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"}

package/out/zero-cache/src/services/change-streamer/change-log-codec.js

@@ -38,9 +38,8 @@ function extractChangeSubstring(streamMessageJSON, tag) {
 	}
 }
 /** Reconstructs the canonical downstream JSON around a stored change. */
-function reconstructWatermarkedChange(entry) {
-	const { watermark, change } = entry;
-	const tag = entry.tag;
+function reconstructWatermarkedChange(watermark, entryTag, change) {
+	const tag = entryTag;
 	switch (tag) {
 		case "begin": return [
 			watermark,

package/out/zero-cache/src/services/change-streamer/change-log-codec.js.map

@@ -1 +1 @@
-{"version":3,"file":"change-log-codec.js","names":[],"sources":["../../../../../../zero-cache/src/services/change-streamer/change-log-codec.ts"],"sourcesContent":["import {BigIntJSON} from '../../../../shared/src/bigint-json.ts';\nimport type {ChangeStreamData} from '../change-source/protocol/current/downstream.ts';\nimport type {ChangeTag, WatermarkedChange} from './change-streamer.ts';\n\nexport type ChangeLogEntry = {\n  watermark: string;\n  tag: string;\n  change: string;\n};\n\nexport type SerializedChangeStreamData = {\n  /** The canonical downstream representation forwarded to subscribers. */\n  readonly json: string;\n  /** The already-serialized change tuple element stored in change logs. */\n  readonly change: string;\n};\n\n/**\n * Serializes a data-plane message and its stored change payload in one pass.\n *\n * Change logs retain only the second tuple element for backwards\n * compatibility. Serializing that element first avoids stringifying the full\n * message and then copying the payload back out of the resulting string on the\n * replication hot path.\n */\nexport function serializeChangeStreamDataWithChange(\n  data: ChangeStreamData,\n): SerializedChangeStreamData {\n  const change = BigIntJSON.stringify(data[1]);\n  const type = data[0];\n  switch (type) {\n    case 'begin':\n    case 'commit':\n      return {\n        json: `[${JSON.stringify(type)},${change},${BigIntJSON.stringify(data[2])}]`,\n        change,\n      };\n    case 'data':\n    case 'rollback':\n      return {json: `[${JSON.stringify(type)},${change}]`, change};\n  }\n}\n\n/** Serializes a data-plane message to the canonical downstream JSON form. */\nexport function serializeChangeStreamData(data: ChangeStreamData): string {\n  return serializeChangeStreamDataWithChange(data).json;\n}\n\n/**\n * Extracts the second tuple element for callers that only have the canonical\n * downstream JSON. The live write path uses\n * {@link serializeChangeStreamDataWithChange} and does not scan or copy the\n * completed message.\n */\nexport function extractChangeSubstring(\n  streamMessageJSON: string,\n  tag: ChangeTag | undefined,\n): string {\n  switch (tag) {\n    case 'begin':\n    case 'commit':\n      // e.g.\n      // [\"begin\",<message-json>,{\"commitWatermark\":\"92fj2d0s\"}]\n      // [\"commit\",<message-json>,{\"watermark\":\"92fj2d0s\"}]\n      return streamMessageJSON.substring(\n        streamMessageJSON.indexOf(',') + 1,\n        streamMessageJSON.lastIndexOf(','),\n      );\n    default:\n      // [\"data\",<message-json>]\n      return streamMessageJSON.substring(\n        streamMessageJSON.indexOf(',') + 1,\n        streamMessageJSON.lastIndexOf(']'),\n      );\n  }\n}\n\n/** Reconstructs the canonical downstream JSON around a stored change. */\nexport function reconstructWatermarkedChange(\n  entry: ChangeLogEntry,\n): WatermarkedChange {\n  const {watermark, change} = entry;\n  const tag = entry.tag as ChangeTag;\n  switch (tag) {\n    case 'begin':\n      return [\n        watermark,\n        tag,\n        `[\"begin\",${change},{\"commitWatermark\":\"${watermark}\"}]`,\n      ];\n    case 'commit':\n      return [\n        watermark,\n        tag,\n        `[\"commit\",${change},{\"watermark\":\"${watermark}\"}]`,\n      ];\n    case 'rollback':\n      return [watermark, tag, `[\"rollback\",${change}]`];\n    default:\n      return [watermark, tag, `[\"data\",${change}]`];\n  }\n}\n"],"mappings":";;;;;;;;;;AAyBA,SAAgB,oCACd,MAC4B;CAC5B,MAAM,SAAS,WAAW,UAAU,KAAK,EAAE;CAC3C,MAAM,OAAO,KAAK;CAClB,QAAQ,MAAR;EACE,KAAK;EACL,KAAK,UACH,OAAO;GACL,MAAM,IAAI,KAAK,UAAU,IAAI,EAAE,GAAG,OAAO,GAAG,WAAW,UAAU,KAAK,EAAE,EAAE;GAC1E;EACF;EACF,KAAK;EACL,KAAK,YACH,OAAO;GAAC,MAAM,IAAI,KAAK,UAAU,IAAI,EAAE,GAAG,OAAO;GAAI;EAAM;CAC/D;AACF;;;;;;;AAaA,SAAgB,uBACd,mBACA,KACQ;CACR,QAAQ,KAAR;EACE,KAAK;EACL,KAAK,UAIH,OAAO,kBAAkB,UACvB,kBAAkB,QAAQ,GAAG,IAAI,GACjC,kBAAkB,YAAY,GAAG,CACnC;EACF,SAEE,OAAO,kBAAkB,UACvB,kBAAkB,QAAQ,GAAG,IAAI,GACjC,kBAAkB,YAAY,GAAG,CACnC;CACJ;AACF;;AAGA,SAAgB,6BACd,OACmB;CACnB,MAAM,EAAC,WAAW,WAAU;CAC5B,MAAM,MAAM,MAAM;CAClB,QAAQ,KAAR;EACE,KAAK,SACH,OAAO;GACL;GACA;GACA,YAAY,OAAO,uBAAuB,UAAU;EACtD;EACF,KAAK,UACH,OAAO;GACL;GACA;GACA,aAAa,OAAO,iBAAiB,UAAU;EACjD;EACF,KAAK,YACH,OAAO;GAAC;GAAW;GAAK,eAAe,OAAO;EAAE;EAClD,SACE,OAAO;GAAC;GAAW;GAAK,WAAW,OAAO;EAAE;CAChD;AACF"}
+{"version":3,"file":"change-log-codec.js","names":[],"sources":["../../../../../../zero-cache/src/services/change-streamer/change-log-codec.ts"],"sourcesContent":["import {BigIntJSON} from '../../../../shared/src/bigint-json.ts';\nimport type {ChangeStreamData} from '../change-source/protocol/current/downstream.ts';\nimport type {ChangeTag, WatermarkedChange} from './change-streamer.ts';\n\nexport type ChangeLogEntry = {\n  watermark: string;\n  tag: string;\n  change: string;\n};\n\nexport type SerializedChangeStreamData = {\n  /** The canonical downstream representation forwarded to subscribers. */\n  readonly json: string;\n  /** The already-serialized change tuple element stored in change logs. */\n  readonly change: string;\n};\n\n/**\n * Serializes a data-plane message and its stored change payload in one pass.\n *\n * Change logs retain only the second tuple element for backwards\n * compatibility. Serializing that element first avoids stringifying the full\n * message and then copying the payload back out of the resulting string on the\n * replication hot path.\n */\nexport function serializeChangeStreamDataWithChange(\n  data: ChangeStreamData,\n): SerializedChangeStreamData {\n  const change = BigIntJSON.stringify(data[1]);\n  const type = data[0];\n  switch (type) {\n    case 'begin':\n    case 'commit':\n      return {\n        json: `[${JSON.stringify(type)},${change},${BigIntJSON.stringify(data[2])}]`,\n        change,\n      };\n    case 'data':\n    case 'rollback':\n      return {json: `[${JSON.stringify(type)},${change}]`, change};\n  }\n}\n\n/** Serializes a data-plane message to the canonical downstream JSON form. */\nexport function serializeChangeStreamData(data: ChangeStreamData): string {\n  return serializeChangeStreamDataWithChange(data).json;\n}\n\n/**\n * Extracts the second tuple element for callers that only have the canonical\n * downstream JSON. The live write path uses\n * {@link serializeChangeStreamDataWithChange} and does not scan or copy the\n * completed message.\n */\nexport function extractChangeSubstring(\n  streamMessageJSON: string,\n  tag: ChangeTag | undefined,\n): string {\n  switch (tag) {\n    case 'begin':\n    case 'commit':\n      // e.g.\n      // [\"begin\",<message-json>,{\"commitWatermark\":\"92fj2d0s\"}]\n      // [\"commit\",<message-json>,{\"watermark\":\"92fj2d0s\"}]\n      return streamMessageJSON.substring(\n        streamMessageJSON.indexOf(',') + 1,\n        streamMessageJSON.lastIndexOf(','),\n      );\n    default:\n      // [\"data\",<message-json>]\n      return streamMessageJSON.substring(\n        streamMessageJSON.indexOf(',') + 1,\n        streamMessageJSON.lastIndexOf(']'),\n      );\n  }\n}\n\n/** Reconstructs the canonical downstream JSON around a stored change. */\nexport function reconstructWatermarkedChange(\n  watermark: string,\n  entryTag: string,\n  change: string,\n): WatermarkedChange {\n  const tag = entryTag as ChangeTag;\n  switch (tag) {\n    case 'begin':\n      return [\n        watermark,\n        tag,\n        `[\"begin\",${change},{\"commitWatermark\":\"${watermark}\"}]`,\n      ];\n    case 'commit':\n      return [\n        watermark,\n        tag,\n        `[\"commit\",${change},{\"watermark\":\"${watermark}\"}]`,\n      ];\n    case 'rollback':\n      return [watermark, tag, `[\"rollback\",${change}]`];\n    default:\n      return [watermark, tag, `[\"data\",${change}]`];\n  }\n}\n"],"mappings":";;;;;;;;;;AAyBA,SAAgB,oCACd,MAC4B;CAC5B,MAAM,SAAS,WAAW,UAAU,KAAK,EAAE;CAC3C,MAAM,OAAO,KAAK;CAClB,QAAQ,MAAR;EACE,KAAK;EACL,KAAK,UACH,OAAO;GACL,MAAM,IAAI,KAAK,UAAU,IAAI,EAAE,GAAG,OAAO,GAAG,WAAW,UAAU,KAAK,EAAE,EAAE;GAC1E;EACF;EACF,KAAK;EACL,KAAK,YACH,OAAO;GAAC,MAAM,IAAI,KAAK,UAAU,IAAI,EAAE,GAAG,OAAO;GAAI;EAAM;CAC/D;AACF;;;;;;;AAaA,SAAgB,uBACd,mBACA,KACQ;CACR,QAAQ,KAAR;EACE,KAAK;EACL,KAAK,UAIH,OAAO,kBAAkB,UACvB,kBAAkB,QAAQ,GAAG,IAAI,GACjC,kBAAkB,YAAY,GAAG,CACnC;EACF,SAEE,OAAO,kBAAkB,UACvB,kBAAkB,QAAQ,GAAG,IAAI,GACjC,kBAAkB,YAAY,GAAG,CACnC;CACJ;AACF;;AAGA,SAAgB,6BACd,WACA,UACA,QACmB;CACnB,MAAM,MAAM;CACZ,QAAQ,KAAR;EACE,KAAK,SACH,OAAO;GACL;GACA;GACA,YAAY,OAAO,uBAAuB,UAAU;EACtD;EACF,KAAK,UACH,OAAO;GACL;GACA;GACA,aAAa,OAAO,iBAAiB,UAAU;EACjD;EACF,KAAK,YACH,OAAO;GAAC;GAAW;GAAK,eAAe,OAAO;EAAE;EAClD,SACE,OAAO;GAAC;GAAW;GAAK,WAAW,OAAO;EAAE;CAChD;AACF"}

package/out/zero-cache/src/services/change-streamer/change-log-initializer.js

@@ -4,10 +4,10 @@ import { BigIntJSON } from "../../../../shared/src/bigint-json.js";
 import { schemaChangeTags } from "../change-source/protocol/current/schema-change-tags.js";
 import { Database } from "../../../../zqlite/src/db.js";
 import { getOrCreateCounter } from "../../observability/metrics.js";
+import { StatementRunner } from "../../db/statements.js";
 import { backfillRequestsFrom, foldCookies } from "../replicator/change-log-cookies.js";
 import { readBackfillRequests, readReplicaCookies } from "../replicator/schema/backfilling.js";
 import { getReplicationState } from "../replicator/schema/replication-state.js";
-import { StatementRunner } from "../../db/statements.js";
 import { CHANGE_LOG_STREAM_TABLE } from "../replicator/change-log-db.js";
 import { SQLITE_CHANGE_LOG_BOUNDARY_SQL } from "./sqlite-change-log-reader.js";
 //#region ../zero-cache/src/services/change-streamer/change-log-initializer.ts
@@ -251,7 +251,7 @@ function readSchemaChanges(db, after, through) {
       SELECT count(*) AS "rows" FROM (
         SELECT 1 FROM "${CHANGE_LOG_STREAM_TABLE}"
           WHERE "watermark" > ? AND "watermark" <= ?
-          LIMIT ${MAX_FOLD_SCAN_ROWS + 1}
+          LIMIT 10001
       )
     `).get(after, through);
 	if (rows > MAX_FOLD_SCAN_ROWS) return;
@@ -308,6 +308,6 @@ function sortKeys(value) {
 	return Object.fromEntries(Object.entries(value).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([k, v]) => [k, sortKeys(v)]));
 }
 //#endregion
-export { ChangeLogInitializer, replicaInitializationSource };
+export { ChangeLogInitializer, readReplicaInitializationParameters, replicaInitializationSource };
 
 //# sourceMappingURL=change-log-initializer.js.map