@rocicorp/zero 0.26.0-canary.7 → 0.26.0

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

@@ -1 +1 @@
-{"version":3,"file":"row-record-cache.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/row-record-cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,YAAY,EAAE,GAAG,EAAC,MAAM,UAAU,CAAC;AAUhD,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,mBAAmB,EACzB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAe,KAAK,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAEL,KAAK,OAAO,EAEb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,KAAK,EACV,KAAK,SAAS,EAGf,MAAM,mBAAmB,CAAC;AAI3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,qBAAa,cAAc;;gBAgCvB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,EACjC,yBAAyB,SAAM,EAC/B,YAAY,oBAAa;IAW3B,oBAAoB,CAAC,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM;IAsD5D,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAIvD;;;;;;;;;;;;;;OAcG;IACG,KAAK,CACT,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC,EACxC,WAAW,EAAE,UAAU,EACvB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,MAAM,CAAC;IAmElB,iBAAiB;IAIjB;;;OAGG;IACH,OAAO,CAAC,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtC,KAAK;IAOE,iBAAiB,CACtB,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,kBAAkB,EAChC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,UAAU,EACnB,kBAAkB,GAAE,MAAM,EAAO,GAChC,cAAc,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC;IAmD7C,iBAAiB,CACf,EAAE,EAAE,mBAAmB,EACvB,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC,EACxC,IAAI,EAAE,aAAa,GAAG,OAAO,EAC7B,EAAE,yDAAW,GACZ,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE;CAiEzB"}
+{"version":3,"file":"row-record-cache.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/row-record-cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,YAAY,EAAE,GAAG,EAAC,MAAM,UAAU,CAAC;AAWhD,OAAO,EAAC,KAAK,UAAU,EAAE,KAAK,mBAAmB,EAAC,MAAM,mBAAmB,CAAC;AAE5E,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAe,KAAK,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAEL,KAAK,OAAO,EAEb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,KAAK,EACV,KAAK,SAAS,EAGf,MAAM,mBAAmB,CAAC;AAI3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,qBAAa,cAAc;;gBAgCvB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,EACjC,yBAAyB,SAAM,EAC/B,YAAY,oBAAa;IAW3B,oBAAoB,CAAC,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM;IAuD5D,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAIvD;;;;;;;;;;;;;;OAcG;IACG,KAAK,CACT,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC,EACxC,WAAW,EAAE,UAAU,EACvB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,MAAM,CAAC;IAsElB,iBAAiB;IAIjB;;;OAGG;IACH,OAAO,CAAC,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtC,KAAK;IAOE,iBAAiB,CACtB,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,kBAAkB,EAChC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,UAAU,EACnB,kBAAkB,GAAE,MAAM,EAAO,GAChC,cAAc,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC;IAmD7C,iBAAiB,CACf,EAAE,EAAE,mBAAmB,EACvB,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC,EACxC,IAAI,EAAE,aAAa,GAAG,OAAO,EAC7B,EAAE,yDAAW,GACZ,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE;CAiEzB"}

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

@@ -3,9 +3,10 @@ import { CustomKeyMap } from "../../../../shared/src/custom-key-map.js";
 import { must } from "../../../../shared/src/must.js";
 import { promiseVoid } from "../../../../shared/src/resolved-promises.js";
 import { READ_COMMITTED, READONLY } from "../../db/mode-enum.js";
+import { runTx } from "../../db/run-transaction.js";
 import { TransactionPool } from "../../db/transaction-pool.js";
 import { getOrCreateHistogram, getOrCreateCounter } from "../../observability/metrics.js";
-import { disableStatementTimeout } from "../../types/pg.js";
+import "../../types/pg.js";
 import { rowIDString } from "../../types/row-key.js";
 import { cvrSchema } from "../../types/shards.js";
 import { checkVersion } from "./cvr-store.js";
@@ -70,6 +71,8 @@ class RowRecordCache {
     }
     const start = Date.now();
     const r = resolver();
