@rocicorp/zero 0.25.0-canary.0 → 0.25.0-canary.10

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

@@ -1,18 +1,16 @@
-import { ident } from 'pg-format';
-import { stringify, } from "../../../../../shared/src/bigint-json.js";
-import { stringCompare } from "../../../../../shared/src/string-compare.js";
-import { normalizedKeyOrder } from "../../../types/row-key.js";
+import { ident } from "pg-format";
+import "../../../../../shared/src/bigint-json.js";
+import "js-xxhash";
 import { cvrSchema } from "../../../types/shards.js";
-import { versionFromString, versionString, } from "./types.js";
-// For readability in the sql statements.
+import { versionFromString, versionString } from "./types.js";
 function schema(shard) {
-    return ident(cvrSchema(shard));
+  return ident(cvrSchema(shard));
 }
 function createSchema(shard) {
-    return `CREATE SCHEMA IF NOT EXISTS ${schema(shard)};`;
+  return `CREATE SCHEMA IF NOT EXISTS ${schema(shard)};`;
 }
 function createInstancesTable(shard) {
-    return `
+  return `
 CREATE TABLE ${schema(shard)}.instances (
   "clientGroupID"  TEXT PRIMARY KEY,
   "version"        TEXT NOT NULL,             -- Sortable representation of CVRVersion, e.g. "5nbqa2w:09"
@@ -29,11 +27,8 @@ CREATE INDEX instances_last_active
   ON ${schema(shard)}.instances ("lastActive");
 `;
 }
-export function compareInstancesRows(a, b) {
-    return stringCompare(a.clientGroupID, b.clientGroupID);
-}
 function createClientsTable(shard) {
-    return `
+  return `
 CREATE TABLE ${schema(shard)}.clients (
   "clientGroupID"      TEXT,
   "clientID"           TEXT,
@@ -48,15 +43,8 @@ CREATE TABLE ${schema(shard)}.clients (
 
 `;
 }
-export function compareClientsRows(a, b) {
-    const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
-    if (clientGroupIDComp !== 0) {
-        return clientGroupIDComp;
-    }
-    return stringCompare(a.clientID, b.clientID);
-}
 function createQueriesTable(shard) {
-    return `
+  return `
 CREATE TABLE ${schema(shard)}.queries (
   "clientGroupID"         TEXT,
   "queryHash"             TEXT, -- this is the hash of the client query AST
@@ -82,23 +70,18 @@ CREATE INDEX queries_patch_version
   ON ${schema(shard)}.queries ("patchVersion" NULLS FIRST);
 `;
 }
-export function compareQueriesRows(a, b) {
-    const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
-    if (clientGroupIDComp !== 0) {
-        return clientGroupIDComp;
-    }
-    return stringCompare(a.queryHash, b.queryHash);
-}
 function createDesiresTable(shard) {
-    return `
+  return `
 CREATE TABLE ${schema(shard)}.desires (
   "clientGroupID"      TEXT,
   "clientID"           TEXT,
   "queryHash"          TEXT,
   "patchVersion"       TEXT NOT NULL,
   "deleted"            BOOL,  -- put vs del "desired" query
-  "ttl"                INTERVAL,  -- Time to live for this client
-  "inactivatedAt"      TIMESTAMPTZ,  -- Time at which this row was inactivated
+  "ttl"                INTERVAL,  -- DEPRECATED: Use ttlMs instead. Time to live for this client
+  "ttlMs"              DOUBLE PRECISION,  -- Time to live in milliseconds
+  "inactivatedAt"      TIMESTAMPTZ,  -- DEPRECATED: Use inactivatedAtMs instead. Time at which this row was inactivated
+  "inactivatedAtMs"    DOUBLE PRECISION,  -- Time at which this row was inactivated (milliseconds since client group start)
 
   PRIMARY KEY ("clientGroupID", "clientID", "queryHash"),
 
@@ -116,88 +99,42 @@ CREATE INDEX desires_inactivated_at
   ON ${schema(shard)}.desires ("inactivatedAt");
 `;
 }
-export function compareDesiresRows(a, b) {
-    const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
-    if (clientGroupIDComp !== 0) {
-        return clientGroupIDComp;
-    }
-    const clientIDComp = stringCompare(a.clientID, b.clientID);
-    if (clientIDComp !== 0) {
-        return clientIDComp;
-    }
-    return stringCompare(a.queryHash, b.queryHash);
-}
-export function rowsRowToRowID(rowsRow) {
-    return {
-        schema: rowsRow.schema,
-        table: rowsRow.table,
-        rowKey: rowsRow.rowKey,
-    };
-}
-export function rowsRowToRowRecord(rowsRow) {
-    return {
-        id: rowsRowToRowID(rowsRow),
-        rowVersion: rowsRow.rowVersion,
-        patchVersion: versionFromString(rowsRow.patchVersion),
-        refCounts: rowsRow.refCounts,
-    };
-}
-export function rowRecordToRowsRow(clientGroupID, rowRecord) {
-    return {
-        clientGroupID,
-        schema: rowRecord.id.schema,
-        table: rowRecord.id.table,
-        rowKey: rowRecord.id.rowKey,
-        rowVersion: rowRecord.rowVersion,
-        patchVersion: versionString(rowRecord.patchVersion),
-        refCounts: rowRecord.refCounts,
-    };
-}
-export function compareRowsRows(a, b) {
-    const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
-    if (clientGroupIDComp !== 0) {
-        return clientGroupIDComp;
-    }
-    const schemaComp = stringCompare(a.schema, b.schema);
-    if (schemaComp !== 0) {
-        return schemaComp;
-    }
-    const tableComp = stringCompare(b.table, b.table);
-    if (tableComp !== 0) {
-        return tableComp;
-    }
-    return stringCompare(stringifySorted(a.rowKey), stringifySorted(b.rowKey));
-}
-/**
- * The version of the data in the `cvr.rows` table. This may lag
- * `version` in `cvr.instances` but eventually catches up, modulo
- * exceptional circumstances like a server crash.
- *
- * The `rowsVersion` is tracked in a separate table (as opposed to
- * a column in the `cvr.instances` table) so that general `cvr` updates
- * and `row` updates can be executed independently without serialization
- * conflicts.
- *
- * Note: Although `clientGroupID` logically references the same column in
- * `cvr.instances`, a FOREIGN KEY constraint must not be declared as the
- * `cvr.rows` TABLE needs to be updated without affecting the
- * `SELECT ... FOR UPDATE` lock when `cvr.instances` is updated.
- */
-export function createRowsVersionTable(shard) {
-    return `
+function rowsRowToRowID(rowsRow) {
+  return {
+    schema: rowsRow.schema,
+    table: rowsRow.table,
+    rowKey: rowsRow.rowKey
+  };
+}
+function rowsRowToRowRecord(rowsRow) {
+  return {
+    id: rowsRowToRowID(rowsRow),
+    rowVersion: rowsRow.rowVersion,
+    patchVersion: versionFromString(rowsRow.patchVersion),
+    refCounts: rowsRow.refCounts
+  };
+}
+function rowRecordToRowsRow(clientGroupID, rowRecord) {
+  return {
+    clientGroupID,
+    schema: rowRecord.id.schema,
+    table: rowRecord.id.table,
+    rowKey: rowRecord.id.rowKey,
+    rowVersion: rowRecord.rowVersion,
+    patchVersion: versionString(rowRecord.patchVersion),
+    refCounts: rowRecord.refCounts
+  };
+}
+function createRowsVersionTable(shard) {
+  return `
 CREATE TABLE ${schema(shard)}."rowsVersion" (
   "clientGroupID" TEXT PRIMARY KEY,
   "version"       TEXT NOT NULL
 );
 `;
 }
-/**
- * CVR `rows` are updated asynchronously from the CVR metadata
- * (i.e. `instances`). The `rowsVersion` table is updated atomically with
- * updates to the `rows` data.
- */
 function createRowsTable(shard) {
-    return `
+  return `
 CREATE TABLE ${schema(shard)}.rows (
   "clientGroupID"    TEXT,
   "schema"           TEXT,
@@ -226,19 +163,17 @@ CREATE INDEX row_ref_counts ON ${schema(shard)}.rows
 `;
 }
 function createTables(shard) {
-    return (createSchema(shard) +
-        createInstancesTable(shard) +
-        createClientsTable(shard) +
-        createQueriesTable(shard) +
-        createDesiresTable(shard) +
-        createRowsVersionTable(shard) +
-        createRowsTable(shard));
-}
-export async function setupCVRTables(lc, db, shard) {
-    lc.info?.(`Setting up CVR tables`);
-    await db.unsafe(createTables(shard));
-}
-function stringifySorted(r) {
-    return stringify(normalizedKeyOrder(r));
-}
-//# sourceMappingURL=cvr.js.map
+  return createSchema(shard) + createInstancesTable(shard) + createClientsTable(shard) + createQueriesTable(shard) + createDesiresTable(shard) + createRowsVersionTable(shard) + createRowsTable(shard);
+}
+async function setupCVRTables(lc, db, shard) {
+  lc.info?.(`Setting up CVR tables`);
+  await db.unsafe(createTables(shard));
+}
+export {
+  createRowsVersionTable,
+  rowRecordToRowsRow,
+  rowsRowToRowID,
+  rowsRowToRowRecord,
+  setupCVRTables
+};
+//# sourceMappingURL=cvr.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"cvr.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/cvr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cvr.js","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/cvr.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {ident} from 'pg-format';\nimport type postgres from 'postgres';\nimport {\n  type JSONObject,\n  type JSONValue,\n  stringify,\n} from '../../../../../shared/src/bigint-json.ts';\nimport type {ReadonlyJSONValue} from '../../../../../shared/src/json.ts';\nimport {stringCompare} from '../../../../../shared/src/string-compare.ts';\nimport type {ClientSchema} from '../../../../../zero-protocol/src/client-schema.ts';\nimport {normalizedKeyOrder, type RowKey} from '../../../types/row-key.ts';\nimport {cvrSchema, type ShardID} from '../../../types/shards.ts';\nimport type {TTLClock} from '../ttl-clock.ts';\nimport {\n  type RowID,\n  type RowRecord,\n  versionFromString,\n  versionString,\n} from './types.ts';\n\n// For readability in the sql statements.\nfunction schema(shard: ShardID) {\n  return ident(cvrSchema(shard));\n}\n\nfunction createSchema(shard: ShardID) {\n  return `CREATE SCHEMA IF NOT EXISTS ${schema(shard)};`;\n}\n\nexport type InstancesRow = {\n  clientGroupID: string;\n  version: string;\n  lastActive: number;\n  ttlClock: TTLClock;\n  replicaVersion: string | null;\n  owner: string | null;\n  grantedAt: number | null;\n  clientSchema: ClientSchema | null;\n};\n\nfunction createInstancesTable(shard: ShardID) {\n  return `\nCREATE TABLE ${schema(shard)}.instances (\n  \"clientGroupID\"  TEXT PRIMARY KEY,\n  \"version\"        TEXT NOT NULL,             -- Sortable representation of CVRVersion, e.g. \"5nbqa2w:09\"\n  \"lastActive\"     TIMESTAMPTZ NOT NULL,      -- For garbage collection\n  \"ttlClock\"       DOUBLE PRECISION NOT NULL, -- The ttl clock gets \"paused\" when disconnected.\n  \"replicaVersion\" TEXT,                      -- Identifies the replica (i.e. initial-sync point) from which the CVR data comes.\n  \"owner\"          TEXT,                      -- The ID of the task / server that has been granted ownership of the CVR.\n  \"grantedAt\"      TIMESTAMPTZ,               -- The time at which the current owner was last granted ownership (most recent connection time).\n  \"clientSchema\"   JSONB                      -- ClientSchema of the client group\n);\n\n-- For garbage collection.\nCREATE INDEX instances_last_active\n  ON ${schema(shard)}.instances (\"lastActive\");\n`;\n}\n\nexport function compareInstancesRows(a: InstancesRow, b: InstancesRow) {\n  return stringCompare(a.clientGroupID, b.clientGroupID);\n}\n\nexport type ClientsRow = {\n  clientGroupID: string;\n  clientID: string;\n};\n\nfunction createClientsTable(shard: ShardID) {\n  return `\nCREATE TABLE ${schema(shard)}.clients (\n  \"clientGroupID\"      TEXT,\n  \"clientID\"           TEXT,\n\n  PRIMARY KEY (\"clientGroupID\", \"clientID\"),\n\n  CONSTRAINT fk_clients_client_group\n    FOREIGN KEY(\"clientGroupID\")\n    REFERENCES ${schema(shard)}.instances(\"clientGroupID\")\n    ON DELETE CASCADE\n);\n\n`;\n}\nexport function compareClientsRows(a: ClientsRow, b: ClientsRow) {\n  const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);\n  if (clientGroupIDComp !== 0) {\n    return clientGroupIDComp;\n  }\n  return stringCompare(a.clientID, b.clientID);\n}\n\nexport type QueriesRow = {\n  clientGroupID: string;\n  queryHash: string;\n  // This is the client AST _AFTER_ applying server name transformations.\n  clientAST: JSONValue | null;\n  queryName: string | null;\n  queryArgs: readonly ReadonlyJSONValue[] | null;\n  patchVersion: string | null;\n  transformationHash: string | null;\n  transformationVersion: string | null;\n  internal: boolean | null;\n  deleted: boolean | null;\n};\n\nfunction createQueriesTable(shard: ShardID) {\n  return `\nCREATE TABLE ${schema(shard)}.queries (\n  \"clientGroupID\"         TEXT,\n  \"queryHash\"             TEXT, -- this is the hash of the client query AST\n  \"clientAST\"             JSONB, -- this is nullable as custom queries will not persist an AST\n  \"queryName\"             TEXT, -- the name of the query if it is a custom query\n  \"queryArgs\"             JSON, -- the arguments of the query if it is a custom query\n  \"patchVersion\"          TEXT,  -- NULL if only desired but not yet \"got\"\n  \"transformationHash\"    TEXT,\n  \"transformationVersion\" TEXT,\n  \"internal\"              BOOL,  -- If true, no need to track / send patches\n  \"deleted\"               BOOL,  -- put vs del \"got\" query\n\n  PRIMARY KEY (\"clientGroupID\", \"queryHash\"),\n\n  CONSTRAINT fk_queries_client_group\n    FOREIGN KEY(\"clientGroupID\")\n    REFERENCES ${schema(shard)}.instances(\"clientGroupID\")\n    ON DELETE CASCADE\n);\n\n-- For catchup patches.\nCREATE INDEX queries_patch_version \n  ON ${schema(shard)}.queries (\"patchVersion\" NULLS FIRST);\n`;\n}\n\nexport function compareQueriesRows(a: QueriesRow, b: QueriesRow) {\n  const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);\n  if (clientGroupIDComp !== 0) {\n    return clientGroupIDComp;\n  }\n  return stringCompare(a.queryHash, b.queryHash);\n}\n\nexport type DesiresRow = {\n  clientGroupID: string;\n  clientID: string;\n  queryHash: string;\n  patchVersion: string;\n  deleted: boolean | null;\n  ttl: number | null;\n  inactivatedAt: TTLClock | null;\n};\n\nfunction createDesiresTable(shard: ShardID) {\n  return `\nCREATE TABLE ${schema(shard)}.desires (\n  \"clientGroupID\"      TEXT,\n  \"clientID\"           TEXT,\n  \"queryHash\"          TEXT,\n  \"patchVersion\"       TEXT NOT NULL,\n  \"deleted\"            BOOL,  -- put vs del \"desired\" query\n  \"ttl\"                INTERVAL,  -- DEPRECATED: Use ttlMs instead. Time to live for this client\n  \"ttlMs\"              DOUBLE PRECISION,  -- Time to live in milliseconds\n  \"inactivatedAt\"      TIMESTAMPTZ,  -- DEPRECATED: Use inactivatedAtMs instead. Time at which this row was inactivated\n  \"inactivatedAtMs\"    DOUBLE PRECISION,  -- Time at which this row was inactivated (milliseconds since client group start)\n\n  PRIMARY KEY (\"clientGroupID\", \"clientID\", \"queryHash\"),\n\n  CONSTRAINT fk_desires_query\n    FOREIGN KEY(\"clientGroupID\", \"queryHash\")\n    REFERENCES ${ident(cvrSchema(shard))}.queries(\"clientGroupID\", \"queryHash\")\n    ON DELETE CASCADE\n);\n\n-- For catchup patches.\nCREATE INDEX desires_patch_version\n  ON ${schema(shard)}.desires (\"patchVersion\");\n\nCREATE INDEX desires_inactivated_at\n  ON ${schema(shard)}.desires (\"inactivatedAt\");\n`;\n}\n\nexport function compareDesiresRows(a: DesiresRow, b: DesiresRow) {\n  const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);\n  if (clientGroupIDComp !== 0) {\n    return clientGroupIDComp;\n  }\n  const clientIDComp = stringCompare(a.clientID, b.clientID);\n  if (clientIDComp !== 0) {\n    return clientIDComp;\n  }\n  return stringCompare(a.queryHash, b.queryHash);\n}\n\nexport type RowsRow = {\n  clientGroupID: string;\n  schema: string;\n  table: string;\n  rowKey: JSONObject;\n  rowVersion: string;\n  patchVersion: string;\n  refCounts: {[queryHash: string]: number} | null;\n};\n\nexport function rowsRowToRowID(rowsRow: RowsRow): RowID {\n  return {\n    schema: rowsRow.schema,\n    table: rowsRow.table,\n    rowKey: rowsRow.rowKey as Record<string, JSONValue>,\n  };\n}\n\nexport function rowsRowToRowRecord(rowsRow: RowsRow): RowRecord {\n  return {\n    id: rowsRowToRowID(rowsRow),\n    rowVersion: rowsRow.rowVersion,\n    patchVersion: versionFromString(rowsRow.patchVersion),\n    refCounts: rowsRow.refCounts,\n  };\n}\n\nexport function rowRecordToRowsRow(\n  clientGroupID: string,\n  rowRecord: RowRecord,\n): RowsRow {\n  return {\n    clientGroupID,\n    schema: rowRecord.id.schema,\n    table: rowRecord.id.table,\n    rowKey: rowRecord.id.rowKey as Record<string, JSONValue>,\n    rowVersion: rowRecord.rowVersion,\n    patchVersion: versionString(rowRecord.patchVersion),\n    refCounts: rowRecord.refCounts,\n  };\n}\n\nexport function compareRowsRows(a: RowsRow, b: RowsRow) {\n  const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);\n  if (clientGroupIDComp !== 0) {\n    return clientGroupIDComp;\n  }\n  const schemaComp = stringCompare(a.schema, b.schema);\n  if (schemaComp !== 0) {\n    return schemaComp;\n  }\n  const tableComp = stringCompare(b.table, b.table);\n  if (tableComp !== 0) {\n    return tableComp;\n  }\n  return stringCompare(\n    stringifySorted(a.rowKey as RowKey),\n    stringifySorted(b.rowKey as RowKey),\n  );\n}\n\n/**\n * The version of the data in the `cvr.rows` table. This may lag\n * `version` in `cvr.instances` but eventually catches up, modulo\n * exceptional circumstances like a server crash.\n *\n * The `rowsVersion` is tracked in a separate table (as opposed to\n * a column in the `cvr.instances` table) so that general `cvr` updates\n * and `row` updates can be executed independently without serialization\n * conflicts.\n *\n * Note: Although `clientGroupID` logically references the same column in\n * `cvr.instances`, a FOREIGN KEY constraint must not be declared as the\n * `cvr.rows` TABLE needs to be updated without affecting the\n * `SELECT ... FOR UPDATE` lock when `cvr.instances` is updated.\n */\nexport function createRowsVersionTable(shard: ShardID) {\n  return `\nCREATE TABLE ${schema(shard)}.\"rowsVersion\" (\n  \"clientGroupID\" TEXT PRIMARY KEY,\n  \"version\"       TEXT NOT NULL\n);\n`;\n}\n\n/**\n * CVR `rows` are updated asynchronously from the CVR metadata\n * (i.e. `instances`). The `rowsVersion` table is updated atomically with\n * updates to the `rows` data.\n */\nfunction createRowsTable(shard: ShardID) {\n  return `\nCREATE TABLE ${schema(shard)}.rows (\n  \"clientGroupID\"    TEXT,\n  \"schema\"           TEXT,\n  \"table\"            TEXT,\n  \"rowKey\"           JSONB,\n  \"rowVersion\"       TEXT NOT NULL,\n  \"patchVersion\"     TEXT NOT NULL,\n  \"refCounts\"        JSONB,  -- {[queryHash: string]: number}, NULL for tombstone\n\n  PRIMARY KEY (\"clientGroupID\", \"schema\", \"table\", \"rowKey\"),\n\n  CONSTRAINT fk_rows_client_group\n    FOREIGN KEY(\"clientGroupID\")\n    REFERENCES ${schema(shard)}.\"rowsVersion\" (\"clientGroupID\")\n    ON DELETE CASCADE\n);\n\n-- For catchup patches.\nCREATE INDEX row_patch_version \n  ON ${schema(shard)}.rows (\"patchVersion\");\n\n-- For listing rows returned by one or more query hashes. e.g.\n-- SELECT * FROM cvr_shard.rows WHERE \"refCounts\" ?| array[...queryHashes...];\nCREATE INDEX row_ref_counts ON ${schema(shard)}.rows \n  USING GIN (\"refCounts\");\n`;\n}\n\nexport type RowsVersionRow = {\n  clientGroupID: string;\n  version: string;\n};\n\nfunction createTables(shard: ShardID) {\n  return (\n    createSchema(shard) +\n    createInstancesTable(shard) +\n    createClientsTable(shard) +\n    createQueriesTable(shard) +\n    createDesiresTable(shard) +\n    createRowsVersionTable(shard) +\n    createRowsTable(shard)\n  );\n}\n\nexport async function setupCVRTables(\n  lc: LogContext,\n  db: postgres.TransactionSql,\n  shard: ShardID,\n) {\n  lc.info?.(`Setting up CVR tables`);\n  await db.unsafe(createTables(shard));\n}\n\nfunction stringifySorted(r: RowKey) {\n  return stringify(normalizedKeyOrder(r));\n}\n"],"names":[],"mappings":";;;;;AAsBA,SAAS,OAAO,OAAgB;AAC9B,SAAO,MAAM,UAAU,KAAK,CAAC;AAC/B;AAEA,SAAS,aAAa,OAAgB;AACpC,SAAO,+BAA+B,OAAO,KAAK,CAAC;AACrD;AAaA,SAAS,qBAAqB,OAAgB;AAC5C,SAAO;AAAA,eACM,OAAO,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,OAarB,OAAO,KAAK,CAAC;AAAA;AAEpB;AAWA,SAAS,mBAAmB,OAAgB;AAC1C,SAAO;AAAA,eACM,OAAO,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAQX,OAAO,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA;AAK9B;AAuBA,SAAS,mBAAmB,OAAgB;AAC1C,SAAO;AAAA,eACM,OAAO,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAgBX,OAAO,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,OAMvB,OAAO,KAAK,CAAC;AAAA;AAEpB;AAoBA,SAAS,mBAAmB,OAAgB;AAC1C,SAAO;AAAA,eACM,OAAO,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAeX,MAAM,UAAU,KAAK,CAAC,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,OAMjC,OAAO,KAAK,CAAC;AAAA;AAAA;AAAA,OAGb,OAAO,KAAK,CAAC;AAAA;AAEpB;AAwBO,SAAS,eAAe,SAAyB;AACtD,SAAO;AAAA,IACL,QAAQ,QAAQ;AAAA,IAChB,OAAO,QAAQ;AAAA,IACf,QAAQ,QAAQ;AAAA,EAAA;AAEpB;AAEO,SAAS,mBAAmB,SAA6B;AAC9D,SAAO;AAAA,IACL,IAAI,eAAe,OAAO;AAAA,IAC1B,YAAY,QAAQ;AAAA,IACpB,cAAc,kBAAkB,QAAQ,YAAY;AAAA,IACpD,WAAW,QAAQ;AAAA,EAAA;AAEvB;AAEO,SAAS,mBACd,eACA,WACS;AACT,SAAO;AAAA,IACL;AAAA,IACA,QAAQ,UAAU,GAAG;AAAA,IACrB,OAAO,UAAU,GAAG;AAAA,IACpB,QAAQ,UAAU,GAAG;AAAA,IACrB,YAAY,UAAU;AAAA,IACtB,cAAc,cAAc,UAAU,YAAY;AAAA,IAClD,WAAW,UAAU;AAAA,EAAA;AAEzB;AAoCO,SAAS,uBAAuB,OAAgB;AACrD,SAAO;AAAA,eACM,OAAO,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA;AAK5B;AAOA,SAAS,gBAAgB,OAAgB;AACvC,SAAO;AAAA,eACM,OAAO,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAaX,OAAO,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,OAMvB,OAAO,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA,iCAIa,OAAO,KAAK,CAAC;AAAA;AAAA;AAG9C;AAOA,SAAS,aAAa,OAAgB;AACpC,SACE,aAAa,KAAK,IAClB,qBAAqB,KAAK,IAC1B,mBAAmB,KAAK,IACxB,mBAAmB,KAAK,IACxB,mBAAmB,KAAK,IACxB,uBAAuB,KAAK,IAC5B,gBAAgB,KAAK;AAEzB;AAEA,eAAsB,eACpB,IACA,IACA,OACA;AACA,KAAG,OAAO,uBAAuB;AACjC,QAAM,GAAG,OAAO,aAAa,KAAK,CAAC;AACrC;"}

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,0BAA0B,CAAC;AAGjE,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,UAAU,EACf,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC,CAoLf"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,0BAA0B,CAAC;AAGjE,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,UAAU,EACf,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC,CAgNf"}

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

