@rocicorp/zero 1.10.0-canary.2 → 1.10.0-canary.20

package/out/zero-cache/src/db/lite-tables.js.map

@@ -1 +1 @@
-{"version":3,"file":"lite-tables.js","names":[],"sources":["../../../../../zero-cache/src/db/lite-tables.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {must} from '../../../shared/src/must.ts';\nimport {difference} from '../../../shared/src/set-utils.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {primaryKeySchema} from '../../../zero-protocol/src/primary-key.ts';\nimport type {Database} from '../../../zqlite/src/db.ts';\nimport {\n  ColumnMetadataStore,\n  metadataToLiteTypeString,\n} from '../services/replicator/schema/column-metadata.ts';\nimport {TableMetadataTracker} from '../services/replicator/schema/table-metadata.ts';\nimport {\n  isArray,\n  isEnum,\n  liteTypeToZqlValueType,\n  mapLiteDataTypeToZqlSchemaValue,\n  nullableUpstream,\n} from '../types/lite.ts';\nimport * as PostgresTypeClass from './postgres-type-class-enum.ts';\nimport type {\n  LiteAndZqlSpec,\n  LiteIndexSpec,\n  LiteTableSpec,\n  MutableLiteIndexSpec,\n  MutableLiteTableSpec,\n} from './specs.ts';\n\ntype ColumnInfo = {\n  table: string;\n  name: string;\n  type: string;\n  notNull: number;\n  dflt: string | null;\n  keyPos: number;\n};\n\nexport type LiteTableSpecWithReplicationStatus = LiteTableSpec & {\n  readonly backfilling?: string[];\n  readonly minRowVersion?: string | null;\n};\n\ntype MutableLiteTableSpecWithReplicationStatus = MutableLiteTableSpec & {\n  backfilling: string[];\n  minRowVersion: string | null;\n};\n\nexport function listTables(\n  db: Database,\n  useColumnMetadata = true,\n  useTableMetadata = true,\n): LiteTableSpecWithReplicationStatus[] {\n  const columns = db\n    .prepare(\n      `\n      SELECT\n        m.name as \"table\",\n        p.name as name,\n        p.type as type,\n        p.\"notnull\" as \"notNull\",\n        p.dflt_value as \"dflt\",\n        p.pk as keyPos\n      FROM sqlite_master as m\n      LEFT JOIN pragma_table_info(m.name) as p\n      WHERE m.type = 'table'\n      AND m.name NOT LIKE 'sqlite_%'\n      AND m.name NOT LIKE '_zero.%'\n      AND m.name NOT LIKE '_litestream_%'\n      `,\n    )\n    .all() as ColumnInfo[];\n\n  const minRowVersions = useTableMetadata\n    ? new TableMetadataTracker(db).getMinRowVersions()\n    : new Map();\n  const tables: LiteTableSpecWithReplicationStatus[] = [];\n  let table: MutableLiteTableSpecWithReplicationStatus | undefined;\n\n  columns.forEach(col => {\n    if (col.table !== table?.name) {\n      // New table\n      table = {\n        name: col.table,\n        columns: {},\n        backfilling: [],\n        minRowVersion: minRowVersions.get(col.table) ?? null,\n      };\n      tables.push(table);\n    }\n\n    // Try to read from metadata table first, fall back to SQLite column type\n    let dataType: string;\n    let elemPgTypeClass:\n      | typeof PostgresTypeClass.Base\n      | typeof PostgresTypeClass.Enum\n      | null;\n\n    const metadata = useColumnMetadata\n      ? ColumnMetadataStore.getInstance(db)?.getColumn(col.table, col.name)\n      : undefined;\n    if (metadata) {\n      // Read from metadata table and convert to pipe notation\n      dataType = metadataToLiteTypeString(metadata);\n      elemPgTypeClass = metadata.isArray\n        ? metadata.isEnum\n          ? PostgresTypeClass.Enum\n          : PostgresTypeClass.Base\n        : null;\n    } else {\n      // Fall back to reading from SQLite column type (pipe notation)\n      dataType = col.type;\n      elemPgTypeClass = isArray(col.type)\n        ? isEnum(col.type)\n          ? PostgresTypeClass.Enum\n          : PostgresTypeClass.Base\n        : null;\n    }\n\n    table.columns[col.name] = {\n      pos: Object.keys(table.columns).length + 1,\n      dataType,\n      characterMaximumLength: null,\n      notNull: col.notNull !== 0,\n      dflt: col.dflt,\n      elemPgTypeClass,\n    };\n    if (metadata?.isBackfilling) {\n      table.backfilling.push(col.name);\n    }\n    if (col.keyPos) {\n      table.primaryKey ??= [];\n      while (table.primaryKey.length < col.keyPos) {\n        table.primaryKey.push('');\n      }\n      table.primaryKey[col.keyPos - 1] = col.name;\n    }\n  });\n\n  return tables;\n}\n\nexport function listIndexes(db: Database): LiteIndexSpec[] {\n  const indexes = db\n    .prepare(\n      `SELECT \n         idx.name as indexName, \n         idx.tbl_name as tableName, \n         info.\"unique\" as \"unique\",\n         col.name as column,\n         CASE WHEN col.desc = 0 THEN 'ASC' ELSE 'DESC' END as dir\n      FROM sqlite_master as idx\n       JOIN pragma_index_list(idx.tbl_name) AS info ON info.name = idx.name\n       JOIN pragma_index_xinfo(idx.name) as col\n       WHERE idx.type = 'index' AND \n             col.key = 1 AND\n             idx.tbl_name NOT LIKE '_zero.%'\n       ORDER BY idx.name, col.seqno ASC`,\n    )\n    .all() as {\n    indexName: string;\n    tableName: string;\n    unique: number;\n    column: string;\n    dir: 'ASC' | 'DESC';\n  }[];\n\n  const ret: MutableLiteIndexSpec[] = [];\n  for (const {indexName: name, tableName, unique, column, dir} of indexes) {\n    if (ret.at(-1)?.name === name) {\n      // Aggregate multiple column names into the array.\n      must(ret.at(-1)).columns[column] = dir;\n    } else {\n      ret.push({\n        tableName,\n        name,\n        columns: {[column]: dir},\n        unique: unique !== 0,\n      });\n    }\n  }\n\n  return ret;\n}\n\nexport type ZqlSpecOptions = {\n  /**\n   * Controls whether to include backfilling columns in the computed\n   * LiteAndZqlSpec. In general, backfilling columns should be include\n   * in \"replication\" logic (copying data from upstream to the replica),\n   * and excluded from \"sync\" logic (sending data from the replica to\n   * clients).\n   */\n  includeBackfillingColumns: boolean;\n};\n\n/**\n * Computes a TableSpec \"view\" of the replicated data that is\n * suitable for processing / consumption for the client. This\n * includes:\n * * excluding tables without a PRIMARY KEY or UNIQUE INDEX\n * * excluding columns with types that are not supported by ZQL\n * * choosing columns to use as the primary key amongst those\n *   in unique indexes\n *\n * @param tableSpecs an optional map to reset and populate\n * @param fullTables an optional map to receive the full table specs,\n *        which may include tables and columns that are not synced to\n *        the client because they lack a primary key or are of unsupported\n *        data types.\n */\nexport function computeZqlSpecs(\n  lc: LogContext,\n  replica: Database,\n  opts: ZqlSpecOptions,\n  tableSpecs: Map<string, LiteAndZqlSpec> = new Map(),\n  fullTables?: Map<string, LiteTableSpec>,\n): Map<string, LiteAndZqlSpec> {\n  return computeZqlSpecsFromLiteSpecs(\n    listTables(replica),\n    listIndexes(replica),\n    opts,\n    tableSpecs,\n    fullTables,\n    lc,\n  );\n}\n\nexport function computeZqlSpecsFromLiteSpecs(\n  tables: LiteTableSpecWithReplicationStatus[],\n  indexes: LiteIndexSpec[],\n  {includeBackfillingColumns}: ZqlSpecOptions,\n  tableSpecs: Map<string, LiteAndZqlSpec> = new Map(),\n  fullTables?: Map<string, LiteTableSpec>,\n  lc?: LogContext,\n): Map<string, LiteAndZqlSpec> {\n  tableSpecs.clear();\n  fullTables?.clear();\n\n  const uniqueIndexColumns = new Map<string, string[][]>();\n  for (const {tableName, columns} of indexes.filter(idx => idx.unique)) {\n    if (!uniqueIndexColumns.has(tableName)) {\n      uniqueIndexColumns.set(tableName, []);\n    }\n    uniqueIndexColumns.get(tableName)?.push(Object.keys(columns));\n  }\n\n  tables.forEach(fullTable => {\n    fullTables?.set(fullTable.name, fullTable);\n\n    const backfilling = new Set(fullTable.backfilling);\n    // Only include columns that:\n    // - have a defined ZQL Value\n    // - aren't backfilling if `includeBackfillingColumns` is false\n    const visibleColumns = Object.entries(fullTable.columns).filter(\n      ([col, {dataType}]) =>\n        liteTypeToZqlValueType(dataType) &&\n        (includeBackfillingColumns || !backfilling.has(col)),\n    );\n    const notNullColumns = new Set(\n      visibleColumns\n        .filter(\n          ([col, {dataType}]) =>\n            !nullableUpstream(dataType) || fullTable.primaryKey?.includes(col),\n        )\n        .map(([col]) => col),\n    );\n\n    const uniqueKeys = uniqueIndexColumns.get(fullTable.name) ?? [];\n    // Examine all column combinations that can serve as a primary key,\n    // i.e. excluding indexes over nullable or unsynced columns.\n    const keys = uniqueKeys.filter(\n      key => difference(new Set(key), notNullColumns).size === 0,\n    );\n    if (keys.length === 0) {\n      // Only include tables with a row key.\n      //\n      // Note that this will automatically exclude tables that are being\n      // backfilled (when includeBackfillingColumns is `false`) since candidate\n      // keys only include visible columns.\n      lc?.debug?.(\n        `not syncing table ${fullTable.name} because it ` +\n          (backfilling.size ? 'is being backfilled' : 'has no primary key'),\n      );\n      return;\n    }\n    // Pick the \"best\" (i.e. shortest) key for default IVM operations.\n    const primaryKey = keys.sort(keyCmp)[0];\n\n    const tableSpec = {\n      ...fullTable,\n      columns: Object.fromEntries(visibleColumns),\n      primaryKey: v.parse(primaryKey, primaryKeySchema),\n      uniqueKeys: uniqueKeys.map(key => v.parse(key, primaryKeySchema)),\n      allPotentialPrimaryKeys: keys.map(key => v.parse(key, primaryKeySchema)),\n      minRowVersion: fullTable.minRowVersion ?? null,\n    };\n\n    tableSpecs.set(tableSpec.name, {\n      tableSpec,\n      zqlSpec: Object.fromEntries(\n        Object.entries(tableSpec.columns).map(([name, {dataType}]) => [\n          name,\n          mapLiteDataTypeToZqlSchemaValue(dataType),\n        ]),\n      ),\n    });\n  });\n  return tableSpecs;\n}\n\nexport function mustGetTableSpec(\n  tableSpecs: Map<string, LiteAndZqlSpec>,\n  tableName: string,\n): LiteAndZqlSpec {\n  const tableSpec = tableSpecs.get(tableName);\n  if (!tableSpec) {\n    throw new Error(\n      `table '${tableName}' is not one of: ${[...tableSpecs.keys()]\n        .filter(t => !t.includes('.') && !t.startsWith('_litestream_'))\n        .sort()}. ` +\n        `Check the spelling and ensure that the table has a primary key.`,\n    );\n  }\n  return tableSpec;\n}\n\n// Deterministic comparator for favoring shorter row keys.\nfunction keyCmp(a: string[], b: string[]) {\n  if (a.length !== b.length) {\n    return a.length - b.length; // Fewer columns are better.\n  }\n  for (let i = 0; i < a.length; i++) {\n    if (a[i] < b[i]) {\n      return -1;\n    }\n    if (a[i] > b[i]) {\n      return 1;\n    }\n  }\n  return 0;\n}\n"],"mappings":"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"}
+{"version":3,"file":"lite-tables.js","names":[],"sources":["../../../../../zero-cache/src/db/lite-tables.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {must} from '../../../shared/src/must.ts';\nimport {difference} from '../../../shared/src/set-utils.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {primaryKeySchema} from '../../../zero-protocol/src/primary-key.ts';\nimport type {Database} from '../../../zqlite/src/db.ts';\nimport {\n  ColumnMetadataStore,\n  metadataToLiteTypeString,\n} from '../services/replicator/schema/column-metadata.ts';\nimport {TableMetadataTracker} from '../services/replicator/schema/table-metadata.ts';\nimport {\n  isArray,\n  isEnum,\n  liteTypeToZqlValueType,\n  mapLiteDataTypeToZqlSchemaValue,\n  nullableUpstream,\n} from '../types/lite.ts';\nimport * as PostgresTypeClass from './postgres-type-class-enum.ts';\nimport type {\n  LiteAndZqlSpec,\n  LiteIndexSpec,\n  LiteTableSpec,\n  MutableLiteIndexSpec,\n  MutableLiteTableSpec,\n} from './specs.ts';\n\ntype ColumnInfo = {\n  table: string;\n  name: string;\n  type: string;\n  notNull: number;\n  dflt: string | null;\n  keyPos: number;\n};\n\nexport type LiteTableSpecWithReplicationStatus = LiteTableSpec & {\n  readonly backfilling?: string[];\n  readonly minRowVersion?: string | null;\n};\n\ntype MutableLiteTableSpecWithReplicationStatus = MutableLiteTableSpec & {\n  backfilling: string[];\n  minRowVersion: string | null;\n};\n\nexport function listTables(\n  db: Database,\n  useColumnMetadata = true,\n  useTableMetadata = true,\n): LiteTableSpecWithReplicationStatus[] {\n  const columns = db\n    .prepare(\n      `\n      SELECT\n        m.name as \"table\",\n        p.name as name,\n        p.type as type,\n        p.\"notnull\" as \"notNull\",\n        p.dflt_value as \"dflt\",\n        p.pk as keyPos\n      FROM sqlite_master as m\n      LEFT JOIN pragma_table_info(m.name) as p\n      WHERE m.type = 'table'\n      AND m.name NOT LIKE 'sqlite_%'\n      AND m.name NOT LIKE '_zero.%'\n      AND m.name NOT LIKE '_litestream_%'\n      `,\n    )\n    .all() as ColumnInfo[];\n\n  const minRowVersions = useTableMetadata\n    ? new TableMetadataTracker(db).getMinRowVersions()\n    : new Map();\n  const tables: LiteTableSpecWithReplicationStatus[] = [];\n  let table: MutableLiteTableSpecWithReplicationStatus | undefined;\n\n  columns.forEach(col => {\n    if (col.table !== table?.name) {\n      // New table\n      table = {\n        name: col.table,\n        columns: {},\n        backfilling: [],\n        minRowVersion: minRowVersions.get(col.table) ?? null,\n      };\n      tables.push(table);\n    }\n\n    // Try to read from metadata table first, fall back to SQLite column type\n    let dataType: string;\n    let elemPgTypeClass:\n      | typeof PostgresTypeClass.Base\n      | typeof PostgresTypeClass.Enum\n      | null;\n\n    const metadata = useColumnMetadata\n      ? ColumnMetadataStore.getInstance(db)?.getColumn(col.table, col.name)\n      : undefined;\n    if (metadata) {\n      // Read from metadata table and convert to pipe notation\n      dataType = metadataToLiteTypeString(metadata);\n      elemPgTypeClass = metadata.isArray\n        ? metadata.isEnum\n          ? PostgresTypeClass.Enum\n          : PostgresTypeClass.Base\n        : null;\n    } else {\n      // Fall back to reading from SQLite column type (pipe notation)\n      dataType = col.type;\n      elemPgTypeClass = isArray(col.type)\n        ? isEnum(col.type)\n          ? PostgresTypeClass.Enum\n          : PostgresTypeClass.Base\n        : null;\n    }\n\n    table.columns[col.name] = {\n      pos: Object.keys(table.columns).length + 1,\n      dataType,\n      characterMaximumLength: null,\n      notNull: col.notNull !== 0,\n      dflt: col.dflt,\n      elemPgTypeClass,\n    };\n    if (metadata?.isBackfilling) {\n      table.backfilling.push(col.name);\n    }\n    if (col.keyPos) {\n      table.primaryKey ??= [];\n      while (table.primaryKey.length < col.keyPos) {\n        table.primaryKey.push('');\n      }\n      table.primaryKey[col.keyPos - 1] = col.name;\n    }\n  });\n\n  return tables;\n}\n\n/**\n * An index as it exists on the replica. SQLite retains only the DDL text of a\n * partial index, not a structured predicate, so replica indexes report a\n * `partial` flag in place of the {@link LiteIndexSpec.predicate}.\n */\nexport type ReplicaIndexSpec = Omit<LiteIndexSpec, 'predicate'> & {\n  readonly partial?: boolean | undefined;\n};\n\ntype MutableReplicaIndexSpec = Omit<MutableLiteIndexSpec, 'predicate'> & {\n  partial?: boolean | undefined;\n};\n\nexport function listIndexes(db: Database): ReplicaIndexSpec[] {\n  const indexes = db\n    .prepare(\n      `SELECT \n         idx.name as indexName, \n         idx.tbl_name as tableName, \n         info.\"unique\" as \"unique\",\n         info.partial as partial,\n         col.name as column,\n         CASE WHEN col.desc = 0 THEN 'ASC' ELSE 'DESC' END as dir\n      FROM sqlite_master as idx\n       JOIN pragma_index_list(idx.tbl_name) AS info ON info.name = idx.name\n       JOIN pragma_index_xinfo(idx.name) as col\n       WHERE idx.type = 'index' AND \n             col.key = 1 AND\n             idx.tbl_name NOT LIKE '_zero.%'\n       ORDER BY idx.name, col.seqno ASC`,\n    )\n    .all() as {\n    indexName: string;\n    tableName: string;\n    unique: number;\n    partial: number;\n    column: string;\n    dir: 'ASC' | 'DESC';\n  }[];\n\n  const ret: MutableReplicaIndexSpec[] = [];\n  for (const {\n    indexName: name,\n    tableName,\n    unique,\n    partial,\n    column,\n    dir,\n  } of indexes) {\n    if (ret.at(-1)?.name === name) {\n      // Aggregate multiple column names into the array.\n      must(ret.at(-1)).columns[column] = dir;\n    } else {\n      ret.push({\n        tableName,\n        name,\n        columns: {[column]: dir},\n        unique: unique !== 0,\n        ...(partial === 0 ? {} : {partial: true}),\n      });\n    }\n  }\n\n  return ret;\n}\n\nexport type ZqlSpecOptions = {\n  /**\n   * Controls whether to include backfilling columns in the computed\n   * LiteAndZqlSpec. In general, backfilling columns should be include\n   * in \"replication\" logic (copying data from upstream to the replica),\n   * and excluded from \"sync\" logic (sending data from the replica to\n   * clients).\n   */\n  includeBackfillingColumns: boolean;\n};\n\n/**\n * Computes a TableSpec \"view\" of the replicated data that is\n * suitable for processing / consumption for the client. This\n * includes:\n * * excluding tables without a PRIMARY KEY or UNIQUE INDEX\n * * excluding columns with types that are not supported by ZQL\n * * choosing columns to use as the primary key amongst those\n *   in unique indexes\n *\n * @param tableSpecs an optional map to reset and populate\n * @param fullTables an optional map to receive the full table specs,\n *        which may include tables and columns that are not synced to\n *        the client because they lack a primary key or are of unsupported\n *        data types.\n */\nexport function computeZqlSpecs(\n  lc: LogContext,\n  replica: Database,\n  opts: ZqlSpecOptions,\n  tableSpecs: Map<string, LiteAndZqlSpec> = new Map(),\n  fullTables?: Map<string, LiteTableSpec>,\n): Map<string, LiteAndZqlSpec> {\n  return computeZqlSpecsFromLiteSpecs(\n    listTables(replica),\n    listIndexes(replica),\n    opts,\n    tableSpecs,\n    fullTables,\n    lc,\n  );\n}\n\nfunction isPartialIndex(idx: LiteIndexSpec | ReplicaIndexSpec): boolean {\n  return (\n    ('predicate' in idx && idx.predicate !== undefined) ||\n    ('partial' in idx && idx.partial === true)\n  );\n}\n\nexport function computeZqlSpecsFromLiteSpecs(\n  tables: LiteTableSpecWithReplicationStatus[],\n  indexes: readonly (LiteIndexSpec | ReplicaIndexSpec)[],\n  {includeBackfillingColumns}: ZqlSpecOptions,\n  tableSpecs: Map<string, LiteAndZqlSpec> = new Map(),\n  fullTables?: Map<string, LiteTableSpec>,\n  lc?: LogContext,\n): Map<string, LiteAndZqlSpec> {\n  tableSpecs.clear();\n  fullTables?.clear();\n\n  const uniqueIndexColumns = new Map<string, string[][]>();\n  // A partial unique index only constrains the rows matching its predicate,\n  // so it cannot serve as a row key.\n  for (const {tableName, columns} of indexes.filter(\n    idx => idx.unique && !isPartialIndex(idx),\n  )) {\n    if (!uniqueIndexColumns.has(tableName)) {\n      uniqueIndexColumns.set(tableName, []);\n    }\n    uniqueIndexColumns.get(tableName)?.push(Object.keys(columns));\n  }\n\n  tables.forEach(fullTable => {\n    fullTables?.set(fullTable.name, fullTable);\n\n    const backfilling = new Set(fullTable.backfilling);\n    // Only include columns that:\n    // - have a defined ZQL Value\n    // - aren't backfilling if `includeBackfillingColumns` is false\n    const visibleColumns = Object.entries(fullTable.columns).filter(\n      ([col, {dataType}]) =>\n        liteTypeToZqlValueType(dataType) &&\n        (includeBackfillingColumns || !backfilling.has(col)),\n    );\n    const notNullColumns = new Set(\n      visibleColumns\n        .filter(\n          ([col, {dataType}]) =>\n            !nullableUpstream(dataType) || fullTable.primaryKey?.includes(col),\n        )\n        .map(([col]) => col),\n    );\n\n    const uniqueKeys = uniqueIndexColumns.get(fullTable.name) ?? [];\n    // Examine all column combinations that can serve as a primary key,\n    // i.e. excluding indexes over nullable or unsynced columns.\n    const keys = uniqueKeys.filter(\n      key => difference(new Set(key), notNullColumns).size === 0,\n    );\n    if (keys.length === 0) {\n      // Only include tables with a row key.\n      //\n      // Note that this will automatically exclude tables that are being\n      // backfilled (when includeBackfillingColumns is `false`) since candidate\n      // keys only include visible columns.\n      lc?.debug?.(\n        `not syncing table ${fullTable.name} because it ` +\n          (backfilling.size ? 'is being backfilled' : 'has no primary key'),\n      );\n      return;\n    }\n    // Pick the \"best\" (i.e. shortest) key for default IVM operations.\n    const primaryKey = keys.sort(keyCmp)[0];\n\n    const tableSpec = {\n      ...fullTable,\n      columns: Object.fromEntries(visibleColumns),\n      primaryKey: v.parse(primaryKey, primaryKeySchema),\n      uniqueKeys: uniqueKeys.map(key => v.parse(key, primaryKeySchema)),\n      allPotentialPrimaryKeys: keys.map(key => v.parse(key, primaryKeySchema)),\n      minRowVersion: fullTable.minRowVersion ?? null,\n    };\n\n    tableSpecs.set(tableSpec.name, {\n      tableSpec,\n      zqlSpec: Object.fromEntries(\n        Object.entries(tableSpec.columns).map(([name, {dataType}]) => [\n          name,\n          mapLiteDataTypeToZqlSchemaValue(dataType),\n        ]),\n      ),\n    });\n  });\n  return tableSpecs;\n}\n\nexport function mustGetTableSpec(\n  tableSpecs: Map<string, LiteAndZqlSpec>,\n  tableName: string,\n): LiteAndZqlSpec {\n  const tableSpec = tableSpecs.get(tableName);\n  if (!tableSpec) {\n    throw new Error(\n      `table '${tableName}' is not one of: ${[...tableSpecs.keys()]\n        .filter(t => !t.includes('.') && !t.startsWith('_litestream_'))\n        .sort()}. ` +\n        `Check the spelling and ensure that the table has a primary key.`,\n    );\n  }\n  return tableSpec;\n}\n\n// Deterministic comparator for favoring shorter row keys.\nfunction keyCmp(a: string[], b: string[]) {\n  if (a.length !== b.length) {\n    return a.length - b.length; // Fewer columns are better.\n  }\n  for (let i = 0; i < a.length; i++) {\n    if (a[i] < b[i]) {\n      return -1;\n    }\n    if (a[i] > b[i]) {\n      return 1;\n    }\n  }\n  return 0;\n}\n"],"mappings":"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"}

