@rocicorp/zero 1.10.0-canary.24 → 1.10.0-canary.26

package/out/zero-cache/src/services/run-ast.d.ts

@@ -10,13 +10,6 @@ import type { PlanDebugger } from '../../../zql/src/planner/planner-debug.ts';
 import type { Database } from '../../../zqlite/src/db.ts';
 import type { JWTAuth } from '../auth/auth.ts';
 import type { LiteAndZqlSpec } from '../db/specs.ts';
-/**
- * Maximum number of synced rows returned per table, and read rows returned
- * per table/query, when analyzing a query in zero-cache. Rows past this are
- * still counted. Keeping every row can exhaust the heap when analyzing queries
- * over large tables.
- */
-export declare const MAX_ANALYZE_ROWS = 1000;
 export type RunAstOptions = {
     applyPermissions?: boolean | undefined;
     auth?: JWTAuth | undefined;
@@ -24,11 +17,6 @@ export type RunAstOptions = {
     costModel?: ConnectionCostModel | undefined;
     db: Database;
     host: BuilderDelegate;
-    /**
-     * Maximum number of synced rows returned per table. Rows past this are still
-     * counted. Defaults to no limit.
-     */
-    maxSyncedRowsPerTable?: number | undefined;
     permissions?: PermissionsConfig | undefined;
     planDebugger?: PlanDebugger | undefined;
     syncedRows?: boolean | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"run-ast.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/run-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAQjD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oDAAoD,CAAC;AAC3F,OAAO,KAAK,EAAC,GAAG,EAAe,MAAM,mCAAmC,CAAC;AAEzE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6CAA6C,CAAC;AAG9E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kDAAkD,CAAC;AACxF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,qCAAqC,CAAC;AAI7C,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,gDAAgD,CAAC;AACxF,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2CAA2C,CAAC;AAC5E,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AAExD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AAG7C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAGnD;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,OAAO,CAAC;AAErC,MAAM,MAAM,aAAa,GAAG;IAC1B,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3B,oBAAoB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC9C,SAAS,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAC5C,EAAE,EAAE,QAAQ,CAAC;IACb,IAAI,EAAE,eAAe,CAAC;IACtB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,WAAW,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC5C,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,wBAAsB,MAAM,CAC1B,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAChC,OAAO,CAAC,kBAAkB,CAAC,CA6K7B"}
+{"version":3,"file":"run-ast.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/run-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAQjD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oDAAoD,CAAC;AAC3F,OAAO,KAAK,EAAC,GAAG,EAAe,MAAM,mCAAmC,CAAC;AAEzE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6CAA6C,CAAC;AAG9E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kDAAkD,CAAC;AACxF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,qCAAqC,CAAC;AAI7C,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,gDAAgD,CAAC;AACxF,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2CAA2C,CAAC;AAC5E,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AAExD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AAG7C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAGnD,MAAM,MAAM,aAAa,GAAG;IAC1B,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3B,oBAAoB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC9C,SAAS,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAC5C,EAAE,EAAE,QAAQ,CAAC;IACb,IAAI,EAAE,eAAe,CAAC;IACtB,WAAW,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC5C,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,wBAAsB,MAAM,CAC1B,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAChC,OAAO,CAAC,kBAAkB,CAAC,CAsJ7B"}

package/out/zero-cache/src/services/run-ast.js

@@ -2,8 +2,8 @@ import { assert } from "../../../shared/src/asserts.js";
 import { sleep } from "../../../shared/src/sleep.js";
 import { must } from "../../../shared/src/must.js";
 import { mapAST } from "../../../zero-protocol/src/ast.js";
-import { skipYields } from "../../../zql/src/ivm/skip-yields.js";
 import { hashOfAST } from "../../../zero-protocol/src/query-hash.js";
+import { skipYields } from "../../../zql/src/ivm/skip-yields.js";
 import { buildPipeline } from "../../../zql/src/builder/builder.js";
 import { astToZQL } from "../../../ast-to-zql/src/ast-to-zql.js";
 import { formatOutput } from "../../../ast-to-zql/src/format.js";
@@ -12,15 +12,8 @@ import { resolveSimpleScalarSubqueries } from "../../../zqlite/src/resolve-scala
 import { transformAndHashQuery } from "../auth/read-authorizer.js";
 import { hydrate } from "./view-syncer/pipeline-driver.js";
 //#region ../zero-cache/src/services/run-ast.ts
-/**
-* Maximum number of synced rows returned per table, and read rows returned
-* per table/query, when analyzing a query in zero-cache. Rows past this are
-* still counted. Keeping every row can exhaust the heap when analyzing queries
-* over large tables.
-*/
-var MAX_ANALYZE_ROWS = 1e3;
 async function runAst(lc, clientSchema, ast, isTransformed, options, yieldProcess) {
-	const { clientToServerMapper, permissions, host, db, maxSyncedRowsPerTable = Infinity } = options;
+	const { clientToServerMapper, permissions, host, db } = options;
 	const result = {
 		warnings: [],
 		syncedRows: void 0,
@@ -53,8 +46,7 @@ async function runAst(lc, clientSchema, ast, isTransformed, options, yieldProces
 	const start = performance.now();
 	let syncedRowCount = 0;
 	const rowsByTable = {};
-	const seen = /* @__PURE__ */ new Set();
-	const truncatedTables = /* @__PURE__ */ new Set();
+	const seenByTable = /* @__PURE__ */ new Set();
 	for (const rowChange of hydrate(pipeline, hashOfAST(resolvedAst), clientSchema, computeZqlSpecs(lc, db, { includeBackfillingColumns: false }))) {
 		if (rowChange === "yield") {
 			await yieldProcess();
@@ -63,21 +55,21 @@ async function runAst(lc, clientSchema, ast, isTransformed, options, yieldProces
 		assert(rowChange.type === 0, "Hydration only handles add row changes");
 		if (syncedRowCount % 10 === 0) await Promise.resolve();
 		if (syncedRowCount % 100 === 0) await sleep(1);
-		const key = JSON.stringify([rowChange.table, rowChange.rowKey]);
-		if (seen.has(key)) continue;
+		let rows = rowsByTable[rowChange.table];
+		const s = rowChange.table + "." + JSON.stringify(rowChange.row);
+		if (seenByTable.has(s)) continue;
 		syncedRowCount++;
-		seen.add(key);
+		seenByTable.add(s);
 		if (options.syncedRows) {
-			const rows = rowsByTable[rowChange.table] ??= [];
-			if (rows.length < maxSyncedRowsPerTable) rows.push(rowChange.row);
-			else truncatedTables.add(rowChange.table);
+			if (!rows) {
+				rows = [];
+				rowsByTable[rowChange.table] = rows;
+			}
+			rows.push(rowChange.row);
 		}
 	}
 	const end = performance.now();
-	if (options.syncedRows) {
-		result.syncedRows = rowsByTable;
-		for (const table of truncatedTables) result.warnings.push(`Only the first ${maxSyncedRowsPerTable} synced rows of "${table}" are included.`);
-	}
+	if (options.syncedRows) result.syncedRows = rowsByTable;
 	result.start = start;
 	result.end = end;
 	result.elapsed = end - start;
@@ -88,14 +80,10 @@ async function runAst(lc, clientSchema, ast, isTransformed, options, yieldProces
 	result.readRowCount = readRowCount;
 	result.dbScansByQuery = host.debug?.getNVisitCounts() ?? {};
 	result.sqlitePlans = host.debug?.getSQLitePlans() ?? {};
-	if (options.vendedRows) {
-		const readRows = host.debug?.getVendedRows();
-		result.readRows = readRows;
-		for (const [table, byQuery] of Object.entries(readRows ?? {})) for (const [query, rows] of Object.entries(byQuery)) if ((result.readRowCountsByQuery[table]?.[query] ?? 0) > rows.length) result.warnings.push(`Only the first ${rows.length} read rows of "${table}" are included for: ${query}`);
-	}
+	if (options.vendedRows) result.readRows = host.debug?.getVendedRows();
 	return result;
 }
 //#endregion
-export { MAX_ANALYZE_ROWS, runAst };
+export { runAst };
 
 //# sourceMappingURL=run-ast.js.map

package/out/zero-cache/src/services/run-ast.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-ast.js","names":[],"sources":["../../../../../zero-cache/src/services/run-ast.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\n// @circular-dep-ignore\nimport {astToZQL} from '../../../ast-to-zql/src/ast-to-zql.ts';\n// @circular-dep-ignore\nimport {formatOutput} from '../../../ast-to-zql/src/format.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {sleep} from '../../../shared/src/sleep.ts';\nimport type {AnalyzeQueryResult} from '../../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST, LiteralValue} from '../../../zero-protocol/src/ast.ts';\nimport {mapAST} from '../../../zero-protocol/src/ast.ts';\nimport type {ClientSchema} from '../../../zero-protocol/src/client-schema.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport {hashOfAST} from '../../../zero-protocol/src/query-hash.ts';\nimport type {PermissionsConfig} from '../../../zero-schema/src/compiled-permissions.ts';\nimport type {NameMapper} from '../../../zero-schema/src/name-mapper.ts';\nimport {\n  buildPipeline,\n  type BuilderDelegate,\n} from '../../../zql/src/builder/builder.ts';\nimport {ChangeType} from '../../../zql/src/ivm/change-type.ts';\nimport type {Node} from '../../../zql/src/ivm/data.ts';\nimport {skipYields} from '../../../zql/src/ivm/operator.ts';\nimport type {ConnectionCostModel} from '../../../zql/src/planner/planner-connection.ts';\nimport type {PlanDebugger} from '../../../zql/src/planner/planner-debug.ts';\nimport type {Database} from '../../../zqlite/src/db.ts';\nimport {resolveSimpleScalarSubqueries} from '../../../zqlite/src/resolve-scalar-subqueries.ts';\nimport type {JWTAuth} from '../auth/auth.ts';\nimport {transformAndHashQuery} from '../auth/read-authorizer.ts';\nimport {computeZqlSpecs} from '../db/lite-tables.ts';\nimport type {LiteAndZqlSpec} from '../db/specs.ts';\nimport {hydrate} from './view-syncer/pipeline-driver.ts';\n\n/**\n * Maximum number of synced rows returned per table, and read rows returned\n * per table/query, when analyzing a query in zero-cache. Rows past this are\n * still counted. Keeping every row can exhaust the heap when analyzing queries\n * over large tables.\n */\nexport const MAX_ANALYZE_ROWS = 1000;\n\nexport type RunAstOptions = {\n  applyPermissions?: boolean | undefined;\n  auth?: JWTAuth | undefined;\n  clientToServerMapper?: NameMapper | undefined;\n  costModel?: ConnectionCostModel | undefined;\n  db: Database;\n  host: BuilderDelegate;\n  /**\n   * Maximum number of synced rows returned per table. Rows past this are still\n   * counted. Defaults to no limit.\n   */\n  maxSyncedRowsPerTable?: number | undefined;\n  permissions?: PermissionsConfig | undefined;\n  planDebugger?: PlanDebugger | undefined;\n  syncedRows?: boolean | undefined;\n  tableSpecs: Map<string, LiteAndZqlSpec>;\n  vendedRows?: boolean | undefined;\n};\n\nexport async function runAst(\n  lc: LogContext,\n  clientSchema: ClientSchema,\n  ast: AST,\n  isTransformed: boolean,\n  options: RunAstOptions,\n  yieldProcess: () => Promise<void>,\n): Promise<AnalyzeQueryResult> {\n  const {\n    clientToServerMapper,\n    permissions,\n    host,\n    db,\n    maxSyncedRowsPerTable = Infinity,\n  } = options;\n  const result: AnalyzeQueryResult = {\n    warnings: [],\n    syncedRows: undefined,\n    syncedRowCount: 0,\n    start: 0,\n    end: 0,\n    elapsed: 0,\n    afterPermissions: undefined,\n    readRows: undefined,\n    readRowCountsByQuery: {},\n    readRowCount: undefined,\n  };\n\n  if (!isTransformed) {\n    // map the AST to server names if not already transformed\n    ast = mapAST(ast, must(clientToServerMapper));\n  }\n  if (options.applyPermissions) {\n    const auth = options.auth;\n    if (!auth) {\n      result.warnings.push(\n        'No auth data provided. Permission rules will compare to `NULL` wherever an auth data field is referenced.',\n      );\n    }\n    ast = transformAndHashQuery(\n      lc,\n      'clientGroupIDForAnalyze',\n      ast,\n      must(permissions),\n      auth,\n      false,\n    ).transformedAst;\n    result.afterPermissions = await formatOutput(ast.table + astToZQL(ast));\n  }\n\n  // Resolve scalar subqueries (e.g. whereExists with {scalar: true}) to\n  // literal equality conditions so that SQLite can use indexes effectively.\n  // Without this, correlated subqueries get stripped from SQL filters and\n  // queries on large tables fall back to full table scans.\n  const executor = (\n    subqueryAST: AST,\n    childField: string,\n  ): LiteralValue | null | undefined => {\n    const input = buildPipeline(subqueryAST, host, 'scalar-subquery');\n    // Consume the full stream rather than using first() to avoid\n    // triggering early return on Take's #initialFetch assertion.\n    // The subquery AST already has limit: 1, so at most one row is produced.\n    let node: Node | undefined;\n    for (const n of skipYields(input.fetch({}))) {\n      node ??= n;\n    }\n    input.destroy();\n    return node ? ((node.row[childField] as LiteralValue) ?? null) : undefined;\n  };\n\n  const {ast: resolvedAst, ignoredScalarHints} = resolveSimpleScalarSubqueries(\n    ast,\n    options.tableSpecs,\n    executor,\n  );\n  for (const {table, uniqueKeys} of ignoredScalarHints) {\n    lc.warn?.(\n      `Ignoring {scalar: true} on the \"${table}\" subquery: it does not ` +\n        `constrain every column of any unique key ` +\n        `[${uniqueKeys.map(k => `(${k.join(', ')})`).join(', ')}] to a ` +\n        `literal with \"=\", so it is not provably limited to one row. ` +\n        `The gate runs as a plain EXISTS.`,\n    );\n  }\n\n  const pipeline = buildPipeline(\n    resolvedAst,\n    host,\n    'query-id',\n    options.costModel,\n    lc,\n    options.planDebugger,\n  );\n\n  const start = performance.now();\n\n  let syncedRowCount = 0;\n  const rowsByTable: Record<string, Row[]> = {};\n  // Dedupe on the row key rather than the whole row to bound memory.\n  const seen: Set<string> = new Set();\n  const truncatedTables: Set<string> = new Set();\n  for (const rowChange of hydrate(\n    pipeline,\n    hashOfAST(resolvedAst),\n    clientSchema,\n    computeZqlSpecs(lc, db, {includeBackfillingColumns: false}),\n  )) {\n    if (rowChange === 'yield') {\n      await yieldProcess();\n      continue;\n    }\n    assert(\n      rowChange.type === ChangeType.ADD,\n      'Hydration only handles add row changes',\n    );\n\n    // yield to other tasks to avoid blocking for too long\n    if (syncedRowCount % 10 === 0) {\n      await Promise.resolve();\n    }\n    if (syncedRowCount % 100 === 0) {\n      await sleep(1);\n    }\n\n    const key = JSON.stringify([rowChange.table, rowChange.rowKey]);\n    if (seen.has(key)) {\n      continue; // skip duplicates\n    }\n    syncedRowCount++;\n    seen.add(key);\n    if (options.syncedRows) {\n      const rows = (rowsByTable[rowChange.table] ??= []);\n      if (rows.length < maxSyncedRowsPerTable) {\n        rows.push(rowChange.row);\n      } else {\n        truncatedTables.add(rowChange.table);\n      }\n    }\n  }\n\n  const end = performance.now();\n  if (options.syncedRows) {\n    result.syncedRows = rowsByTable;\n    for (const table of truncatedTables) {\n      result.warnings.push(\n        `Only the first ${maxSyncedRowsPerTable} synced rows of \"${table}\" are included.`,\n      );\n    }\n  }\n  result.start = start;\n  result.end = end;\n  result.elapsed = end - start;\n\n  // Always include the count of synced and vended rows.\n  result.syncedRowCount = syncedRowCount;\n  result.readRowCountsByQuery = host.debug?.getVendedRowCounts() ?? {};\n  let readRowCount = 0;\n  for (const c of Object.values(result.readRowCountsByQuery)) {\n    for (const v of Object.values(c)) {\n      readRowCount += v;\n    }\n  }\n  result.readRowCount = readRowCount;\n  result.dbScansByQuery = host.debug?.getNVisitCounts() ?? {};\n  result.sqlitePlans = host.debug?.getSQLitePlans() ?? {};\n\n  if (options.vendedRows) {\n    const readRows = host.debug?.getVendedRows();\n    result.readRows = readRows;\n    for (const [table, byQuery] of Object.entries(readRows ?? {})) {\n      for (const [query, rows] of Object.entries(byQuery)) {\n        if ((result.readRowCountsByQuery[table]?.[query] ?? 0) > rows.length) {\n          result.warnings.push(\n            `Only the first ${rows.length} read rows of \"${table}\" are included for: ${query}`,\n          );\n        }\n      }\n    }\n  }\n  return result;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAuCA,IAAa,mBAAmB;AAqBhC,eAAsB,OACpB,IACA,cACA,KACA,eACA,SACA,cAC6B;CAC7B,MAAM,EACJ,sBACA,aACA,MACA,IACA,wBAAwB,aACtB;CACJ,MAAM,SAA6B;EACjC,UAAU,CAAC;EACX,YAAY,KAAA;EACZ,gBAAgB;EAChB,OAAO;EACP,KAAK;EACL,SAAS;EACT,kBAAkB,KAAA;EAClB,UAAU,KAAA;EACV,sBAAsB,CAAC;EACvB,cAAc,KAAA;CAChB;CAEA,IAAI,CAAC,eAEH,MAAM,OAAO,KAAK,KAAK,oBAAoB,CAAC;CAE9C,IAAI,QAAQ,kBAAkB;EAC5B,MAAM,OAAO,QAAQ;EACrB,IAAI,CAAC,MACH,OAAO,SAAS,KACd,2GACF;EAEF,MAAM,sBACJ,IACA,2BACA,KACA,KAAK,WAAW,GAChB,MACA,KACF,EAAE;EACF,OAAO,mBAAmB,MAAM,aAAa,IAAI,QAAQ,SAAS,GAAG,CAAC;CACxE;CAMA,MAAM,YACJ,aACA,eACoC;EACpC,MAAM,QAAQ,cAAc,aAAa,MAAM,iBAAiB;EAIhE,IAAI;EACJ,KAAK,MAAM,KAAK,WAAW,MAAM,MAAM,CAAC,CAAC,CAAC,GACxC,SAAS;EAEX,MAAM,QAAQ;EACd,OAAO,OAAS,KAAK,IAAI,eAAgC,OAAQ,KAAA;CACnE;CAEA,MAAM,EAAC,KAAK,aAAa,uBAAsB,8BAC7C,KACA,QAAQ,YACR,QACF;CACA,KAAK,MAAM,EAAC,OAAO,gBAAe,oBAChC,GAAG,OACD,mCAAmC,MAAM,oEAEnC,WAAW,KAAI,MAAK,IAAI,EAAE,KAAK,IAAI,EAAE,EAAE,EAAE,KAAK,IAAI,EAAE,oGAG5D;CAGF,MAAM,WAAW,cACf,aACA,MACA,YACA,QAAQ,WACR,IACA,QAAQ,YACV;CAEA,MAAM,QAAQ,YAAY,IAAI;CAE9B,IAAI,iBAAiB;CACrB,MAAM,cAAqC,CAAC;CAE5C,MAAM,uBAAoB,IAAI,IAAI;CAClC,MAAM,kCAA+B,IAAI,IAAI;CAC7C,KAAK,MAAM,aAAa,QACtB,UACA,UAAU,WAAW,GACrB,cACA,gBAAgB,IAAI,IAAI,EAAC,2BAA2B,MAAK,CAAC,CAC5D,GAAG;EACD,IAAI,cAAc,SAAS;GACzB,MAAM,aAAa;GACnB;EACF;EACA,OACE,UAAU,SAAS,GACnB,wCACF;EAGA,IAAI,iBAAiB,OAAO,GAC1B,MAAM,QAAQ,QAAQ;EAExB,IAAI,iBAAiB,QAAQ,GAC3B,MAAM,MAAM,CAAC;EAGf,MAAM,MAAM,KAAK,UAAU,CAAC,UAAU,OAAO,UAAU,MAAM,CAAC;EAC9D,IAAI,KAAK,IAAI,GAAG,GACd;EAEF;EACA,KAAK,IAAI,GAAG;EACZ,IAAI,QAAQ,YAAY;GACtB,MAAM,OAAQ,YAAY,UAAU,WAAW,CAAC;GAChD,IAAI,KAAK,SAAS,uBAChB,KAAK,KAAK,UAAU,GAAG;QAEvB,gBAAgB,IAAI,UAAU,KAAK;EAEvC;CACF;CAEA,MAAM,MAAM,YAAY,IAAI;CAC5B,IAAI,QAAQ,YAAY;EACtB,OAAO,aAAa;EACpB,KAAK,MAAM,SAAS,iBAClB,OAAO,SAAS,KACd,kBAAkB,sBAAsB,mBAAmB,MAAM,gBACnE;CAEJ;CACA,OAAO,QAAQ;CACf,OAAO,MAAM;CACb,OAAO,UAAU,MAAM;CAGvB,OAAO,iBAAiB;CACxB,OAAO,uBAAuB,KAAK,OAAO,mBAAmB,KAAK,CAAC;CACnE,IAAI,eAAe;CACnB,KAAK,MAAM,KAAK,OAAO,OAAO,OAAO,oBAAoB,GACvD,KAAK,MAAM,KAAK,OAAO,OAAO,CAAC,GAC7B,gBAAgB;CAGpB,OAAO,eAAe;CACtB,OAAO,iBAAiB,KAAK,OAAO,gBAAgB,KAAK,CAAC;CAC1D,OAAO,cAAc,KAAK,OAAO,eAAe,KAAK,CAAC;CAEtD,IAAI,QAAQ,YAAY;EACtB,MAAM,WAAW,KAAK,OAAO,cAAc;EAC3C,OAAO,WAAW;EAClB,KAAK,MAAM,CAAC,OAAO,YAAY,OAAO,QAAQ,YAAY,CAAC,CAAC,GAC1D,KAAK,MAAM,CAAC,OAAO,SAAS,OAAO,QAAQ,OAAO,GAChD,KAAK,OAAO,qBAAqB,SAAS,UAAU,KAAK,KAAK,QAC5D,OAAO,SAAS,KACd,kBAAkB,KAAK,OAAO,iBAAiB,MAAM,sBAAsB,OAC7E;CAIR;CACA,OAAO;AACT"}
+{"version":3,"file":"run-ast.js","names":[],"sources":["../../../../../zero-cache/src/services/run-ast.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\n// @circular-dep-ignore\nimport {astToZQL} from '../../../ast-to-zql/src/ast-to-zql.ts';\n// @circular-dep-ignore\nimport {formatOutput} from '../../../ast-to-zql/src/format.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {sleep} from '../../../shared/src/sleep.ts';\nimport type {AnalyzeQueryResult} from '../../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST, LiteralValue} from '../../../zero-protocol/src/ast.ts';\nimport {mapAST} from '../../../zero-protocol/src/ast.ts';\nimport type {ClientSchema} from '../../../zero-protocol/src/client-schema.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport {hashOfAST} from '../../../zero-protocol/src/query-hash.ts';\nimport type {PermissionsConfig} from '../../../zero-schema/src/compiled-permissions.ts';\nimport type {NameMapper} from '../../../zero-schema/src/name-mapper.ts';\nimport {\n  buildPipeline,\n  type BuilderDelegate,\n} from '../../../zql/src/builder/builder.ts';\nimport {ChangeType} from '../../../zql/src/ivm/change-type.ts';\nimport type {Node} from '../../../zql/src/ivm/data.ts';\nimport {skipYields} from '../../../zql/src/ivm/operator.ts';\nimport type {ConnectionCostModel} from '../../../zql/src/planner/planner-connection.ts';\nimport type {PlanDebugger} from '../../../zql/src/planner/planner-debug.ts';\nimport type {Database} from '../../../zqlite/src/db.ts';\nimport {resolveSimpleScalarSubqueries} from '../../../zqlite/src/resolve-scalar-subqueries.ts';\nimport type {JWTAuth} from '../auth/auth.ts';\nimport {transformAndHashQuery} from '../auth/read-authorizer.ts';\nimport {computeZqlSpecs} from '../db/lite-tables.ts';\nimport type {LiteAndZqlSpec} from '../db/specs.ts';\nimport {hydrate} from './view-syncer/pipeline-driver.ts';\n\nexport type RunAstOptions = {\n  applyPermissions?: boolean | undefined;\n  auth?: JWTAuth | undefined;\n  clientToServerMapper?: NameMapper | undefined;\n  costModel?: ConnectionCostModel | undefined;\n  db: Database;\n  host: BuilderDelegate;\n  permissions?: PermissionsConfig | undefined;\n  planDebugger?: PlanDebugger | undefined;\n  syncedRows?: boolean | undefined;\n  tableSpecs: Map<string, LiteAndZqlSpec>;\n  vendedRows?: boolean | undefined;\n};\n\nexport async function runAst(\n  lc: LogContext,\n  clientSchema: ClientSchema,\n  ast: AST,\n  isTransformed: boolean,\n  options: RunAstOptions,\n  yieldProcess: () => Promise<void>,\n): Promise<AnalyzeQueryResult> {\n  const {clientToServerMapper, permissions, host, db} = options;\n  const result: AnalyzeQueryResult = {\n    warnings: [],\n    syncedRows: undefined,\n    syncedRowCount: 0,\n    start: 0,\n    end: 0,\n    elapsed: 0,\n    afterPermissions: undefined,\n    readRows: undefined,\n    readRowCountsByQuery: {},\n    readRowCount: undefined,\n  };\n\n  if (!isTransformed) {\n    // map the AST to server names if not already transformed\n    ast = mapAST(ast, must(clientToServerMapper));\n  }\n  if (options.applyPermissions) {\n    const auth = options.auth;\n    if (!auth) {\n      result.warnings.push(\n        'No auth data provided. Permission rules will compare to `NULL` wherever an auth data field is referenced.',\n      );\n    }\n    ast = transformAndHashQuery(\n      lc,\n      'clientGroupIDForAnalyze',\n      ast,\n      must(permissions),\n      auth,\n      false,\n    ).transformedAst;\n    result.afterPermissions = await formatOutput(ast.table + astToZQL(ast));\n  }\n\n  // Resolve scalar subqueries (e.g. whereExists with {scalar: true}) to\n  // literal equality conditions so that SQLite can use indexes effectively.\n  // Without this, correlated subqueries get stripped from SQL filters and\n  // queries on large tables fall back to full table scans.\n  const executor = (\n    subqueryAST: AST,\n    childField: string,\n  ): LiteralValue | null | undefined => {\n    const input = buildPipeline(subqueryAST, host, 'scalar-subquery');\n    // Consume the full stream rather than using first() to avoid\n    // triggering early return on Take's #initialFetch assertion.\n    // The subquery AST already has limit: 1, so at most one row is produced.\n    let node: Node | undefined;\n    for (const n of skipYields(input.fetch({}))) {\n      node ??= n;\n    }\n    input.destroy();\n    return node ? ((node.row[childField] as LiteralValue) ?? null) : undefined;\n  };\n\n  const {ast: resolvedAst, ignoredScalarHints} = resolveSimpleScalarSubqueries(\n    ast,\n    options.tableSpecs,\n    executor,\n  );\n  for (const {table, uniqueKeys} of ignoredScalarHints) {\n    lc.warn?.(\n      `Ignoring {scalar: true} on the \"${table}\" subquery: it does not ` +\n        `constrain every column of any unique key ` +\n        `[${uniqueKeys.map(k => `(${k.join(', ')})`).join(', ')}] to a ` +\n        `literal with \"=\", so it is not provably limited to one row. ` +\n        `The gate runs as a plain EXISTS.`,\n    );\n  }\n\n  const pipeline = buildPipeline(\n    resolvedAst,\n    host,\n    'query-id',\n    options.costModel,\n    lc,\n    options.planDebugger,\n  );\n\n  const start = performance.now();\n\n  let syncedRowCount = 0;\n  const rowsByTable: Record<string, Row[]> = {};\n  const seenByTable: Set<string> = new Set();\n  for (const rowChange of hydrate(\n    pipeline,\n    hashOfAST(resolvedAst),\n    clientSchema,\n    computeZqlSpecs(lc, db, {includeBackfillingColumns: false}),\n  )) {\n    if (rowChange === 'yield') {\n      await yieldProcess();\n      continue;\n    }\n    assert(\n      rowChange.type === ChangeType.ADD,\n      'Hydration only handles add row changes',\n    );\n\n    // yield to other tasks to avoid blocking for too long\n    if (syncedRowCount % 10 === 0) {\n      await Promise.resolve();\n    }\n    if (syncedRowCount % 100 === 0) {\n      await sleep(1);\n    }\n\n    let rows: Row[] = rowsByTable[rowChange.table];\n    const s = rowChange.table + '.' + JSON.stringify(rowChange.row);\n    if (seenByTable.has(s)) {\n      continue; // skip duplicates\n    }\n    syncedRowCount++;\n    seenByTable.add(s);\n    if (options.syncedRows) {\n      if (!rows) {\n        rows = [];\n        rowsByTable[rowChange.table] = rows;\n      }\n      rows.push(rowChange.row);\n    }\n  }\n\n  const end = performance.now();\n  if (options.syncedRows) {\n    result.syncedRows = rowsByTable;\n  }\n  result.start = start;\n  result.end = end;\n  result.elapsed = end - start;\n\n  // Always include the count of synced and vended rows.\n  result.syncedRowCount = syncedRowCount;\n  result.readRowCountsByQuery = host.debug?.getVendedRowCounts() ?? {};\n  let readRowCount = 0;\n  for (const c of Object.values(result.readRowCountsByQuery)) {\n    for (const v of Object.values(c)) {\n      readRowCount += v;\n    }\n  }\n  result.readRowCount = readRowCount;\n  result.dbScansByQuery = host.debug?.getNVisitCounts() ?? {};\n  result.sqlitePlans = host.debug?.getSQLitePlans() ?? {};\n\n  if (options.vendedRows) {\n    result.readRows = host.debug?.getVendedRows();\n  }\n  return result;\n}\n"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAE1C;;;GAGG;AACH,qBAAa,aAAa,CAAC,CAAC,SAAS,OAAO;;gBAOxC,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC,EAC1B,OAAO,GAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,OAAoB;IAOhD;;;OAGG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC;IA6BzB,IAAI,IAAI,WAEP;IAED,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC;CAG3B"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAE1C;;;GAGG;AACH,qBAAa,aAAa,CAAC,CAAC,SAAS,OAAO;;gBAOxC,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,CAAC,EAC1B,OAAO,GAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,OAAoB;IAOhD;;;OAGG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC;IAqBzB,IAAI,IAAI,WAEP;IAED,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC;CAG3B"}

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

@@ -23,7 +23,7 @@ var ServiceRunner = class {
 		const service = this.#create(id);
 		this.#instances.set(id, service);
 		service.run().catch((e) => this.#lc.error?.(`Error running ${service.constructor?.name} ${service.id}`, e)).finally(() => {
-			if (this.#instances.get(id) === service) this.#instances.delete(id);
+			this.#instances.delete(id);
 		});
 		return service;
 	}

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

@@ -1 +1 @@
-{"version":3,"file":"runner.js","names":["#lc","#instances","#create","#isValid"],"sources":["../../../../../zero-cache/src/services/runner.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {Service} from './service.ts';\n\n/**\n * Manages the creation and lifecycle of objects that implement\n * {@link Service}.\n */\nexport class ServiceRunner<S extends Service> {\n  readonly #lc: LogContext;\n  readonly #instances = new Map<string, S>();\n  readonly #create: (id: string) => S;\n  readonly #isValid: (existing: S) => boolean;\n\n  constructor(\n    lc: LogContext,\n    factory: (id: string) => S,\n    isValid: (existing: S) => boolean = () => true,\n  ) {\n    this.#lc = lc;\n    this.#create = factory;\n    this.#isValid = isValid;\n  }\n\n  /**\n   * Creates and runs the Service with the given `id`, returning\n   * an existing one if it is still running a valid.\n   */\n  getService(id: string): S {\n    const existing = this.#instances.get(id);\n    if (existing && this.#isValid(existing)) {\n      return existing;\n    }\n    const service = this.#create(id);\n    this.#instances.set(id, service);\n    void service\n      .run()\n      .catch(e =>\n        this.#lc.error?.(\n          `Error running ${service.constructor?.name} ${service.id}`,\n          e,\n        ),\n      )\n      .finally(() => {\n        // Only remove the instance that just finished. If it was already\n        // replaced (e.g. because it became invalid and a new instance was\n        // created under the same id while it was still shutting down), the\n        // replacement must stay tracked; otherwise the next getService()\n        // would spawn a duplicate and the untracked one would never be\n        // stopped by this runner.\n        if (this.#instances.get(id) === service) {\n          this.#instances.delete(id);\n        }\n      });\n    return service;\n  }\n\n  get size() {\n    return this.#instances.size;\n  }\n\n  getServices(): Iterable<S> {\n    return this.#instances.values();\n  }\n}\n"],"mappings":";;;;;AAOA,IAAa,gBAAb,MAA8C;CAC5C;CACA,6BAAsB,IAAI,IAAe;CACzC;CACA;CAEA,YACE,IACA,SACA,gBAA0C,MAC1C;EACA,KAAKA,MAAM;EACX,KAAKE,UAAU;EACf,KAAKC,WAAW;CAClB;;;;;CAMA,WAAW,IAAe;EACxB,MAAM,WAAW,KAAKF,WAAW,IAAI,EAAE;EACvC,IAAI,YAAY,KAAKE,SAAS,QAAQ,GACpC,OAAO;EAET,MAAM,UAAU,KAAKD,QAAQ,EAAE;EAC/B,KAAKD,WAAW,IAAI,IAAI,OAAO;EAC/B,QACG,IAAI,EACJ,OAAM,MACL,KAAKD,IAAI,QACP,iBAAiB,QAAQ,aAAa,KAAK,GAAG,QAAQ,MACtD,CACF,CACF,EACC,cAAc;GAOb,IAAI,KAAKC,WAAW,IAAI,EAAE,MAAM,SAC9B,KAAKA,WAAW,OAAO,EAAE;EAE7B,CAAC;EACH,OAAO;CACT;CAEA,IAAI,OAAO;EACT,OAAO,KAAKA,WAAW;CACzB;CAEA,cAA2B;EACzB,OAAO,KAAKA,WAAW,OAAO;CAChC;AACF"}
+{"version":3,"file":"runner.js","names":["#lc","#instances","#create","#isValid"],"sources":["../../../../../zero-cache/src/services/runner.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {Service} from './service.ts';\n\n/**\n * Manages the creation and lifecycle of objects that implement\n * {@link Service}.\n */\nexport class ServiceRunner<S extends Service> {\n  readonly #lc: LogContext;\n  readonly #instances = new Map<string, S>();\n  readonly #create: (id: string) => S;\n  readonly #isValid: (existing: S) => boolean;\n\n  constructor(\n    lc: LogContext,\n    factory: (id: string) => S,\n    isValid: (existing: S) => boolean = () => true,\n  ) {\n    this.#lc = lc;\n    this.#create = factory;\n    this.#isValid = isValid;\n  }\n\n  /**\n   * Creates and runs the Service with the given `id`, returning\n   * an existing one if it is still running a valid.\n   */\n  getService(id: string): S {\n    const existing = this.#instances.get(id);\n    if (existing && this.#isValid(existing)) {\n      return existing;\n    }\n    const service = this.#create(id);\n    this.#instances.set(id, service);\n    void service\n      .run()\n      .catch(e =>\n        this.#lc.error?.(\n          `Error running ${service.constructor?.name} ${service.id}`,\n          e,\n        ),\n      )\n      .finally(() => {\n        this.#instances.delete(id);\n      });\n    return service;\n  }\n\n  get size() {\n    return this.#instances.size;\n  }\n\n  getServices(): Iterable<S> {\n    return this.#instances.values();\n  }\n}\n"],"mappings":";;;;;AAOA,IAAa,gBAAb,MAA8C;CAC5C;CACA,6BAAsB,IAAI,IAAe;CACzC;CACA;CAEA,YACE,IACA,SACA,gBAA0C,MAC1C;EACA,KAAKA,MAAM;EACX,KAAKE,UAAU;EACf,KAAKC,WAAW;CAClB;;;;;CAMA,WAAW,IAAe;EACxB,MAAM,WAAW,KAAKF,WAAW,IAAI,EAAE;EACvC,IAAI,YAAY,KAAKE,SAAS,QAAQ,GACpC,OAAO;EAET,MAAM,UAAU,KAAKD,QAAQ,EAAE;EAC/B,KAAKD,WAAW,IAAI,IAAI,OAAO;EAC/B,QACG,IAAI,EACJ,OAAM,MACL,KAAKD,IAAI,QACP,iBAAiB,QAAQ,aAAa,KAAK,GAAG,QAAQ,MACtD,CACF,CACF,EACC,cAAc;GACb,KAAKC,WAAW,OAAO,EAAE;EAC3B,CAAC;EACH,OAAO;CACT;CAEA,IAAI,OAAO;EACT,OAAO,KAAKA,WAAW;CACzB;CAEA,cAA2B;EACzB,OAAO,KAAKA,WAAW,OAAO;CAChC;AACF"}

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

@@ -113,7 +113,6 @@ export type RowSetSignatureProvider = (queryID: string) => bigint | undefined;
  *
  * * {@link trackQueries} for queries that are being executed or removed.
  * * {@link received} for all rows received from the executed queries
- * * {@link removeTrackedQueries} for optional queries that did not execute
  * * {@link deleteUnreferencedRows} to remove any rows that have
  *       fallen out of the query result view.
  * * {@link flush}
@@ -154,36 +153,6 @@ export declare class CVRQueryDrivenUpdater extends CVRUpdater {
         newVersion: CVRVersion;
         queryPatches: PatchToVersion[];
     };
-    /**
-     * Converts queries that were tracked as executed into normal query
-     * removals. This is used when a hydration budget expires after
-     * `trackQueries()` has established the final poke version but before an
-     * optional query starts hydration.
-     *
-     * The query ID remains in `#removedOrExecutedQueryIDs`, so its row
-     * references are dropped by {@link deleteUnreferencedRows} exactly as they
-     * would be for a query removed up front. Never un-track a query here: rows
-     * already flushed by {@link received} have had its refCounts stripped and
-     * cannot be restored.
-     */
-    removeTrackedQueries(queryIDs: Iterable<string>): PatchToVersion[];
-    /**
-     * Aborts queries that were tracked as executed but whose hydration was cut
-     * short (see the view-syncer's hydration circuit breaker).
-     *
-     * Rows received for an aborted query in this update have that query's
-     * references stripped: a row left with no references is deleted, and the
-     * 'del' patch cancels the 'put' the client has already received, while a
-     * row still referenced by other queries keeps its patch version. The query
-     * is then removed from the CVR. It stays tracked as executed, so
-     * {@link deleteUnreferencedRows} also drops the references held by rows that
-     * were synced for it before this update, exactly as for a removed query.
-     *
-     * Like {@link removeTrackedQueries}, this must be called after
-     * {@link trackQueries} has established the final version, and after all
-     * rows of the aborted queries have been {@link received}.
-     */
-    abortExecutedQueries(lc: LogContext, queryIDs: readonly string[]): Promise<PatchToVersion[]>;
     updatedVersion(): CVRVersion;
     /**
      * Public alias for {@link _ensureNewVersion}. Forces a `configVersion` bump
@@ -229,20 +198,6 @@ export declare function getInactiveQueries(cvr: CVR): {
     inactivatedAt: TTLClock;
     ttl: number;
 }[];
-export type HydrationQueryGroups<T extends QueryRecord = QueryRecord> = {
-    required: T[];
-    /**
-     * Never contains an internal query: those are always required, so callers
-     * can rely on `patchVersion` being present on the type.
-     */
-    optional: Exclude<T, InternalQueryRecord>[];
-};
-/**
- * Splits hydration candidates into required and optional queries. Optional
- * queries are ordered from latest to earliest effective expiration; an
- * ownerless query has the lowest priority.
- */
-export declare function classifyQueriesForHydration<T extends QueryRecord>(queries: Iterable<T>): HydrationQueryGroups<T>;
 export declare function nextEvictionTime(cvr: CVR): TTLClock | undefined;
 export {};
 //# sourceMappingURL=cvr.d.ts.map

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

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

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

@@ -310,7 +310,6 @@ var CVRConfigDrivenUpdater = class extends CVRUpdater {
 *
 * * {@link trackQueries} for queries that are being executed or removed.
 * * {@link received} for all rows received from the executed queries
-* * {@link removeTrackedQueries} for optional queries that did not execute
 * * {@link deleteUnreferencedRows} to remove any rows that have
 *       fallen out of the query result view.
 * * {@link flush}
@@ -321,7 +320,6 @@ var CVRConfigDrivenUpdater = class extends CVRUpdater {
 */
 var CVRQueryDrivenUpdater = class extends CVRUpdater {
 	#removedOrExecutedQueryIDs = /* @__PURE__ */ new Set();
-	#executedQueryIDs = /* @__PURE__ */ new Set();
 	#receivedRows = new CustomKeyMap(rowIDString);
 	#lastPatches = new CustomKeyMap(rowIDString);
 	#rowSetSignature;
@@ -398,7 +396,6 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 		return startSpan(tracer, "CVRQueryDrivenUpdater.#trackExecuted", () => {
 			assert(!this.#removedOrExecutedQueryIDs.has(queryID), () => `Query ${queryID} already tracked as executed or removed`);
 			this.#removedOrExecutedQueryIDs.add(queryID);
-			this.#executedQueryIDs.add(queryID);
 			let gotQueryPatch;
 			const query = this._cvr.queries[queryID];
 			if (query.transformationHash !== transformationHash) {
@@ -419,101 +416,6 @@ var CVRQueryDrivenUpdater = class extends CVRUpdater {
 		});
 	}
 	/**
-	* Converts queries that were tracked as executed into normal query
-	* removals. This is used when a hydration budget expires after
-	* `trackQueries()` has established the final poke version but before an
-	* optional query starts hydration.
-	*
-	* The query ID remains in `#removedOrExecutedQueryIDs`, so its row
-	* references are dropped by {@link deleteUnreferencedRows} exactly as they
-	* would be for a query removed up front. Never un-track a query here: rows
-	* already flushed by {@link received} have had its refCounts stripped and
-	* cannot be restored.
-	*/
-	removeTrackedQueries(queryIDs) {
-		assert(this.#existingRows !== void 0, "trackQueries() was not called");
-		assert(cmpVersions(this._orig.version, this._cvr.version) < 0, "A final CVR version must be set before removing tracked queries");
-		const patches = [];
-		for (const queryID of queryIDs) {
-			assert(this.#executedQueryIDs.has(queryID), () => `Query ${queryID} was not tracked as executed`);
-			const query = must(this._cvr.queries[queryID]);
-			assertNotInternal(query);
-			assert(Object.values(query.clientState).every(({ inactivatedAt }) => inactivatedAt !== void 0), () => `Query ${queryID} is active`);
-			assert(query.patchVersion !== void 0, `Query ${queryID} is not gotten`);
-			delete this._cvr.queries[queryID];
-			const patch = {
-				type: "query",
-				op: "del",
-				id: queryID
-			};
-			this._cvrStore.markQueryAsDeleted(this._cvr.version, patch);
-			patches.push({
-				patch,
-				toVersion: this._cvr.version
-			});
-		}
-		return patches;
-	}
-	/**
-	* Aborts queries that were tracked as executed but whose hydration was cut
-	* short (see the view-syncer's hydration circuit breaker).
-	*
-	* Rows received for an aborted query in this update have that query's
-	* references stripped: a row left with no references is deleted, and the
-	* 'del' patch cancels the 'put' the client has already received, while a
-	* row still referenced by other queries keeps its patch version. The query
-	* is then removed from the CVR. It stays tracked as executed, so
-	* {@link deleteUnreferencedRows} also drops the references held by rows that
-	* were synced for it before this update, exactly as for a removed query.
-	*
-	* Like {@link removeTrackedQueries}, this must be called after
-	* {@link trackQueries} has established the final version, and after all
-	* rows of the aborted queries have been {@link received}.
-	*/
-	async abortExecutedQueries(lc, queryIDs) {
-		assert(this.#existingRows !== void 0, "trackQueries() was not called");
-		assert(cmpVersions(this._orig.version, this._cvr.version) < 0, "A final CVR version must be set before aborting executed queries");
-		const aborted = new Set(queryIDs);
-		for (const queryID of aborted) {
-			assert(this.#executedQueryIDs.has(queryID), `Query ${queryID} was not tracked as executed`);
-			assertNotInternal(must(this._cvr.queries[queryID]));
-		}
-		const existingRows = await this._cvrStore.getRowRecords();
-		const unrefs = new CustomKeyMap(rowIDString);
-		for (const [id, refCounts] of this.#receivedRows) {
-			if (refCounts === null) continue;
-			let unref;
-			for (const queryID of aborted) {
-				const count = refCounts[queryID];
-				if (!count) continue;
-				if (!unref) {
-					const version = this.#lastPatches.get(id)?.rowVersion ?? existingRows.get(id)?.rowVersion;
-					unref = {
-						refCounts: {},
-						...version && { version }
-					};
-					unrefs.set(id, unref);
-				}
-				unref.refCounts[queryID] = -count;
-			}
-		}
-		const patches = unrefs.size > 0 ? await this.received(lc, unrefs) : [];
-		for (const queryID of aborted) {
-			delete this._cvr.queries[queryID];
-			const patch = {
-				type: "query",
-				op: "del",
-				id: queryID
-			};
-			this._cvrStore.markQueryAsDeleted(this._cvr.version, patch);
-			patches.push({
-				patch,
-				toVersion: this._cvr.version
-			});
-		}
-		return patches;
-	}
-	/**
 	* Tracks a query removed from the "gotten" set. In addition to producing the
 	* appropriate patches for deleting the query, the removed query is taken into
 	* account when computing the final row records in
@@ -751,40 +653,6 @@ function getInactiveQueries(cvr) {
 		return ttlClockAsNumber(a.inactivatedAt) + a.ttl - ttlClockAsNumber(b.inactivatedAt) - b.ttl;
 	});
 }
-/**
-* Splits hydration candidates into required and optional queries. Optional
-* queries are ordered from latest to earliest effective expiration; an
-* ownerless query has the lowest priority.
-*/
-function classifyQueriesForHydration(queries) {
-	const required = [];
-	const optionalWithExpiration = [];
-	for (const query of queries) {
-		if (query.type === "internal" || Object.values(query.clientState).some((state) => state.inactivatedAt === void 0)) {
-			required.push(query);
-			continue;
-		}
-		let expiration;
-		for (const { inactivatedAt, ttl } of Object.values(query.clientState)) {
-			assert(inactivatedAt !== void 0, "inactive query has active client");
-			const clientExpiration = ttlClockAsNumber(inactivatedAt) + clampTTL(ttl);
-			expiration = Math.max(expiration ?? -Infinity, clientExpiration);
-		}
-		optionalWithExpiration.push({
-			query,
-			expiration
-		});
-	}
-	optionalWithExpiration.sort((a, b) => {
-		if (a.expiration === void 0) return b.expiration === void 0 ? 0 : 1;
-		if (b.expiration === void 0) return -1;
-		return b.expiration - a.expiration;
-	});
-	return {
-		required,
-		optional: optionalWithExpiration.map(({ query }) => query)
-	};
-}
 function nextEvictionTime(cvr) {
 	let next;
 	for (const { inactivatedAt, ttl } of getInactiveQueries(cvr)) {
@@ -813,6 +681,6 @@ function newQueryRecord(id, ast, name, args) {
 	};
 }
 //#endregion
-export { CVRConfigDrivenUpdater, CVRQueryDrivenUpdater, classifyQueriesForHydration, nextEvictionTime };
+export { CVRConfigDrivenUpdater, CVRQueryDrivenUpdater, nextEvictionTime };
 
 //# sourceMappingURL=cvr.js.map