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

package/out/zero-cache/src/server/worker-dispatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-dispatcher.js","names":["#lc","#state"],"sources":["../../../../../zero-cache/src/server/worker-dispatcher.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport UrlPattern from 'url-pattern';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {h32} from '../../../shared/src/hash.ts';\nimport {getOrCreateGauge} from '../observability/metrics.ts';\nimport {RunningState} from '../services/running-state.ts';\nimport type {Service} from '../services/service.ts';\nimport type {IncomingMessageSubset} from '../types/http.ts';\nimport type {Worker} from '../types/processes.ts';\nimport {installWebSocketHandoff} from '../types/websocket-handoff.ts';\nimport {getConnectParams} from '../workers/connect-params.ts';\n\nexport class WorkerDispatcher implements Service {\n  readonly id = 'worker-dispatcher';\n  readonly #lc: LogContext;\n\n  readonly #state = new RunningState(this.id);\n\n  constructor(\n    lc: LogContext,\n    taskID: string,\n    parent: Worker,\n    syncers: Worker[],\n    mutator: Worker | undefined,\n    changeStreamer: Worker | undefined,\n  ) {\n    this.#lc = lc;\n\n    function connectParams(req: IncomingMessageSubset) {\n      const {headers, url: u} = req;\n      const url = new URL(u ?? '', 'http://unused/');\n      const path = parsePath(url);\n      if (!path) {\n        throw new Error(`Invalid URL: ${u}`);\n      }\n      const version = Number(path.version);\n      if (Number.isNaN(version)) {\n        throw new Error(`Invalid version: ${u}`);\n      }\n      const {params, error} = getConnectParams(version, url, headers);\n      if (error !== null) {\n        throw new Error(error);\n      }\n      return params;\n    }\n\n    const handlePush = (req: IncomingMessageSubset) => {\n      assert(\n        mutator !== undefined,\n        'Received a push for a custom mutation but no `push.url` was configured.',\n      );\n      return {payload: connectParams(req), sender: mutator};\n    };\n\n    let maxProtocolVersion = 0;\n    getOrCreateGauge(\n      'sync',\n      'max-protocol-version',\n      'Latest sync protocol version from a connecting client',\n    ).addCallback(result => {\n      if (maxProtocolVersion) {\n        result.observe(maxProtocolVersion);\n      }\n    });\n\n    const handleSync = (req: IncomingMessageSubset) => {\n      assert(syncers.length, 'Received a sync request with no sync workers.');\n      const params = connectParams(req);\n      const {clientGroupID, protocolVersion} = params;\n      maxProtocolVersion = Math.max(maxProtocolVersion, protocolVersion);\n\n      // Include the TaskID when hash-bucketting the client group to the sync\n      // worker. This diversifies the distribution of client groups (across\n      // workers) for different tasks, so that if one task sheds connections\n      // from its most heavily loaded sync worker(s), those client groups will\n      // be distributed uniformly across workers on the receiving task(s).\n      const syncer = h32(taskID + '/' + clientGroupID) % syncers.length;\n\n      lc.debug?.(`connecting ${clientGroupID} to syncer ${syncer}`);\n      return {payload: params, sender: syncers[syncer]};\n    };\n\n    const handleChangeStream = (req: IncomingMessageSubset) => {\n      // Note: The change-streamer is generally not dispatched via the main\n      //       port, and in particular, should *not* be accessible via that\n      //       port in single-node mode. However, this plumbing is maintained\n      //       for the purpose of allowing --lazy-startup of the\n      //       replication-manager as a possible future feature.\n      assert(\n        syncers.length === 0 && mutator === undefined,\n        'Dispatch to the change-streamer via the main port ' +\n          'is only allowed in multi-node mode',\n      );\n      assert(\n        changeStreamer,\n        'Received a change-streamer request without a change-streamer worker',\n      );\n      const url = new URL(req.url ?? '', 'http://unused/');\n      const path = parsePath(url);\n      if (!path) {\n        throw new Error(`Invalid URL: ${req.url}`);\n      }\n\n      return {\n        payload: path.action,\n        sender: changeStreamer,\n      };\n    };\n\n    // handoff messages from this ZeroDispatcher to the appropriate worker (pool).\n    installWebSocketHandoff<unknown>(\n      lc,\n      request => {\n        const {url: u} = request;\n        const url = new URL(u ?? '', 'http://unused/');\n        const path = parsePath(url);\n        if (!path) {\n          throw new Error(`Invalid URL: ${u}`);\n        }\n        switch (path.worker) {\n          case 'sync':\n            return handleSync(request);\n          case 'replication':\n            return handleChangeStream(request);\n          case 'mutate':\n            return handlePush(request);\n          default:\n            throw new Error(`Invalid URL: ${u}`);\n        }\n      },\n      parent,\n    );\n  }\n\n  run() {\n    const readyStart = Date.now();\n    getOrCreateGauge('server', 'uptime', {\n      description: 'Cumulative uptime, starting from when requests are served',\n      unit: 's',\n    }).addCallback(result => result.observe((Date.now() - readyStart) / 1000));\n\n    return this.#state.stopped();\n  }\n\n  stop() {\n    this.#state.stop(this.#lc);\n    return this.#state.stopped();\n  }\n}\n\nconst URL_PATTERN = new UrlPattern('(/:base)/:worker/v:version/:action');\n\nexport function parsePath(url: URL):\n  | {\n      base?: string;\n      worker: 'sync' | 'mutate' | 'replication';\n      version: string;\n      action: string;\n    }\n  | undefined {\n  // The match() returns both null and undefined.\n  return URL_PATTERN.match(url.pathname) || undefined;\n} // The server allows the client to use any /:base/ path to facilitate\n// servicing requests on the same domain as the application.\n"],"mappings":";;;;;;;;AAYA,IAAa,mBAAb,MAAiD;CAC/C,KAAc;CACd;CAEA,SAAkB,IAAI,aAAa,KAAK,EAAE;CAE1C,YACE,IACA,QACA,QACA,SACA,SACA,gBACA;EACA,KAAKA,MAAM;EAEX,SAAS,cAAc,KAA4B;GACjD,MAAM,EAAC,SAAS,KAAK,MAAK;GAC1B,MAAM,MAAM,IAAI,IAAI,KAAK,IAAI,gBAAgB;GAC7C,MAAM,OAAO,UAAU,GAAG;GAC1B,IAAI,CAAC,MACH,MAAM,IAAI,MAAM,gBAAgB,GAAG;GAErC,MAAM,UAAU,OAAO,KAAK,OAAO;GACnC,IAAI,OAAO,MAAM,OAAO,GACtB,MAAM,IAAI,MAAM,oBAAoB,GAAG;GAEzC,MAAM,EAAC,QAAQ,UAAS,iBAAiB,SAAS,KAAK,OAAO;GAC9D,IAAI,UAAU,MACZ,MAAM,IAAI,MAAM,KAAK;GAEvB,OAAO;EACT;EAEA,MAAM,cAAc,QAA+B;GACjD,OACE,YAAY,KAAA,GACZ,yEACF;GACA,OAAO;IAAC,SAAS,cAAc,GAAG;IAAG,QAAQ;GAAO;EACtD;EAEA,IAAI,qBAAqB;EACzB,iBACE,QACA,wBACA,uDACF,EAAE,aAAY,WAAU;GACtB,IAAI,oBACF,OAAO,QAAQ,kBAAkB;EAErC,CAAC;EAED,MAAM,cAAc,QAA+B;GACjD,OAAO,QAAQ,QAAQ,+CAA+C;GACtE,MAAM,SAAS,cAAc,GAAG;GAChC,MAAM,EAAC,eAAe,oBAAmB;GACzC,qBAAqB,KAAK,IAAI,oBAAoB,eAAe;GAOjE,MAAM,SAAS,IAAI,SAAS,MAAM,aAAa,IAAI,QAAQ;GAE3D,GAAG,QAAQ,cAAc,cAAc,aAAa,QAAQ;GAC5D,OAAO;IAAC,SAAS;IAAQ,QAAQ,QAAQ;GAAO;EAClD;EAEA,MAAM,sBAAsB,QAA+B;GAMzD,OACE,QAAQ,WAAW,KAAK,YAAY,KAAA,GACpC,sFAEF;GACA,OACE,gBACA,qEACF;GAEA,MAAM,OAAO,UAAU,IADP,IAAI,IAAI,OAAO,IAAI,gBACZ,CAAG;GAC1B,IAAI,CAAC,MACH,MAAM,IAAI,MAAM,gBAAgB,IAAI,KAAK;GAG3C,OAAO;IACL,SAAS,KAAK;IACd,QAAQ;GACV;EACF;EAGA,wBACE,KACA,YAAW;GACT,MAAM,EAAC,KAAK,MAAK;GAEjB,MAAM,OAAO,UAAU,IADP,IAAI,KAAK,IAAI,gBACN,CAAG;GAC1B,IAAI,CAAC,MACH,MAAM,IAAI,MAAM,gBAAgB,GAAG;GAErC,QAAQ,KAAK,QAAb;IACE,KAAK,QACH,OAAO,WAAW,OAAO;IAC3B,KAAK,eACH,OAAO,mBAAmB,OAAO;IACnC,KAAK,UACH,OAAO,WAAW,OAAO;IAC3B,SACE,MAAM,IAAI,MAAM,gBAAgB,GAAG;GACvC;EACF,GACA,MACF;CACF;CAEA,MAAM;EACJ,MAAM,aAAa,KAAK,IAAI;EAC5B,iBAAiB,UAAU,UAAU;GACnC,aAAa;GACb,MAAM;EACR,CAAC,EAAE,aAAY,WAAU,OAAO,SAAS,KAAK,IAAI,IAAI,cAAc,GAAI,CAAC;EAEzE,OAAO,KAAKC,OAAO,QAAQ;CAC7B;CAEA,OAAO;EACL,KAAKA,OAAO,KAAK,KAAKD,GAAG;EACzB,OAAO,KAAKC,OAAO,QAAQ;CAC7B;AACF;AAEA,IAAM,cAAc,IAAI,WAAW,oCAAoC;AAEvE,SAAgB,UAAU,KAOZ;CAEZ,OAAO,YAAY,MAAM,IAAI,QAAQ,KAAK,KAAA;AAC5C"}
+{"version":3,"file":"worker-dispatcher.js","names":["#lc","#state","#assigner"],"sources":["../../../../../zero-cache/src/server/worker-dispatcher.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport UrlPattern from 'url-pattern';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {\n  getOrCreateCounter,\n  getOrCreateGauge,\n} from '../observability/metrics.ts';\nimport {RunningState} from '../services/running-state.ts';\nimport type {Service} from '../services/service.ts';\nimport type {IncomingMessageSubset} from '../types/http.ts';\nimport type {ClientGroupStatusMessage, Worker} from '../types/processes.ts';\nimport {installWebSocketHandoff} from '../types/websocket-handoff.ts';\nimport {getConnectParams} from '../workers/connect-params.ts';\nimport {SyncerAssigner} from './syncer-assigner.ts';\n\nexport class WorkerDispatcher implements Service {\n  readonly id = 'worker-dispatcher';\n  readonly #lc: LogContext;\n  readonly #state = new RunningState(this.id);\n  readonly #assigner: SyncerAssigner;\n\n  constructor(\n    lc: LogContext,\n    taskID: string,\n    parent: Worker,\n    syncers: Worker[],\n    mutator: Worker | undefined,\n    changeStreamer: Worker | undefined,\n  ) {\n    this.#lc = lc;\n\n    const assigner = new SyncerAssigner(taskID, syncers.length);\n    this.#assigner = assigner;\n\n    const workerDispatchesCounter = getOrCreateCounter(\n      'sync',\n      'worker-dispatches',\n      'Dispatched client group connections to worker',\n    );\n\n    getOrCreateGauge(\n      'sync',\n      'worker-client-groups',\n      'Number of active client groups assigned to worker',\n    ).addCallback(result => {\n      for (let i = 0; i < syncers.length; i++) {\n        result.observe(assigner.getWorkerLoad(i), {worker: String(i)});\n      }\n    });\n\n    syncers.forEach((syncer, index) => {\n      syncer.onMessageType<ClientGroupStatusMessage>(\n        'clientGroupStatus',\n        ({clientGroupID, active, generation}) => {\n          if (!active) {\n            assigner.release(clientGroupID, index, generation);\n          }\n        },\n      );\n    });\n\n    function connectParams(req: IncomingMessageSubset) {\n      const {headers, url: u} = req;\n      const url = new URL(u ?? '', 'http://unused/');\n      const path = parsePath(url);\n      if (!path) {\n        throw new Error(`Invalid URL: ${u}`);\n      }\n      const version = Number(path.version);\n      if (Number.isNaN(version)) {\n        throw new Error(`Invalid version: ${u}`);\n      }\n      const {params, error} = getConnectParams(version, url, headers);\n      if (error !== null) {\n        throw new Error(error);\n      }\n      return params;\n    }\n\n    const handlePush = (req: IncomingMessageSubset) => {\n      assert(\n        mutator !== undefined,\n        'Received a push for a custom mutation but no `push.url` was configured.',\n      );\n      return {payload: connectParams(req), sender: mutator};\n    };\n\n    let maxProtocolVersion = 0;\n    getOrCreateGauge(\n      'sync',\n      'max-protocol-version',\n      'Latest sync protocol version from a connecting client',\n    ).addCallback(result => {\n      if (maxProtocolVersion) {\n        result.observe(maxProtocolVersion);\n      }\n    });\n\n    const handleSync = (req: IncomingMessageSubset) => {\n      assert(syncers.length, 'Received a sync request with no sync workers.');\n      const params = connectParams(req);\n      const {clientGroupID, protocolVersion} = params;\n      maxProtocolVersion = Math.max(maxProtocolVersion, protocolVersion);\n\n      const {worker: syncer, generation} = assigner.assign(clientGroupID);\n      workerDispatchesCounter.add(1, {worker: String(syncer)});\n\n      lc.debug?.(`connecting ${clientGroupID} to syncer ${syncer}`);\n      return {payload: {...params, generation}, sender: syncers[syncer]};\n    };\n\n    const handleChangeStream = (req: IncomingMessageSubset) => {\n      // Note: The change-streamer is generally not dispatched via the main\n      //       port, and in particular, should *not* be accessible via that\n      //       port in single-node mode. However, this plumbing is maintained\n      //       for the purpose of allowing --lazy-startup of the\n      //       replication-manager as a possible future feature.\n      assert(\n        syncers.length === 0 && mutator === undefined,\n        'Dispatch to the change-streamer via the main port ' +\n          'is only allowed in multi-node mode',\n      );\n      assert(\n        changeStreamer,\n        'Received a change-streamer request without a change-streamer worker',\n      );\n      const url = new URL(req.url ?? '', 'http://unused/');\n      const path = parsePath(url);\n      if (!path) {\n        throw new Error(`Invalid URL: ${req.url}`);\n      }\n\n      return {\n        payload: path.action,\n        sender: changeStreamer,\n      };\n    };\n\n    // handoff messages from this ZeroDispatcher to the appropriate worker (pool).\n    installWebSocketHandoff<unknown>(\n      lc,\n      request => {\n        const {url: u} = request;\n        const url = new URL(u ?? '', 'http://unused/');\n        const path = parsePath(url);\n        if (!path) {\n          throw new Error(`Invalid URL: ${u}`);\n        }\n        switch (path.worker) {\n          case 'sync':\n            return handleSync(request);\n          case 'replication':\n            return handleChangeStream(request);\n          case 'mutate':\n            return handlePush(request);\n          default:\n            throw new Error(`Invalid URL: ${u}`);\n        }\n      },\n      parent,\n    );\n  }\n\n  run() {\n    const readyStart = Date.now();\n    getOrCreateGauge('server', 'uptime', {\n      description: 'Cumulative uptime, starting from when requests are served',\n      unit: 's',\n    }).addCallback(result => result.observe((Date.now() - readyStart) / 1000));\n\n    return this.#state.stopped();\n  }\n\n  stop() {\n    this.#assigner.destroy();\n    this.#state.stop(this.#lc);\n    return this.#state.stopped();\n  }\n}\n\nconst URL_PATTERN = new UrlPattern('(/:base)/:worker/v:version/:action');\n\nexport function parsePath(url: URL):\n  | {\n      base?: string;\n      worker: 'sync' | 'mutate' | 'replication';\n      version: string;\n      action: string;\n    }\n  | undefined {\n  // The match() returns both null and undefined.\n  return URL_PATTERN.match(url.pathname) || undefined;\n} // The server allows the client to use any /:base/ path to facilitate\n// servicing requests on the same domain as the application.\n"],"mappings":"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"}