package/out/zero-cache/src/db/migration-lite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migration-lite.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/db/migration-lite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAIjD,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,KAAK,EAAC,QAAQ,IAAI,EAAE,EAAC,MAAM,2BAA2B,CAAC;AAG9D,KAAK,UAAU,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAEpE;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB;;;;OAIG;IACH,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;IAEzB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,UAAU,EACf,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,SAAS,EACzB,uBAAuB,EAAE,uBAAuB,GAC/C,OAAO,CAAC,IAAI,CAAC,CA4Hf;AAaD,eAAO,MAAM,cAAc;IACzB;;;;;;OAMG;;IAGH;;;;;;OAMG;;IAGH;;;;OAIG;;aAEH,CAAC;AAGH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAG5D,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,CAmBxD"}
+{"version":3,"file":"migration-lite.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/db/migration-lite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAIjD,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,KAAK,EAAC,QAAQ,IAAI,EAAE,EAAC,MAAM,2BAA2B,CAAC;AAG9D,KAAK,UAAU,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAEpE;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB;;;;OAIG;IACH,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;IAEzB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,UAAU,EACf,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,SAAS,EACzB,uBAAuB,EAAE,uBAAuB,GAC/C,OAAO,CAAC,IAAI,CAAC,CAiIf;AAaD,eAAO,MAAM,cAAc;IACzB;;;;;;OAMG;;IAGH;;;;;;OAMG;;IAGH;;;;OAIG;;aAEH,CAAC;AAGH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAG5D,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,CAmBxD"}