+    r.promise.catch(() => {
+    });
     this.#cache = r.promise;
     try {
       const cache = new CustomKeyMap(
@@ -126,6 +129,8 @@ class RowRecordCache {
     this.#pendingRowsVersion = rowsVersion;
     if (!flushed && this.#flushing === null) {
       this.#flushing = resolver();
+      this.#flushing.promise.catch(() => {
+      });
       this.#setTimeout(() => this.#flush(), 0);
     }
     return cache.size;
@@ -135,10 +140,9 @@ class RowRecordCache {
     try {
       while (this.#pendingRowsVersion !== this.#flushedRowsVersion) {
         const start = performance.now();
-        const { rows, rowsVersion } = await this.#db.begin(
-          READ_COMMITTED,
+        const { rows, rowsVersion } = await runTx(
+          this.#db,
           (tx) => {
-            disableStatementTimeout(tx);
             const rows2 = this.#pending.size;
             const rowsVersion2 = must(this.#pendingRowsVersion);
             void Promise.all(
@@ -146,7 +150,8 @@ class RowRecordCache {
             ).catch((e) => this.#lc.error?.(`error flushing cvr rows`, e));
             this.#pending.clear();
             return { rows: rows2, rowsVersion: rowsVersion2 };
-          }
+          },
+          { mode: READ_COMMITTED }
         );
         const elapsed = performance.now() - start;
         this.#lc.debug?.(
@@ -233,7 +238,7 @@ class RowRecordCache {
     const pending = [
       tx`INSERT INTO ${this.#cvr("rowsVersion")} ${tx(rowsVersion)}
            ON CONFLICT ("clientGroupID") 
-           DO UPDATE SET ${tx(rowsVersion)}`.execute()
+           DO UPDATE SET ${tx(rowsVersion)}`
     ];
     const rowRecordRows = [];
     for (const [id, row] of rowUpdates.entries()) {
@@ -245,7 +250,7 @@ class RowRecordCache {
               AND "schema" = ${id.schema}
               AND "table" = ${id.table}
               AND "rowKey" = ${id.rowKey}
-       `.execute()
+       `
         );
       } else {
         rowRecordRows.push(rowRecordToRowsRow(this.#cvrID, row));
@@ -270,7 +275,7 @@ class RowRecordCache {
     DO UPDATE SET "rowVersion" = excluded."rowVersion",
       "patchVersion" = excluded."patchVersion",
       "refCounts" = excluded."refCounts"
-    `.execute()
+    `
       );
       lc.debug?.(
         `flushing ${rowUpdates.size} rows (${rowRecordRows.length} inserts, ${rowUpdates.size - rowRecordRows.length} deletes)`

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

@@ -1 +1 @@
-{"version":3,"file":"row-record-cache.js","sources":["../../../../../../zero-cache/src/services/view-syncer/row-record-cache.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {type Resolver, resolver} from '@rocicorp/resolver';\nimport type {PendingQuery, Row} from 'postgres';\nimport {CustomKeyMap} from '../../../../shared/src/custom-key-map.ts';\nimport {must} from '../../../../shared/src/must.ts';\nimport {promiseVoid} from '../../../../shared/src/resolved-promises.ts';\nimport * as Mode from '../../db/mode-enum.ts';\nimport {TransactionPool} from '../../db/transaction-pool.ts';\nimport {\n  getOrCreateCounter,\n  getOrCreateHistogram,\n} from '../../observability/metrics.ts';\nimport {\n  disableStatementTimeout,\n  type PostgresDB,\n  type PostgresTransaction,\n} from '../../types/pg.ts';\nimport {rowIDString} from '../../types/row-key.ts';\nimport {cvrSchema, type ShardID} from '../../types/shards.ts';\nimport {checkVersion, type CVRFlushStats} from './cvr-store.ts';\nimport type {CVRSnapshot} from './cvr.ts';\nimport {\n  rowRecordToRowsRow,\n  type RowsRow,\n  rowsRowToRowRecord,\n} from './schema/cvr.ts';\nimport {\n  cmpVersions,\n  type CVRVersion,\n  type NullableCVRVersion,\n  type RowID,\n  type RowRecord,\n  versionString,\n  versionToNullableCookie,\n} from './schema/types.ts';\n\nconst FLUSH_TYPE_ATTRIBUTE = 'flush.type';\n\n/**\n * The RowRecordCache is an in-memory cache of the `cvr.rows` tables that\n * operates as both a write-through and write-back cache.\n *\n * For \"small\" CVR updates (i.e. zero or small numbers of rows) the\n * RowRecordCache operates as write-through, executing commits in\n * {@link executeRowUpdates()} before they are {@link apply}-ed to the\n * in-memory state.\n *\n * For \"large\" CVR updates (i.e. with many rows), the cache switches to a\n * write-back mode of operation, in which {@link executeRowUpdates()} is a\n * no-op, and {@link apply()} initiates a background task to flush the pending\n * row changes to the store. This allows the client poke to be completed and\n * committed on the client without waiting for the heavyweight operation of\n * committing the row records to the CVR store.\n *\n * Note that when the cache is in write-back mode, all updates become\n * write-back (i.e. asynchronously flushed) until the pending update queue is\n * fully flushed. This is required because updates must be applied in version\n * order. As with all pending work systems in zero-cache, multiple pending\n * updates are coalesced to reduce buildup of work.\n *\n * ### High level consistency\n *\n * Note that the above caching scheme only applies to the row data in `cvr.rows`\n * and corresponding `cvr.rowsVersion` tables. CVR metadata and query\n * information, on the other hand, are always committed before completing the\n * client poke. In this manner, the difference between the `version` column in\n * `cvr.instances` and the analogous column in `cvr.rowsVersion` determines\n * whether the data in the store is consistent, or whether it is awaiting a\n * pending update.\n *\n * The logic in {@link CVRStore#load()} takes this into account by loading both\n * the `cvr.instances` version and the `cvr.rowsVersion` version and checking\n * if they are in sync, waiting for a configurable delay until they are.\n *\n * ### Eventual conversion\n *\n * In the event of a continual stream of mutations (e.g. an animation-style\n * app), it is conceivable that the row record data be continually behind\n * the CVR metadata. In order to effect eventual convergence, a new view-syncer\n * signals the current view-syncer to stop updating by writing new `owner`\n * information to the `cvr.instances` row. This effectively stops the mutation\n * processing (in {@link CVRStore.#checkVersionAndOwnership}) so that the row\n * data can eventually catch up, allowing the new view-syncer to take over.\n *\n * Of course, there is the pathological situation in which a view-syncer\n * process crashes before the pending row updates are flushed. In this case,\n * the wait timeout will elapse and the CVR considered invalid.\n */\nexport class RowRecordCache {\n  // The state in the #cache is always in sync with the CVR metadata\n  // (i.e. cvr.instances). It may contain information that has not yet\n  // been flushed to cvr.rows.\n  #cache: Promise<CustomKeyMap<RowID, RowRecord>> | undefined;\n  readonly #lc: LogContext;\n  readonly #db: PostgresDB;\n  readonly #schema: string;\n  readonly #cvrID: string;\n  readonly #failService: (e: unknown) => void;\n  readonly #deferredRowFlushThreshold: number;\n  readonly #setTimeout: typeof setTimeout;\n\n  // Write-back cache state.\n  readonly #pending = new CustomKeyMap<RowID, RowRecord | null>(rowIDString);\n  #pendingRowsVersion: CVRVersion | null = null;\n  #flushedRowsVersion: CVRVersion | null = null;\n  #flushing: Resolver<void> | null = null;\n\n  readonly #cvrFlushTime = getOrCreateHistogram('sync', 'cvr.flush-time', {\n    description:\n      'Time to flush a CVR transaction. This includes both synchronous ' +\n      'and asynchronous flushes, distinguished by the flush.type attribute',\n    unit: 's',\n  });\n  readonly #cvrRowsFlushed = getOrCreateCounter(\n    'sync',\n    'cvr.rows-flushed',\n    'Number of (changed) rows flushed to a CVR',\n  );\n\n  constructor(\n    lc: LogContext,\n    db: PostgresDB,\n    shard: ShardID,\n    cvrID: string,\n    failService: (e: unknown) => void,\n    deferredRowFlushThreshold = 100,\n    setTimeoutFn = setTimeout,\n  ) {\n    this.#lc = lc;\n    this.#db = db;\n    this.#schema = cvrSchema(shard);\n    this.#cvrID = cvrID;\n    this.#failService = failService;\n    this.#deferredRowFlushThreshold = deferredRowFlushThreshold;\n    this.#setTimeout = setTimeoutFn;\n  }\n\n  recordSyncFlushStats(stats: CVRFlushStats, elapsedMs: number) {\n    this.#cvrFlushTime.record(elapsedMs / 1000, {\n      [FLUSH_TYPE_ATTRIBUTE]: 'sync',\n    });\n    if (stats.rowsDeferred === 0) {\n      this.#cvrRowsFlushed.add(stats.rows);\n    }\n  }\n\n  #recordAsyncFlushStats(rows: number, elapsedMs: number) {\n    this.#cvrFlushTime.record(elapsedMs / 1000, {\n      [FLUSH_TYPE_ATTRIBUTE]: 'async',\n    });\n    this.#cvrRowsFlushed.add(rows);\n  }\n\n  #cvr(table: string) {\n    return this.#db(`${this.#schema}.${table}`);\n  }\n\n  async #ensureLoaded(): Promise<CustomKeyMap<RowID, RowRecord>> {\n    if (this.#cache) {\n      return this.#cache;\n    }\n    const start = Date.now();\n    const r = resolver<CustomKeyMap<RowID, RowRecord>>();\n    // Set this.#cache immediately (before await) so that only one db\n    // query is made even if there are multiple callers.\n    this.#cache = r.promise;\n    try {\n      const cache: CustomKeyMap<RowID, RowRecord> = new CustomKeyMap(\n        rowIDString,\n      );\n      for await (const rows of this.#db<RowsRow[]>`\n        SELECT * FROM ${this.#cvr(`rows`)}\n          WHERE \"clientGroupID\" = ${this.#cvrID} AND \"refCounts\" IS NOT NULL`\n        // TODO(arv): Arbitrary page size\n        .cursor(5000)) {\n        for (const row of rows) {\n          const rowRecord = rowsRowToRowRecord(row);\n          cache.set(rowRecord.id, rowRecord);\n        }\n      }\n      this.#lc.debug?.(\n        `Loaded ${cache.size} row records in ${Date.now() - start} ms`,\n      );\n      r.resolve(cache);\n      return this.#cache;\n    } catch (e) {\n      r.reject(e); // Make sure the error is reflected in the cached promise\n      throw e;\n    }\n  }\n\n  getRowRecords(): Promise<ReadonlyMap<RowID, RowRecord>> {\n    return this.#ensureLoaded();\n  }\n\n  /**\n   * Applies the `rowRecords` corresponding to the `rowsVersion`\n   * to the cache, indicating whether the corresponding updates\n   * (generated by {@link executeRowUpdates}) were `flushed`.\n   *\n   * If `flushed` is false, the RowRecordCache will flush the records\n   * asynchronously.\n   *\n   * Note that `apply()` indicates that the CVR metadata associated with\n   * the `rowRecords` was successfully committed, which essentially means\n   * that this process has the unconditional right (and responsibility) of\n   * following up with a flush of the `rowRecords`. In particular, the\n   * commit of row records are not conditioned on the version or ownership\n   * columns of the `cvr.instances` row.\n   */\n  async apply(\n    rowRecords: Map<RowID, RowRecord | null>,\n    rowsVersion: CVRVersion,\n    flushed: boolean,\n  ): Promise<number> {\n    const cache = await this.#ensureLoaded();\n    for (const [id, row] of rowRecords.entries()) {\n      if (row === null || row.refCounts === null) {\n        cache.delete(id);\n      } else {\n        cache.set(id, row);\n      }\n      if (!flushed) {\n        this.#pending.set(id, row);\n      }\n    }\n    this.#pendingRowsVersion = rowsVersion;\n    // Initiate a flush if not already flushing.\n    if (!flushed && this.#flushing === null) {\n      this.#flushing = resolver();\n      this.#setTimeout(() => this.#flush(), 0);\n    }\n    return cache.size;\n  }\n\n  async #flush() {\n    const flushing = must(this.#flushing);\n    try {\n      while (this.#pendingRowsVersion !== this.#flushedRowsVersion) {\n        const start = performance.now();\n\n        const {rows, rowsVersion} = await this.#db.begin(\n          Mode.READ_COMMITTED,\n          tx => {\n            disableStatementTimeout(tx);\n\n            // Note: This code block is synchronous, guaranteeing that the\n            // #pendingRowsVersion is consistent with the #pending rows.\n            const rows = this.#pending.size;\n            const rowsVersion = must(this.#pendingRowsVersion);\n            // Awaiting all of the individual statements incurs too much\n            // overhead. Instead, just catch and log exception(s); the outer\n            // transaction will properly fail.\n            void Promise.all(\n              this.executeRowUpdates(tx, rowsVersion, this.#pending, 'force'),\n            ).catch(e => this.#lc.error?.(`error flushing cvr rows`, e));\n\n            this.#pending.clear();\n            return {rows, rowsVersion};\n          },\n        );\n        const elapsed = performance.now() - start;\n        this.#lc.debug?.(\n          `flushed ${rows} rows@${versionString(rowsVersion)} (${elapsed} ms)`,\n        );\n        this.#recordAsyncFlushStats(rows, elapsed);\n        this.#flushedRowsVersion = rowsVersion;\n        // Note: apply() may have called while the transaction was committing,\n        //       which will result in looping to commit the next #pendingRowsVersion.\n      }\n      this.#lc.debug?.(\n        `up to date rows@${versionToNullableCookie(this.#flushedRowsVersion)}`,\n      );\n      flushing.resolve();\n      this.#flushing = null;\n    } catch (e) {\n      flushing.reject(e);\n      this.#failService(e);\n    }\n  }\n\n  hasPendingUpdates() {\n    return this.#flushing !== null;\n  }\n\n  /**\n   * Returns a promise that resolves when all outstanding row-records\n   * have been committed.\n   */\n  flushed(lc: LogContext): Promise<void> {\n    if (this.#flushing) {\n      lc.debug?.('awaiting pending row flush');\n      return this.#flushing.promise;\n    }\n    return promiseVoid;\n  }\n\n  clear() {\n    // Note: Only the #cache is cleared. #pending updates, on the other hand,\n    // comprise canonical (i.e. already flushed) data and must be flushed\n    // even if the snapshot of the present state (the #cache) is cleared.\n    this.#cache = undefined;\n  }\n\n  async *catchupRowPatches(\n    lc: LogContext,\n    afterVersion: NullableCVRVersion,\n    upToCVR: CVRSnapshot,\n    current: CVRVersion,\n    excludeQueryHashes: string[] = [],\n  ): AsyncGenerator<RowsRow[], void, undefined> {\n    if (cmpVersions(afterVersion, upToCVR.version) >= 0) {\n      return;\n    }\n\n    const startMs = Date.now();\n    const start = afterVersion ? versionString(afterVersion) : '';\n    const end = versionString(upToCVR.version);\n    lc.debug?.(`scanning row patches for clients from ${start}`);\n\n    // Before accessing the CVR db, pending row records must be flushed.\n    // Note that because catchupRowPatches() is called from within the\n    // view syncer lock, this flush is guaranteed to complete since no\n    // new CVR updates can happen while the lock is held.\n    await this.flushed(lc);\n    const flushMs = Date.now() - startMs;\n\n    const reader = new TransactionPool(lc, Mode.READONLY).run(this.#db);\n    try {\n      // Verify that we are reading the right version of the CVR.\n      await reader.processReadTask(tx =>\n        checkVersion(tx, this.#schema, this.#cvrID, current),\n      );\n\n      const {query} = await reader.processReadTask(tx => {\n        const query =\n          excludeQueryHashes.length === 0\n            ? tx<RowsRow[]>`SELECT * FROM ${this.#cvr('rows')}\n        WHERE \"clientGroupID\" = ${this.#cvrID}\n          AND \"patchVersion\" > ${start}\n          AND \"patchVersion\" <= ${end}`\n            : // Exclude rows that were already sent as part of query hydration.\n              tx<RowsRow[]>`SELECT * FROM ${this.#cvr('rows')}\n        WHERE \"clientGroupID\" = ${this.#cvrID}\n          AND \"patchVersion\" > ${start}\n          AND \"patchVersion\" <= ${end}\n          AND (\"refCounts\" IS NULL OR NOT \"refCounts\" ?| ${excludeQueryHashes})`;\n        return {query};\n      });\n\n      yield* query.cursor(10000);\n    } finally {\n      reader.setDone();\n    }\n\n    const totalMs = Date.now() - startMs;\n    lc.debug?.(\n      `finished row catchup (flush: ${flushMs} ms, total: ${totalMs} ms)`,\n    );\n  }\n\n  executeRowUpdates(\n    tx: PostgresTransaction,\n    version: CVRVersion,\n    rowUpdates: Map<RowID, RowRecord | null>,\n    mode: 'allow-defer' | 'force',\n    lc = this.#lc,\n  ): PendingQuery<Row[]>[] {\n    if (\n      mode === 'allow-defer' &&\n      // defer if pending rows are being flushed\n      (this.#flushing !== null ||\n        // or if the new batch is above the limit.\n        rowUpdates.size > this.#deferredRowFlushThreshold)\n    ) {\n      return [];\n    }\n    const rowsVersion = {\n      clientGroupID: this.#cvrID,\n      version: versionString(version),\n    };\n    const pending: PendingQuery<Row[]>[] = [\n      tx`INSERT INTO ${this.#cvr('rowsVersion')} ${tx(rowsVersion)}\n           ON CONFLICT (\"clientGroupID\") \n           DO UPDATE SET ${tx(rowsVersion)}`.execute(),\n    ];\n\n    const rowRecordRows: RowsRow[] = [];\n    for (const [id, row] of rowUpdates.entries()) {\n      if (row === null) {\n        pending.push(\n          tx`\n          DELETE FROM ${this.#cvr('rows')}\n            WHERE \"clientGroupID\" = ${this.#cvrID}\n              AND \"schema\" = ${id.schema}\n              AND \"table\" = ${id.table}\n              AND \"rowKey\" = ${id.rowKey}\n       `.execute(),\n        );\n      } else {\n        rowRecordRows.push(rowRecordToRowsRow(this.#cvrID, row));\n      }\n    }\n    if (rowRecordRows.length) {\n      pending.push(\n        tx`\n  INSERT INTO ${this.#cvr('rows')}(\n      \"clientGroupID\", \"schema\", \"table\", \"rowKey\", \"rowVersion\", \"patchVersion\", \"refCounts\"\n  ) SELECT\n      \"clientGroupID\", \"schema\", \"table\", \"rowKey\", \"rowVersion\", \"patchVersion\", \"refCounts\"\n    FROM json_to_recordset(${rowRecordRows}) AS x(\n      \"clientGroupID\" TEXT,\n      \"schema\" TEXT,\n      \"table\" TEXT,\n      \"rowKey\" JSONB,\n      \"rowVersion\" TEXT,\n      \"patchVersion\" TEXT,\n      \"refCounts\" JSONB\n  ) ON CONFLICT (\"clientGroupID\", \"schema\", \"table\", \"rowKey\")\n    DO UPDATE SET \"rowVersion\" = excluded.\"rowVersion\",\n      \"patchVersion\" = excluded.\"patchVersion\",\n      \"refCounts\" = excluded.\"refCounts\"\n    `.execute(),\n      );\n      lc.debug?.(\n        `flushing ${rowUpdates.size} rows (${rowRecordRows.length} inserts, ${\n          rowUpdates.size - rowRecordRows.length\n        } deletes)`,\n      );\n    }\n    return pending;\n  }\n}\n"],"names":["Mode.READ_COMMITTED","rows","rowsVersion","Mode.READONLY","query"],"mappings":"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"}
+{"version":3,"file":"row-record-cache.js","sources":["../../../../../../zero-cache/src/services/view-syncer/row-record-cache.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {type Resolver, resolver} from '@rocicorp/resolver';\nimport type {PendingQuery, Row} from 'postgres';\nimport {CustomKeyMap} from '../../../../shared/src/custom-key-map.ts';\nimport {must} from '../../../../shared/src/must.ts';\nimport {promiseVoid} from '../../../../shared/src/resolved-promises.ts';\nimport * as Mode from '../../db/mode-enum.ts';\nimport {runTx} from '../../db/run-transaction.ts';\nimport {TransactionPool} from '../../db/transaction-pool.ts';\nimport {\n  getOrCreateCounter,\n  getOrCreateHistogram,\n} from '../../observability/metrics.ts';\nimport {type PostgresDB, type PostgresTransaction} from '../../types/pg.ts';\nimport {rowIDString} from '../../types/row-key.ts';\nimport {cvrSchema, type ShardID} from '../../types/shards.ts';\nimport {checkVersion, type CVRFlushStats} from './cvr-store.ts';\nimport type {CVRSnapshot} from './cvr.ts';\nimport {\n  rowRecordToRowsRow,\n  type RowsRow,\n  rowsRowToRowRecord,\n} from './schema/cvr.ts';\nimport {\n  cmpVersions,\n  type CVRVersion,\n  type NullableCVRVersion,\n  type RowID,\n  type RowRecord,\n  versionString,\n  versionToNullableCookie,\n} from './schema/types.ts';\n\nconst FLUSH_TYPE_ATTRIBUTE = 'flush.type';\n\n/**\n * The RowRecordCache is an in-memory cache of the `cvr.rows` tables that\n * operates as both a write-through and write-back cache.\n *\n * For \"small\" CVR updates (i.e. zero or small numbers of rows) the\n * RowRecordCache operates as write-through, executing commits in\n * {@link executeRowUpdates()} before they are {@link apply}-ed to the\n * in-memory state.\n *\n * For \"large\" CVR updates (i.e. with many rows), the cache switches to a\n * write-back mode of operation, in which {@link executeRowUpdates()} is a\n * no-op, and {@link apply()} initiates a background task to flush the pending\n * row changes to the store. This allows the client poke to be completed and\n * committed on the client without waiting for the heavyweight operation of\n * committing the row records to the CVR store.\n *\n * Note that when the cache is in write-back mode, all updates become\n * write-back (i.e. asynchronously flushed) until the pending update queue is\n * fully flushed. This is required because updates must be applied in version\n * order. As with all pending work systems in zero-cache, multiple pending\n * updates are coalesced to reduce buildup of work.\n *\n * ### High level consistency\n *\n * Note that the above caching scheme only applies to the row data in `cvr.rows`\n * and corresponding `cvr.rowsVersion` tables. CVR metadata and query\n * information, on the other hand, are always committed before completing the\n * client poke. In this manner, the difference between the `version` column in\n * `cvr.instances` and the analogous column in `cvr.rowsVersion` determines\n * whether the data in the store is consistent, or whether it is awaiting a\n * pending update.\n *\n * The logic in {@link CVRStore#load()} takes this into account by loading both\n * the `cvr.instances` version and the `cvr.rowsVersion` version and checking\n * if they are in sync, waiting for a configurable delay until they are.\n *\n * ### Eventual conversion\n *\n * In the event of a continual stream of mutations (e.g. an animation-style\n * app), it is conceivable that the row record data be continually behind\n * the CVR metadata. In order to effect eventual convergence, a new view-syncer\n * signals the current view-syncer to stop updating by writing new `owner`\n * information to the `cvr.instances` row. This effectively stops the mutation\n * processing (in {@link CVRStore.#checkVersionAndOwnership}) so that the row\n * data can eventually catch up, allowing the new view-syncer to take over.\n *\n * Of course, there is the pathological situation in which a view-syncer\n * process crashes before the pending row updates are flushed. In this case,\n * the wait timeout will elapse and the CVR considered invalid.\n */\nexport class RowRecordCache {\n  // The state in the #cache is always in sync with the CVR metadata\n  // (i.e. cvr.instances). It may contain information that has not yet\n  // been flushed to cvr.rows.\n  #cache: Promise<CustomKeyMap<RowID, RowRecord>> | undefined;\n  readonly #lc: LogContext;\n  readonly #db: PostgresDB;\n  readonly #schema: string;\n  readonly #cvrID: string;\n  readonly #failService: (e: unknown) => void;\n  readonly #deferredRowFlushThreshold: number;\n  readonly #setTimeout: typeof setTimeout;\n\n  // Write-back cache state.\n  readonly #pending = new CustomKeyMap<RowID, RowRecord | null>(rowIDString);\n  #pendingRowsVersion: CVRVersion | null = null;\n  #flushedRowsVersion: CVRVersion | null = null;\n  #flushing: Resolver<void> | null = null;\n\n  readonly #cvrFlushTime = getOrCreateHistogram('sync', 'cvr.flush-time', {\n    description:\n      'Time to flush a CVR transaction. This includes both synchronous ' +\n      'and asynchronous flushes, distinguished by the flush.type attribute',\n    unit: 's',\n  });\n  readonly #cvrRowsFlushed = getOrCreateCounter(\n    'sync',\n    'cvr.rows-flushed',\n    'Number of (changed) rows flushed to a CVR',\n  );\n\n  constructor(\n    lc: LogContext,\n    db: PostgresDB,\n    shard: ShardID,\n    cvrID: string,\n    failService: (e: unknown) => void,\n    deferredRowFlushThreshold = 100,\n    setTimeoutFn = setTimeout,\n  ) {\n    this.#lc = lc;\n    this.#db = db;\n    this.#schema = cvrSchema(shard);\n    this.#cvrID = cvrID;\n    this.#failService = failService;\n    this.#deferredRowFlushThreshold = deferredRowFlushThreshold;\n    this.#setTimeout = setTimeoutFn;\n  }\n\n  recordSyncFlushStats(stats: CVRFlushStats, elapsedMs: number) {\n    this.#cvrFlushTime.record(elapsedMs / 1000, {\n      [FLUSH_TYPE_ATTRIBUTE]: 'sync',\n    });\n    if (stats.rowsDeferred === 0) {\n      this.#cvrRowsFlushed.add(stats.rows);\n    }\n  }\n\n  #recordAsyncFlushStats(rows: number, elapsedMs: number) {\n    this.#cvrFlushTime.record(elapsedMs / 1000, {\n      [FLUSH_TYPE_ATTRIBUTE]: 'async',\n    });\n    this.#cvrRowsFlushed.add(rows);\n  }\n\n  #cvr(table: string) {\n    return this.#db(`${this.#schema}.${table}`);\n  }\n\n  async #ensureLoaded(): Promise<CustomKeyMap<RowID, RowRecord>> {\n    if (this.#cache) {\n      return this.#cache;\n    }\n    const start = Date.now();\n    const r = resolver<CustomKeyMap<RowID, RowRecord>>();\n    r.promise.catch(() => {});\n    // Set this.#cache immediately (before await) so that only one db\n    // query is made even if there are multiple callers.\n    this.#cache = r.promise;\n    try {\n      const cache: CustomKeyMap<RowID, RowRecord> = new CustomKeyMap(\n        rowIDString,\n      );\n      for await (const rows of this.#db<RowsRow[]>`\n        SELECT * FROM ${this.#cvr(`rows`)}\n          WHERE \"clientGroupID\" = ${this.#cvrID} AND \"refCounts\" IS NOT NULL`\n        // TODO(arv): Arbitrary page size\n        .cursor(5000)) {\n        for (const row of rows) {\n          const rowRecord = rowsRowToRowRecord(row);\n          cache.set(rowRecord.id, rowRecord);\n        }\n      }\n      this.#lc.debug?.(\n        `Loaded ${cache.size} row records in ${Date.now() - start} ms`,\n      );\n      r.resolve(cache);\n      return this.#cache;\n    } catch (e) {\n      r.reject(e); // Make sure the error is reflected in the cached promise\n      throw e;\n    }\n  }\n\n  getRowRecords(): Promise<ReadonlyMap<RowID, RowRecord>> {\n    return this.#ensureLoaded();\n  }\n\n  /**\n   * Applies the `rowRecords` corresponding to the `rowsVersion`\n   * to the cache, indicating whether the corresponding updates\n   * (generated by {@link executeRowUpdates}) were `flushed`.\n   *\n   * If `flushed` is false, the RowRecordCache will flush the records\n   * asynchronously.\n   *\n   * Note that `apply()` indicates that the CVR metadata associated with\n   * the `rowRecords` was successfully committed, which essentially means\n   * that this process has the unconditional right (and responsibility) of\n   * following up with a flush of the `rowRecords`. In particular, the\n   * commit of row records are not conditioned on the version or ownership\n   * columns of the `cvr.instances` row.\n   */\n  async apply(\n    rowRecords: Map<RowID, RowRecord | null>,\n    rowsVersion: CVRVersion,\n    flushed: boolean,\n  ): Promise<number> {\n    const cache = await this.#ensureLoaded();\n    for (const [id, row] of rowRecords.entries()) {\n      if (row === null || row.refCounts === null) {\n        cache.delete(id);\n      } else {\n        cache.set(id, row);\n      }\n      if (!flushed) {\n        this.#pending.set(id, row);\n      }\n    }\n    this.#pendingRowsVersion = rowsVersion;\n    // Initiate a flush if not already flushing.\n    if (!flushed && this.#flushing === null) {\n      this.#flushing = resolver();\n      // The #flush() method handles propagating errors to #failService.\n      // Attach a rejection handler to this promise to avoid unhandled\n      // rejections.\n      this.#flushing.promise.catch(() => {});\n      this.#setTimeout(() => this.#flush(), 0);\n    }\n    return cache.size;\n  }\n\n  async #flush() {\n    const flushing = must(this.#flushing);\n    try {\n      while (this.#pendingRowsVersion !== this.#flushedRowsVersion) {\n        const start = performance.now();\n\n        const {rows, rowsVersion} = await runTx(\n          this.#db,\n          tx => {\n            // Note: This code block is synchronous, guaranteeing that the\n            // #pendingRowsVersion is consistent with the #pending rows.\n            const rows = this.#pending.size;\n            const rowsVersion = must(this.#pendingRowsVersion);\n            // Awaiting all of the individual statements incurs too much\n            // overhead. Instead, just catch and log exception(s); the outer\n            // transaction will properly fail.\n            void Promise.all(\n              this.executeRowUpdates(tx, rowsVersion, this.#pending, 'force'),\n            ).catch(e => this.#lc.error?.(`error flushing cvr rows`, e));\n\n            this.#pending.clear();\n            return {rows, rowsVersion};\n          },\n          {mode: Mode.READ_COMMITTED},\n        );\n        const elapsed = performance.now() - start;\n        this.#lc.debug?.(\n          `flushed ${rows} rows@${versionString(rowsVersion)} (${elapsed} ms)`,\n        );\n        this.#recordAsyncFlushStats(rows, elapsed);\n        this.#flushedRowsVersion = rowsVersion;\n        // Note: apply() may have called while the transaction was committing,\n        //       which will result in looping to commit the next #pendingRowsVersion.\n      }\n      this.#lc.debug?.(\n        `up to date rows@${versionToNullableCookie(this.#flushedRowsVersion)}`,\n      );\n      flushing.resolve();\n      this.#flushing = null;\n    } catch (e) {\n      flushing.reject(e);\n      this.#failService(e);\n    }\n  }\n\n  hasPendingUpdates() {\n    return this.#flushing !== null;\n  }\n\n  /**\n   * Returns a promise that resolves when all outstanding row-records\n   * have been committed.\n   */\n  flushed(lc: LogContext): Promise<void> {\n    if (this.#flushing) {\n      lc.debug?.('awaiting pending row flush');\n      return this.#flushing.promise;\n    }\n    return promiseVoid;\n  }\n\n  clear() {\n    // Note: Only the #cache is cleared. #pending updates, on the other hand,\n    // comprise canonical (i.e. already flushed) data and must be flushed\n    // even if the snapshot of the present state (the #cache) is cleared.\n    this.#cache = undefined;\n  }\n\n  async *catchupRowPatches(\n    lc: LogContext,\n    afterVersion: NullableCVRVersion,\n    upToCVR: CVRSnapshot,\n    current: CVRVersion,\n    excludeQueryHashes: string[] = [],\n  ): AsyncGenerator<RowsRow[], void, undefined> {\n    if (cmpVersions(afterVersion, upToCVR.version) >= 0) {\n      return;\n    }\n\n    const startMs = Date.now();\n    const start = afterVersion ? versionString(afterVersion) : '';\n    const end = versionString(upToCVR.version);\n    lc.debug?.(`scanning row patches for clients from ${start}`);\n\n    // Before accessing the CVR db, pending row records must be flushed.\n    // Note that because catchupRowPatches() is called from within the\n    // view syncer lock, this flush is guaranteed to complete since no\n    // new CVR updates can happen while the lock is held.\n    await this.flushed(lc);\n    const flushMs = Date.now() - startMs;\n\n    const reader = new TransactionPool(lc, Mode.READONLY).run(this.#db);\n    try {\n      // Verify that we are reading the right version of the CVR.\n      await reader.processReadTask(tx =>\n        checkVersion(tx, this.#schema, this.#cvrID, current),\n      );\n\n      const {query} = await reader.processReadTask(tx => {\n        const query =\n          excludeQueryHashes.length === 0\n            ? tx<RowsRow[]>`SELECT * FROM ${this.#cvr('rows')}\n        WHERE \"clientGroupID\" = ${this.#cvrID}\n          AND \"patchVersion\" > ${start}\n          AND \"patchVersion\" <= ${end}`\n            : // Exclude rows that were already sent as part of query hydration.\n              tx<RowsRow[]>`SELECT * FROM ${this.#cvr('rows')}\n        WHERE \"clientGroupID\" = ${this.#cvrID}\n          AND \"patchVersion\" > ${start}\n          AND \"patchVersion\" <= ${end}\n          AND (\"refCounts\" IS NULL OR NOT \"refCounts\" ?| ${excludeQueryHashes})`;\n        return {query};\n      });\n\n      yield* query.cursor(10000);\n    } finally {\n      reader.setDone();\n    }\n\n    const totalMs = Date.now() - startMs;\n    lc.debug?.(\n      `finished row catchup (flush: ${flushMs} ms, total: ${totalMs} ms)`,\n    );\n  }\n\n  executeRowUpdates(\n    tx: PostgresTransaction,\n    version: CVRVersion,\n    rowUpdates: Map<RowID, RowRecord | null>,\n    mode: 'allow-defer' | 'force',\n    lc = this.#lc,\n  ): PendingQuery<Row[]>[] {\n    if (\n      mode === 'allow-defer' &&\n      // defer if pending rows are being flushed\n      (this.#flushing !== null ||\n        // or if the new batch is above the limit.\n        rowUpdates.size > this.#deferredRowFlushThreshold)\n    ) {\n      return [];\n    }\n    const rowsVersion = {\n      clientGroupID: this.#cvrID,\n      version: versionString(version),\n    };\n    const pending: PendingQuery<Row[]>[] = [\n      tx`INSERT INTO ${this.#cvr('rowsVersion')} ${tx(rowsVersion)}\n           ON CONFLICT (\"clientGroupID\") \n           DO UPDATE SET ${tx(rowsVersion)}`,\n    ];\n\n    const rowRecordRows: RowsRow[] = [];\n    for (const [id, row] of rowUpdates.entries()) {\n      if (row === null) {\n        pending.push(\n          tx`\n          DELETE FROM ${this.#cvr('rows')}\n            WHERE \"clientGroupID\" = ${this.#cvrID}\n              AND \"schema\" = ${id.schema}\n              AND \"table\" = ${id.table}\n              AND \"rowKey\" = ${id.rowKey}\n       `,\n        );\n      } else {\n        rowRecordRows.push(rowRecordToRowsRow(this.#cvrID, row));\n      }\n    }\n    if (rowRecordRows.length) {\n      pending.push(\n        tx`\n  INSERT INTO ${this.#cvr('rows')}(\n      \"clientGroupID\", \"schema\", \"table\", \"rowKey\", \"rowVersion\", \"patchVersion\", \"refCounts\"\n  ) SELECT\n      \"clientGroupID\", \"schema\", \"table\", \"rowKey\", \"rowVersion\", \"patchVersion\", \"refCounts\"\n    FROM json_to_recordset(${rowRecordRows}) AS x(\n      \"clientGroupID\" TEXT,\n      \"schema\" TEXT,\n      \"table\" TEXT,\n      \"rowKey\" JSONB,\n      \"rowVersion\" TEXT,\n      \"patchVersion\" TEXT,\n      \"refCounts\" JSONB\n  ) ON CONFLICT (\"clientGroupID\", \"schema\", \"table\", \"rowKey\")\n    DO UPDATE SET \"rowVersion\" = excluded.\"rowVersion\",\n      \"patchVersion\" = excluded.\"patchVersion\",\n      \"refCounts\" = excluded.\"refCounts\"\n    `,\n      );\n      lc.debug?.(\n        `flushing ${rowUpdates.size} rows (${rowRecordRows.length} inserts, ${\n          rowUpdates.size - rowRecordRows.length\n        } deletes)`,\n      );\n    }\n    return pending;\n  }\n}\n"],"names":["rows","rowsVersion","Mode.READ_COMMITTED","Mode.READONLY","query"],"mappings":"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"}

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

@@ -0,0 +1,2 @@
+export declare const tracer: import("@opentelemetry/api").Tracer;
+//# sourceMappingURL=tracer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tracer.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/tracer.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,MAAM,qCAA0C,CAAC"}

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

@@ -0,0 +1,7 @@
+import { trace } from "@opentelemetry/api";
+import { version } from "../../../../otel/src/version.js";
+const tracer = trace.getTracer("view-syncer", version);
+export {
+  tracer
+};
+//# sourceMappingURL=tracer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tracer.js","sources":["../../../../../../zero-cache/src/services/view-syncer/tracer.ts"],"sourcesContent":["import {trace} from '@opentelemetry/api';\nimport {version} from '../../../../otel/src/version.ts';\n\nexport const tracer = trace.getTracer('view-syncer', version);\n"],"names":[],"mappings":";;AAGO,MAAM,SAAS,MAAM,UAAU,eAAe,OAAO;"}

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

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

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

@@ -1,8 +1,6 @@
-import { trace } from "@opentelemetry/api";
 import { Lock } from "@rocicorp/lock";
 import { resolver } from "@rocicorp/resolver";
 import { startSpan, startAsyncSpan, manualSpan } from "../../../../otel/src/span.js";
-import { version } from "../../../../otel/src/version.js";
 import { assert, unreachable } from "../../../../shared/src/asserts.js";
 import { stringify } from "../../../../shared/src/bigint-json.js";
 import { CustomKeyMap } from "../../../../shared/src/custom-key-map.js";
@@ -19,7 +17,7 @@ import { ProtocolErrorWithLevel, getLogLevel } from "../../types/error-with-leve
 import { rowIDString } from "../../types/row-key.js";
 import { Subscription } from "../../types/subscription.js";
 import "../replicator/schema/replication-state.js";
-import { startPoke, ClientHandler } from "./client-handler.js";
+import { ClientHandler, startPoke } from "./client-handler.js";
 import { CVRStore, ClientNotFoundError } from "./cvr-store.js";
 import { CVRConfigDrivenUpdater, nextEvictionTime, CVRQueryDrivenUpdater } from "./cvr.js";
 import { handleInspect } from "./inspect-handler.js";
@@ -40,8 +38,8 @@ import "../../types/pg-data-type.js";
 import "../../db/specs.js";
 import { ResetPipelinesSignal } from "./snapshotter.js";
 import { versionString, cmpVersions, EMPTY_CVR_VERSION, versionToCookie, versionFromString } from "./schema/types.js";
+import { tracer } from "./tracer.js";
 import { ttlClockFromNumber, ttlClockAsNumber } from "./ttl-clock.js";
-const tracer = trace.getTracer("view-syncer", version);
 const PROTOCOL_VERSION_ATTR = "protocol.version";
 const DEFAULT_KEEPALIVE_MS = 5e3;
 function randomID() {
@@ -294,13 +292,13 @@ class ViewSyncerService {
             this.#pipelines.reset(clientSchema);
             this.#pipelinesSynced = false;
           }
-          const version2 = this.#pipelines.advanceWithoutDiff();
+          const version = this.#pipelines.advanceWithoutDiff();
           const cvrVer = versionString(cvr.version);
-          if (version2 < cvr.version.stateVersion) {
-            lc.debug?.(`replica@${version2} is behind cvr@${cvrVer}`);
+          if (version < cvr.version.stateVersion) {
+            lc.debug?.(`replica@${version} is behind cvr@${cvrVer}`);
             return;
           }
-          lc.info?.(`init pipelines@${version2} (cvr@${cvrVer})`);
+          lc.info?.(`init pipelines@${version} (cvr@${cvrVer})`);
           await this.#hydrateUnchangedQueries(lc, cvr);
           await this.#syncQueryPipelineSet(lc, cvr, "missing");
           this.#pipelinesSynced = true;
@@ -567,20 +565,24 @@ class ViewSyncerService {
     return ttlClock;
   }
   #flushUpdater(lc, updater) {
-    return this.#runPriorityOp(lc, "flushing cvr", async () => {
-      const now = Date.now();
-      const ttlClock = this.#getTTLClock(now);
-      const { cvr, flushed } = await updater.flush(
-        lc,
-        this.#lastConnectTime,
-        now,
-        ttlClock
-      );
-      if (flushed) {
-        this.#startTTLClockInterval(lc);
-      }
-      return cvr;
-    });
+    return startAsyncSpan(
+      tracer,
+      "vs.#flushUpdater",
+      () => this.#runPriorityOp(lc, "flushing cvr", async () => {
+        const now = Date.now();
+        const ttlClock = this.#getTTLClock(now);
+        const { cvr, flushed } = await updater.flush(
+          lc,
+          this.#lastConnectTime,
+          now,
+          ttlClock
+        );
+        if (flushed) {
+          this.#startTTLClockInterval(lc);
+        }
+        return cvr;
+      })
+    );
   }
   #startTTLClockInterval(lc) {
     this.#stopTTLClockInterval();
@@ -620,11 +622,20 @@ class ViewSyncerService {
     this.#cvr = await this.#flushUpdater(lc, updater);
     if (cmpVersions(cvr.version, this.#cvr.version) < 0) {
       const newCVR = this.#cvr;
-      const pokers = startPoke(this.#getClients(cvr.version), newCVR.version);
-      for (const patch of patches) {
-        await pokers.addPatch(patch);
-      }
-      await pokers.end(newCVR.version);
+      await startAsyncSpan(
+        tracer,
+        "vs.#updateCVRConfig.pokeClients",
+        async () => {
+          const pokers = startPoke(
+            this.#getClients(cvr.version),
+            newCVR.version
+          );
+          for (const patch of patches) {
+            await pokers.addPatch(patch);
+          }
+          await pokers.end(newCVR.version);
+        }
+      );
     }
     if (this.#pipelinesSynced) {
       await this.#syncQueryPipelineSet(lc, this.#cvr, customQueryTransformMode);
@@ -698,7 +709,7 @@ class ViewSyncerService {
     deleted,
     desiredQueriesPatch,
     activeClients
-  }, cvr, customQueryTransformMode, profileID) => startAsyncSpan(tracer, "vs.#patchQueries", async () => {
+  }, cvr, customQueryTransformMode, profileID) => startAsyncSpan(tracer, "vs.#handleConfigUpdate", async () => {
     const deletedClientIDs = [];
     const deletedClientGroupIDs = [];
     cvr = await this.#updateCVRConfig(
@@ -770,12 +781,16 @@ class ViewSyncerService {
     );
     if (deletedClientIDs.length && deleted?.clientIDs?.length || deletedClientGroupIDs.length) {
       const clients = this.#getClients();
-      await Promise.allSettled(
-        clients.map(
-          (client) => client.sendDeleteClients(
-            lc,
-            deletedClientIDs,
-            deletedClientGroupIDs
+      await startAsyncSpan(
+        tracer,
+        "vs.#handleConfigUpdate.sendDeleteClients",
+        () => Promise.allSettled(
+          clients.map(
+            (client) => client.sendDeleteClients(
+              lc,
+              deletedClientIDs,
+              deletedClientGroupIDs
+            )
           )
         )
       );
@@ -1365,8 +1380,8 @@ class ViewSyncerService {
           }
           parsedRow.refCounts[queryID] ??= 0;
           const updateVersion = (row2) => {
-            const { version: version2, contents } = contentsAndVersion(row2);
-            parsedRow.version = version2;
+            const { version, contents } = contentsAndVersion(row2);
+            parsedRow.version = version;
             parsedRow.contents = contents;
           };
           switch (type) {
@@ -1410,19 +1425,19 @@ class ViewSyncerService {
       );
       const start = performance.now();
       const timer = new TimeSliceTimer(lc);
-      const { version: version2, numChanges, changes } = this.#pipelines.advance(timer);
-      lc = lc.withContext("newVersion", version2);
+      const { version, numChanges, changes } = this.#pipelines.advance(timer);
+      lc = lc.withContext("newVersion", version);
       const updater = new CVRQueryDrivenUpdater(
         this.#cvrStore,
         cvr,
-        version2,
+        version,
         this.#pipelines.replicaVersion
       );
       const pokers = startPoke(
         this.#getClients(cvr.version),
         updater.updatedVersion()
       );
-      lc.debug?.(`applying ${numChanges} to advance to ${version2}`);
+      lc.debug?.(`applying ${numChanges} to advance to ${version}`);
       try {
         await this.#processChanges(
           lc,
@@ -1506,11 +1521,11 @@ function yieldProcess(_lc) {
   return timeSliceQueue.withLock(() => new Promise(setImmediate));
 }
 function contentsAndVersion(row) {
-  const { [ZERO_VERSION_COLUMN_NAME]: version2, ...contents } = row;
-  if (typeof version2 !== "string" || version2.length === 0) {
+  const { [ZERO_VERSION_COLUMN_NAME]: version, ...contents } = row;
+  if (typeof version !== "string" || version.length === 0) {
     throw new Error(`Invalid _0_version in ${stringify(row)}`);
   }
-  return { contents, version: version2 };
+  return { contents, version };
 }
 const NEW_CVR_VERSION = { stateVersion: "00" };
 function checkClientAndCVRVersions(client, cvr) {