@@ -1,146 +1,192 @@
-import { runSchemaMigrations, } from "../../../db/migration.js";
+import { runSchemaMigrations } from "../../../db/migration.js";
 import { cvrSchema } from "../../../types/shards.js";
-import { createRowsVersionTable, setupCVRTables } from "./cvr.js";
-export async function initViewSyncerSchema(log, db, shard) {
-    const schema = cvrSchema(shard);
-    const setupMigration = {
-        migrateSchema: (lc, tx) => setupCVRTables(lc, tx, shard),
-        minSafeVersion: 1,
-    };
-    const migrateV1toV2 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.instances ADD "replicaVersion" TEXT`;
-        },
-    };
-    const migrateV2ToV3 = {
-        migrateSchema: async (_, tx) => {
-            await tx.unsafe(createRowsVersionTable(shard));
-        },
-        /** Populates the cvr.rowsVersion table with versions from cvr.instances. */
-        migrateData: async (lc, tx) => {
-            const pending = [];
-            for await (const versions of tx `
-      SELECT "clientGroupID", "version" FROM ${tx(schema)}.instances`.cursor(5000)) {
-                for (const version of versions) {
-                    pending.push(tx `INSERT INTO ${tx(schema)}."rowsVersion" ${tx(version)} 
+import { setupCVRTables, createRowsVersionTable } from "./cvr.js";
+async function initViewSyncerSchema(log, db, shard) {
+  const schema = cvrSchema(shard);
+  const setupMigration = {
+    migrateSchema: (lc, tx) => setupCVRTables(lc, tx, shard),
+    minSafeVersion: 1
+  };
+  const migrateV1toV2 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.instances ADD "replicaVersion" TEXT`;
+    }
+  };
+  const migrateV2ToV3 = {
+    migrateSchema: async (_, tx) => {
+      await tx.unsafe(createRowsVersionTable(shard));
+    },
+    /** Populates the cvr.rowsVersion table with versions from cvr.instances. */
+    migrateData: async (lc, tx) => {
+      const pending = [];
+      for await (const versions of tx`
+      SELECT "clientGroupID", "version" FROM ${tx(schema)}.instances`.cursor(
+        5e3
+      )) {
+        for (const version of versions) {
+          pending.push(
+            tx`INSERT INTO ${tx(schema)}."rowsVersion" ${tx(version)} 
                ON CONFLICT ("clientGroupID")
-               DO UPDATE SET ${tx(version)}`.execute());
-                }
-            }
-            lc.info?.(`initializing rowsVersion for ${pending.length} cvrs`);
-            await Promise.all(pending);
-        },
-    };
-    const migrateV3ToV4 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.instances ADD "owner" TEXT`;
-            await tx `ALTER TABLE ${tx(schema)}.instances ADD "grantedAt" TIMESTAMPTZ`;
-        },
-    };
-    const migrateV5ToV6 = {
-        migrateSchema: async (_, tx) => {
-            await tx `
+               DO UPDATE SET ${tx(version)}`.execute()
+          );
+        }
+      }
+      lc.info?.(`initializing rowsVersion for ${pending.length} cvrs`);
+      await Promise.all(pending);
+    }
+  };
+  const migrateV3ToV4 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.instances ADD "owner" TEXT`;
+      await tx`ALTER TABLE ${tx(schema)}.instances ADD "grantedAt" TIMESTAMPTZ`;
+    }
+  };
+  const migrateV5ToV6 = {
+    migrateSchema: async (_, tx) => {
+      await tx`
       ALTER TABLE ${tx(schema)}."rows"
         DROP CONSTRAINT fk_rows_client_group`;
-            await tx `
+      await tx`
       ALTER TABLE ${tx(schema)}."rowsVersion"
         DROP CONSTRAINT fk_rows_version_client_group`;