package/out/zero-cache/src/db/migration-lite.js

@@ -46,9 +46,11 @@ async function runSchemaMigrations(log, debugName, dbPath, setupMigration, incre
 					return versions;
 				});
 			}
-			db.exec("ANALYZE main");
-			log.info?.("ANALYZE completed");
-		} else db.pragma("optimize = 0x10002");
+			const start = performance.now();
+			db.pragma("optimize");
+			const elapsed = performance.now() - start;
+			log.info?.(`OPTIMIZE completed (${elapsed.toFixed(2)}ms)`);
+		}
 		db.pragma("synchronous = NORMAL");
 		db.unsafeMode(false);
 		assert(versions.dataVersion === codeVersion, () => `Final dataVersion (${versions.dataVersion}) does not match codeVersion (${codeVersion})`);

package/out/zero-cache/src/db/migration-lite.js.map

@@ -1 +1 @@
-{"version":3,"file":"migration-lite.js","names":[],"sources":["../../../../../zero-cache/src/db/migration-lite.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {AbortError} from '../../../shared/src/abort-error.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {randInt} from '../../../shared/src/rand.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport type {Database as Db} from '../../../zqlite/src/db.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\n\ntype Operations = (log: LogContext, tx: Db) => Promise<void> | void;\n\n/**\n * Encapsulates the logic for setting up or upgrading to a new schema. After the\n * Migration code successfully completes, {@link runSchemaMigrations}\n * will update the schema version and commit the transaction.\n */\nexport type Migration = {\n  /**\n   * Perform database operations that create or alter table structure. This is\n   * called at most once during lifetime of the application. If a `migrateData()`\n   * operation is defined, that will be performed after `migrateSchema()` succeeds.\n   */\n  migrateSchema?: Operations;\n\n  /**\n   * Perform database operations to migrate data to the new schema. This is\n   * called after `migrateSchema()` (if defined), and may be called again\n   * to re-migrate data after the server was rolled back to an earlier version,\n   * and rolled forward again.\n   *\n   * Consequently, the logic in `migrateData()` must be idempotent.\n   */\n  migrateData?: Operations;\n\n  /**\n   * Sets the `minSafeVersion` to the specified value, prohibiting running\n   * any earlier code versions.\n   */\n  minSafeVersion?: number;\n};\n\n/**\n * Mapping of incremental migrations to move from the previous old code\n * version to next one. Versions must be non-zero.\n *\n * The schema resulting from performing incremental migrations should be\n * equivalent to that of the `setupMigration` on a blank database.\n *\n * The highest destinationVersion of this map denotes the current\n * \"code version\", and is also used as the destination version when\n * running the initial setup migration on a blank database.\n */\nexport type IncrementalMigrationMap = {\n  [destinationVersion: number]: Migration;\n};\n\n/**\n * Ensures that the schema is compatible with the current code, updating and\n * migrating the schema if necessary.\n */\nexport async function runSchemaMigrations(\n  log: LogContext,\n  debugName: string,\n  dbPath: string,\n  setupMigration: Migration,\n  incrementalMigrationMap: IncrementalMigrationMap,\n): Promise<void> {\n  const start = Date.now();\n  log = log.withContext(\n    'initSchema',\n    randInt(0, Number.MAX_SAFE_INTEGER).toString(36),\n  );\n  const db = new Database(log, dbPath);\n\n  try {\n    const versionMigrations = sorted(incrementalMigrationMap);\n    assert(\n      versionMigrations.length,\n      `Must specify a at least one version migration`,\n    );\n    assert(\n      versionMigrations[0][0] > 0,\n      `Versions must be non-zero positive numbers`,\n    );\n    // oxlint-disable-next-line typescript/no-non-null-assertion\n    const codeVersion = versionMigrations.at(-1)![0];\n    log.info?.(\n      `Checking schema for compatibility with ${debugName} at schema v${codeVersion}`,\n    );\n\n    let versions = await runTransaction(log, db, tx => {\n      const versions = getVersionHistory(tx);\n      if (codeVersion < versions.minSafeVersion) {\n        throw new Error(\n          `Cannot run ${debugName} at schema v${codeVersion} because rollback limit is v${versions.minSafeVersion}`,\n        );\n      }\n\n      if (versions.dataVersion > codeVersion) {\n        log.info?.(\n          `Data is at v${versions.dataVersion}. Resetting to v${codeVersion}`,\n        );\n        return updateVersionHistory(log, tx, versions, codeVersion);\n      }\n      return versions;\n    });\n    if (versions.dataVersion < codeVersion) {\n      db.unsafeMode(true); // Enables journal_mode = OFF\n      db.pragma('locking_mode = EXCLUSIVE');\n      db.pragma('foreign_keys = OFF');\n      db.pragma('journal_mode = OFF');\n      db.pragma('synchronous = OFF');\n      // Unfortunately, AUTO_VACUUM is not compatible with BEGIN CONCURRENT,\n      // so it is not an option for the replica file.\n      // https://sqlite.org/forum/forumpost/25f183416a\n      // db.pragma('auto_vacuum = INCREMENTAL');\n\n      const migrations =\n        versions.dataVersion === 0\n          ? // For the empty database v0, only run the setup migration.\n            ([[codeVersion, setupMigration]] as const)\n          : versionMigrations;\n\n      for (const [dest, migration] of migrations) {\n        if (versions.dataVersion < dest) {\n          log.info?.(\n            `Migrating schema from v${versions.dataVersion} to v${dest}`,\n          );\n          void log.flush(); // Flush logs before each migration to help debug crash-y migrations.\n\n          versions = await runTransaction(log, db, async tx => {\n            // Fetch meta from within the transaction to make the migration atomic.\n            let versions = getVersionHistory(tx);\n            if (versions.dataVersion < dest) {\n              versions = await runMigration(log, tx, versions, dest, migration);\n              assert(\n                versions.dataVersion === dest,\n                () =>\n                  `Migration did not reach target version: expected ${dest}, got ${versions.dataVersion}`,\n              );\n            }\n            return versions;\n          });\n        }\n      }\n\n      db.exec('ANALYZE main');\n      log.info?.('ANALYZE completed');\n    } else {\n      // Run optimize whenever opening an sqlite db file as recommended in\n      // https://www.sqlite.org/pragma.html#pragma_optimize\n      // It is important to run the same initialization steps as is done\n      // in the view-syncer (i.e. when preparing database for serving\n      // replication) so that any corruption detected in the view-syncer is\n      // similarly detected in the change-streamer, facilitating an eventual\n      // recovery by resyncing the replica anew.\n      db.pragma('optimize = 0x10002');\n      // Do not run `quick_check` here. It scans the full database and can\n      // dominate startup time for large replicas or slower disks.\n    }\n\n    db.pragma('synchronous = NORMAL');\n    db.unsafeMode(false);\n\n    assert(\n      versions.dataVersion === codeVersion,\n      () =>\n        `Final dataVersion (${versions.dataVersion}) does not match codeVersion (${codeVersion})`,\n    );\n    log.info?.(\n      `Running ${debugName} at schema v${codeVersion} (${\n        Date.now() - start\n      } ms)`,\n    );\n  } catch (e) {\n    if (e instanceof AbortError) {\n      // AbortErrors (e.g. AutoResetSignal) are not failures. They are the\n      // expected mechanism for signaling that the replica needs a reset (e.g.\n      // corruption or an incompatible schema version) so that the caller can\n      // resync anew. Logging them at `error` would trip error-based alerting\n      // for a normal, self-healing path.\n      log.warn?.('Replica requires reset; resync will follow', e);\n    } else {\n      log.error?.('Error in ensureSchemaMigrated', e);\n    }\n    throw e;\n  } finally {\n    db.close();\n    void log.flush(); // Flush the logs but do not block server progress on it.\n  }\n}\n\nfunction sorted(\n  incrementalMigrationMap: IncrementalMigrationMap,\n): [number, Migration][] {\n  const versionMigrations: [number, Migration][] = [];\n  for (const [v, m] of Object.entries(incrementalMigrationMap)) {\n    versionMigrations.push([Number(v), m]);\n  }\n  return versionMigrations.sort(([a], [b]) => a - b);\n}\n\n// Exposed for tests.\nexport const versionHistory = v.object({\n  /**\n   * The `schemaVersion` is highest code version that has ever been run\n   * on the database, and is used to delineate the structure of the tables\n   * in the database. A schemaVersion only moves forward; rolling back to\n   * an earlier (safe) code version does not revert schema changes that\n   * have already been applied.\n   */\n  schemaVersion: v.number(),\n\n  /**\n   * The data version is the code version of the latest server that ran.\n   * Note that this may be less than the schemaVersion in the case that\n   * a server is rolled back to an earlier version after a schema change.\n   * In such a case, data (but not schema), may need to be re-migrated\n   * when rolling forward again.\n   */\n  dataVersion: v.number(),\n\n  /**\n   * The minimum code version that is safe to run. This is used when\n   * a schema migration is not backwards compatible with an older version\n   * of the code.\n   */\n  minSafeVersion: v.number(),\n});\n\n// Exposed for tests.\nexport type VersionHistory = v.Infer<typeof versionHistory>;\n\n// Exposed for tests\nexport function getVersionHistory(db: Db): VersionHistory {\n  // Note: The `lock` column transparently ensures that at most one row exists.\n  db.prepare(\n    `\n    CREATE TABLE IF NOT EXISTS \"_zero.versionHistory\" (\n      dataVersion INTEGER NOT NULL,\n      schemaVersion INTEGER NOT NULL,\n      minSafeVersion INTEGER NOT NULL,\n\n      lock INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)\n    );\n  `,\n  ).run();\n  const result = db\n    .prepare(\n      'SELECT dataVersion, schemaVersion, minSafeVersion FROM \"_zero.versionHistory\"',\n    )\n    .get() as VersionHistory;\n  return result ?? {dataVersion: 0, schemaVersion: 0, minSafeVersion: 0};\n}\n\nfunction updateVersionHistory(\n  log: LogContext,\n  db: Db,\n  prev: VersionHistory,\n  newVersion: number,\n  minSafeVersion?: number,\n): VersionHistory {\n  assert(newVersion > 0, 'newVersion must be positive');\n  const meta = {\n    ...prev,\n    dataVersion: newVersion,\n    // The schemaVersion never moves backwards.\n    schemaVersion: Math.max(newVersion, prev.schemaVersion),\n    minSafeVersion: getMinSafeVersion(log, prev, minSafeVersion),\n  } satisfies VersionHistory;\n\n  db.prepare(\n    `\n    INSERT INTO \"_zero.versionHistory\" (dataVersion, schemaVersion, minSafeVersion, lock)\n    VALUES (@dataVersion, @schemaVersion, @minSafeVersion, 1)\n    ON CONFLICT (lock) DO UPDATE\n    SET dataVersion=@dataVersion,\n        schemaVersion=@schemaVersion,\n        minSafeVersion=@minSafeVersion\n  `,\n  ).run(meta);\n\n  return meta;\n}\n\nasync function runMigration(\n  log: LogContext,\n  tx: Db,\n  versions: VersionHistory,\n  destinationVersion: number,\n  migration: Migration,\n): Promise<VersionHistory> {\n  if (versions.schemaVersion < destinationVersion) {\n    await migration.migrateSchema?.(log, tx);\n  }\n  if (versions.dataVersion < destinationVersion) {\n    await migration.migrateData?.(log, tx);\n  }\n  return updateVersionHistory(\n    log,\n    tx,\n    versions,\n    destinationVersion,\n    migration.minSafeVersion,\n  );\n}\n\n/**\n * Bumps the rollback limit [[toAtLeast]] the specified version.\n * Leaves the rollback limit unchanged if it is equal or greater.\n */\nfunction getMinSafeVersion(\n  log: LogContext,\n  current: VersionHistory,\n  proposedSafeVersion?: number,\n): number {\n  if (proposedSafeVersion === undefined) {\n    return current.minSafeVersion;\n  }\n  if (current.minSafeVersion >= proposedSafeVersion) {\n    // The rollback limit must never move backwards.\n    log.debug?.(\n      `rollback limit is already at ${current.minSafeVersion}, ` +\n        `don't need to bump to ${proposedSafeVersion}`,\n    );\n    return current.minSafeVersion;\n  }\n  log.info?.(\n    `bumping rollback limit from ${current.minSafeVersion} to ${proposedSafeVersion}`,\n  );\n  return proposedSafeVersion;\n}\n\n// Note: We use a custom transaction wrapper (instead of db.begin(...)) in order\n// to support async operations within the transaction.\nasync function runTransaction<T>(\n  log: LogContext,\n  db: Db,\n  tx: (db: Db) => Promise<T> | T,\n): Promise<T> {\n  db.prepare('BEGIN EXCLUSIVE').run();\n  try {\n    const result = await tx(db);\n    db.prepare('COMMIT').run();\n    return result;\n  } catch (e) {\n    if (e instanceof AbortError) {\n      // AbortErrors (e.g. AutoResetSignal) are an expected, self-healing\n      // control-flow signal, not a failure. Log at `warn` so the rollback is\n      // still visible without tripping error-based alerting.\n      log.warn?.('Aborted transaction for reset signal', e);\n    } else {\n      log.error?.('Aborted transaction due to error', e);\n    }\n    try {\n      db.prepare('ROLLBACK').run();\n    } catch (rollbackError) {\n      log.error?.('Unable to rollback transaction', rollbackError);\n      const combinedError = new Error(\n        `Transaction failed and rollback also failed: operation error = ${String(\n          e,\n        )}; rollback error = ${String(rollbackError)}`,\n      );\n      combinedError.cause = e;\n      throw combinedError;\n    }\n    throw e;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"migration-lite.js","names":[],"sources":["../../../../../zero-cache/src/db/migration-lite.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {AbortError} from '../../../shared/src/abort-error.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {randInt} from '../../../shared/src/rand.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport type {Database as Db} from '../../../zqlite/src/db.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\n\ntype Operations = (log: LogContext, tx: Db) => Promise<void> | void;\n\n/**\n * Encapsulates the logic for setting up or upgrading to a new schema. After the\n * Migration code successfully completes, {@link runSchemaMigrations}\n * will update the schema version and commit the transaction.\n */\nexport type Migration = {\n  /**\n   * Perform database operations that create or alter table structure. This is\n   * called at most once during lifetime of the application. If a `migrateData()`\n   * operation is defined, that will be performed after `migrateSchema()` succeeds.\n   */\n  migrateSchema?: Operations;\n\n  /**\n   * Perform database operations to migrate data to the new schema. This is\n   * called after `migrateSchema()` (if defined), and may be called again\n   * to re-migrate data after the server was rolled back to an earlier version,\n   * and rolled forward again.\n   *\n   * Consequently, the logic in `migrateData()` must be idempotent.\n   */\n  migrateData?: Operations;\n\n  /**\n   * Sets the `minSafeVersion` to the specified value, prohibiting running\n   * any earlier code versions.\n   */\n  minSafeVersion?: number;\n};\n\n/**\n * Mapping of incremental migrations to move from the previous old code\n * version to next one. Versions must be non-zero.\n *\n * The schema resulting from performing incremental migrations should be\n * equivalent to that of the `setupMigration` on a blank database.\n *\n * The highest destinationVersion of this map denotes the current\n * \"code version\", and is also used as the destination version when\n * running the initial setup migration on a blank database.\n */\nexport type IncrementalMigrationMap = {\n  [destinationVersion: number]: Migration;\n};\n\n/**\n * Ensures that the schema is compatible with the current code, updating and\n * migrating the schema if necessary.\n */\nexport async function runSchemaMigrations(\n  log: LogContext,\n  debugName: string,\n  dbPath: string,\n  setupMigration: Migration,\n  incrementalMigrationMap: IncrementalMigrationMap,\n): Promise<void> {\n  const start = Date.now();\n  log = log.withContext(\n    'initSchema',\n    randInt(0, Number.MAX_SAFE_INTEGER).toString(36),\n  );\n  const db = new Database(log, dbPath);\n\n  try {\n    const versionMigrations = sorted(incrementalMigrationMap);\n    assert(\n      versionMigrations.length,\n      `Must specify a at least one version migration`,\n    );\n    assert(\n      versionMigrations[0][0] > 0,\n      `Versions must be non-zero positive numbers`,\n    );\n    // oxlint-disable-next-line typescript/no-non-null-assertion\n    const codeVersion = versionMigrations.at(-1)![0];\n    log.info?.(\n      `Checking schema for compatibility with ${debugName} at schema v${codeVersion}`,\n    );\n\n    let versions = await runTransaction(log, db, tx => {\n      const versions = getVersionHistory(tx);\n      if (codeVersion < versions.minSafeVersion) {\n        throw new Error(\n          `Cannot run ${debugName} at schema v${codeVersion} because rollback limit is v${versions.minSafeVersion}`,\n        );\n      }\n\n      if (versions.dataVersion > codeVersion) {\n        log.info?.(\n          `Data is at v${versions.dataVersion}. Resetting to v${codeVersion}`,\n        );\n        return updateVersionHistory(log, tx, versions, codeVersion);\n      }\n      return versions;\n    });\n    if (versions.dataVersion < codeVersion) {\n      db.unsafeMode(true); // Enables journal_mode = OFF\n      db.pragma('locking_mode = EXCLUSIVE');\n      db.pragma('foreign_keys = OFF');\n      db.pragma('journal_mode = OFF');\n      db.pragma('synchronous = OFF');\n      // Unfortunately, AUTO_VACUUM is not compatible with BEGIN CONCURRENT,\n      // so it is not an option for the replica file.\n      // https://sqlite.org/forum/forumpost/25f183416a\n      // db.pragma('auto_vacuum = INCREMENTAL');\n\n      const migrations =\n        versions.dataVersion === 0\n          ? // For the empty database v0, only run the setup migration.\n            ([[codeVersion, setupMigration]] as const)\n          : versionMigrations;\n\n      for (const [dest, migration] of migrations) {\n        if (versions.dataVersion < dest) {\n          log.info?.(\n            `Migrating schema from v${versions.dataVersion} to v${dest}`,\n          );\n          void log.flush(); // Flush logs before each migration to help debug crash-y migrations.\n\n          versions = await runTransaction(log, db, async tx => {\n            // Fetch meta from within the transaction to make the migration atomic.\n            let versions = getVersionHistory(tx);\n            if (versions.dataVersion < dest) {\n              versions = await runMigration(log, tx, versions, dest, migration);\n              assert(\n                versions.dataVersion === dest,\n                () =>\n                  `Migration did not reach target version: expected ${dest}, got ${versions.dataVersion}`,\n              );\n            }\n            return versions;\n          });\n        }\n      }\n\n      // Note: This used to be ANALYZE but that takes a long time for large\n      // dbs. The SQLite docs generally recommend optimize instead.\n      //\n      // https://sqlite.org/pragma.html#pragma_analysis_limit\n      //\n      // Beginning with SQLite version 3.46.0 (2024-05-23), the recommended\n      // way of running ANALYZE is with the PRAGMA optimize command.\n      // The PRAGMA optimize will automatically set a reasonable, temporary\n      // analysis limit that ensures that the PRAGMA optimize command will\n      // finish quickly even on enormous databases. Applications that use\n      // the PRAGMA optimize instead of running ANALYZE directly do not need\n      // to set an analysis limit.\n      const start = performance.now();\n      db.pragma('optimize');\n      const elapsed = performance.now() - start;\n      log.info?.(`OPTIMIZE completed (${elapsed.toFixed(2)}ms)`);\n    }\n\n    // Do not run `quick_check` here. It scans the full database and can\n    // dominate startup time for large replicas or slower disks.\n    db.pragma('synchronous = NORMAL');\n    db.unsafeMode(false);\n\n    assert(\n      versions.dataVersion === codeVersion,\n      () =>\n        `Final dataVersion (${versions.dataVersion}) does not match codeVersion (${codeVersion})`,\n    );\n    log.info?.(\n      `Running ${debugName} at schema v${codeVersion} (${\n        Date.now() - start\n      } ms)`,\n    );\n  } catch (e) {\n    if (e instanceof AbortError) {\n      // AbortErrors (e.g. AutoResetSignal) are not failures. They are the\n      // expected mechanism for signaling that the replica needs a reset (e.g.\n      // corruption or an incompatible schema version) so that the caller can\n      // resync anew. Logging them at `error` would trip error-based alerting\n      // for a normal, self-healing path.\n      log.warn?.('Replica requires reset; resync will follow', e);\n    } else {\n      log.error?.('Error in ensureSchemaMigrated', e);\n    }\n    throw e;\n  } finally {\n    db.close();\n    void log.flush(); // Flush the logs but do not block server progress on it.\n  }\n}\n\nfunction sorted(\n  incrementalMigrationMap: IncrementalMigrationMap,\n): [number, Migration][] {\n  const versionMigrations: [number, Migration][] = [];\n  for (const [v, m] of Object.entries(incrementalMigrationMap)) {\n    versionMigrations.push([Number(v), m]);\n  }\n  return versionMigrations.sort(([a], [b]) => a - b);\n}\n\n// Exposed for tests.\nexport const versionHistory = v.object({\n  /**\n   * The `schemaVersion` is highest code version that has ever been run\n   * on the database, and is used to delineate the structure of the tables\n   * in the database. A schemaVersion only moves forward; rolling back to\n   * an earlier (safe) code version does not revert schema changes that\n   * have already been applied.\n   */\n  schemaVersion: v.number(),\n\n  /**\n   * The data version is the code version of the latest server that ran.\n   * Note that this may be less than the schemaVersion in the case that\n   * a server is rolled back to an earlier version after a schema change.\n   * In such a case, data (but not schema), may need to be re-migrated\n   * when rolling forward again.\n   */\n  dataVersion: v.number(),\n\n  /**\n   * The minimum code version that is safe to run. This is used when\n   * a schema migration is not backwards compatible with an older version\n   * of the code.\n   */\n  minSafeVersion: v.number(),\n});\n\n// Exposed for tests.\nexport type VersionHistory = v.Infer<typeof versionHistory>;\n\n// Exposed for tests\nexport function getVersionHistory(db: Db): VersionHistory {\n  // Note: The `lock` column transparently ensures that at most one row exists.\n  db.prepare(\n    `\n    CREATE TABLE IF NOT EXISTS \"_zero.versionHistory\" (\n      dataVersion INTEGER NOT NULL,\n      schemaVersion INTEGER NOT NULL,\n      minSafeVersion INTEGER NOT NULL,\n\n      lock INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)\n    );\n  `,\n  ).run();\n  const result = db\n    .prepare(\n      'SELECT dataVersion, schemaVersion, minSafeVersion FROM \"_zero.versionHistory\"',\n    )\n    .get() as VersionHistory;\n  return result ?? {dataVersion: 0, schemaVersion: 0, minSafeVersion: 0};\n}\n\nfunction updateVersionHistory(\n  log: LogContext,\n  db: Db,\n  prev: VersionHistory,\n  newVersion: number,\n  minSafeVersion?: number,\n): VersionHistory {\n  assert(newVersion > 0, 'newVersion must be positive');\n  const meta = {\n    ...prev,\n    dataVersion: newVersion,\n    // The schemaVersion never moves backwards.\n    schemaVersion: Math.max(newVersion, prev.schemaVersion),\n    minSafeVersion: getMinSafeVersion(log, prev, minSafeVersion),\n  } satisfies VersionHistory;\n\n  db.prepare(\n    `\n    INSERT INTO \"_zero.versionHistory\" (dataVersion, schemaVersion, minSafeVersion, lock)\n    VALUES (@dataVersion, @schemaVersion, @minSafeVersion, 1)\n    ON CONFLICT (lock) DO UPDATE\n    SET dataVersion=@dataVersion,\n        schemaVersion=@schemaVersion,\n        minSafeVersion=@minSafeVersion\n  `,\n  ).run(meta);\n\n  return meta;\n}\n\nasync function runMigration(\n  log: LogContext,\n  tx: Db,\n  versions: VersionHistory,\n  destinationVersion: number,\n  migration: Migration,\n): Promise<VersionHistory> {\n  if (versions.schemaVersion < destinationVersion) {\n    await migration.migrateSchema?.(log, tx);\n  }\n  if (versions.dataVersion < destinationVersion) {\n    await migration.migrateData?.(log, tx);\n  }\n  return updateVersionHistory(\n    log,\n    tx,\n    versions,\n    destinationVersion,\n    migration.minSafeVersion,\n  );\n}\n\n/**\n * Bumps the rollback limit [[toAtLeast]] the specified version.\n * Leaves the rollback limit unchanged if it is equal or greater.\n */\nfunction getMinSafeVersion(\n  log: LogContext,\n  current: VersionHistory,\n  proposedSafeVersion?: number,\n): number {\n  if (proposedSafeVersion === undefined) {\n    return current.minSafeVersion;\n  }\n  if (current.minSafeVersion >= proposedSafeVersion) {\n    // The rollback limit must never move backwards.\n    log.debug?.(\n      `rollback limit is already at ${current.minSafeVersion}, ` +\n        `don't need to bump to ${proposedSafeVersion}`,\n    );\n    return current.minSafeVersion;\n  }\n  log.info?.(\n    `bumping rollback limit from ${current.minSafeVersion} to ${proposedSafeVersion}`,\n  );\n  return proposedSafeVersion;\n}\n\n// Note: We use a custom transaction wrapper (instead of db.begin(...)) in order\n// to support async operations within the transaction.\nasync function runTransaction<T>(\n  log: LogContext,\n  db: Db,\n  tx: (db: Db) => Promise<T> | T,\n): Promise<T> {\n  db.prepare('BEGIN EXCLUSIVE').run();\n  try {\n    const result = await tx(db);\n    db.prepare('COMMIT').run();\n    return result;\n  } catch (e) {\n    if (e instanceof AbortError) {\n      // AbortErrors (e.g. AutoResetSignal) are an expected, self-healing\n      // control-flow signal, not a failure. Log at `warn` so the rollback is\n      // still visible without tripping error-based alerting.\n      log.warn?.('Aborted transaction for reset signal', e);\n    } else {\n      log.error?.('Aborted transaction due to error', e);\n    }\n    try {\n      db.prepare('ROLLBACK').run();\n    } catch (rollbackError) {\n      log.error?.('Unable to rollback transaction', rollbackError);\n      const combinedError = new Error(\n        `Transaction failed and rollback also failed: operation error = ${String(\n          e,\n        )}; rollback error = ${String(rollbackError)}`,\n      );\n      combinedError.cause = e;\n      throw combinedError;\n    }\n    throw e;\n  }\n}\n"],"mappings":"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"}