package/out/zero-cache/src/server/worker-urls.d.ts

@@ -4,6 +4,7 @@ export declare const MUTATOR_URL: URL;
 export declare const REAPER_URL: URL;
 export declare const REPLICATOR_URL: URL;
 export declare const SHADOW_SYNCER_URL: URL;
+export declare const SLOT_KEEPER_URL: URL;
 export declare const SYNCER_URL: URL;
 export declare const WRITE_WORKER_URL: URL;
 //# sourceMappingURL=worker-urls.d.ts.map

package/out/zero-cache/src/server/worker-urls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-urls.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/worker-urls.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,mBAAmB,KAAkC,CAAC;AACnE,eAAO,MAAM,QAAQ,KAAuB,CAAC;AAC7C,eAAO,MAAM,WAAW,KAA0B,CAAC;AACnD,eAAO,MAAM,UAAU,KAAyB,CAAC;AACjD,eAAO,MAAM,cAAc,KAA6B,CAAC;AACzD,eAAO,MAAM,iBAAiB,KAAgC,CAAC;AAC/D,eAAO,MAAM,UAAU,KAAyB,CAAC;AACjD,eAAO,MAAM,gBAAgB,KAA+B,CAAC"}
+{"version":3,"file":"worker-urls.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/worker-urls.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,mBAAmB,KAAkC,CAAC;AACnE,eAAO,MAAM,QAAQ,KAAuB,CAAC;AAC7C,eAAO,MAAM,WAAW,KAA0B,CAAC;AACnD,eAAO,MAAM,UAAU,KAAyB,CAAC;AACjD,eAAO,MAAM,cAAc,KAA6B,CAAC;AACzD,eAAO,MAAM,iBAAiB,KAAgC,CAAC;AAC/D,eAAO,MAAM,eAAe,KAA8B,CAAC;AAC3D,eAAO,MAAM,UAAU,KAAyB,CAAC;AACjD,eAAO,MAAM,gBAAgB,KAA+B,CAAC"}