-        },
-    };
-    const migrateV6ToV7 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.desires ADD "expiresAt" TIMESTAMPTZ`;
-            await tx `ALTER TABLE ${tx(schema)}.desires ADD "inactivatedAt" TIMESTAMPTZ`;
-            await tx `ALTER TABLE ${tx(schema)}.desires ADD "ttl" INTERVAL`;
-            await tx `CREATE INDEX desires_expires_at ON ${tx(schema)}.desires ("expiresAt")`;
-            await tx `CREATE INDEX desires_inactivated_at ON ${tx(schema)}.desires ("inactivatedAt")`;
-        },
-    };
-    const migrateV7ToV8 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}."desires" DROP CONSTRAINT fk_desires_client`;
-        },
-    };
-    const migrateV8ToV9 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.instances ADD "clientSchema" JSONB`;
-        },
-    };
-    const migrateV9ToV10 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.queries ADD "queryName" TEXT`;
-            await tx `ALTER TABLE ${tx(schema)}.queries ADD "queryArgs" JSONB`;
-            await tx `ALTER TABLE ${tx(schema)}.queries ALTER COLUMN "clientAST" DROP NOT NULL`;
-        },
-    };
-    const migrateV10ToV11 = {
-        migrateSchema: async (_, tx) => {
-            await tx `DROP INDEX IF EXISTS ${tx(schema)}.desires_expires_at`;
-            await tx `ALTER TABLE ${tx(schema)}.desires DROP COLUMN "expiresAt"`;
-            await tx `DROP INDEX IF EXISTS ${tx(schema)}.client_patch_version`;
-            await tx `ALTER TABLE ${tx(schema)}.clients DROP COLUMN "patchVersion"`;
-            await tx `ALTER TABLE ${tx(schema)}.clients DROP COLUMN "deleted"`;
-        },
-    };
-    const migratedV11ToV12 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.queries ALTER COLUMN "queryArgs" TYPE JSON USING "queryArgs"::JSON`;
-        },
-    };
-    const migratedV12ToV13 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.instances ADD COLUMN "ttlClock" DOUBLE PRECISION NOT NULL DEFAULT 0`;
-        },
-    };
-    const migratedV13ToV14 = {
-        migrateSchema: async (_, sql) => {
-            await sql `
+    }
+  };
+  const migrateV6ToV7 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.desires ADD "expiresAt" TIMESTAMPTZ`;
+      await tx`ALTER TABLE ${tx(
+        schema
+      )}.desires ADD "inactivatedAt" TIMESTAMPTZ`;
+      await tx`ALTER TABLE ${tx(schema)}.desires ADD "ttl" INTERVAL`;
+      await tx`CREATE INDEX desires_expires_at ON ${tx(
+        schema
+      )}.desires ("expiresAt")`;
+      await tx`CREATE INDEX desires_inactivated_at ON ${tx(
+        schema
+      )}.desires ("inactivatedAt")`;
+    }
+  };
+  const migrateV7ToV8 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(
+        schema
+      )}."desires" DROP CONSTRAINT fk_desires_client`;
+    }
+  };
+  const migrateV8ToV9 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.instances ADD "clientSchema" JSONB`;
+    }
+  };
+  const migrateV9ToV10 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.queries ADD "queryName" TEXT`;
+      await tx`ALTER TABLE ${tx(schema)}.queries ADD "queryArgs" JSONB`;
+      await tx`ALTER TABLE ${tx(schema)}.queries ALTER COLUMN "clientAST" DROP NOT NULL`;
+    }
+  };
+  const migrateV10ToV11 = {
+    migrateSchema: async (_, tx) => {
+      await tx`DROP INDEX IF EXISTS ${tx(schema)}.desires_expires_at`;
+      await tx`ALTER TABLE ${tx(schema)}.desires DROP COLUMN "expiresAt"`;
+      await tx`DROP INDEX IF EXISTS ${tx(schema)}.client_patch_version`;
+      await tx`ALTER TABLE ${tx(schema)}.clients DROP COLUMN "patchVersion"`;
+      await tx`ALTER TABLE ${tx(schema)}.clients DROP COLUMN "deleted"`;
+    }
+  };
+  const migratedV11ToV12 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.queries ALTER COLUMN "queryArgs" TYPE JSON USING "queryArgs"::JSON`;
+    }
+  };
+  const migratedV12ToV13 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.instances ADD COLUMN "ttlClock" DOUBLE PRECISION NOT NULL DEFAULT 0`;
+    }
+  };
+  const migratedV13ToV14 = {
+    migrateSchema: async (_, sql) => {
+      await sql`
         CREATE INDEX instances_last_active ON ${sql(schema)}.instances ("lastActive");
       `;
-            // Update / add foreign key constraints to cascade deletes.
-            for (const [table, reference] of [
-                ['clients', 'instances'],
-                ['queries', 'instances'],
-                ['rows', 'rowsVersion'],
-            ]) {
-                const constraint = sql(`fk_${table}_client_group`);
-                await sql `
+      for (const [table, reference] of [
+        ["clients", "instances"],
+        ["queries", "instances"],
+        ["rows", "rowsVersion"]
+      ]) {
+        const constraint = sql(`fk_${table}_client_group`);
+        await sql`
           ALTER TABLE ${sql(schema)}.${sql(table)} DROP CONSTRAINT IF EXISTS ${constraint}`;
-                await sql `
+        await sql`
           ALTER TABLE ${sql(schema)}.${sql(table)} ADD CONSTRAINT ${constraint}
             FOREIGN KEY("clientGroupID")
             REFERENCES ${sql(schema)}.${sql(reference)} ("clientGroupID")
             ON DELETE CASCADE;
         `;
-            }
-        },
-    };
-    const schemaVersionMigrationMap = {
-        2: migrateV1toV2,
-        3: migrateV2ToV3,
-        4: migrateV3ToV4,
-        // v5 enables asynchronous row-record flushing, and thus relies on
-        // the logic that updates and checks the rowsVersion table in v3.
-        5: { minSafeVersion: 3 },
-        6: migrateV5ToV6,
-        7: migrateV6ToV7,
-        8: migrateV7ToV8,
-        9: migrateV8ToV9,
-        // v10 adds queryName and queryArgs to the queries table to support
-        // custom queries. clientAST is now optional to support migrating
-        // off client queries.
-        10: migrateV9ToV10,
-        // V11 removes the deprecated queries."expiresAt", clients."patchVersion",
-        // clients."deleted" columns.
-        11: migrateV10ToV11,
-        12: migratedV11ToV12,
-        // V13 adds instances."ttlClock"
-        13: migratedV12ToV13,
-        // V14 adds an index on instances."lastActive" and a FK constraint
-        // from rows."clientGroupID" to rowsVersion."clientGroupID" for
-        // garbage collection
-        14: migratedV13ToV14,
-    };
-    await runSchemaMigrations(log, 'view-syncer', cvrSchema(shard), db, setupMigration, schemaVersionMigrationMap);
+      }
+    }
+  };
+  const migratedV14ToV15 = {
+    migrateSchema: async (_, sql) => {
+      await sql`ALTER TABLE ${sql(schema)}.desires 
+        ADD COLUMN "inactivatedAtMs" DOUBLE PRECISION`;
+      await sql`ALTER TABLE ${sql(schema)}.desires 
+        ADD COLUMN "ttlMs" DOUBLE PRECISION`;
+    },
+    // Migrate existing data: convert TIMESTAMPTZ to milliseconds for inactivatedAt
+    // and INTERVAL to milliseconds for ttl
+    // Note: EXTRACT(EPOCH FROM NULL) returns NULL, so NULL values are preserved
+    migrateData: async (lc, sql) => {
+      lc.info?.(
+        "Migrating desires.inactivatedAt to inactivatedAtMs and ttl to ttlMs"
+      );
+      await sql`
+        UPDATE ${sql(schema)}.desires
+        SET "inactivatedAtMs" = EXTRACT(EPOCH FROM "inactivatedAt") * 1000,
+            "ttlMs" = EXTRACT(EPOCH FROM "ttl") * 1000
+      `;
+    }
+  };
+  const schemaVersionMigrationMap = {
+    2: migrateV1toV2,
+    3: migrateV2ToV3,
+    4: migrateV3ToV4,
+    // v5 enables asynchronous row-record flushing, and thus relies on
+    // the logic that updates and checks the rowsVersion table in v3.
+    5: { minSafeVersion: 3 },
+    6: migrateV5ToV6,
+    7: migrateV6ToV7,
+    8: migrateV7ToV8,
+    9: migrateV8ToV9,
+    // v10 adds queryName and queryArgs to the queries table to support
+    // custom queries. clientAST is now optional to support migrating
+    // off client queries.
+    10: migrateV9ToV10,
+    // V11 removes the deprecated queries."expiresAt", clients."patchVersion",
+    // clients."deleted" columns.
+    11: migrateV10ToV11,
+    12: migratedV11ToV12,
+    // V13 adds instances."ttlClock"
+    13: migratedV12ToV13,
+    // V14 adds an index on instances."lastActive" and a FK constraint
+    // from rows."clientGroupID" to rowsVersion."clientGroupID" for
+    // garbage collection
+    14: migratedV13ToV14,
+    // V15 adds desires."inactivatedAtTTLClock" to store TTLClock values
+    // directly as DOUBLE PRECISION, avoiding postgres.js TIMESTAMPTZ
+    // type conversion issues
+    15: migratedV14ToV15
+  };
+  await runSchemaMigrations(
+    log,
+    "view-syncer",
+    cvrSchema(shard),
+    db,
+    setupMigration,
+    schemaVersionMigrationMap
+  );
 }
-//# sourceMappingURL=init.js.map
+export {
+  initViewSyncerSchema
+};
+//# sourceMappingURL=init.js.map