package/out/zero-cache/src/db/specs.d.ts

@@ -13,6 +13,17 @@ export declare const columnSpec: v.ObjectType<{
     dflt: v.Optional<string | null>;
 }, undefined>;
 export type ColumnSpec = Readonly<v.Infer<typeof columnSpec>>;
+export declare const publishedColumnSpec: v.ObjectType<Omit<{
+    pos: v.Type<number>;
+    dataType: v.Type<string>;
+    pgTypeClass: v.Optional<"e" | "d" | "b" | "c" | "p" | "r" | "m">;
+    elemPgTypeClass: v.Optional<"e" | "d" | "b" | "c" | "p" | "r" | "m" | null>;
+    characterMaximumLength: v.Optional<number | null>;
+    notNull: v.Optional<boolean | null>;
+    dflt: v.Optional<string | null>;
+}, "typeOID"> & {
+    typeOID: v.Type<number>;
+}, undefined>;
 export declare const liteTableSpec: v.ObjectType<{
     name: v.Type<string>;
     columns: v.Type<Record<string, {
@@ -106,11 +117,39 @@ export type LiteAndZqlSpec = {
 export type TableSpec = Readonly<v.Infer<typeof tableSpec>>;
 export type PublishedTableSpec = Readonly<v.Infer<typeof publishedTableSpec>>;
 export declare const directionSchema: v.Type<"ASC" | "DESC">;
+export type IndexPredicateValue = {
+    readonly type: 'boolean';
+    readonly value: boolean;
+} | {
+    readonly type: 'integer';
+    readonly value: string;
+} | {
+    readonly type: 'string';
+    readonly value: string;
+};
+export type IndexPredicate = {
+    readonly type: 'and' | 'or';
+    readonly conditions: readonly IndexPredicate[];
+} | {
+    readonly type: 'not';
+    readonly condition: IndexPredicate;
+} | {
+    readonly type: 'null-test';
+    readonly column: string;
+    readonly op: 'IS NULL' | 'IS NOT NULL';
+} | {
+    readonly type: 'comparison';
+    readonly column: string;
+    readonly op: '=' | '<>' | '<' | '<=' | '>' | '>=';
+    readonly value: IndexPredicateValue;
+};
+export declare const indexPredicateSchema: v.Type<IndexPredicate>;
 export declare const liteIndexSpec: v.ObjectType<{
     name: v.Type<string>;
     tableName: v.Type<string>;
     unique: v.Type<boolean>;
     columns: v.Type<Record<string, "ASC" | "DESC">>;
+    predicate: v.Optional<IndexPredicate>;
 }, undefined>;
 export type MutableLiteIndexSpec = v.Infer<typeof liteIndexSpec>;
 export type LiteIndexSpec = Readonly<MutableLiteIndexSpec>;
@@ -119,6 +158,7 @@ export declare const indexSpec: v.ObjectType<Omit<{
     tableName: v.Type<string>;
     unique: v.Type<boolean>;
     columns: v.Type<Record<string, "ASC" | "DESC">>;
+    predicate: v.Optional<IndexPredicate>;
 }, "schema"> & {
     schema: v.Type<string>;
 }, undefined>;
@@ -128,6 +168,7 @@ export declare const publishedIndexSpec: v.ObjectType<Omit<Omit<{
     tableName: v.Type<string>;
     unique: v.Type<boolean>;
     columns: v.Type<Record<string, "ASC" | "DESC">>;
+    predicate: v.Optional<IndexPredicate>;
 }, "schema"> & {
     schema: v.Type<string>;
 }, "isReplicaIdentity" | "isPrimaryKey" | "isImmediate"> & {

package/out/zero-cache/src/db/specs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specs.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/db/specs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,0CAA0C,CAAC;AAI1E,eAAO,MAAM,iBAAiB,iDAQ7B,CAAC;AASF,eAAO,MAAM,UAAU;;;;;;;;aAarB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC;AAM9D,eAAO,MAAM,aAAa;;;;;;;;;;;;aAIxB,CAAC;AAEH,eAAO,MAAM,SAAS;;;;;;;;;;;;;;aAEpB,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAQ7B,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEjE,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,oBAAoB,CAAC,CAAC;AAE3D,MAAM,MAAM,+BAA+B,GAAG,IAAI,CAChD,aAAa,EACb,YAAY,CACb,GAAG;IACF;;;OAGG;IACH,UAAU,EAAE,UAAU,EAAE,CAAC;IAEzB;;;;OAIG;IACH,UAAU,EAAE,UAAU,CAAC;IAEvB;;;OAGG;IACH,uBAAuB,EAAE,UAAU,EAAE,CAAC;IAEtC;;;;OAIG;IACH,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,+BAA+B,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;AAE5D,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;AAE9E,eAAO,MAAM,eAAe,wBAAgC,CAAC;AAE7D,eAAO,MAAM,aAAa;;;;;aAKxB,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEjE,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,oBAAoB,CAAC,CAAC;AAE3D,eAAO,MAAM,SAAS;;;;;;;aAEpB,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;AAEhE,eAAO,MAAM,kBAAkB;;;;;;;;;;;aAI7B,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAC3C,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CACnC,CAAC"}
+{"version":3,"file":"specs.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/db/specs.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/db/specs.js

@@ -1,4 +1,4 @@
-import { literalUnion, valita_exports } from "../../../shared/src/valita.js";
+import { literalUnion, readonlyArray, readonlyObject, valita_exports } from "../../../shared/src/valita.js";
 //#region ../zero-cache/src/db/specs.ts
 var pgTypeClassSchema = literalUnion("b", "c", "d", "e", "p", "r", "m");
 var pgReplicaIdentitySchema = literalUnion("d", "n", "f", "i");
@@ -25,11 +25,38 @@ var publishedTableSpec = tableSpec.extend({
 	publications: valita_exports.record(valita_exports.object({ rowFilter: valita_exports.string().nullable() }))
 });
 var directionSchema = literalUnion("ASC", "DESC");
+var indexPredicateValueSchema = valita_exports.union(readonlyObject({
+	type: valita_exports.literal("boolean"),
+	value: valita_exports.boolean()
+}), readonlyObject({
+	type: valita_exports.literal("integer"),
+	value: valita_exports.string()
+}), readonlyObject({
+	type: valita_exports.literal("string"),
+	value: valita_exports.string()
+}));
+var indexPredicateSchema = valita_exports.lazy(() => valita_exports.union(readonlyObject({
+	type: literalUnion("and", "or"),
+	conditions: readonlyArray(indexPredicateSchema)
+}), readonlyObject({
+	type: valita_exports.literal("not"),
+	condition: indexPredicateSchema
+}), readonlyObject({
+	type: valita_exports.literal("null-test"),
+	column: valita_exports.string(),
+	op: literalUnion("IS NULL", "IS NOT NULL")
+}), readonlyObject({
+	type: valita_exports.literal("comparison"),
+	column: valita_exports.string(),
+	op: literalUnion("=", "<>", "<", "<=", ">", ">="),
+	value: indexPredicateValueSchema
+})));
 var indexSpec = valita_exports.object({
 	name: valita_exports.string(),
 	tableName: valita_exports.string(),
 	unique: valita_exports.boolean(),
-	columns: valita_exports.record(directionSchema)
+	columns: valita_exports.record(directionSchema),
+	predicate: indexPredicateSchema.optional()
 }).extend({ schema: valita_exports.string() });
 var publishedIndexSpec = indexSpec.extend({
 	isReplicaIdentity: valita_exports.boolean().optional(),
@@ -37,6 +64,6 @@ var publishedIndexSpec = indexSpec.extend({
 	isImmediate: valita_exports.boolean().optional()
 });
 //#endregion
-export { columnSpec, indexSpec, publishedIndexSpec, publishedTableSpec, tableSpec };
+export { columnSpec, indexSpec, publishedColumnSpec, publishedIndexSpec, publishedTableSpec, tableSpec };
 
 //# sourceMappingURL=specs.js.map

package/out/zero-cache/src/db/specs.js.map

@@ -1 +1 @@
-{"version":3,"file":"specs.js","names":[],"sources":["../../../../../zero-cache/src/db/specs.ts"],"sourcesContent":["import type {DeepReadonly} from '../../../shared/src/json.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport type {PrimaryKey} from '../../../zero-protocol/src/primary-key.ts';\nimport type {SchemaValue} from '../../../zero-schema/src/table-schema.ts';\nimport * as PostgresReplicaIdentity from './postgres-replica-identity-enum.ts';\nimport * as PostgresTypeClass from './postgres-type-class-enum.ts';\n\nexport const pgTypeClassSchema = v.literalUnion(\n  PostgresTypeClass.Base,\n  PostgresTypeClass.Composite,\n  PostgresTypeClass.Domain,\n  PostgresTypeClass.Enum,\n  PostgresTypeClass.Pseudo,\n  PostgresTypeClass.Range,\n  PostgresTypeClass.Multirange,\n);\n\nconst pgReplicaIdentitySchema = v.literalUnion(\n  PostgresReplicaIdentity.Default,\n  PostgresReplicaIdentity.Nothing,\n  PostgresReplicaIdentity.Full,\n  PostgresReplicaIdentity.Index,\n);\n\nexport const columnSpec = v.object({\n  pos: v.number(),\n  dataType: v.string(),\n  pgTypeClass: pgTypeClassSchema.optional(),\n\n  // If the column is an array, this will be the type of the\n  // elements in the array. If the column is not an array,\n  // this will be null.\n  elemPgTypeClass: pgTypeClassSchema.nullable().optional(),\n\n  characterMaximumLength: v.number().nullable().optional(),\n  notNull: v.boolean().nullable().optional(),\n  dflt: v.string().nullable().optional(),\n});\n\nexport type ColumnSpec = Readonly<v.Infer<typeof columnSpec>>;\n\nconst publishedColumnSpec = columnSpec.extend({\n  typeOID: v.number(),\n});\n\nexport const liteTableSpec = v.object({\n  name: v.string(),\n  columns: v.record(columnSpec),\n  primaryKey: v.array(v.string()).optional(),\n});\n\nexport const tableSpec = liteTableSpec.extend({\n  schema: v.string(),\n});\n\nexport const publishedTableSpec = tableSpec.extend({\n  oid: v.number(),\n  // Always present for new instances (e.g. from DDL triggers), but\n  // may from `initialSchema` object stored in the `replicas` table.\n  schemaOID: v.number().optional(),\n  columns: v.record(publishedColumnSpec),\n  replicaIdentity: pgReplicaIdentitySchema.optional(),\n  publications: v.record(v.object({rowFilter: v.string().nullable()})),\n});\n\nexport type MutableLiteTableSpec = v.Infer<typeof liteTableSpec>;\n\nexport type LiteTableSpec = Readonly<MutableLiteTableSpec>;\n\nexport type LiteTableSpecWithKeysAndVersion = Omit<\n  LiteTableSpec,\n  'primaryKey'\n> & {\n  /**\n   * All keys associated with a unique index.  Includes indexes with\n   * nullable columns.\n   */\n  uniqueKeys: PrimaryKey[];\n\n  /**\n   * The key selected to act as the \"primary key\". Primary keys\n   * are not explicitly set on the replica, but an appropriate\n   * unique index is required.\n   */\n  primaryKey: PrimaryKey; // note: required\n\n  /**\n   * All keys associated with a unique index over non-null\n   * columns, i.e. suitable as a primary key.\n   */\n  allPotentialPrimaryKeys: PrimaryKey[];\n\n  /**\n   * The minimum `_0_version` value for every row in the table. If this is\n   * present, `_0_version` value in the row itself should only be used if\n   * it is greater (i.e. later) than the `minRowVersion`.\n   */\n  minRowVersion: string | null;\n};\n\nexport type LiteAndZqlSpec = {\n  tableSpec: LiteTableSpecWithKeysAndVersion;\n  zqlSpec: Record<string, SchemaValue>;\n};\n\nexport type TableSpec = Readonly<v.Infer<typeof tableSpec>>;\n\nexport type PublishedTableSpec = Readonly<v.Infer<typeof publishedTableSpec>>;\n\nexport const directionSchema = v.literalUnion('ASC', 'DESC');\n\nexport const liteIndexSpec = v.object({\n  name: v.string(),\n  tableName: v.string(),\n  unique: v.boolean(),\n  columns: v.record(directionSchema),\n});\n\nexport type MutableLiteIndexSpec = v.Infer<typeof liteIndexSpec>;\n\nexport type LiteIndexSpec = Readonly<MutableLiteIndexSpec>;\n\nexport const indexSpec = liteIndexSpec.extend({\n  schema: v.string(),\n});\n\nexport type IndexSpec = DeepReadonly<v.Infer<typeof indexSpec>>;\n\nexport const publishedIndexSpec = indexSpec.extend({\n  isReplicaIdentity: v.boolean().optional(),\n  isPrimaryKey: v.boolean().optional(),\n  isImmediate: v.boolean().optional(),\n});\n\nexport type PublishedIndexSpec = DeepReadonly<\n  v.Infer<typeof publishedIndexSpec>\n>;\n"],"mappings":";;AAOA,IAAa,oBAAoB,aAC/B,KACA,KACA,KACA,KACA,KACA,KACA,GACF;AAEA,IAAM,0BAA0B,aAC9B,KACA,KACA,KACA,GACF;AAEA,IAAa,aAAa,eAAE,OAAO;CACjC,KAAK,eAAE,OAAO;CACd,UAAU,eAAE,OAAO;CACnB,aAAa,kBAAkB,SAAS;CAKxC,iBAAiB,kBAAkB,SAAS,EAAE,SAAS;CAEvD,wBAAwB,eAAE,OAAO,EAAE,SAAS,EAAE,SAAS;CACvD,SAAS,eAAE,QAAQ,EAAE,SAAS,EAAE,SAAS;CACzC,MAAM,eAAE,OAAO,EAAE,SAAS,EAAE,SAAS;AACvC,CAAC;AAID,IAAM,sBAAsB,WAAW,OAAO,EAC5C,SAAS,eAAE,OAAO,EACpB,CAAC;AAQD,IAAa,YANgB,eAAE,OAAO;CACpC,MAAM,eAAE,OAAO;CACf,SAAS,eAAE,OAAO,UAAU;CAC5B,YAAY,eAAE,MAAM,eAAE,OAAO,CAAC,EAAE,SAAS;AAC3C,CAEyB,EAAc,OAAO,EAC5C,QAAQ,eAAE,OAAO,EACnB,CAAC;AAED,IAAa,qBAAqB,UAAU,OAAO;CACjD,KAAK,eAAE,OAAO;CAGd,WAAW,eAAE,OAAO,EAAE,SAAS;CAC/B,SAAS,eAAE,OAAO,mBAAmB;CACrC,iBAAiB,wBAAwB,SAAS;CAClD,cAAc,eAAE,OAAO,eAAE,OAAO,EAAC,WAAW,eAAE,OAAO,EAAE,SAAS,EAAC,CAAC,CAAC;AACrE,CAAC;AA8CD,IAAa,kBAAkB,aAAe,OAAO,MAAM;AAa3D,IAAa,YAXgB,eAAE,OAAO;CACpC,MAAM,eAAE,OAAO;CACf,WAAW,eAAE,OAAO;CACpB,QAAQ,eAAE,QAAQ;CAClB,SAAS,eAAE,OAAO,eAAe;AACnC,CAMyB,EAAc,OAAO,EAC5C,QAAQ,eAAE,OAAO,EACnB,CAAC;AAID,IAAa,qBAAqB,UAAU,OAAO;CACjD,mBAAmB,eAAE,QAAQ,EAAE,SAAS;CACxC,cAAc,eAAE,QAAQ,EAAE,SAAS;CACnC,aAAa,eAAE,QAAQ,EAAE,SAAS;AACpC,CAAC"}
+{"version":3,"file":"specs.js","names":[],"sources":["../../../../../zero-cache/src/db/specs.ts"],"sourcesContent":["import type {DeepReadonly} from '../../../shared/src/json.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport type {PrimaryKey} from '../../../zero-protocol/src/primary-key.ts';\nimport type {SchemaValue} from '../../../zero-schema/src/table-schema.ts';\nimport * as PostgresReplicaIdentity from './postgres-replica-identity-enum.ts';\nimport * as PostgresTypeClass from './postgres-type-class-enum.ts';\n\nexport const pgTypeClassSchema = v.literalUnion(\n  PostgresTypeClass.Base,\n  PostgresTypeClass.Composite,\n  PostgresTypeClass.Domain,\n  PostgresTypeClass.Enum,\n  PostgresTypeClass.Pseudo,\n  PostgresTypeClass.Range,\n  PostgresTypeClass.Multirange,\n);\n\nconst pgReplicaIdentitySchema = v.literalUnion(\n  PostgresReplicaIdentity.Default,\n  PostgresReplicaIdentity.Nothing,\n  PostgresReplicaIdentity.Full,\n  PostgresReplicaIdentity.Index,\n);\n\nexport const columnSpec = v.object({\n  pos: v.number(),\n  dataType: v.string(),\n  pgTypeClass: pgTypeClassSchema.optional(),\n\n  // If the column is an array, this will be the type of the\n  // elements in the array. If the column is not an array,\n  // this will be null.\n  elemPgTypeClass: pgTypeClassSchema.nullable().optional(),\n\n  characterMaximumLength: v.number().nullable().optional(),\n  notNull: v.boolean().nullable().optional(),\n  dflt: v.string().nullable().optional(),\n});\n\nexport type ColumnSpec = Readonly<v.Infer<typeof columnSpec>>;\n\nexport const publishedColumnSpec = columnSpec.extend({\n  typeOID: v.number(),\n});\n\nexport const liteTableSpec = v.object({\n  name: v.string(),\n  columns: v.record(columnSpec),\n  primaryKey: v.array(v.string()).optional(),\n});\n\nexport const tableSpec = liteTableSpec.extend({\n  schema: v.string(),\n});\n\nexport const publishedTableSpec = tableSpec.extend({\n  oid: v.number(),\n  // Always present for new instances (e.g. from DDL triggers), but\n  // may from `initialSchema` object stored in the `replicas` table.\n  schemaOID: v.number().optional(),\n  columns: v.record(publishedColumnSpec),\n  replicaIdentity: pgReplicaIdentitySchema.optional(),\n  publications: v.record(v.object({rowFilter: v.string().nullable()})),\n});\n\nexport type MutableLiteTableSpec = v.Infer<typeof liteTableSpec>;\n\nexport type LiteTableSpec = Readonly<MutableLiteTableSpec>;\n\nexport type LiteTableSpecWithKeysAndVersion = Omit<\n  LiteTableSpec,\n  'primaryKey'\n> & {\n  /**\n   * All keys associated with a unique index.  Includes indexes with\n   * nullable columns.\n   */\n  uniqueKeys: PrimaryKey[];\n\n  /**\n   * The key selected to act as the \"primary key\". Primary keys\n   * are not explicitly set on the replica, but an appropriate\n   * unique index is required.\n   */\n  primaryKey: PrimaryKey; // note: required\n\n  /**\n   * All keys associated with a unique index over non-null\n   * columns, i.e. suitable as a primary key.\n   */\n  allPotentialPrimaryKeys: PrimaryKey[];\n\n  /**\n   * The minimum `_0_version` value for every row in the table. If this is\n   * present, `_0_version` value in the row itself should only be used if\n   * it is greater (i.e. later) than the `minRowVersion`.\n   */\n  minRowVersion: string | null;\n};\n\nexport type LiteAndZqlSpec = {\n  tableSpec: LiteTableSpecWithKeysAndVersion;\n  zqlSpec: Record<string, SchemaValue>;\n};\n\nexport type TableSpec = Readonly<v.Infer<typeof tableSpec>>;\n\nexport type PublishedTableSpec = Readonly<v.Infer<typeof publishedTableSpec>>;\n\nexport const directionSchema = v.literalUnion('ASC', 'DESC');\n\nexport type IndexPredicateValue =\n  | {readonly type: 'boolean'; readonly value: boolean}\n  | {readonly type: 'integer'; readonly value: string}\n  | {readonly type: 'string'; readonly value: string};\n\nexport type IndexPredicate =\n  | {\n      readonly type: 'and' | 'or';\n      readonly conditions: readonly IndexPredicate[];\n    }\n  | {readonly type: 'not'; readonly condition: IndexPredicate}\n  | {\n      readonly type: 'null-test';\n      readonly column: string;\n      readonly op: 'IS NULL' | 'IS NOT NULL';\n    }\n  | {\n      readonly type: 'comparison';\n      readonly column: string;\n      readonly op: '=' | '<>' | '<' | '<=' | '>' | '>=';\n      readonly value: IndexPredicateValue;\n    };\n\nconst indexPredicateValueSchema: v.Type<IndexPredicateValue> = v.union(\n  v.readonlyObject({type: v.literal('boolean'), value: v.boolean()}),\n  v.readonlyObject({type: v.literal('integer'), value: v.string()}),\n  v.readonlyObject({type: v.literal('string'), value: v.string()}),\n);\n\nexport const indexPredicateSchema: v.Type<IndexPredicate> = v.lazy(() =>\n  v.union(\n    v.readonlyObject({\n      type: v.literalUnion('and', 'or'),\n      conditions: v.readonlyArray(indexPredicateSchema),\n    }),\n    v.readonlyObject({\n      type: v.literal('not'),\n      condition: indexPredicateSchema,\n    }),\n    v.readonlyObject({\n      type: v.literal('null-test'),\n      column: v.string(),\n      op: v.literalUnion('IS NULL', 'IS NOT NULL'),\n    }),\n    v.readonlyObject({\n      type: v.literal('comparison'),\n      column: v.string(),\n      op: v.literalUnion('=', '<>', '<', '<=', '>', '>='),\n      value: indexPredicateValueSchema,\n    }),\n  ),\n);\n\nexport const liteIndexSpec = v.object({\n  name: v.string(),\n  tableName: v.string(),\n  unique: v.boolean(),\n  columns: v.record(directionSchema),\n  predicate: indexPredicateSchema.optional(),\n});\n\nexport type MutableLiteIndexSpec = v.Infer<typeof liteIndexSpec>;\n\nexport type LiteIndexSpec = Readonly<MutableLiteIndexSpec>;\n\nexport const indexSpec = liteIndexSpec.extend({\n  schema: v.string(),\n});\n\nexport type IndexSpec = DeepReadonly<v.Infer<typeof indexSpec>>;\n\nexport const publishedIndexSpec = indexSpec.extend({\n  isReplicaIdentity: v.boolean().optional(),\n  isPrimaryKey: v.boolean().optional(),\n  isImmediate: v.boolean().optional(),\n});\n\nexport type PublishedIndexSpec = DeepReadonly<\n  v.Infer<typeof publishedIndexSpec>\n>;\n"],"mappings":";;AAOA,IAAa,oBAAoB,aAC/B,KACA,KACA,KACA,KACA,KACA,KACA,GACF;AAEA,IAAM,0BAA0B,aAC9B,KACA,KACA,KACA,GACF;AAEA,IAAa,aAAa,eAAE,OAAO;CACjC,KAAK,eAAE,OAAO;CACd,UAAU,eAAE,OAAO;CACnB,aAAa,kBAAkB,SAAS;CAKxC,iBAAiB,kBAAkB,SAAS,EAAE,SAAS;CAEvD,wBAAwB,eAAE,OAAO,EAAE,SAAS,EAAE,SAAS;CACvD,SAAS,eAAE,QAAQ,EAAE,SAAS,EAAE,SAAS;CACzC,MAAM,eAAE,OAAO,EAAE,SAAS,EAAE,SAAS;AACvC,CAAC;AAID,IAAa,sBAAsB,WAAW,OAAO,EACnD,SAAS,eAAE,OAAO,EACpB,CAAC;AAQD,IAAa,YANgB,eAAE,OAAO;CACpC,MAAM,eAAE,OAAO;CACf,SAAS,eAAE,OAAO,UAAU;CAC5B,YAAY,eAAE,MAAM,eAAE,OAAO,CAAC,EAAE,SAAS;AAC3C,CAEyB,EAAc,OAAO,EAC5C,QAAQ,eAAE,OAAO,EACnB,CAAC;AAED,IAAa,qBAAqB,UAAU,OAAO;CACjD,KAAK,eAAE,OAAO;CAGd,WAAW,eAAE,OAAO,EAAE,SAAS;CAC/B,SAAS,eAAE,OAAO,mBAAmB;CACrC,iBAAiB,wBAAwB,SAAS;CAClD,cAAc,eAAE,OAAO,eAAE,OAAO,EAAC,WAAW,eAAE,OAAO,EAAE,SAAS,EAAC,CAAC,CAAC;AACrE,CAAC;AA8CD,IAAa,kBAAkB,aAAe,OAAO,MAAM;AAyB3D,IAAM,4BAAyD,eAAE,MAC/D,eAAiB;CAAC,MAAM,eAAE,QAAQ,SAAS;CAAG,OAAO,eAAE,QAAQ;AAAC,CAAC,GACjE,eAAiB;CAAC,MAAM,eAAE,QAAQ,SAAS;CAAG,OAAO,eAAE,OAAO;AAAC,CAAC,GAChE,eAAiB;CAAC,MAAM,eAAE,QAAQ,QAAQ;CAAG,OAAO,eAAE,OAAO;AAAC,CAAC,CACjE;AAEA,IAAa,uBAA+C,eAAE,WAC5D,eAAE,MACA,eAAiB;CACf,MAAM,aAAe,OAAO,IAAI;CAChC,YAAY,cAAgB,oBAAoB;AAClD,CAAC,GACD,eAAiB;CACf,MAAM,eAAE,QAAQ,KAAK;CACrB,WAAW;AACb,CAAC,GACD,eAAiB;CACf,MAAM,eAAE,QAAQ,WAAW;CAC3B,QAAQ,eAAE,OAAO;CACjB,IAAI,aAAe,WAAW,aAAa;AAC7C,CAAC,GACD,eAAiB;CACf,MAAM,eAAE,QAAQ,YAAY;CAC5B,QAAQ,eAAE,OAAO;CACjB,IAAI,aAAe,KAAK,MAAM,KAAK,MAAM,KAAK,IAAI;CAClD,OAAO;AACT,CAAC,CACH,CACF;AAcA,IAAa,YAZgB,eAAE,OAAO;CACpC,MAAM,eAAE,OAAO;CACf,WAAW,eAAE,OAAO;CACpB,QAAQ,eAAE,QAAQ;CAClB,SAAS,eAAE,OAAO,eAAe;CACjC,WAAW,qBAAqB,SAAS;AAC3C,CAMyB,EAAc,OAAO,EAC5C,QAAQ,eAAE,OAAO,EACnB,CAAC;AAID,IAAa,qBAAqB,UAAU,OAAO;CACjD,mBAAmB,eAAE,QAAQ,EAAE,SAAS;CACxC,cAAc,eAAE,QAAQ,EAAE,SAAS;CACnC,aAAa,eAAE,QAAQ,EAAE,SAAS;AACpC,CAAC"}

package/out/zero-cache/src/db/transaction-pool.d.ts

@@ -1,6 +1,7 @@
 import type { LogContext } from '@rocicorp/logger';
 import type postgres from 'postgres';
 import type { Enum } from '../../../shared/src/enum.ts';
+import { Queue } from '../../../shared/src/queue.ts';
 import { type PostgresDB, type PostgresTransaction } from '../types/pg.ts';
 import type * as Mode from './mode-enum.ts';
 type Mode = Enum<typeof Mode>;
@@ -47,15 +48,6 @@ export type Options = {
      * workers will be shut down after an idle timeout of 5 seconds.
      */
     maxWorkers?: number;
-    /**
-     * Aborts the transaction if the response for a statement is not received
-     * within the specified timeout. Note that this is different from a Postgres
-     * `statement_timeout` or `lock_timeout` in that it is specifically intended
-     * to detect situations in which Postgres either never received the
-     * statement, or the application never got the response for the executed
-     * statement.
-     */
-    statementResponseTimeout?: number;
 };
 /**
  * A TransactionPool is a pool of one or more {@link postgres.TransactionSql}
@@ -181,11 +173,13 @@ export declare function sharedSnapshot(): {
     snapshotID: Promise<string>;
 };
 /**
- * @returns An `init` Task for importing a snapshot from another transaction.
+ * @returns An `init` Task for importing a snapshot from another transaction,
+ *          as well as an `imported` Queue which resolves or rejects when each
+ *          worker is initialized.
  */
 export declare function importSnapshot(snapshotID: string): {
     init: Task;
-    imported: Promise<void>;
+    imported: Queue<void>;
 };
 /**
  * A superclass of Errors used for control flow that is needed to handle
@@ -205,9 +199,5 @@ type TimeoutTasks = {
     forExtraWorkers: TimeoutTask;
 };
 export declare const TIMEOUT_TASKS: TimeoutTasks;
-export declare class ResponseTimeoutError extends Error {
-    static readonly name = "ResponseTimeoutError";
-    constructor(msg: string);
-}
 export {};
 //# sourceMappingURL=transaction-pool.d.ts.map

package/out/zero-cache/src/db/transaction-pool.d.ts.map

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

package/out/zero-cache/src/db/transaction-pool.js

@@ -22,16 +22,14 @@ var TransactionPool = class {
 	#workers = [];
 	#initialWorkers;
 	#maxWorkers;
-	#responseTimeout;
 	#timeoutTask;
 	#numWorkers;
 	#numWorking = 0;
 	#db;
 	#done = false;
 	#failure;
-	#orphanedQueryCheckInterval;
 	constructor(lc, opts, timeoutTasks = TIMEOUT_TASKS) {
-		const { mode, init, cleanup, initialWorkers = 1, maxWorkers = initialWorkers, statementResponseTimeout } = opts;
+		const { mode, init, cleanup, initialWorkers = 1, maxWorkers = initialWorkers } = opts;
 		assert(initialWorkers > 0, "initialWorkers must be positive");
 		assert(maxWorkers >= initialWorkers, "maxWorkers must be >= initialWorkers");
 		this.#lc = lc;
@@ -42,8 +40,6 @@ var TransactionPool = class {
 		this.#numWorkers = initialWorkers;
 		this.#maxWorkers = maxWorkers;
 		this.#timeoutTask = timeoutTasks;
-		this.#responseTimeout = statementResponseTimeout;
-		this.#orphanedQueryCheckInterval = setInterval(this.#checkForOrphanedQueries, Math.min(5e3, statementResponseTimeout ?? 5e3));
 	}
 	/**
 	* Starts the pool of workers to process Tasks with transactions opened from the
@@ -159,9 +155,6 @@ var TransactionPool = class {
 	}
 	#start = performance.now();
 	#stmts = 0;
-	#latestDoneIndex = 0;
-	#latestDoneTime = 0;
-	#pending = /* @__PURE__ */ new Map();
 	/**
 	* Implements the semantics specified in {@link process()}.
 	*
@@ -188,69 +181,18 @@ var TransactionPool = class {
 					r.resolve();
 					return { pending: null };
 				}
-				const time = Date.now();
 				return { pending: stmts.reduce((_, stmt) => {
 					const query = stmt;
 					const index = ++this.#stmts;
-					const { promise: aborted, reject: abort } = resolver();
-					aborted.catch(() => {});
-					this.#pending.set(query, {
-						index,
-						time,
-						abort
-					});
-					const responded = stmt.execute().then(() => {
+					return stmt.execute().then(() => {
 						if (index % 1e3 === 0) lc[index % 1e4 === 0 ? "info" : "debug"]?.(`executed ${this.#stmts}th statement (${(performance.now() - this.#start).toFixed(3)} ms)`, { statement: query.string });
-					}).catch((e) => this.fail(e)).finally(() => {
-						this.#pending.delete(query);
-						if (index > this.#latestDoneIndex) {
-							this.#latestDoneIndex = index;
-							this.#latestDoneTime = Date.now();
-						}
-					});
-					const done = Promise.race([responded, aborted]);
-					done.catch(() => {});
-					return done;
+					}).catch((e) => this.fail(e));
 				}, promiseVoid).finally(r.resolve) };
 			},
 			rejected: r.resolve
 		};
 	}
 	/**
-	* Periodically checks the map of `#pending` queries for which Promises
-	* have yet to be resolved. Checks for pathological scenarios that have
-	* been observed:
-	*
-	* * A promise does not resolve, even though the transaction is otherwise
-	*   healthy with keepalives being sent.
-	* * A transaction never "finishes" at the postgres.js level after the
-	*   worker exits, implying that postgres.js is awaiting the `last` promise
-	*   returned. In this case Postgres disconnected the application with an
-	*   idle-in-transaction timeout, suggesting that all statements did in
-	*   fact complete.
-	*/
-	#checkForOrphanedQueries = () => {
-		if (this.#pending.size === 0) return;
-		const now = Date.now();
-		for (const [query, { index, time, abort }] of this.#pending.entries()) {
-			const statement = query.string;
-			const abortWith = (msg) => {
-				this.#lc.warn?.(msg, { statement });
-				const err = new ResponseTimeoutError(msg);
-				abort(err);
-				this.fail(err);
-				this.#pending.delete(query);
-			};
-			if (index < this.#latestDoneIndex) {
-				const elapsed = now - this.#latestDoneTime;
-				if (this.#responseTimeout && elapsed > this.#responseTimeout) abortWith(`statement ${this.#latestDoneIndex} completed ${elapsed} ms ago, but statement ${index} has not.`);
-			} else {
-				const elapsed = now - time;
-				if (this.#responseTimeout && elapsed > this.#responseTimeout) abortWith(`response for statement timed out after ${elapsed} ms`);
-			}
-		}
-	};
-	/**
 	* Processes and returns the result of executing the {@link ReadTask} from
 	* within the transaction. An error thrown by the task will result in
 	* rejecting the returned Promise, but will not affect the transaction pool
@@ -317,7 +259,6 @@ var TransactionPool = class {
 		assert(!this.#done, "already set done");
 		this.#done = true;
 		for (let i = 0; i < this.#numWorkers; i++) this.#tasks.enqueue("done");
-		Promise.allSettled(this.#workers).then(() => clearInterval(this.#orphanedQueryCheckInterval));
 	}
 	isRunning() {
 		return this.#db !== void 0 && !this.#done && this.#failure === void 0;
@@ -331,19 +272,50 @@ var TransactionPool = class {
 			const level = this.#failure instanceof ControlFlowError ? "debug" : "info";
 			this.#lc[level]?.(this.#failure);
 			for (let i = 0; i < this.#numWorkers; i++) this.#tasks.enqueue(this.#failure);
-			Promise.allSettled(this.#workers).then(() => clearInterval(this.#orphanedQueryCheckInterval));
 		}
 	}
 };
 /**
-* @returns An `init` Task for importing a snapshot from another transaction.
+* Returns `init` and `cleanup` {@link Task}s for a TransactionPool that ensure its workers
+* share a single view of the database. This is used for View Notifier and View Syncer logic
+* that allows multiple entities to perform parallel reads on the same snapshot of the database.
+*/
+function sharedSnapshot() {
+	const { promise: snapshotExported, resolve: exportSnapshot, reject: failExport } = resolver();
+	let firstWorkerRun = false;
+	let exporterLc;
+	let firstWorkerDone = false;
+	return {
+		init: (tx, lc) => {
+			if (!firstWorkerRun) {
+				firstWorkerRun = true;
+				exporterLc = lc;
+				const stmt = tx`SELECT pg_export_snapshot() AS snapshot;`.simple();
+				stmt.then((result) => exportSnapshot(result[0].snapshot), failExport);
+				return [stmt];
+			}
+			if (!firstWorkerDone) return snapshotExported.then((snapshotID) => [tx.unsafe(`SET TRANSACTION SNAPSHOT '${snapshotID}'`)]);
+			lc.debug?.("All work is done. No need to set snapshot");
+			return [];
+		},
+		cleanup: (_tx, lc) => {
+			if (lc === exporterLc) firstWorkerDone = true;
+			return [];
+		},
+		snapshotID: snapshotExported
+	};
+}
+/**
+* @returns An `init` Task for importing a snapshot from another transaction,
+*          as well as an `imported` Queue which resolves or rejects when each
+*          worker is initialized.
 */
 function importSnapshot(snapshotID) {
-	const { promise: imported, resolve, reject } = resolver();
+	const imported = new Queue();
 	return {
 		init: (tx) => {
 			const stmt = tx.unsafe(`SET TRANSACTION SNAPSHOT '${snapshotID}'`);
-			stmt.then(() => resolve(), reject);
+			stmt.then(() => imported.enqueue(), (err) => imported.enqueueRejection(err));
 			return [stmt];
 		},
 		imported
@@ -397,13 +369,7 @@ var TIMEOUT_TASKS = {
 		task: "done"
 	}
 };
-var ResponseTimeoutError = class extends Error {
-	static name = "ResponseTimeoutError";
-	constructor(msg) {
-		super(msg);
-	}
-};
 //#endregion
-export { TransactionPool, importSnapshot };
+export { TransactionPool, importSnapshot, sharedSnapshot };
 
 //# sourceMappingURL=transaction-pool.js.map