package/out/zero-cache/src/server/worker-urls.js

@@ -11,9 +11,10 @@ resolve("./mutator.ts");
 var REAPER_URL = resolve("./reaper.ts");
 var REPLICATOR_URL = resolve("./replicator.ts");
 var SHADOW_SYNCER_URL = resolve("./shadow-syncer.ts");
+var SLOT_KEEPER_URL = resolve("./slot-keeper.ts");
 var SYNCER_URL = resolve("./syncer.ts");
 var WRITE_WORKER_URL = resolve("./write-worker.ts");
 //#endregion
-export { CHANGE_STREAMER_URL, MAIN_URL, REAPER_URL, REPLICATOR_URL, SHADOW_SYNCER_URL, SYNCER_URL, WRITE_WORKER_URL };
+export { CHANGE_STREAMER_URL, MAIN_URL, REAPER_URL, REPLICATOR_URL, SHADOW_SYNCER_URL, SLOT_KEEPER_URL, SYNCER_URL, WRITE_WORKER_URL };
 
 //# sourceMappingURL=worker-urls.js.map

package/out/zero-cache/src/server/worker-urls.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-urls.js","names":[],"sources":["../../../../../zero-cache/src/server/worker-urls.ts"],"sourcesContent":["// This module provides URLs for worker files.\n\nconst tsRe = /\\.ts$/;\n\nfunction resolve(path: string): URL {\n  const {url} = import.meta;\n  if (url.endsWith('.js')) {\n    // When compiled, change .ts to .js\n    path = path.replace(tsRe, '.js');\n  }\n  return new URL(path, url);\n}\n\n// These URLs are part of the build process. See ../../zero/tool/build.ts\n// All these urls must be relative to this file and be located in the same directory.\n\nexport const CHANGE_STREAMER_URL = resolve('./change-streamer.ts');\nexport const MAIN_URL = resolve('./main.ts');\nexport const MUTATOR_URL = resolve('./mutator.ts');\nexport const REAPER_URL = resolve('./reaper.ts');\nexport const REPLICATOR_URL = resolve('./replicator.ts');\nexport const SHADOW_SYNCER_URL = resolve('./shadow-syncer.ts');\nexport const SYNCER_URL = resolve('./syncer.ts');\nexport const WRITE_WORKER_URL = resolve('./write-worker.ts');\n"],"mappings":";AAEA,IAAM,OAAO;AAEb,SAAS,QAAQ,MAAmB;CAClC,MAAM,EAAC,QAAO,OAAO;CACrB,IAAI,IAAI,SAAS,KAAK,GAEpB,OAAO,KAAK,QAAQ,MAAM,KAAK;CAEjC,OAAO,IAAI,IAAI,MAAM,GAAG;AAC1B;AAKA,IAAa,sBAAsB,QAAQ,sBAAsB;AACjE,IAAa,WAAW,QAAQ,WAAW;AAChB,QAAQ,cAAc;AACjD,IAAa,aAAa,QAAQ,aAAa;AAC/C,IAAa,iBAAiB,QAAQ,iBAAiB;AACvD,IAAa,oBAAoB,QAAQ,oBAAoB;AAC7D,IAAa,aAAa,QAAQ,aAAa;AAC/C,IAAa,mBAAmB,QAAQ,mBAAmB"}
+{"version":3,"file":"worker-urls.js","names":[],"sources":["../../../../../zero-cache/src/server/worker-urls.ts"],"sourcesContent":["// This module provides URLs for worker files.\n\nconst tsRe = /\\.ts$/;\n\nfunction resolve(path: string): URL {\n  const {url} = import.meta;\n  if (url.endsWith('.js')) {\n    // When compiled, change .ts to .js\n    path = path.replace(tsRe, '.js');\n  }\n  return new URL(path, url);\n}\n\n// These URLs are part of the build process. See ../../zero/tool/build.ts\n// All these urls must be relative to this file and be located in the same directory.\n\nexport const CHANGE_STREAMER_URL = resolve('./change-streamer.ts');\nexport const MAIN_URL = resolve('./main.ts');\nexport const MUTATOR_URL = resolve('./mutator.ts');\nexport const REAPER_URL = resolve('./reaper.ts');\nexport const REPLICATOR_URL = resolve('./replicator.ts');\nexport const SHADOW_SYNCER_URL = resolve('./shadow-syncer.ts');\nexport const SLOT_KEEPER_URL = resolve('./slot-keeper.ts');\nexport const SYNCER_URL = resolve('./syncer.ts');\nexport const WRITE_WORKER_URL = resolve('./write-worker.ts');\n"],"mappings":";AAEA,IAAM,OAAO;AAEb,SAAS,QAAQ,MAAmB;CAClC,MAAM,EAAC,QAAO,OAAO;CACrB,IAAI,IAAI,SAAS,KAAK,GAEpB,OAAO,KAAK,QAAQ,MAAM,KAAK;CAEjC,OAAO,IAAI,IAAI,MAAM,GAAG;AAC1B;AAKA,IAAa,sBAAsB,QAAQ,sBAAsB;AACjE,IAAa,WAAW,QAAQ,WAAW;AAChB,QAAQ,cAAc;AACjD,IAAa,aAAa,QAAQ,aAAa;AAC/C,IAAa,iBAAiB,QAAQ,iBAAiB;AACvD,IAAa,oBAAoB,QAAQ,oBAAoB;AAC7D,IAAa,kBAAkB,QAAQ,kBAAkB;AACzD,IAAa,aAAa,QAAQ,aAAa;AAC/C,IAAa,mBAAmB,QAAQ,mBAAmB"}

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

