@rocicorp/zero 0.25.0-canary.18 → 0.25.0-canary.21

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

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

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

@@ -54,7 +54,7 @@ import { computeZqlSpecs, mustGetTableSpec } from "../db/lite-tables.js";
 import { runAst } from "./run-ast.js";
 import { TimeSliceTimer } from "./view-syncer/view-syncer.js";
 const TIME_SLICE_LAP_THRESHOLD_MS = 200;
-async function analyzeQuery(lc, config, clientSchema, ast, syncedRows = true, vendedRows = false, permissions, authData, plannerDebug = false) {
+async function analyzeQuery(lc, config, clientSchema, ast, syncedRows = true, vendedRows = false, permissions, authData, joinPlans = false) {
   var _stack = [];
   try {
     const db = __using(_stack, new Database(lc, config.replica.file));
@@ -62,8 +62,8 @@ async function analyzeQuery(lc, config, clientSchema, ast, syncedRows = true, ve
     const tableSpecs = /* @__PURE__ */ new Map();
     const tables = /* @__PURE__ */ new Map();
     computeZqlSpecs(lc, db, tableSpecs, fullTables);
-    const planDebugger = plannerDebug ? new AccumulatorDebugger() : void 0;
-    const costModel = plannerDebug ? createSQLiteCostModel(db, tableSpecs) : void 0;
+    const planDebugger = joinPlans ? new AccumulatorDebugger() : void 0;
+    const costModel = joinPlans ? createSQLiteCostModel(db, tableSpecs) : void 0;
     const timer = await new TimeSliceTimer().start();
     const shouldYield = () => timer.elapsedLap() > TIME_SLICE_LAP_THRESHOLD_MS;
     const yieldProcess = () => timer.yieldProcess();
@@ -113,9 +113,9 @@ async function analyzeQuery(lc, config, clientSchema, ast, syncedRows = true, ve
       },
       yieldProcess
     );
-    result.plans = explainQueries(result.readRowCountsByQuery ?? {}, db);
+    result.sqlitePlans = explainQueries(result.readRowCountsByQuery ?? {}, db);
     if (planDebugger) {
-      result.plannerEvents = serializePlanDebugEvents(planDebugger.events);
+      result.joinPlans = serializePlanDebugEvents(planDebugger.events);
     }
     return result;
   } catch (_) {

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

@@ -1 +1 @@
-{"version":3,"file":"analyze.js","sources":["../../../../../zero-cache/src/services/analyze.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {AnalyzeQueryResult} from '../../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {PermissionsConfig} from '../../../zero-schema/src/compiled-permissions.ts';\nimport {Debug} from '../../../zql/src/builder/debug-delegate.ts';\nimport {MemoryStorage} from '../../../zql/src/ivm/memory-storage.ts';\nimport {\n  AccumulatorDebugger,\n  serializePlanDebugEvents,\n} from '../../../zql/src/planner/planner-debug.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\nimport {explainQueries} from '../../../zqlite/src/explain-queries.ts';\nimport {createSQLiteCostModel} from '../../../zqlite/src/sqlite-cost-model.ts';\nimport {TableSource} from '../../../zqlite/src/table-source.ts';\nimport type {NormalizedZeroConfig} from '../config/normalize.ts';\nimport {computeZqlSpecs, mustGetTableSpec} from '../db/lite-tables.ts';\nimport type {LiteAndZqlSpec, LiteTableSpec} from '../db/specs.ts';\nimport {runAst} from './run-ast.ts';\nimport {TimeSliceTimer, type TokenData} from './view-syncer/view-syncer.ts';\nimport type {ClientSchema} from '../../../zero-protocol/src/client-schema.ts';\n\nconst TIME_SLICE_LAP_THRESHOLD_MS = 200;\n\nexport async function analyzeQuery(\n  lc: LogContext,\n  config: NormalizedZeroConfig,\n  clientSchema: ClientSchema,\n  ast: AST,\n  syncedRows = true,\n  vendedRows = false,\n  permissions?: PermissionsConfig,\n  authData?: TokenData,\n  plannerDebug = false,\n): Promise<AnalyzeQueryResult> {\n  using db = new Database(lc, config.replica.file);\n  const fullTables = new Map<string, LiteTableSpec>();\n  const tableSpecs = new Map<string, LiteAndZqlSpec>();\n  const tables = new Map<string, TableSource>();\n\n  computeZqlSpecs(lc, db, tableSpecs, fullTables);\n\n  const planDebugger = plannerDebug ? new AccumulatorDebugger() : undefined;\n  const costModel = plannerDebug\n    ? createSQLiteCostModel(db, tableSpecs)\n    : undefined;\n  const timer = await new TimeSliceTimer().start();\n  const shouldYield = () => timer.elapsedLap() > TIME_SLICE_LAP_THRESHOLD_MS;\n  const yieldProcess = () => timer.yieldProcess();\n  const result = await runAst(\n    lc,\n    clientSchema,\n    ast,\n    true,\n    {\n      applyPermissions: permissions !== undefined,\n      syncedRows,\n      vendedRows,\n      authData,\n      db,\n      tableSpecs,\n      permissions,\n      costModel,\n      planDebugger,\n      host: {\n        debug: new Debug(),\n        getSource(tableName: string) {\n          let source = tables.get(tableName);\n          if (source) {\n            return source;\n          }\n\n          const tableSpec = mustGetTableSpec(tableSpecs, tableName);\n          const {primaryKey} = tableSpec.tableSpec;\n\n          source = new TableSource(\n            lc,\n            config.log,\n            db,\n            tableName,\n            tableSpec.zqlSpec,\n            primaryKey,\n            shouldYield,\n          );\n          tables.set(tableName, source);\n          return source;\n        },\n        createStorage() {\n          return new MemoryStorage();\n        },\n        decorateSourceInput: input => input,\n        decorateInput: input => input,\n        addEdge() {},\n        decorateFilterInput: input => input,\n      },\n    },\n    yieldProcess,\n  );\n\n  result.plans = explainQueries(result.readRowCountsByQuery ?? {}, db);\n\n  if (planDebugger) {\n    result.plannerEvents = serializePlanDebugEvents(planDebugger.events);\n  }\n\n  return result;\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,MAAM,8BAA8B;AAEpC,eAAsB,aACpB,IACA,QACA,cACA,KACA,aAAa,MACb,aAAa,OACb,aACA,UACA,eAAe,OACc;AAC7B;AAAA;AAAA,UAAM,KAAK,oBAAI,SAAS,IAAI,OAAO,QAAQ,IAAI;AAC/C,UAAM,iCAAiB,IAAA;AACvB,UAAM,iCAAiB,IAAA;AACvB,UAAM,6BAAa,IAAA;AAEnB,oBAAgB,IAAI,IAAI,YAAY,UAAU;AAE9C,UAAM,eAAe,eAAe,IAAI,oBAAA,IAAwB;AAChE,UAAM,YAAY,eACd,sBAAsB,IAAI,UAAU,IACpC;AACJ,UAAM,QAAQ,MAAM,IAAI,eAAA,EAAiB,MAAA;AACzC,UAAM,cAAc,MAAM,MAAM,WAAA,IAAe;AAC/C,UAAM,eAAe,MAAM,MAAM,aAAA;AACjC,UAAM,SAAS,MAAM;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,QACE,kBAAkB,gBAAgB;AAAA,QAClC;AAAA,QACA;AAAA,QACA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,MAAM;AAAA,UACJ,OAAO,IAAI,MAAA;AAAA,UACX,UAAU,WAAmB;AAC3B,gBAAI,SAAS,OAAO,IAAI,SAAS;AACjC,gBAAI,QAAQ;AACV,qBAAO;AAAA,YACT;AAEA,kBAAM,YAAY,iBAAiB,YAAY,SAAS;AACxD,kBAAM,EAAC,eAAc,UAAU;AAE/B,qBAAS,IAAI;AAAA,cACX;AAAA,cACA,OAAO;AAAA,cACP;AAAA,cACA;AAAA,cACA,UAAU;AAAA,cACV;AAAA,cACA;AAAA,YAAA;AAEF,mBAAO,IAAI,WAAW,MAAM;AAC5B,mBAAO;AAAA,UACT;AAAA,UACA,gBAAgB;AACd,mBAAO,IAAI,cAAA;AAAA,UACb;AAAA,UACA,qBAAqB,CAAA,UAAS;AAAA,UAC9B,eAAe,CAAA,UAAS;AAAA,UACxB,UAAU;AAAA,UAAC;AAAA,UACX,qBAAqB,CAAA,UAAS;AAAA,QAAA;AAAA,MAChC;AAAA,MAEF;AAAA,IAAA;AAGF,WAAO,QAAQ,eAAe,OAAO,wBAAwB,CAAA,GAAI,EAAE;AAEnE,QAAI,cAAc;AAChB,aAAO,gBAAgB,yBAAyB,aAAa,MAAM;AAAA,IACrE;AAEA,WAAO;AAAA,WAtEP;AAAA;AAAA;AAAA;AAAA;AAuEF;"}
+{"version":3,"file":"analyze.js","sources":["../../../../../zero-cache/src/services/analyze.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {AnalyzeQueryResult} from '../../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {PermissionsConfig} from '../../../zero-schema/src/compiled-permissions.ts';\nimport {Debug} from '../../../zql/src/builder/debug-delegate.ts';\nimport {MemoryStorage} from '../../../zql/src/ivm/memory-storage.ts';\nimport {\n  AccumulatorDebugger,\n  serializePlanDebugEvents,\n} from '../../../zql/src/planner/planner-debug.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\nimport {explainQueries} from '../../../zqlite/src/explain-queries.ts';\nimport {createSQLiteCostModel} from '../../../zqlite/src/sqlite-cost-model.ts';\nimport {TableSource} from '../../../zqlite/src/table-source.ts';\nimport type {NormalizedZeroConfig} from '../config/normalize.ts';\nimport {computeZqlSpecs, mustGetTableSpec} from '../db/lite-tables.ts';\nimport type {LiteAndZqlSpec, LiteTableSpec} from '../db/specs.ts';\nimport {runAst} from './run-ast.ts';\nimport {TimeSliceTimer, type TokenData} from './view-syncer/view-syncer.ts';\nimport type {ClientSchema} from '../../../zero-protocol/src/client-schema.ts';\n\nconst TIME_SLICE_LAP_THRESHOLD_MS = 200;\n\nexport async function analyzeQuery(\n  lc: LogContext,\n  config: NormalizedZeroConfig,\n  clientSchema: ClientSchema,\n  ast: AST,\n  syncedRows = true,\n  vendedRows = false,\n  permissions?: PermissionsConfig,\n  authData?: TokenData,\n  joinPlans = false,\n): Promise<AnalyzeQueryResult> {\n  using db = new Database(lc, config.replica.file);\n  const fullTables = new Map<string, LiteTableSpec>();\n  const tableSpecs = new Map<string, LiteAndZqlSpec>();\n  const tables = new Map<string, TableSource>();\n\n  computeZqlSpecs(lc, db, tableSpecs, fullTables);\n\n  const planDebugger = joinPlans ? new AccumulatorDebugger() : undefined;\n  const costModel = joinPlans\n    ? createSQLiteCostModel(db, tableSpecs)\n    : undefined;\n  const timer = await new TimeSliceTimer().start();\n  const shouldYield = () => timer.elapsedLap() > TIME_SLICE_LAP_THRESHOLD_MS;\n  const yieldProcess = () => timer.yieldProcess();\n  const result = await runAst(\n    lc,\n    clientSchema,\n    ast,\n    true,\n    {\n      applyPermissions: permissions !== undefined,\n      syncedRows,\n      vendedRows,\n      authData,\n      db,\n      tableSpecs,\n      permissions,\n      costModel,\n      planDebugger,\n      host: {\n        debug: new Debug(),\n        getSource(tableName: string) {\n          let source = tables.get(tableName);\n          if (source) {\n            return source;\n          }\n\n          const tableSpec = mustGetTableSpec(tableSpecs, tableName);\n          const {primaryKey} = tableSpec.tableSpec;\n\n          source = new TableSource(\n            lc,\n            config.log,\n            db,\n            tableName,\n            tableSpec.zqlSpec,\n            primaryKey,\n            shouldYield,\n          );\n          tables.set(tableName, source);\n          return source;\n        },\n        createStorage() {\n          return new MemoryStorage();\n        },\n        decorateSourceInput: input => input,\n        decorateInput: input => input,\n        addEdge() {},\n        decorateFilterInput: input => input,\n      },\n    },\n    yieldProcess,\n  );\n\n  result.sqlitePlans = explainQueries(result.readRowCountsByQuery ?? {}, db);\n\n  if (planDebugger) {\n    result.joinPlans = serializePlanDebugEvents(planDebugger.events);\n  }\n\n  return result;\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,MAAM,8BAA8B;AAEpC,eAAsB,aACpB,IACA,QACA,cACA,KACA,aAAa,MACb,aAAa,OACb,aACA,UACA,YAAY,OACiB;AAC7B;AAAA;AAAA,UAAM,KAAK,oBAAI,SAAS,IAAI,OAAO,QAAQ,IAAI;AAC/C,UAAM,iCAAiB,IAAA;AACvB,UAAM,iCAAiB,IAAA;AACvB,UAAM,6BAAa,IAAA;AAEnB,oBAAgB,IAAI,IAAI,YAAY,UAAU;AAE9C,UAAM,eAAe,YAAY,IAAI,oBAAA,IAAwB;AAC7D,UAAM,YAAY,YACd,sBAAsB,IAAI,UAAU,IACpC;AACJ,UAAM,QAAQ,MAAM,IAAI,eAAA,EAAiB,MAAA;AACzC,UAAM,cAAc,MAAM,MAAM,WAAA,IAAe;AAC/C,UAAM,eAAe,MAAM,MAAM,aAAA;AACjC,UAAM,SAAS,MAAM;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,QACE,kBAAkB,gBAAgB;AAAA,QAClC;AAAA,QACA;AAAA,QACA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,MAAM;AAAA,UACJ,OAAO,IAAI,MAAA;AAAA,UACX,UAAU,WAAmB;AAC3B,gBAAI,SAAS,OAAO,IAAI,SAAS;AACjC,gBAAI,QAAQ;AACV,qBAAO;AAAA,YACT;AAEA,kBAAM,YAAY,iBAAiB,YAAY,SAAS;AACxD,kBAAM,EAAC,eAAc,UAAU;AAE/B,qBAAS,IAAI;AAAA,cACX;AAAA,cACA,OAAO;AAAA,cACP;AAAA,cACA;AAAA,cACA,UAAU;AAAA,cACV;AAAA,cACA;AAAA,YAAA;AAEF,mBAAO,IAAI,WAAW,MAAM;AAC5B,mBAAO;AAAA,UACT;AAAA,UACA,gBAAgB;AACd,mBAAO,IAAI,cAAA;AAAA,UACb;AAAA,UACA,qBAAqB,CAAA,UAAS;AAAA,UAC9B,eAAe,CAAA,UAAS;AAAA,UACxB,UAAU;AAAA,UAAC;AAAA,UACX,qBAAqB,CAAA,UAAS;AAAA,QAAA;AAAA,MAChC;AAAA,MAEF;AAAA,IAAA;AAGF,WAAO,cAAc,eAAe,OAAO,wBAAwB,CAAA,GAAI,EAAE;AAEzE,QAAI,cAAc;AAChB,aAAO,YAAY,yBAAyB,aAAa,MAAM;AAAA,IACjE;AAEA,WAAO;AAAA,WAtEP;AAAA;AAAA;AAAA;AAAA;AAuEF;"}

package/out/zero-cache/src/services/mutagen/pusher.d.ts

@@ -135,12 +135,12 @@ export declare class PusherService implements Service, Pusher {
             afterPermissions?: string | undefined;
             vendedRowCounts?: Record<string, Record<string, number>> | undefined;
             vendedRows?: Record<string, Record<string, Readonly<Record<string, import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined>>[]>> | undefined;
-            plans?: Record<string, string[]> | undefined;
+            sqlitePlans?: Record<string, string[]> | undefined;
             readRows?: Record<string, Record<string, Readonly<Record<string, import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined>>[]>> | undefined;
             readRowCountsByQuery?: Record<string, Record<string, number>> | undefined;
             readRowCount?: number | undefined;
             dbScansByQuery?: Record<string, Record<string, number>> | undefined;
-            plannerEvents?: ({
+            joinPlans?: ({
                 type: "attempt-start";
                 attemptNumber: number;
                 totalAttempts: number;
@@ -434,12 +434,12 @@ export declare class PusherService implements Service, Pusher {
             afterPermissions?: string | undefined;
             vendedRowCounts?: Record<string, Record<string, number>> | undefined;
             vendedRows?: Record<string, Record<string, Readonly<Record<string, import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined>>[]>> | undefined;
-            plans?: Record<string, string[]> | undefined;
+            sqlitePlans?: Record<string, string[]> | undefined;
             readRows?: Record<string, Record<string, Readonly<Record<string, import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined>>[]>> | undefined;
             readRowCountsByQuery?: Record<string, Record<string, number>> | undefined;
             readRowCount?: number | undefined;
             dbScansByQuery?: Record<string, Record<string, number>> | undefined;
-            plannerEvents?: ({
+            joinPlans?: ({
                 type: "attempt-start";
                 attemptNumber: number;
                 totalAttempts: number;

package/out/zero-cache/src/services/view-syncer/active-users-gauge.d.ts

@@ -1,4 +1,5 @@
 import type { LogContext } from '@rocicorp/logger';
+import { type ActiveUsers } from '../../server/anonymous-otel-start.ts';
 import type { PostgresDB } from '../../types/pg.ts';
 import { type ShardID } from '../../types/shards.ts';
 import type { Service } from '../service.ts';
@@ -8,7 +9,7 @@ type Options = {
 export declare class ActiveUsersGauge implements Service {
     #private;
     readonly id = "active-users-gauge";
-    constructor(lc: LogContext, db: PostgresDB, shard: ShardID, opts?: Options);
+    constructor(lc: LogContext, db: PostgresDB, shard: ShardID, opts?: Options, setActiveUsersGetterFn?: (getter: () => ActiveUsers) => void);
     run(): Promise<void>;
     stop(): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"active-users-gauge.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/active-users-gauge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAE9D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAK3C,KAAK,OAAO,GAAG;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,qBAAa,gBAAiB,YAAW,OAAO;;IAC9C,QAAQ,CAAC,EAAE,wBAAwB;gBAajC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,EACd,IAAI,GAAE,OAAY;IAQd,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAItB"}
+{"version":3,"file":"active-users-gauge.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/active-users-gauge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAE9D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAK3C,KAAK,OAAO,GAAG;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,qBAAa,gBAAiB,YAAW,OAAO;;IAC9C,QAAQ,CAAC,EAAE,wBAAwB;gBAajC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,EACd,IAAI,GAAE,OAAY,EAClB,sBAAsB,sCAAuB;IASzC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA8C1B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAItB"}

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

@@ -1,3 +1,5 @@
+import { must } from "../../../../shared/src/must.js";
+import { mapValues } from "../../../../shared/src/objects.js";
 import { setActiveUsersGetter } from "../../server/anonymous-otel-start.js";
 import { cvrSchema } from "../../types/shards.js";
 import { RunningState } from "../running-state.js";
@@ -10,30 +12,41 @@ class ActiveUsersGauge {
   #schema;
   #updateIntervalMs;
   #state = new RunningState("active-users-gauge");
+  #setActiveUsersGetter;
   // latest computed value exposed via the observable gauge callback
-  #value = 0;
-  #getterSet = false;
-  constructor(lc, db, shard, opts = {}) {
+  #lastActiveUsers;
+  constructor(lc, db, shard, opts = {}, setActiveUsersGetterFn = setActiveUsersGetter) {
     this.#lc = lc;
     this.#db = db;
     this.#schema = cvrSchema(shard);
     this.#updateIntervalMs = opts.updateIntervalMs ?? 60 * 1e3;
+    this.#setActiveUsersGetter = setActiveUsersGetterFn;
   }
   async run() {
     while (this.#state.shouldRun()) {
       try {
-        const since = Date.now() - DAY;
-        const [{ cnt }] = await this.#db`
-          SELECT COUNT(*) AS cnt
-          FROM ${this.#db(this.#schema)}.instances
-          WHERE "lastActive" > ${since}
+        const now = Date.now();
+        const since30day = now - DAY * 30;
+        const since7day = now - DAY * 7;
+        const since1day = now - DAY;
+        const [actives] = await this.#db`
+          SELECT 
+            COUNT(*) FILTER (WHERE "lastActive" >= ${since1day}) AS active_users_last_day,
+            COUNT(DISTINCT("profileID")) FILTER (WHERE "lastActive" >= ${since1day} AND starts_with("profileID", 'p')) AS users_1da,
+            COUNT(DISTINCT("profileID")) FILTER (WHERE "lastActive" >= ${since7day} AND starts_with("profileID", 'p')) AS users_7da,
+            COUNT(DISTINCT("profileID")) FILTER (WHERE starts_with("profileID", 'p')) AS users_30da,
+            COUNT(DISTINCT("profileID")) FILTER (WHERE "lastActive" >= ${since1day}) AS users_1da_legacy,
+            COUNT(DISTINCT("profileID")) FILTER (WHERE "lastActive" >= ${since7day}) AS users_7da_legacy,
+            COUNT(DISTINCT("profileID")) AS users_30da_legacy
+            FROM ${this.#db(this.#schema)}.instances
+            WHERE "lastActive" >= ${since30day}
         `;
-        this.#value = Number(cnt);
-        if (!this.#getterSet) {
-          setActiveUsersGetter(() => this.#value);
-          this.#getterSet = true;
+        const setGetter = this.#lastActiveUsers === void 0;
+        this.#lastActiveUsers = mapValues(actives, (bigVal) => Number(bigVal));
+        if (setGetter) {
+          this.#setActiveUsersGetter(() => must(this.#lastActiveUsers));
         }
-        this.#lc.debug?.(`updated active-users gauge to ${this.#value}`);
+        this.#lc.debug?.(`updated active-users gauge`, this.#lastActiveUsers);
       } catch (e) {
         this.#lc.warn?.("error updating active-users gauge", e);
       }

package/out/zero-cache/src/services/view-syncer/active-users-gauge.js.map

@@ -1 +1 @@
-{"version":3,"file":"active-users-gauge.js","sources":["../../../../../../zero-cache/src/services/view-syncer/active-users-gauge.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {setActiveUsersGetter} from '../../server/anonymous-otel-start.ts';\nimport type {PostgresDB} from '../../types/pg.ts';\nimport {cvrSchema, type ShardID} from '../../types/shards.ts';\nimport {RunningState} from '../running-state.ts';\nimport type {Service} from '../service.ts';\n\nconst MINUTE = 60 * 1000;\nconst DAY = 24 * 60 * MINUTE;\n\ntype Options = {\n  updateIntervalMs?: number;\n};\n\nexport class ActiveUsersGauge implements Service {\n  readonly id = 'active-users-gauge';\n\n  readonly #lc: LogContext;\n  readonly #db: PostgresDB;\n  readonly #schema: string;\n  readonly #updateIntervalMs: number;\n  readonly #state = new RunningState('active-users-gauge');\n\n  // latest computed value exposed via the observable gauge callback\n  #value = 0;\n  #getterSet = false;\n\n  constructor(\n    lc: LogContext,\n    db: PostgresDB,\n    shard: ShardID,\n    opts: Options = {},\n  ) {\n    this.#lc = lc;\n    this.#db = db;\n    this.#schema = cvrSchema(shard);\n    this.#updateIntervalMs = opts.updateIntervalMs ?? 60 * 1000; // default 1 minute\n  }\n\n  async run(): Promise<void> {\n    while (this.#state.shouldRun()) {\n      try {\n        const since = Date.now() - DAY;\n        const [{cnt}] = await this.#db<[{cnt: bigint}]>`\n          SELECT COUNT(*) AS cnt\n          FROM ${this.#db(this.#schema)}.instances\n          WHERE \"lastActive\" > ${since}\n        `;\n        this.#value = Number(cnt);\n\n        // Set the getter after the first value is computed\n        if (!this.#getterSet) {\n          setActiveUsersGetter(() => this.#value);\n          this.#getterSet = true;\n        }\n\n        this.#lc.debug?.(`updated active-users gauge to ${this.#value}`);\n      } catch (e) {\n        this.#lc.warn?.('error updating active-users gauge', e);\n      }\n\n      await this.#state.sleep(this.#updateIntervalMs);\n    }\n  }\n\n  stop(): Promise<void> {\n    this.#state.stop(this.#lc);\n    return this.#state.stopped();\n  }\n}\n"],"names":[],"mappings":";;;AAOA,MAAM,SAAS,KAAK;AACpB,MAAM,MAAM,KAAK,KAAK;AAMf,MAAM,iBAAoC;AAAA,EACtC,KAAK;AAAA,EAEL;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS,IAAI,aAAa,oBAAoB;AAAA;AAAA,EAGvD,SAAS;AAAA,EACT,aAAa;AAAA,EAEb,YACE,IACA,IACA,OACA,OAAgB,CAAA,GAChB;AACA,SAAK,MAAM;AACX,SAAK,MAAM;AACX,SAAK,UAAU,UAAU,KAAK;AAC9B,SAAK,oBAAoB,KAAK,oBAAoB,KAAK;AAAA,EACzD;AAAA,EAEA,MAAM,MAAqB;AACzB,WAAO,KAAK,OAAO,aAAa;AAC9B,UAAI;AACF,cAAM,QAAQ,KAAK,IAAA,IAAQ;AAC3B,cAAM,CAAC,EAAC,IAAA,CAAI,IAAI,MAAM,KAAK;AAAA;AAAA,iBAElB,KAAK,IAAI,KAAK,OAAO,CAAC;AAAA,iCACN,KAAK;AAAA;AAE9B,aAAK,SAAS,OAAO,GAAG;AAGxB,YAAI,CAAC,KAAK,YAAY;AACpB,+BAAqB,MAAM,KAAK,MAAM;AACtC,eAAK,aAAa;AAAA,QACpB;AAEA,aAAK,IAAI,QAAQ,iCAAiC,KAAK,MAAM,EAAE;AAAA,MACjE,SAAS,GAAG;AACV,aAAK,IAAI,OAAO,qCAAqC,CAAC;AAAA,MACxD;AAEA,YAAM,KAAK,OAAO,MAAM,KAAK,iBAAiB;AAAA,IAChD;AAAA,EACF;AAAA,EAEA,OAAsB;AACpB,SAAK,OAAO,KAAK,KAAK,GAAG;AACzB,WAAO,KAAK,OAAO,QAAA;AAAA,EACrB;AACF;"}
+{"version":3,"file":"active-users-gauge.js","sources":["../../../../../../zero-cache/src/services/view-syncer/active-users-gauge.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {must} from '../../../../shared/src/must.ts';\nimport {mapValues} from '../../../../shared/src/objects.ts';\nimport {\n  setActiveUsersGetter,\n  type ActiveUsers,\n} from '../../server/anonymous-otel-start.ts';\nimport type {PostgresDB} from '../../types/pg.ts';\nimport {cvrSchema, type ShardID} from '../../types/shards.ts';\nimport {RunningState} from '../running-state.ts';\nimport type {Service} from '../service.ts';\n\nconst MINUTE = 60 * 1000;\nconst DAY = 24 * 60 * MINUTE;\n\ntype Options = {\n  updateIntervalMs?: number;\n};\n\nexport class ActiveUsersGauge implements Service {\n  readonly id = 'active-users-gauge';\n\n  readonly #lc: LogContext;\n  readonly #db: PostgresDB;\n  readonly #schema: string;\n  readonly #updateIntervalMs: number;\n  readonly #state = new RunningState('active-users-gauge');\n  readonly #setActiveUsersGetter: typeof setActiveUsersGetter;\n\n  // latest computed value exposed via the observable gauge callback\n  #lastActiveUsers: ActiveUsers | undefined;\n\n  constructor(\n    lc: LogContext,\n    db: PostgresDB,\n    shard: ShardID,\n    opts: Options = {},\n    setActiveUsersGetterFn = setActiveUsersGetter,\n  ) {\n    this.#lc = lc;\n    this.#db = db;\n    this.#schema = cvrSchema(shard);\n    this.#updateIntervalMs = opts.updateIntervalMs ?? 60 * 1000; // default 1 minute\n    this.#setActiveUsersGetter = setActiveUsersGetterFn;\n  }\n\n  async run(): Promise<void> {\n    while (this.#state.shouldRun()) {\n      try {\n        const now = Date.now();\n        const since30day = now - DAY * 30;\n        const since7day = now - DAY * 7;\n        const since1day = now - DAY;\n\n        // This query performs a single scan over the `profile_ids_last_active`\n        // index to compute aggregated results for all of our active user\n        // metric variants.\n        //\n        // The eventually-correct metrics are `users_#da` which count distinct\n        // profileIDs produced by the zero-client (i.e. starting with 'p').\n        // The `users_#da_legacy` metrics include back-filled profileIDs (which\n        // start with `cg`) and will over-count users on apps using memstore.\n        const [actives] = await this.#db<[ActiveUsers]> /*sql*/ `\n          SELECT \n            COUNT(*) FILTER (WHERE \"lastActive\" >= ${since1day}) AS active_users_last_day,\n            COUNT(DISTINCT(\"profileID\")) FILTER (WHERE \"lastActive\" >= ${since1day} AND starts_with(\"profileID\", 'p')) AS users_1da,\n            COUNT(DISTINCT(\"profileID\")) FILTER (WHERE \"lastActive\" >= ${since7day} AND starts_with(\"profileID\", 'p')) AS users_7da,\n            COUNT(DISTINCT(\"profileID\")) FILTER (WHERE starts_with(\"profileID\", 'p')) AS users_30da,\n            COUNT(DISTINCT(\"profileID\")) FILTER (WHERE \"lastActive\" >= ${since1day}) AS users_1da_legacy,\n            COUNT(DISTINCT(\"profileID\")) FILTER (WHERE \"lastActive\" >= ${since7day}) AS users_7da_legacy,\n            COUNT(DISTINCT(\"profileID\")) AS users_30da_legacy\n            FROM ${this.#db(this.#schema)}.instances\n            WHERE \"lastActive\" >= ${since30day}\n        `;\n        // Determine if the getter needs to be set (i.e. the first time).\n        const setGetter = this.#lastActiveUsers === undefined;\n        this.#lastActiveUsers = mapValues(actives, bigVal => Number(bigVal));\n\n        // Set the getter after the first value is computed\n        if (setGetter) {\n          this.#setActiveUsersGetter(() => must(this.#lastActiveUsers));\n        }\n\n        this.#lc.debug?.(`updated active-users gauge`, this.#lastActiveUsers);\n      } catch (e) {\n        this.#lc.warn?.('error updating active-users gauge', e);\n      }\n\n      await this.#state.sleep(this.#updateIntervalMs);\n    }\n  }\n\n  stop(): Promise<void> {\n    this.#state.stop(this.#lc);\n    return this.#state.stopped();\n  }\n}\n"],"names":[],"mappings":";;;;;AAYA,MAAM,SAAS,KAAK;AACpB,MAAM,MAAM,KAAK,KAAK;AAMf,MAAM,iBAAoC;AAAA,EACtC,KAAK;AAAA,EAEL;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS,IAAI,aAAa,oBAAoB;AAAA,EAC9C;AAAA;AAAA,EAGT;AAAA,EAEA,YACE,IACA,IACA,OACA,OAAgB,CAAA,GAChB,yBAAyB,sBACzB;AACA,SAAK,MAAM;AACX,SAAK,MAAM;AACX,SAAK,UAAU,UAAU,KAAK;AAC9B,SAAK,oBAAoB,KAAK,oBAAoB,KAAK;AACvD,SAAK,wBAAwB;AAAA,EAC/B;AAAA,EAEA,MAAM,MAAqB;AACzB,WAAO,KAAK,OAAO,aAAa;AAC9B,UAAI;AACF,cAAM,MAAM,KAAK,IAAA;AACjB,cAAM,aAAa,MAAM,MAAM;AAC/B,cAAM,YAAY,MAAM,MAAM;AAC9B,cAAM,YAAY,MAAM;AAUxB,cAAM,CAAC,OAAO,IAAI,MAAM,KAAK;AAAA;AAAA,qDAEgB,SAAS;AAAA,yEACW,SAAS;AAAA,yEACT,SAAS;AAAA;AAAA,yEAET,SAAS;AAAA,yEACT,SAAS;AAAA;AAAA,mBAE/D,KAAK,IAAI,KAAK,OAAO,CAAC;AAAA,oCACL,UAAU;AAAA;AAGtC,cAAM,YAAY,KAAK,qBAAqB;AAC5C,aAAK,mBAAmB,UAAU,SAAS,CAAA,WAAU,OAAO,MAAM,CAAC;AAGnE,YAAI,WAAW;AACb,eAAK,sBAAsB,MAAM,KAAK,KAAK,gBAAgB,CAAC;AAAA,QAC9D;AAEA,aAAK,IAAI,QAAQ,8BAA8B,KAAK,gBAAgB;AAAA,MACtE,SAAS,GAAG;AACV,aAAK,IAAI,OAAO,qCAAqC,CAAC;AAAA,MACxD;AAEA,YAAM,KAAK,OAAO,MAAM,KAAK,iBAAiB;AAAA,IAChD;AAAA,EACF;AAAA,EAEA,OAAsB;AACpB,SAAK,OAAO,KAAK,KAAK,GAAG;AACzB,WAAO,KAAK,OAAO,QAAA;AAAA,EACrB;AACF;"}

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

@@ -10,7 +10,7 @@ type Options = {
 export declare class CVRPurger implements Service {
     #private;
     readonly id = "reaper";
-    constructor(lc: LogContext, db: PostgresDB, shard: ShardID, { inactivityThresholdMs, initialBatchSize, initialIntervalMs }: Options);
+    constructor(lc: LogContext, db: PostgresDB, shard: ShardID, { inactivityThresholdMs, initialBatchSize, initialIntervalMs }: Options, tombstonePurgeThreshold?: number);
     run(): Promise<void>;
     purgeInactiveCVRs(maxCVRs: number): Promise<{
         purged: number;

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

@@ -1 +1 @@
-{"version":3,"file":"cvr-purger.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/cvr-purger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAA0B,KAAK,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAE9D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAK3C,KAAK,OAAO,GAAG;IACb,qBAAqB,EAAE,MAAM,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,qBAAa,SAAU,YAAW,OAAO;;IACvC,QAAQ,CAAC,EAAE,YAAY;gBAWrB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,EACd,EAAC,qBAAqB,EAAE,gBAAgB,EAAE,iBAAiB,EAAC,EAAE,OAAO;IAUjE,GAAG;IAgDT,iBAAiB,CACf,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC,CAAC;IAwD/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAItB"}
+{"version":3,"file":"cvr-purger.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/cvr-purger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAA0B,KAAK,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAE9D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAQ3C,KAAK,OAAO,GAAG;IACb,qBAAqB,EAAE,MAAM,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,qBAAa,SAAU,YAAW,OAAO;;IACvC,QAAQ,CAAC,EAAE,YAAY;gBAYrB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,EACd,EAAC,qBAAqB,EAAE,gBAAgB,EAAE,iBAAiB,EAAC,EAAE,OAAO,EACrE,uBAAuB,SAA4B;IAc/C,GAAG;IAgDT,iBAAiB,CACf,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC,CAAC;IAgF/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAItB"}

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

@@ -5,20 +5,26 @@ import { cvrSchema } from "../../types/shards.js";
 import { RunningState } from "../running-state.js";
 const MINUTE = 60 * 1e3;
 const MAX_PURGE_INTERVAL_MS = 16 * MINUTE;
+const TOMBSTONE_PURGE_THRESHOLD = 31 * 24 * 60 * 60 * 1e3;
 class CVRPurger {
   id = "reaper";
   #lc;
   #db;
   #schema;
   #inactivityThresholdMs;
+  #tombstonePurgeThresholdMs;
   #initialBatchSize;
   #initialIntervalMs;
   #state = new RunningState("reaper");
-  constructor(lc, db, shard, { inactivityThresholdMs, initialBatchSize, initialIntervalMs }) {
+  constructor(lc, db, shard, { inactivityThresholdMs, initialBatchSize, initialIntervalMs }, tombstonePurgeThreshold = TOMBSTONE_PURGE_THRESHOLD) {
     this.#lc = lc;
     this.#db = db;
     this.#schema = cvrSchema(shard);
     this.#inactivityThresholdMs = inactivityThresholdMs;
+    this.#tombstonePurgeThresholdMs = Math.max(
+      tombstonePurgeThreshold,
+      inactivityThresholdMs
+    );
     this.#initialBatchSize = initialBatchSize;
     this.#initialIntervalMs = initialIntervalMs;
   }
@@ -61,33 +67,51 @@ class CVRPurger {
   purgeInactiveCVRs(maxCVRs) {
     return this.#db.begin(READ_COMMITTED, async (sql) => {
       disableStatementTimeout(sql);
-      const threshold = Date.now() - this.#inactivityThresholdMs;
+      const now = Date.now();
+      const threshold = now - this.#inactivityThresholdMs;
+      const tombstonePurgeThreshold = now - this.#tombstonePurgeThresholdMs;
       const ids = (await sql`
           SELECT "clientGroupID" FROM ${sql(this.#schema)}.instances
-            WHERE "lastActive" < ${threshold}
+            WHERE NOT "deleted" AND "lastActive" < ${threshold}
             ORDER BY "lastActive" ASC
             LIMIT ${maxCVRs}
             FOR UPDATE SKIP LOCKED
       `.values()).flat();
       if (ids.length > 0) {
-        await Promise.all(
-          [
-            "desires",
-            "queries",
-            "clients",
-            "instances",
-            "rows",
-            "rowsVersion"
-          ].map(
-            (table) => sql`
+        const stmts = [
+          "desires",
+          "queries",
+          "clients",
+          "rows",
+          "rowsVersion"
+        ].map(
+          (table) => sql`
             DELETE FROM ${sql(this.#schema)}.${sql(table)} 
               WHERE "clientGroupID" IN ${sql(ids)}`.execute()
-          )
         );
+        stmts.push(
+          sql`
+            UPDATE ${sql(this.#schema)}.instances
+              SET "deleted" = TRUE, 
+                  "version" = '00', 
+                  "ttlClock" = 0,
+                  "replicaVersion" = NULL, 
+                  "owner" = NULL,
+                  "grantedAt" = NULL,
+                  "clientSchema" = NULL
+              WHERE "clientGroupID" IN ${sql(ids)}`.execute()
+        );
+        stmts.push(
+          sql`
+            DELETE FROM ${sql(this.#schema)}.instances
+              WHERE "deleted" AND "lastActive" < ${tombstonePurgeThreshold}
+          `.execute()
+        );
+        await Promise.all(stmts);
       }
       const [{ remaining }] = await sql`
         SELECT COUNT(*) AS remaining FROM ${sql(this.#schema)}.instances
-          WHERE "lastActive" < ${threshold}
+          WHERE NOT "deleted" AND "lastActive" < ${threshold}
       `;
       return { purged: ids.length, remaining: Number(remaining) };
     });

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

@@ -1 +1 @@
-{"version":3,"file":"cvr-purger.js","sources":["../../../../../../zero-cache/src/services/view-syncer/cvr-purger.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {promiseVoid} from '../../../../shared/src/resolved-promises.ts';\nimport {READ_COMMITTED} from '../../db/mode-enum.ts';\nimport {disableStatementTimeout, type PostgresDB} from '../../types/pg.ts';\nimport {cvrSchema, type ShardID} from '../../types/shards.ts';\nimport {RunningState} from '../running-state.ts';\nimport type {Service} from '../service.ts';\n\nconst MINUTE = 60 * 1000;\nconst MAX_PURGE_INTERVAL_MS = 16 * MINUTE;\n\ntype Options = {\n  inactivityThresholdMs: number;\n  initialBatchSize: number;\n  initialIntervalMs: number;\n};\n\nexport class CVRPurger implements Service {\n  readonly id = 'reaper';\n\n  readonly #lc: LogContext;\n  readonly #db: PostgresDB;\n  readonly #schema: string;\n  readonly #inactivityThresholdMs: number;\n  readonly #initialBatchSize: number;\n  readonly #initialIntervalMs: number;\n  readonly #state = new RunningState('reaper');\n\n  constructor(\n    lc: LogContext,\n    db: PostgresDB,\n    shard: ShardID,\n    {inactivityThresholdMs, initialBatchSize, initialIntervalMs}: Options,\n  ) {\n    this.#lc = lc;\n    this.#db = db;\n    this.#schema = cvrSchema(shard);\n    this.#inactivityThresholdMs = inactivityThresholdMs;\n    this.#initialBatchSize = initialBatchSize;\n    this.#initialIntervalMs = initialIntervalMs;\n  }\n\n  async run() {\n    let purgeable: number | undefined;\n    let maxCVRsPerPurge = this.#initialBatchSize;\n    let purgeInterval = this.#initialIntervalMs;\n\n    if (this.#initialBatchSize === 0) {\n      this.#lc.warn?.(\n        `CVR garbage collection is disabled (initialBatchSize = 0)`,\n      );\n      // Do nothing and just wait to be stopped.\n      await this.#state.stopped();\n    } else {\n      this.#lc.info?.(\n        `running cvr-purger with`,\n        await this.#db`SHOW statement_timeout`,\n      );\n    }\n\n    while (this.#state.shouldRun()) {\n      try {\n        const start = performance.now();\n        const {purged, remaining} =\n          await this.purgeInactiveCVRs(maxCVRsPerPurge);\n\n        if (purgeable !== undefined && remaining > purgeable) {\n          // If the number of purgeable CVRs has grown even after the purge,\n          // increase the number purged per round to achieve a steady state.\n          maxCVRsPerPurge += this.#initialBatchSize;\n          this.#lc.info?.(`increased CVRs per purge to ${maxCVRsPerPurge}`);\n        }\n        purgeable = remaining;\n\n        purgeInterval =\n          purgeable > 0\n            ? this.#initialIntervalMs\n            : Math.min(purgeInterval * 2, MAX_PURGE_INTERVAL_MS);\n        const elapsed = performance.now() - start;\n        this.#lc.info?.(\n          `purged ${purged} inactive CVRs (${elapsed.toFixed(2)} ms). Next purge in ${purgeInterval} ms`,\n        );\n        await this.#state.sleep(purgeInterval);\n      } catch (e) {\n        this.#lc.warn?.(`error encountered while garbage collecting CVRs`, e);\n      }\n    }\n  }\n\n  // Exported for testing.\n  purgeInactiveCVRs(\n    maxCVRs: number,\n  ): Promise<{purged: number; remaining: number}> {\n    return this.#db.begin(READ_COMMITTED, async sql => {\n      disableStatementTimeout(sql);\n\n      const threshold = Date.now() - this.#inactivityThresholdMs;\n      // Implementation note: `FOR UPDATE` will prevent a syncer from\n      // concurrently updating the CVR, since the update also performs\n      // a `SELECT ... FOR UPDATE`, instead causing that update to\n      // fail, which will cause the client to create a new CVR.\n      //\n      // `SKIP LOCKED` will skip over CVRs that a syncer is already\n      // in the process of updating. In this manner, an in-progress\n      // update effectively excludes the CVR from the purge.\n      const ids = (\n        await sql<{clientGroupID: string}[]>`\n          SELECT \"clientGroupID\" FROM ${sql(this.#schema)}.instances\n            WHERE \"lastActive\" < ${threshold}\n            ORDER BY \"lastActive\" ASC\n            LIMIT ${maxCVRs}\n            FOR UPDATE SKIP LOCKED\n      `.values()\n      ).flat();\n\n      if (ids.length > 0) {\n        // Explicitly delete rows from cvr tables from \"bottom\" up. Even\n        // though all tables eventually reference a (\"top\") ancestor row in the\n        // \"instances\" or \"rowsVersion\" tables, relying on foreign key\n        // cascading deletes can be suboptimal when the foreign key is not a\n        // prefix of the primary key (e.g. the \"desires\" foreign key reference\n        // to the \"queries\" table is not a prefix of the \"desires\" primary\n        // key).\n        await Promise.all(\n          [\n            'desires',\n            'queries',\n            'clients',\n            'instances',\n            'rows',\n            'rowsVersion',\n          ].map(table =>\n            sql`\n            DELETE FROM ${sql(this.#schema)}.${sql(table)} \n              WHERE \"clientGroupID\" IN ${sql(ids)}`.execute(),\n          ),\n        );\n      }\n\n      const [{remaining}] = await sql<[{remaining: bigint}]>`\n        SELECT COUNT(*) AS remaining FROM ${sql(this.#schema)}.instances\n          WHERE \"lastActive\" < ${threshold}\n      `;\n\n      return {purged: ids.length, remaining: Number(remaining)};\n    });\n  }\n\n  stop(): Promise<void> {\n    this.#state.stop(this.#lc);\n    return promiseVoid;\n  }\n}\n"],"names":[],"mappings":";;;;;AAQA,MAAM,SAAS,KAAK;AACpB,MAAM,wBAAwB,KAAK;AAQ5B,MAAM,UAA6B;AAAA,EAC/B,KAAK;AAAA,EAEL;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS,IAAI,aAAa,QAAQ;AAAA,EAE3C,YACE,IACA,IACA,OACA,EAAC,uBAAuB,kBAAkB,qBAC1C;AACA,SAAK,MAAM;AACX,SAAK,MAAM;AACX,SAAK,UAAU,UAAU,KAAK;AAC9B,SAAK,yBAAyB;AAC9B,SAAK,oBAAoB;AACzB,SAAK,qBAAqB;AAAA,EAC5B;AAAA,EAEA,MAAM,MAAM;AACV,QAAI;AACJ,QAAI,kBAAkB,KAAK;AAC3B,QAAI,gBAAgB,KAAK;AAEzB,QAAI,KAAK,sBAAsB,GAAG;AAChC,WAAK,IAAI;AAAA,QACP;AAAA,MAAA;AAGF,YAAM,KAAK,OAAO,QAAA;AAAA,IACpB,OAAO;AACL,WAAK,IAAI;AAAA,QACP;AAAA,QACA,MAAM,KAAK;AAAA,MAAA;AAAA,IAEf;AAEA,WAAO,KAAK,OAAO,aAAa;AAC9B,UAAI;AACF,cAAM,QAAQ,YAAY,IAAA;AAC1B,cAAM,EAAC,QAAQ,UAAA,IACb,MAAM,KAAK,kBAAkB,eAAe;AAE9C,YAAI,cAAc,UAAa,YAAY,WAAW;AAGpD,6BAAmB,KAAK;AACxB,eAAK,IAAI,OAAO,+BAA+B,eAAe,EAAE;AAAA,QAClE;AACA,oBAAY;AAEZ,wBACE,YAAY,IACR,KAAK,qBACL,KAAK,IAAI,gBAAgB,GAAG,qBAAqB;AACvD,cAAM,UAAU,YAAY,IAAA,IAAQ;AACpC,aAAK,IAAI;AAAA,UACP,UAAU,MAAM,mBAAmB,QAAQ,QAAQ,CAAC,CAAC,uBAAuB,aAAa;AAAA,QAAA;AAE3F,cAAM,KAAK,OAAO,MAAM,aAAa;AAAA,MACvC,SAAS,GAAG;AACV,aAAK,IAAI,OAAO,mDAAmD,CAAC;AAAA,MACtE;AAAA,IACF;AAAA,EACF;AAAA;AAAA,EAGA,kBACE,SAC8C;AAC9C,WAAO,KAAK,IAAI,MAAM,gBAAgB,OAAM,QAAO;AACjD,8BAAwB,GAAG;AAE3B,YAAM,YAAY,KAAK,IAAA,IAAQ,KAAK;AASpC,YAAM,OACJ,MAAM;AAAA,wCAC0B,IAAI,KAAK,OAAO,CAAC;AAAA,mCACtB,SAAS;AAAA;AAAA,oBAExB,OAAO;AAAA;AAAA,QAEnB,OAAA,GACA,KAAA;AAEF,UAAI,IAAI,SAAS,GAAG;AAQlB,cAAM,QAAQ;AAAA,UACZ;AAAA,YACE;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,UAAA,EACA;AAAA,YAAI,CAAA,UACJ;AAAA,0BACc,IAAI,KAAK,OAAO,CAAC,IAAI,IAAI,KAAK,CAAC;AAAA,yCAChB,IAAI,GAAG,CAAC,GAAG,QAAA;AAAA,UAAQ;AAAA,QAClD;AAAA,MAEJ;AAEA,YAAM,CAAC,EAAC,WAAU,IAAI,MAAM;AAAA,4CACU,IAAI,KAAK,OAAO,CAAC;AAAA,iCAC5B,SAAS;AAAA;AAGpC,aAAO,EAAC,QAAQ,IAAI,QAAQ,WAAW,OAAO,SAAS,EAAA;AAAA,IACzD,CAAC;AAAA,EACH;AAAA,EAEA,OAAsB;AACpB,SAAK,OAAO,KAAK,KAAK,GAAG;AACzB,WAAO;AAAA,EACT;AACF;"}
+{"version":3,"file":"cvr-purger.js","sources":["../../../../../../zero-cache/src/services/view-syncer/cvr-purger.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {promiseVoid} from '../../../../shared/src/resolved-promises.ts';\nimport {READ_COMMITTED} from '../../db/mode-enum.ts';\nimport {disableStatementTimeout, type PostgresDB} from '../../types/pg.ts';\nimport {cvrSchema, type ShardID} from '../../types/shards.ts';\nimport {RunningState} from '../running-state.ts';\nimport type {Service} from '../service.ts';\n\nconst MINUTE = 60 * 1000;\nconst MAX_PURGE_INTERVAL_MS = 16 * MINUTE;\n\n// Purge tombstones after 31 days to facilitate up to a 30-day actives metric.\nconst TOMBSTONE_PURGE_THRESHOLD = 31 * 24 * 60 * 60 * 1000;\n\ntype Options = {\n  inactivityThresholdMs: number;\n  initialBatchSize: number;\n  initialIntervalMs: number;\n};\n\nexport class CVRPurger implements Service {\n  readonly id = 'reaper';\n\n  readonly #lc: LogContext;\n  readonly #db: PostgresDB;\n  readonly #schema: string;\n  readonly #inactivityThresholdMs: number;\n  readonly #tombstonePurgeThresholdMs: number;\n  readonly #initialBatchSize: number;\n  readonly #initialIntervalMs: number;\n  readonly #state = new RunningState('reaper');\n\n  constructor(\n    lc: LogContext,\n    db: PostgresDB,\n    shard: ShardID,\n    {inactivityThresholdMs, initialBatchSize, initialIntervalMs}: Options,\n    tombstonePurgeThreshold = TOMBSTONE_PURGE_THRESHOLD,\n  ) {\n    this.#lc = lc;\n    this.#db = db;\n    this.#schema = cvrSchema(shard);\n    this.#inactivityThresholdMs = inactivityThresholdMs;\n    this.#tombstonePurgeThresholdMs = Math.max(\n      tombstonePurgeThreshold,\n      inactivityThresholdMs,\n    );\n    this.#initialBatchSize = initialBatchSize;\n    this.#initialIntervalMs = initialIntervalMs;\n  }\n\n  async run() {\n    let purgeable: number | undefined;\n    let maxCVRsPerPurge = this.#initialBatchSize;\n    let purgeInterval = this.#initialIntervalMs;\n\n    if (this.#initialBatchSize === 0) {\n      this.#lc.warn?.(\n        `CVR garbage collection is disabled (initialBatchSize = 0)`,\n      );\n      // Do nothing and just wait to be stopped.\n      await this.#state.stopped();\n    } else {\n      this.#lc.info?.(\n        `running cvr-purger with`,\n        await this.#db`SHOW statement_timeout`,\n      );\n    }\n\n    while (this.#state.shouldRun()) {\n      try {\n        const start = performance.now();\n        const {purged, remaining} =\n          await this.purgeInactiveCVRs(maxCVRsPerPurge);\n\n        if (purgeable !== undefined && remaining > purgeable) {\n          // If the number of purgeable CVRs has grown even after the purge,\n          // increase the number purged per round to achieve a steady state.\n          maxCVRsPerPurge += this.#initialBatchSize;\n          this.#lc.info?.(`increased CVRs per purge to ${maxCVRsPerPurge}`);\n        }\n        purgeable = remaining;\n\n        purgeInterval =\n          purgeable > 0\n            ? this.#initialIntervalMs\n            : Math.min(purgeInterval * 2, MAX_PURGE_INTERVAL_MS);\n        const elapsed = performance.now() - start;\n        this.#lc.info?.(\n          `purged ${purged} inactive CVRs (${elapsed.toFixed(2)} ms). Next purge in ${purgeInterval} ms`,\n        );\n        await this.#state.sleep(purgeInterval);\n      } catch (e) {\n        this.#lc.warn?.(`error encountered while garbage collecting CVRs`, e);\n      }\n    }\n  }\n\n  // Exported for testing.\n  purgeInactiveCVRs(\n    maxCVRs: number,\n  ): Promise<{purged: number; remaining: number}> {\n    return this.#db.begin(READ_COMMITTED, async sql => {\n      disableStatementTimeout(sql);\n\n      const now = Date.now();\n      const threshold = now - this.#inactivityThresholdMs;\n      const tombstonePurgeThreshold = now - this.#tombstonePurgeThresholdMs;\n      // Implementation note: `FOR UPDATE` will prevent a syncer from\n      // concurrently updating the CVR, since the update also performs\n      // a `SELECT ... FOR UPDATE`, instead causing that update to\n      // fail, which will cause the client to create a new CVR.\n      //\n      // `SKIP LOCKED` will skip over CVRs that a syncer is already\n      // in the process of updating. In this manner, an in-progress\n      // update effectively excludes the CVR from the purge.\n      const ids = (\n        await sql<{clientGroupID: string}[]>`\n          SELECT \"clientGroupID\" FROM ${sql(this.#schema)}.instances\n            WHERE NOT \"deleted\" AND \"lastActive\" < ${threshold}\n            ORDER BY \"lastActive\" ASC\n            LIMIT ${maxCVRs}\n            FOR UPDATE SKIP LOCKED\n      `.values()\n      ).flat();\n\n      if (ids.length > 0) {\n        // Explicitly delete rows from cvr tables from \"bottom\" up. Relying on\n        // foreign key cascading deletes can be suboptimal when the foreign key\n        // is not a prefix of the primary key (e.g. the \"desires\" foreign key\n        // reference to the \"queries\" table is not a prefix of the \"desires\"\n        // primary key).\n        const stmts = [\n          'desires',\n          'queries',\n          'clients',\n          'rows',\n          'rowsVersion',\n        ].map(table =>\n          sql`\n            DELETE FROM ${sql(this.#schema)}.${sql(table)} \n              WHERE \"clientGroupID\" IN ${sql(ids)}`.execute(),\n        );\n        // Tombstones are written for the `instances` rows, preserving the\n        // \"profileID\" and \"lastActive\" columns for computing usage stats.\n        //\n        // For backwards compatibility (i.e. older zero-caches that do not\n        // check the \"deleted\" column) reset the \"version\" to '00' to trigger\n        // the ClientNotFound error via\n        // view-syncer.ts:checkClientAndCVRVersions()\n        stmts.push(\n          sql`\n            UPDATE ${sql(this.#schema)}.instances\n              SET \"deleted\" = TRUE, \n                  \"version\" = '00', \n                  \"ttlClock\" = 0,\n                  \"replicaVersion\" = NULL, \n                  \"owner\" = NULL,\n                  \"grantedAt\" = NULL,\n                  \"clientSchema\" = NULL\n              WHERE \"clientGroupID\" IN ${sql(ids)}`.execute(),\n        );\n        // Tombstone rows are deleted after the tombstonePurgeThreshold.\n        stmts.push(\n          sql`\n            DELETE FROM ${sql(this.#schema)}.instances\n              WHERE \"deleted\" AND \"lastActive\" < ${tombstonePurgeThreshold}\n          `.execute(),\n        );\n        await Promise.all(stmts);\n      }\n\n      const [{remaining}] = await sql<[{remaining: bigint}]>`\n        SELECT COUNT(*) AS remaining FROM ${sql(this.#schema)}.instances\n          WHERE NOT \"deleted\" AND \"lastActive\" < ${threshold}\n      `;\n\n      return {purged: ids.length, remaining: Number(remaining)};\n    });\n  }\n\n  stop(): Promise<void> {\n    this.#state.stop(this.#lc);\n    return promiseVoid;\n  }\n}\n"],"names":[],"mappings":"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"}

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

@@ -52,7 +52,7 @@ export declare class CVRStore {
      *          `undefined`.
      */
     getTTLClock(): Promise<TTLClock | undefined>;
-    putInstance({ version, replicaVersion, lastActive, clientSchema, ttlClock, }: Pick<CVRSnapshot, 'version' | 'replicaVersion' | 'lastActive' | 'clientSchema' | 'ttlClock'>): void;
+    putInstance({ version, replicaVersion, lastActive, clientSchema, profileID, ttlClock, }: Pick<CVRSnapshot, 'version' | 'replicaVersion' | 'lastActive' | 'clientSchema' | 'profileID' | 'ttlClock'>): void;
     markQueryAsDeleted(version: CVRVersion, queryPatch: QueryPatch): void;
     putQuery(query: QueryRecord): void;
     updateQuery(query: QueryRecord): void;
@@ -78,6 +78,9 @@ export declare class CVRStore {
  * (i.e. by doing a plain `SELECT` rather than a `SELECT ... FOR UPDATE`).
  */
 export declare function checkVersion(tx: PostgresTransaction, schema: string, clientGroupID: string, expectedCurrentVersion: CVRVersion): Promise<void>;
+export declare class ClientNotFoundError extends ProtocolErrorWithLevel {
+    constructor(message: string);
+}
 export declare class ConcurrentModificationException extends ProtocolErrorWithLevel {
     readonly name = "ConcurrentModificationException";
     constructor(expectedVersion: string, actualVersion: string);

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

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

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

@@ -118,11 +118,9 @@ class CVRStore {
         return result;
       }
       assert(err);
-      throw new ProtocolErrorWithLevel({
-        kind: ClientNotFound,
-        message: `max attempts exceeded waiting for CVR@${err.cvrVersion} to catch up from ${err.rowsVersion}`,
-        origin: ZeroCache
-      });
+      throw new ClientNotFoundError(
+        `max attempts exceeded waiting for CVR@${err.cvrVersion} to catch up from ${err.rowsVersion}`
+      );
     });
   }
   async #load(lc, lastConnectTime) {
@@ -137,7 +135,8 @@ class CVRStore {
       replicaVersion: null,
       clients: {},
       queries: {},
-      clientSchema: null
+      clientSchema: null,
+      profileID: null
     };
     const [instance, clientsRows, queryRows, desiresRows] = await this.#db.begin(READONLY, (tx) => [
       tx`SELECT cvr."version", 
@@ -147,6 +146,8 @@ class CVRStore {
                  "owner", 
                  "grantedAt",
                  "clientSchema", 
+                 "profileID",
+                 "deleted",
                  rows."version" as "rowsVersion"
             FROM ${this.#cvr("instances")} AS cvr
             LEFT JOIN ${this.#cvr("rowsVersion")} AS rows 
@@ -176,7 +177,8 @@ class CVRStore {
         ttlClock: ttlClockFromNumber(0),
         // TTL clock starts at 0 for new instances
         replicaVersion: null,
-        clientSchema: null
+        clientSchema: null,
+        profileID: null
       });
     } else {
       assert(instance.length === 1);
@@ -188,8 +190,15 @@ class CVRStore {
         owner,
         grantedAt,
         rowsVersion,
-        clientSchema
+        clientSchema,
+        profileID,
+        deleted
       } = instance[0];
+      if (deleted) {
+        throw new ClientNotFoundError(
+          "Client has been purged due to inactivity"
+        );
+      }
       if (owner !== this.#taskID) {
         if ((grantedAt ?? 0) > lastConnectTime) {
           throw new OwnershipError(owner, grantedAt, lastConnectTime);
@@ -211,6 +220,7 @@ class CVRStore {
       cvr.lastActive = lastActive;
       cvr.ttlClock = ttlClock;
       cvr.replicaVersion = replicaVersion;
+      cvr.profileID = profileID;
       try {
         cvr.clientSchema = clientSchema === null ? null : parse(clientSchema, clientSchemaSchema);
       } catch (e) {
@@ -309,6 +319,7 @@ class CVRStore {
     replicaVersion,
     lastActive,
     clientSchema,
+    profileID,
     ttlClock
   }) {
     this.#writes.add({
@@ -322,7 +333,8 @@ class CVRStore {
           replicaVersion,
           owner: this.#taskID,
           grantedAt: lastConnectTime,
-          clientSchema
+          clientSchema,
+          profileID
         };
         return tx`
         INSERT INTO ${this.#cvr("instances")} ${tx(change)} 
@@ -697,6 +709,15 @@ async function checkVersion(tx, schema, clientGroupID, expectedCurrentVersion) {
     throw new ConcurrentModificationException(expected, version2);
   }
 }
+class ClientNotFoundError extends ProtocolErrorWithLevel {
+  constructor(message) {
+    super({
+      kind: ClientNotFound,
+      message,
+      origin: ZeroCache
+    });
+  }
+}
 class ConcurrentModificationException extends ProtocolErrorWithLevel {
   name = "ConcurrentModificationException";
   constructor(expectedVersion, actualVersion) {
@@ -750,6 +771,7 @@ class RowsVersionBehindError extends Error {
 }
 export {
   CVRStore,
+  ClientNotFoundError,
   ConcurrentModificationException,
   InvalidClientSchemaError,
   OwnershipError,