@@ -1 +1 @@
-{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oDAAoD,CAAC;AAC3F,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6CAA6C,CAAC;AAC9E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kDAAkD,CAAC;AAWxF,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAQjE,wBAAsB,YAAY,CAChC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,oBAAoB,EAC5B,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,GAAG,EACR,UAAU,UAAO,EACjB,UAAU,UAAQ,EAClB,WAAW,CAAC,EAAE,iBAAiB,EAC/B,IAAI,CAAC,EAAE,OAAO,EACd,SAAS,UAAQ,GAChB,OAAO,CAAC,kBAAkB,CAAC,CA4F7B"}
+{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oDAAoD,CAAC;AAC3F,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6CAA6C,CAAC;AAC9E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kDAAkD,CAAC;AAWxF,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAQjE,wBAAsB,YAAY,CAChC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,oBAAoB,EAC5B,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,GAAG,EACR,UAAU,UAAO,EACjB,UAAU,UAAQ,EAClB,WAAW,CAAC,EAAE,iBAAiB,EAC/B,IAAI,CAAC,EAAE,OAAO,EACd,SAAS,UAAQ,GAChB,OAAO,CAAC,kBAAkB,CAAC,CA4F7B"}

package/out/zero-cache/src/services/analyze.js

@@ -1,3 +1,4 @@
+import { getOrInsertComputed } from "../../../shared/src/map.js";
 import { MemoryStorage } from "../../../zql/src/ivm/memory-storage.js";
 import { AccumulatorDebugger, serializePlanDebugEvents } from "../../../zql/src/planner/planner-debug.js";
 import { Debug } from "../../../zql/src/builder/debug-delegate.js";
@@ -5,7 +6,7 @@ import { Database } from "../../../zqlite/src/db.js";
 import { TableSource } from "../../../zqlite/src/table-source.js";
 import { computeZqlSpecs, mustGetTableSpec } from "../db/lite-tables.js";
 import { createSQLiteCostModel } from "../../../zqlite/src/sqlite-cost-model.js";
-import { runAst } from "./run-ast.js";
+import { MAX_ANALYZE_ROWS, runAst } from "./run-ast.js";
 import { explainQueries } from "../../../zqlite/src/explain-queries.js";
 import { _usingCtx } from "../../../_virtual/_@oxc-project_runtime@0.130.0/helpers/usingCtx.js";
 import { TimeSliceTimer } from "./view-syncer/view-syncer.js";
@@ -34,17 +35,18 @@ async function analyzeQuery(lc, config, clientSchema, ast, syncedRows = true, ve
 			permissions,
 			costModel,
 			planDebugger,
+			maxSyncedRowsPerTable: MAX_ANALYZE_ROWS,
 			host: {
-				debug: new Debug(),
+				debug: new Debug(vendedRows, MAX_ANALYZE_ROWS),
 				enableNotExists: true,
+				disableCorrelatedPredicatePushdown: config.enableCorrelatedPredicatePushdown === false,
+				enablePlannerAwarePushdown: config.enablePlannerAwarePushdown !== false,
 				getSource(tableName) {
-					let source = tables.get(tableName);
-					if (source) return source;
-					const tableSpec = mustGetTableSpec(tableSpecs, tableName);
-					const { primaryKey } = tableSpec.tableSpec;
-					source = new TableSource(lc, config.log, db, tableName, tableSpec.zqlSpec, primaryKey, shouldYield);
-					tables.set(tableName, source);
-					return source;
+					return getOrInsertComputed(tables, tableName, (tableName) => {
+						const tableSpec = mustGetTableSpec(tableSpecs, tableName);
+						const { primaryKey } = tableSpec.tableSpec;
+						return new TableSource(lc, config.log, db, tableName, tableSpec.zqlSpec, primaryKey, shouldYield);
+					});
 				},
 				createStorage() {
 					return new MemoryStorage();

package/out/zero-cache/src/services/analyze.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.js","names":[],"sources":["../../../../../zero-cache/src/services/analyze.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {AnalyzeQueryResult} from '../../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {ClientSchema} from '../../../zero-protocol/src/client-schema.ts';\nimport type {PermissionsConfig} from '../../../zero-schema/src/compiled-permissions.ts';\nimport {Debug} from '../../../zql/src/builder/debug-delegate.ts';\nimport {MemoryStorage} from '../../../zql/src/ivm/memory-storage.ts';\nimport {\n  AccumulatorDebugger,\n  serializePlanDebugEvents,\n} from '../../../zql/src/planner/planner-debug.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\nimport {explainQueries} from '../../../zqlite/src/explain-queries.ts';\nimport {createSQLiteCostModel} from '../../../zqlite/src/sqlite-cost-model.ts';\nimport {TableSource} from '../../../zqlite/src/table-source.ts';\nimport type {JWTAuth} from '../auth/auth.ts';\nimport type {NormalizedZeroConfig} from '../config/normalize.ts';\nimport {computeZqlSpecs, mustGetTableSpec} from '../db/lite-tables.ts';\nimport type {LiteAndZqlSpec, LiteTableSpec} from '../db/specs.ts';\nimport {runAst} from './run-ast.ts';\nimport {TimeSliceTimer} from './view-syncer/view-syncer.ts';\n\nconst TIME_SLICE_LAP_THRESHOLD_MS = 200;\n\nexport async function analyzeQuery(\n  lc: LogContext,\n  config: NormalizedZeroConfig,\n  clientSchema: ClientSchema,\n  ast: AST,\n  syncedRows = true,\n  vendedRows = false,\n  permissions?: PermissionsConfig,\n  auth?: JWTAuth,\n  joinPlans = false,\n): Promise<AnalyzeQueryResult> {\n  using db = new Database(lc, config.replica.file);\n  const fullTables = new Map<string, LiteTableSpec>();\n  const tableSpecs = new Map<string, LiteAndZqlSpec>();\n  const tables = new Map<string, TableSource>();\n\n  computeZqlSpecs(\n    lc,\n    db,\n    {includeBackfillingColumns: false},\n    tableSpecs,\n    fullTables,\n  );\n\n  // Mirror production: the planner runs iff ZERO_ENABLE_QUERY_PLANNER is set\n  // on the server, so the analysis reflects what actually executes. Diagnostic\n  // event collection is orthogonal and opt-in via `joinPlans`.\n  const costModel = config.enableQueryPlanner\n    ? createSQLiteCostModel(db, tableSpecs)\n    : undefined;\n  const planDebugger = joinPlans ? new AccumulatorDebugger() : undefined;\n  const timer = await new TimeSliceTimer(lc).start();\n  const shouldYield = () => timer.elapsedLap() > TIME_SLICE_LAP_THRESHOLD_MS;\n  const yieldProcess = () => timer.yieldProcess();\n  const result = await runAst(\n    lc,\n    clientSchema,\n    ast,\n    true,\n    {\n      applyPermissions: permissions !== undefined,\n      syncedRows,\n      vendedRows,\n      auth,\n      db,\n      tableSpecs,\n      permissions,\n      costModel,\n      planDebugger,\n      host: {\n        debug: new Debug(),\n        enableNotExists: true,\n        getSource(tableName: string) {\n          let source = tables.get(tableName);\n          if (source) {\n            return source;\n          }\n\n          const tableSpec = mustGetTableSpec(tableSpecs, tableName);\n          const {primaryKey} = tableSpec.tableSpec;\n\n          source = new TableSource(\n            lc,\n            config.log,\n            db,\n            tableName,\n            tableSpec.zqlSpec,\n            primaryKey,\n            shouldYield,\n          );\n          tables.set(tableName, source);\n          return source;\n        },\n        createStorage() {\n          return new MemoryStorage();\n        },\n        decorateSourceInput: input => input,\n        decorateInput: input => input,\n        addEdge() {},\n        decorateFilterInput: input => input,\n      },\n    },\n    yieldProcess,\n  );\n\n  // Fill in plans for any queries SQLite did not actually execute (and thus\n  // did not populate scanStatus EXPLAIN for) using the substituted-binding\n  // fallback. Plans captured at execution time use the real bindings and win.\n  const fallback = explainQueries(result.readRowCountsByQuery ?? {}, db);\n  const captured = result.sqlitePlans ?? {};\n  for (const [query, plan] of Object.entries(fallback)) {\n    if (!captured[query]) {\n      captured[query] = plan;\n    }\n  }\n  result.sqlitePlans = captured;\n\n  if (planDebugger) {\n    result.joinPlans = serializePlanDebugEvents(planDebugger.events);\n  }\n\n  return result;\n}\n"],"mappings":";;;;;;;;;;;;AAsBA,IAAM,8BAA8B;AAEpC,eAAsB,aACpB,IACA,QACA,cACA,KACA,aAAa,MACb,aAAa,OACb,aACA,MACA,YAAY,OACiB;;;EAC7B,MAAM,KAAA,YAAA,EAAK,IAAI,SAAS,IAAI,OAAO,QAAQ,IAAI,CAAA;EAC/C,MAAM,6BAAa,IAAI,IAA2B;EAClD,MAAM,6BAAa,IAAI,IAA4B;EACnD,MAAM,yBAAS,IAAI,IAAyB;EAE5C,gBACE,IACA,IACA,EAAC,2BAA2B,MAAK,GACjC,YACA,UACF;EAKA,MAAM,YAAY,OAAO,qBACrB,sBAAsB,IAAI,UAAU,IACpC,KAAA;EACJ,MAAM,eAAe,YAAY,IAAI,oBAAoB,IAAI,KAAA;EAC7D,MAAM,QAAQ,MAAM,IAAI,eAAe,EAAE,EAAE,MAAM;EACjD,MAAM,oBAAoB,MAAM,WAAW,IAAI;EAC/C,MAAM,qBAAqB,MAAM,aAAa;EAC9C,MAAM,SAAS,MAAM,OACnB,IACA,cACA,KACA,MACA;GACE,kBAAkB,gBAAgB,KAAA;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA,MAAM;IACJ,OAAO,IAAI,MAAM;IACjB,iBAAiB;IACjB,UAAU,WAAmB;KAC3B,IAAI,SAAS,OAAO,IAAI,SAAS;KACjC,IAAI,QACF,OAAO;KAGT,MAAM,YAAY,iBAAiB,YAAY,SAAS;KACxD,MAAM,EAAC,eAAc,UAAU;KAE/B,SAAS,IAAI,YACX,IACA,OAAO,KACP,IACA,WACA,UAAU,SACV,YACA,WACF;KACA,OAAO,IAAI,WAAW,MAAM;KAC5B,OAAO;IACT;IACA,gBAAgB;KACd,OAAO,IAAI,cAAc;IAC3B;IACA,sBAAqB,UAAS;IAC9B,gBAAe,UAAS;IACxB,UAAU,CAAC;IACX,sBAAqB,UAAS;GAChC;EACF,GACA,YACF;EAKA,MAAM,WAAW,eAAe,OAAO,wBAAwB,CAAC,GAAG,EAAE;EACrE,MAAM,WAAW,OAAO,eAAe,CAAC;EACxC,KAAK,MAAM,CAAC,OAAO,SAAS,OAAO,QAAQ,QAAQ,GACjD,IAAI,CAAC,SAAS,QACZ,SAAS,SAAS;EAGtB,OAAO,cAAc;EAErB,IAAI,cACF,OAAO,YAAY,yBAAyB,aAAa,MAAM;EAGjE,OAAO;;;;;;AACT"}
+{"version":3,"file":"analyze.js","names":[],"sources":["../../../../../zero-cache/src/services/analyze.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {getOrInsertComputed} from '../../../shared/src/map.ts';\nimport type {AnalyzeQueryResult} from '../../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {ClientSchema} from '../../../zero-protocol/src/client-schema.ts';\nimport type {PermissionsConfig} from '../../../zero-schema/src/compiled-permissions.ts';\nimport {Debug} from '../../../zql/src/builder/debug-delegate.ts';\nimport {MemoryStorage} from '../../../zql/src/ivm/memory-storage.ts';\nimport {\n  AccumulatorDebugger,\n  serializePlanDebugEvents,\n} from '../../../zql/src/planner/planner-debug.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\nimport {explainQueries} from '../../../zqlite/src/explain-queries.ts';\nimport {createSQLiteCostModel} from '../../../zqlite/src/sqlite-cost-model.ts';\nimport {TableSource} from '../../../zqlite/src/table-source.ts';\nimport type {JWTAuth} from '../auth/auth.ts';\nimport type {NormalizedZeroConfig} from '../config/normalize.ts';\nimport {computeZqlSpecs, mustGetTableSpec} from '../db/lite-tables.ts';\nimport type {LiteAndZqlSpec, LiteTableSpec} from '../db/specs.ts';\nimport {MAX_ANALYZE_ROWS, runAst} from './run-ast.ts';\nimport {TimeSliceTimer} from './view-syncer/view-syncer.ts';\n\nconst TIME_SLICE_LAP_THRESHOLD_MS = 200;\n\nexport async function analyzeQuery(\n  lc: LogContext,\n  config: NormalizedZeroConfig,\n  clientSchema: ClientSchema,\n  ast: AST,\n  syncedRows = true,\n  vendedRows = false,\n  permissions?: PermissionsConfig,\n  auth?: JWTAuth,\n  joinPlans = false,\n): Promise<AnalyzeQueryResult> {\n  using db = new Database(lc, config.replica.file);\n  const fullTables = new Map<string, LiteTableSpec>();\n  const tableSpecs = new Map<string, LiteAndZqlSpec>();\n  const tables = new Map<string, TableSource>();\n\n  computeZqlSpecs(\n    lc,\n    db,\n    {includeBackfillingColumns: false},\n    tableSpecs,\n    fullTables,\n  );\n\n  // Mirror production: the planner runs iff ZERO_ENABLE_QUERY_PLANNER is set\n  // on the server, so the analysis reflects what actually executes. Diagnostic\n  // event collection is orthogonal and opt-in via `joinPlans`.\n  const costModel = config.enableQueryPlanner\n    ? createSQLiteCostModel(db, tableSpecs)\n    : undefined;\n  const planDebugger = joinPlans ? new AccumulatorDebugger() : undefined;\n  const timer = await new TimeSliceTimer(lc).start();\n  const shouldYield = () => timer.elapsedLap() > TIME_SLICE_LAP_THRESHOLD_MS;\n  const yieldProcess = () => timer.yieldProcess();\n  const result = await runAst(\n    lc,\n    clientSchema,\n    ast,\n    true,\n    {\n      applyPermissions: permissions !== undefined,\n      syncedRows,\n      vendedRows,\n      auth,\n      db,\n      tableSpecs,\n      permissions,\n      costModel,\n      planDebugger,\n      maxSyncedRowsPerTable: MAX_ANALYZE_ROWS,\n      host: {\n        debug: new Debug(vendedRows, MAX_ANALYZE_ROWS),\n        enableNotExists: true,\n        // Mirror production, as with the planner above.\n        disableCorrelatedPredicatePushdown:\n          config.enableCorrelatedPredicatePushdown === false,\n        enablePlannerAwarePushdown: config.enablePlannerAwarePushdown !== false,\n        getSource(tableName: string) {\n          return getOrInsertComputed(tables, tableName, tableName => {\n            const tableSpec = mustGetTableSpec(tableSpecs, tableName);\n            const {primaryKey} = tableSpec.tableSpec;\n\n            return new TableSource(\n              lc,\n              config.log,\n              db,\n              tableName,\n              tableSpec.zqlSpec,\n              primaryKey,\n              shouldYield,\n            );\n          });\n        },\n        createStorage() {\n          return new MemoryStorage();\n        },\n        decorateSourceInput: input => input,\n        decorateInput: input => input,\n        addEdge() {},\n        decorateFilterInput: input => input,\n      },\n    },\n    yieldProcess,\n  );\n\n  // Fill in plans for any queries SQLite did not actually execute (and thus\n  // did not populate scanStatus EXPLAIN for) using the substituted-binding\n  // fallback. Plans captured at execution time use the real bindings and win.\n  const fallback = explainQueries(result.readRowCountsByQuery ?? {}, db);\n  const captured = result.sqlitePlans ?? {};\n  for (const [query, plan] of Object.entries(fallback)) {\n    if (!captured[query]) {\n      captured[query] = plan;\n    }\n  }\n  result.sqlitePlans = captured;\n\n  if (planDebugger) {\n    result.joinPlans = serializePlanDebugEvents(planDebugger.events);\n  }\n\n  return result;\n}\n"],"mappings":";;;;;;;;;;;;;AAuBA,IAAM,8BAA8B;AAEpC,eAAsB,aACpB,IACA,QACA,cACA,KACA,aAAa,MACb,aAAa,OACb,aACA,MACA,YAAY,OACiB;;;EAC7B,MAAM,KAAA,YAAA,EAAK,IAAI,SAAS,IAAI,OAAO,QAAQ,IAAI,CAAA;EAC/C,MAAM,6BAAa,IAAI,IAA2B;EAClD,MAAM,6BAAa,IAAI,IAA4B;EACnD,MAAM,yBAAS,IAAI,IAAyB;EAE5C,gBACE,IACA,IACA,EAAC,2BAA2B,MAAK,GACjC,YACA,UACF;EAKA,MAAM,YAAY,OAAO,qBACrB,sBAAsB,IAAI,UAAU,IACpC,KAAA;EACJ,MAAM,eAAe,YAAY,IAAI,oBAAoB,IAAI,KAAA;EAC7D,MAAM,QAAQ,MAAM,IAAI,eAAe,EAAE,EAAE,MAAM;EACjD,MAAM,oBAAoB,MAAM,WAAW,IAAI;EAC/C,MAAM,qBAAqB,MAAM,aAAa;EAC9C,MAAM,SAAS,MAAM,OACnB,IACA,cACA,KACA,MACA;GACE,kBAAkB,gBAAgB,KAAA;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA,uBAAuB;GACvB,MAAM;IACJ,OAAO,IAAI,MAAM,YAAY,gBAAgB;IAC7C,iBAAiB;IAEjB,oCACE,OAAO,sCAAsC;IAC/C,4BAA4B,OAAO,+BAA+B;IAClE,UAAU,WAAmB;KAC3B,OAAO,oBAAoB,QAAQ,YAAW,cAAa;MACzD,MAAM,YAAY,iBAAiB,YAAY,SAAS;MACxD,MAAM,EAAC,eAAc,UAAU;MAE/B,OAAO,IAAI,YACT,IACA,OAAO,KACP,IACA,WACA,UAAU,SACV,YACA,WACF;KACF,CAAC;IACH;IACA,gBAAgB;KACd,OAAO,IAAI,cAAc;IAC3B;IACA,sBAAqB,UAAS;IAC9B,gBAAe,UAAS;IACxB,UAAU,CAAC;IACX,sBAAqB,UAAS;GAChC;EACF,GACA,YACF;EAKA,MAAM,WAAW,eAAe,OAAO,wBAAwB,CAAC,GAAG,EAAE;EACrE,MAAM,WAAW,OAAO,eAAe,CAAC;EACxC,KAAK,MAAM,CAAC,OAAO,SAAS,OAAO,QAAQ,QAAQ,GACjD,IAAI,CAAC,SAAS,QACZ,SAAS,SAAS;EAGtB,OAAO,cAAc;EAErB,IAAI,cACF,OAAO,YAAY,yBAAyB,aAAa,MAAM;EAGjE,OAAO;;;;;;AACT"}

package/out/zero-cache/src/services/change-source/common/backfill-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backfill-manager.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/common/backfill-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,EAAmB,KAAK,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAKzE,OAAO,KAAK,EACV,iBAAiB,EACjB,eAAe,EACf,mBAAmB,EAEnB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EACV,UAAU,EACV,uBAAuB,EACvB,QAAQ,EACT,MAAM,gCAAgC,CAAC;AAMxC;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,eAAe,GAAG,iBAAiB,CAAC;IAC7C,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,KAAK,gBAAgB,GAAG,CACtB,GAAG,EAAE,eAAe,KACjB,cAAc,CAAC,eAAe,CAAC,CAAC;AAuBrC;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,eAAgB,YAAW,UAAU,EAAE,QAAQ;;IAgC1D,YACE,EAAE,EAAE,UAAU,EACd,cAAc,EAAE,uBAAuB,EACvC,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,GAAE,UAA6B,EACzC,YAAY,SAA0B,EACtC,YAAY,SAA0B,EACtC,oBAAoB,SAAyB,EAU9C;IAED,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,QAU5D;IAqPD;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CA2M3C;IAED,MAAM,IAAI,IAAI,CAGb;CACF;AAED,uBAAe,mBAAoB,SAAQ,KAAK;IAC9C,YAAY,EAAE,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAM5D;CACF;AA6BD;;;;;GAKG;AACH,qBAAa,0BAA2B,SAAQ,mBAAmB;IACjE,QAAQ,CAAC,IAAI,gCAAgC;IAE7C,YAAY,EAAE,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAE5D;CACF"}
+{"version":3,"file":"backfill-manager.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/common/backfill-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAUjD,OAAO,EAAmB,KAAK,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAKzE,OAAO,KAAK,EACV,iBAAiB,EACjB,eAAe,EACf,mBAAmB,EAEnB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EACV,UAAU,EACV,uBAAuB,EACvB,QAAQ,EACT,MAAM,gCAAgC,CAAC;AAMxC;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,eAAe,GAAG,iBAAiB,CAAC;IAC7C,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,KAAK,gBAAgB,GAAG,CACtB,GAAG,EAAE,eAAe,KACjB,cAAc,CAAC,eAAe,CAAC,CAAC;AAkFrC;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,eAAgB,YAAW,UAAU,EAAE,QAAQ;;IA4C1D,YACE,EAAE,EAAE,UAAU,EACd,cAAc,EAAE,uBAAuB,EACvC,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,GAAE,UAA6B,EACzC,YAAY,SAA0B,EACtC,YAAY,SAA0B,EACtC,oBAAoB,SAAyB,EAU9C;IAED,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,QAU5D;IA4bD;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CA6M3C;IAED,MAAM,IAAI,IAAI,CAab;CACF;AAED,uBAAe,mBAAoB,SAAQ,KAAK;IAC9C,YAAY,EAAE,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAM5D;CACF;AA6BD;;;;;GAKG;AACH,qBAAa,0BAA2B,SAAQ,mBAAmB;IACjE,QAAQ,CAAC,IAAI,gCAAgC;IAE7C,YAAY,EAAE,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAE5D;CACF"}

package/out/zero-cache/src/services/change-source/common/backfill-manager.js

@@ -1,9 +1,12 @@
 import { assert } from "../../../../../shared/src/asserts.js";
+import { AbortError } from "../../../../../shared/src/abort-error.js";
 import { must } from "../../../../../shared/src/must.js";
+import { promiseOrAbort } from "../../../../../shared/src/promise-race.js";
 import { stringify } from "../../../../../shared/src/bigint-json.js";
 import "../../../types/lite.js";
 import { randInt } from "../../../../../shared/src/rand.js";
 import { stateVersionFromString, stateVersionToString } from "../../../types/state-version.js";
+import { Queue } from "../../../../../shared/src/queue.js";
 import { CustomKeyMap } from "../../../../../shared/src/custom-key-map.js";
 import { resolver } from "@rocicorp/resolver";
 //#region ../zero-cache/src/services/change-source/common/backfill-manager.ts
@@ -16,6 +19,34 @@ function tableKey({ schema, name }) {
 * COMMIT/checkpoint so it can't monopolize the replica.
 */
 var COMMIT_THRESHOLD_BYTES = 8 * 1024 * 1024;
+/**
+* How many backfill messages the prefetch producer may read ahead of the
+* reservation-holding consumer loop. This bounds the in-memory buffer (~this
+* many {@link BackfillMessage}s, each up to the stream's flush threshold, e.g.
+* 64 KiB) while giving the consumer a supply of ready messages so it never
+* has to wait on the upstream COPY while holding the change-stream reservation.
+*/
+var BACKFILL_PREFETCH_CREDITS = 16;
+/**
+* While the backfill holds an open transaction but its prefetch queue is empty
+* (i.e. the upstream is momentarily behind), the consumer polls for the next
+* message at this interval so that a replication transaction that begins
+* waiting mid-fetch can preempt the backfill within this bound, rather than
+* being blocked for the entire (possibly slow) upstream read.
+*
+* If stats indicate that these stalls are highly correlative with replication
+* lag (indicating that replication changes are waiting on these polls), we
+* can address this by adding an API to the change stream multiplexer that
+* would allow backfill to relinquish an in-progress commit on demand (i.e.
+* only if replication asks for a reservation).
+*/
+var BACKFILL_WAITER_POLL_MS = 10;
+/** Interval at which in-progress backfill timing stats are logged. */
+var BACKFILL_STATS_LOG_INTERVAL_MS = 1e4;
+/** Sentinel enqueued by the prefetch producer when the backfill stream ends. */
+var DONE = Symbol("backfill-done");
+/** Sentinel returned by a polled dequeue that timed out (see {@link BACKFILL_WAITER_POLL_MS}). */
+var POLL = Symbol("backfill-poll");
 var MIN_BACKOFF_INTERVAL_MS = 2e3;
 var MAX_BACKOFF_INTERVAL_MS = 6e4;
 /**
@@ -57,6 +88,16 @@ var BackfillManager = class {
 	/** The watermark of the current transaction in the change stream. */
 	#currentTxWatermark = null;
 	#commitThresholdBytes;
+	/**
+	* Aborted when the change stream is canceled. No further backfills are run.
+	*
+	* TODO: Thread this into the backfillStream so that upstream I/O can be
+	* aborted.
+	*/
+	#controller = new AbortController();
+	get #canceled() {
+		return this.#controller.signal.aborted;
+	}
 	constructor(lc, changeStreamer, backfillStreamer, jsonFormat = "s", minBackoffMs = MIN_BACKOFF_INTERVAL_MS, maxBackoffMs = MAX_BACKOFF_INTERVAL_MS, commitThresholdBytes = COMMIT_THRESHOLD_BYTES) {
 		this.#lc = lc.withContext("component", "backfill-manager");
 		this.#changeStreamer = changeStreamer;
@@ -102,12 +143,13 @@ var BackfillManager = class {
 	#retryDelayMs;
 	#backfillRetryTimer;
 	#checkAndStartBackfill() {
-		if (!this.#backfillRetryTimer && !this.#runningBackfill && this.#requiredBackfills.size) {
+		if (!this.#canceled && !this.#backfillRetryTimer && !this.#runningBackfill && this.#requiredBackfills.size) {
 			const candidates = [...this.#requiredBackfills.values()];
 			const request = candidates[randInt(0, candidates.length - 1)];
 			const state = {
 				request,
-				minWatermark: ""
+				minWatermark: "",
+				stopped: new AbortController()
 			};
 			const lc = this.#lc.withContext("table", request.table.name);
 			this.#runningBackfill = state;
@@ -121,8 +163,11 @@ var BackfillManager = class {
 		}
 	}
 	#retryBackfillWithBackoff(e) {
-		const log = this.#retryDelayMs === this.#maxBackoffMs ? "error" : "warn";
-		this.#lc[log]?.(`Error running backfill. Retrying in ${this.#retryDelayMs} ms`, e);
+		if (this.#canceled) {
+			this.#lc.debug?.(`not retrying backfill: change stream canceled`, e);
+			return;
+		}
+		this.#lc.warn?.(`Error running backfill. Retrying in ${this.#retryDelayMs} ms`, e);
 		this.#backfillRetryTimer = setTimeout(() => {
 			this.#backfillRetryTimer = void 0;
 			this.#checkAndStartBackfill();
@@ -133,14 +178,27 @@ var BackfillManager = class {
 		const changeStream = this.#changeStreamer;
 		let backfillTx = null;
 		let uncommittedBytes = 0;
+		const stats = {
+			start: performance.now(),
+			lastLogged: performance.now(),
+			messages: 0,
+			bytes: 0,
+			commits: 0,
+			stalls: 0,
+			produceMs: 0,
+			pushMs: 0,
+			reserveMs: 0,
+			stallMs: 0,
+			waitMs: 0
+		};
 		/**
 		* @returns the new tx watermark, or null if backfill was cancelled
 		*/
 		const beginTxFor = async (msg) => {
 			assert(backfillTx === null, "Expected no active backfill transaction");
 			const lastWatermark = await changeStream.reserve("backfill");
-			if (state.canceledReason || msg.tag === "backfill" && msg.watermark < state.minWatermark) {
-				if (state.canceledReason === void 0) {
+			if (state.stopped.signal.aborted || msg.tag === "backfill" && msg.watermark < state.minWatermark) {
+				if (!state.stopped.signal.aborted) {
 					assert(msg.tag === "backfill", "Expected backfill message tag");
 					this.#stopRunningBackfill(`row key change at ${state.minWatermark} postdates backfill watermark at ${msg.watermark}`, state);
 				}
@@ -152,7 +210,7 @@ var BackfillManager = class {
 				major,
 				minor: BigInt(minor) + 1n
 			});
-			if (msg.tag === "backfill-completed" && tx < msg.watermark) tx = msg.watermark;
+			if (tx < msg.watermark) tx = msg.watermark;
 			changeStream.push([
 				"begin",
 				{
@@ -172,25 +230,138 @@ var BackfillManager = class {
 					{ watermark: backfillTx }
 				]);
 				changeStream.release(backfillTx);
+				stats.commits++;
 			}
 			backfillTx = null;
 			uncommittedBytes = 0;
 		};
-		for await (const { message: msg, byteSize } of this.#backfillStreamer(state.request)) {
-			const mustWaitBeforeFlush = msg.tag === "backfill-completed" && (this.#changeStreamReached(lc, msg.watermark) || backfillTx !== null && backfillTx < msg.watermark);
-			if (backfillTx && (changeStream.waiterDelay() > 0 || mustWaitBeforeFlush || uncommittedBytes >= this.#commitThresholdBytes)) commitTx();
-			mustWaitBeforeFlush && await mustWaitBeforeFlush;
-			if (msg.tag === "backfill" && msg.rowValues.length > 0 && msg.relation.rowKey.columns.length === 0) throw new MissingRowKeyError(state.request);
-			if ((backfillTx ??= await beginTxFor(msg)) === null) {
-				lc.info?.(`backfill stream canceled: ${state.canceledReason}`, state.request);
-				this.#checkAndStartBackfill();
-				return;
+		const ready = new Queue();
+		const credits = new Queue();
+		for (let i = 0; i < BACKFILL_PREFETCH_CREDITS; i++) credits.enqueue(1);
+		let stopProducer = false;
+		const onCancel = () => ready.enqueueRejection(new AbortError("backfill canceled"));
+		if (!this.#canceled) this.#controller.signal.addEventListener("abort", onCancel);
+		const producer = (async () => {
+			try {
+				let t0 = performance.now();
+				for await (const value of this.#backfillStreamer(state.request)) {
+					stats.produceMs += performance.now() - t0;
+					await credits.dequeue();
+					if (stopProducer || this.#canceled) {
+						ready.enqueueRejection(new AbortError("backfill canceled"));
+						return;
+					}
+					ready.enqueue(value);
+					t0 = performance.now();
+				}
+				ready.enqueue(DONE);
+			} catch (e) {
+				ready.enqueueRejection(e);
+			}
+		})();
+		producer.catch(() => {});
+		const nextItem = async () => {
+			if (backfillTx === null || ready.size() > 0) {
+				const n = ready.dequeue();
+				return n instanceof Promise ? await n : n;
+			}
+			for (;;) {
+				if (backfillTx !== null && changeStream.waiterDelay() > 0) commitTx();
+				const n = backfillTx !== null ? ready.dequeue(POLL, BACKFILL_WAITER_POLL_MS) : ready.dequeue();
+				const t0 = performance.now();
+				const v = n instanceof Promise ? await n : n;
+				if (v === POLL) {
+					stats.stallMs += performance.now() - t0;
+					continue;
+				}
+				if (n instanceof Promise) {
+					stats.stallMs += performance.now() - t0;
+					stats.stalls++;
+				}
+				return v;
+			}
+		};
+		try {
+			for (;;) {
+				const item = await nextItem();
+				if (item === DONE) break;
+				credits.enqueue(1);
+				if (this.#canceled) {
+					lc.info?.(`backfill stream canceled: change stream canceled`);
+					return;
+				}
+				const { message: msg, byteSize } = item;
+				const waitForChangeStream = this.#changeStreamReached(lc, msg.watermark);
+				if (backfillTx && (changeStream.waiterDelay() > 0 || waitForChangeStream || uncommittedBytes >= this.#commitThresholdBytes)) commitTx();
+				if (waitForChangeStream) {
+					const t0 = performance.now();
+					await promiseOrAbort(waitForChangeStream, state.stopped.signal);
+					const elapsed = performance.now() - t0;
+					stats.waitMs += elapsed;
+					lc.info?.(`change stream reached ${msg.watermark} after waiting ${Math.round(elapsed)} ms`);
+				}
+				if (msg.tag === "backfill" && msg.rowValues.length > 0 && msg.relation.rowKey.columns.length === 0) throw new MissingRowKeyError(state.request);
+				if (backfillTx === null) {
+					const t0 = performance.now();
+					backfillTx = await beginTxFor(msg);
+					stats.reserveMs += performance.now() - t0;
+					if (backfillTx === null) {
+						lc.info?.(`backfill stream canceled: ${state.stopped.signal.reason}`, state.request);
+						this.#checkAndStartBackfill();
+						return;
+					}
+				}
+				const t0 = performance.now();
+				await changeStream.push(["data", msg]);
+				stats.pushMs += performance.now() - t0;
+				uncommittedBytes += byteSize;
+				stats.messages++;
+				stats.bytes += byteSize;
+				this.#maybeLogBackfillStats(lc, stats);
 			}
-			await changeStream.push(["data", msg]);
-			uncommittedBytes += byteSize;
+			if (backfillTx) commitTx();
+			lc.debug?.(`backfill stream exited`);
+		} finally {
+			stopProducer = true;
+			credits.enqueue(1);
+			if (!this.#canceled) await producer;
+			this.#controller.signal.removeEventListener("abort", onCancel);
+			this.#logBackfillStats(lc, stats);
+		}
+	}
+	#maybeLogBackfillStats(lc, stats) {
+		const now = performance.now();
+		if (now - stats.lastLogged >= BACKFILL_STATS_LOG_INTERVAL_MS) {
+			this.#logBackfillStats(lc, stats);
+			stats.lastLogged = now;
 		}
-		backfillTx && commitTx();
-		lc.debug?.(`backfill stream exited`, state.canceledReason ?? "");
+	}
+	/**
+	* Logs where the backfill spent its time. `produceMs` (upstream read +
+	* parse/decode) accrues on the prefetch producer concurrently with the
+	* consumer's `pushMs` (downstream backpressure), so the two can overlap and
+	* their sum can exceed `elapsedMs`. `reserveMs` is time spent (re)acquiring
+	* the change-stream reservation, and `stallMs` is time the consumer waited on
+	* an empty prefetch queue (i.e. blocked on the upstream) — a large `stallMs`
+	* indicates an upstream-bound backfill. `waitMs` is time spent waiting
+	* (without the reservation) for the change stream to reach the backfill
+	* watermark, during which the upstream snapshot is held open.
+	*/
+	#logBackfillStats(lc, stats) {
+		const elapsed = performance.now() - stats.start;
+		lc.info?.(`backfill timing`, {
+			messages: stats.messages,
+			bytes: stats.bytes,
+			commits: stats.commits,
+			stalls: stats.stalls,
+			elapsedMs: Math.round(elapsed),
+			produceMs: Math.round(stats.produceMs),
+			pushMs: Math.round(stats.pushMs),
+			reserveMs: Math.round(stats.reserveMs),
+			stallMs: Math.round(stats.stallMs),
+			waitMs: Math.round(stats.waitMs),
+			throughputKBps: elapsed > 0 ? Math.round(stats.bytes / 1024 / (elapsed / 1e3)) : 0
+		});
 	}
 	#backfillRunningFor(table) {
 		const state = this.#runningBackfill;
@@ -205,7 +376,7 @@ var BackfillManager = class {
 	#stopRunningBackfill(reason, instance) {
 		const backfill = this.#runningBackfill;
 		if (backfill && backfill === (instance ?? backfill)) {
-			backfill.canceledReason = reason;
+			backfill.stopped.abort(reason);
 			this.#runningBackfill = null;
 			reason && this.#lc.info?.(`canceling backfill:`, reason);
 		}
@@ -269,7 +440,7 @@ var BackfillManager = class {
 						name,
 						metadata
 					},
-					columns: backfill
+					columns: Object.fromEntries(Object.entries(backfill).map(([col, id]) => [col, { id }]))
 				});
 				break;
 			}
@@ -308,7 +479,7 @@ var BackfillManager = class {
 							...table,
 							metadata
 						},
-						columns: { [column.name]: backfill }
+						columns: { [column.name]: { id: backfill } }
 					});
 					else this.#setRequiredBackfill(tag, {
 						...backfillRequest,
@@ -318,7 +489,7 @@ var BackfillManager = class {
 						},
 						columns: {
 							...backfillRequest.columns,
-							[column.name]: backfill
+							[column.name]: { id: backfill }
 						}
 					});
 				}
@@ -387,8 +558,11 @@ var BackfillManager = class {
 		}
 	}
 	cancel() {
+		this.#controller.abort("canceled");
 		this.#stopRunningBackfill(`change stream canceled`);
 		clearTimeout(this.#backfillRetryTimer);
+		this.#backfillRetryTimer = void 0;
+		for (const { reached } of this.#awaitingStatusWatermarks.splice(0)) reached();
 	}
 };
 var BackfillStreamError = class extends Error {