@rocicorp/zero 0.26.1 → 0.26.2-canary.4

package/out/zero-cache/src/services/change-streamer/schema/init.js

@@ -1,102 +1,74 @@
-import { runSchemaMigrations } from "../../../db/migration.js";
 import { cdcSchema } from "../../../types/shards.js";
-import { setupCDCTables, createBackfillTables, createReplicationStateTable } from "./tables.js";
+import { createBackfillTables, createReplicationStateTable, setupCDCTables } from "./tables.js";
+import { runSchemaMigrations } from "../../../db/migration.js";
+//#region ../zero-cache/src/services/change-streamer/schema/init.ts
 async function migrateFromLegacySchemas(lc, db, newSchema, ...legacy) {
-  const rows = await db`
+	const names = (await db`
     SELECT nspname FROM pg_namespace 
-      WHERE nspname IN ${db([newSchema, ...legacy])}`.values();
-  const names = rows.flat();
-  if (names.includes(newSchema)) {
-    return;
-  }
-  for (const schema of legacy) {
-    if (names.includes(schema)) {
-      lc.info?.(`Migrating ${schema} to ${newSchema}`);
-      await db`ALTER SCHEMA ${db(schema)} RENAME TO ${db(newSchema)}`;
-      break;
-    }
-  }
+      WHERE nspname IN ${db([newSchema, ...legacy])}`.values()).flat();
+	if (names.includes(newSchema)) return;
+	for (const schema of legacy) if (names.includes(schema)) {
+		lc.info?.(`Migrating ${schema} to ${newSchema}`);
+		await db`ALTER SCHEMA ${db(schema)} RENAME TO ${db(newSchema)}`;
+		break;
+	}
 }
 async function initChangeStreamerSchema(log, db, shard) {
-  const schema = cdcSchema(shard);
-  const { appID } = shard;
-  await migrateFromLegacySchemas(
-    log,
-    db,
-    schema,
-    appID === "zero" ? `cdc_0` : `cdc_${appID}`,
-    "cdc"
-  );
-  const setupMigration = {
-    migrateSchema: (lc, tx) => setupCDCTables(lc, tx, shard),
-    minSafeVersion: 1
-  };
-  async function migrateV1toV2(_, db2) {
-    await db2`
-    ALTER TABLE ${db2(schema)}."replicationConfig" ADD "resetRequired" BOOL`;
-  }
-  const migrateV2ToV3 = {
-    migrateSchema: async (_, db2) => {
-      await db2.unsafe(createReplicationStateTable(shard));
-    },
-    migrateData: async (_, db2) => {
-      const lastWatermark = await getLastWatermarkV2(db2, shard);
-      const replicationState = { lastWatermark };
-      await db2`
-      TRUNCATE TABLE ${db2(schema)}."replicationState"`;
-      await db2`
-      INSERT INTO ${db2(schema)}."replicationState" ${db2(replicationState)}`;
-    }
-  };
-  const migrateV3ToV4 = {
-    migrateSchema: async (_, db2) => {
-      await db2`
-      ALTER TABLE ${db2(schema)}."changeLog" ALTER "change" TYPE JSON;
+	const schema = cdcSchema(shard);
+	const { appID } = shard;
+	await migrateFromLegacySchemas(log, db, schema, appID === "zero" ? `cdc_0` : `cdc_${appID}`, "cdc");
+	const setupMigration = {
+		migrateSchema: (lc, tx) => setupCDCTables(lc, tx, shard),
+		minSafeVersion: 1
+	};
+	async function migrateV1toV2(_, db) {
+		await db`
+    ALTER TABLE ${db(schema)}."replicationConfig" ADD "resetRequired" BOOL`;
+	}
+	const migrateV2ToV3 = {
+		migrateSchema: async (_, db) => {
+			await db.unsafe(createReplicationStateTable(shard));
+		},
+		migrateData: async (_, db) => {
+			const replicationState = { lastWatermark: await getLastWatermarkV2(db, shard) };
+			await db`
+      TRUNCATE TABLE ${db(schema)}."replicationState"`;
+			await db`
+      INSERT INTO ${db(schema)}."replicationState" ${db(replicationState)}`;
+		}
+	};
+	const migrateV3ToV4 = { migrateSchema: async (_, db) => {
+		await db`
+      ALTER TABLE ${db(schema)}."changeLog" ALTER "change" TYPE JSON;
       `;
-    }
-  };
-  const migrateV4ToV5 = {
-    migrateSchema: async (_, db2) => {
-      await db2`
-      ALTER TABLE ${db2(schema)}."replicationState" ADD "ownerAddress" TEXT;
+	} };
+	const migrateV4ToV5 = { migrateSchema: async (_, db) => {
+		await db`
+      ALTER TABLE ${db(schema)}."replicationState" ADD "ownerAddress" TEXT;
       `;
-    }
-  };
-  const migrateV5ToV6 = {
-    migrateSchema: async (_, db2) => {
-      await db2.unsafe(createBackfillTables(shard));
-    }
-  };
-  const schemaVersionMigrationMap = {
-    2: { migrateSchema: migrateV1toV2 },
-    3: migrateV2ToV3,
-    4: migrateV3ToV4,
-    5: migrateV4ToV5,
-    6: migrateV5ToV6
-  };
-  await runSchemaMigrations(
-    log,
-    "change-streamer",
-    schema,
-    db,
-    setupMigration,
-    schemaVersionMigrationMap
-  );
+	} };
+	const migrateV5ToV6 = { migrateSchema: async (_, db) => {
+		await db.unsafe(createBackfillTables(shard));
+	} };
+	await runSchemaMigrations(log, "change-streamer", schema, db, setupMigration, {
+		2: { migrateSchema: migrateV1toV2 },
+		3: migrateV2ToV3,
+		4: migrateV3ToV4,
+		5: migrateV4ToV5,
+		6: migrateV5ToV6
+	});
 }
 async function getLastWatermarkV2(db, shard) {
-  const schema = cdcSchema(shard);
-  const [{ max }] = await db`
+	const schema = cdcSchema(shard);
+	const [{ max }] = await db`
     SELECT MAX(watermark) as max FROM ${db(schema)}."changeLog"`;
-  if (max !== null) {
-    return max;
-  }
-  const [{ replicaVersion }] = await db`
+	if (max !== null) return max;
+	const [{ replicaVersion }] = await db`
     SELECT "replicaVersion" FROM ${db(schema)}."replicationConfig"
     `;
-  return replicaVersion;
+	return replicaVersion;
 }
-export {
-  getLastWatermarkV2,
-  initChangeStreamerSchema
-};
-//# sourceMappingURL=init.js.map
+//#endregion
+export { initChangeStreamerSchema };
+
+//# sourceMappingURL=init.js.map

package/out/zero-cache/src/services/change-streamer/schema/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/init.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {\n  runSchemaMigrations,\n  type IncrementalMigrationMap,\n  type Migration,\n} from '../../../db/migration.ts';\nimport type {PostgresDB, PostgresTransaction} from '../../../types/pg.ts';\nimport {cdcSchema, type ShardID} from '../../../types/shards.ts';\nimport {\n  createBackfillTables,\n  createReplicationStateTable,\n  setupCDCTables,\n  type ReplicationState,\n} from './tables.ts';\n\nasync function migrateFromLegacySchemas(\n  lc: LogContext,\n  db: PostgresDB,\n  newSchema: string,\n  ...legacy: string[]\n) {\n  const rows = await db<{nspname: string}[]>`\n    SELECT nspname FROM pg_namespace \n      WHERE nspname IN ${db([newSchema, ...legacy])}`.values();\n  // oxlint-disable-next-line unicorn/prefer-set-has -- Small collection, array is more appropriate\n  const names = rows.flat();\n  if (names.includes(newSchema)) {\n    return; // already migrated\n  }\n  for (const schema of legacy) {\n    if (names.includes(schema)) {\n      lc.info?.(`Migrating ${schema} to ${newSchema}`);\n      await db`ALTER SCHEMA ${db(schema)} RENAME TO ${db(newSchema)}`;\n      break;\n    }\n  }\n}\n\nexport async function initChangeStreamerSchema(\n  log: LogContext,\n  db: PostgresDB,\n  shard: ShardID,\n): Promise<void> {\n  const schema = cdcSchema(shard);\n  const {appID} = shard;\n  await migrateFromLegacySchemas(\n    log,\n    db,\n    schema,\n    appID === 'zero' ? `cdc_0` : `cdc_${appID}`,\n    'cdc',\n  );\n\n  const setupMigration: Migration = {\n    migrateSchema: (lc, tx) => setupCDCTables(lc, tx, shard),\n    minSafeVersion: 1,\n  };\n\n  async function migrateV1toV2(_: LogContext, db: PostgresTransaction) {\n    await db`\n    ALTER TABLE ${db(schema)}.\"replicationConfig\" ADD \"resetRequired\" BOOL`;\n  }\n\n  const migrateV2ToV3 = {\n    migrateSchema: async (_: LogContext, db: PostgresTransaction) => {\n      await db.unsafe(createReplicationStateTable(shard));\n    },\n\n    migrateData: async (_: LogContext, db: PostgresTransaction) => {\n      const lastWatermark = await getLastWatermarkV2(db, shard);\n      const replicationState: Partial<ReplicationState> = {lastWatermark};\n      await db`\n      TRUNCATE TABLE ${db(schema)}.\"replicationState\"`;\n      await db`\n      INSERT INTO ${db(schema)}.\"replicationState\" ${db(replicationState)}`;\n    },\n  };\n\n  const migrateV3ToV4 = {\n    migrateSchema: async (_: LogContext, db: PostgresTransaction) => {\n      await db`\n      ALTER TABLE ${db(schema)}.\"changeLog\" ALTER \"change\" TYPE JSON;\n      `;\n    },\n  };\n\n  const migrateV4ToV5 = {\n    migrateSchema: async (_: LogContext, db: PostgresTransaction) => {\n      await db`\n      ALTER TABLE ${db(schema)}.\"replicationState\" ADD \"ownerAddress\" TEXT;\n      `;\n    },\n  };\n\n  const migrateV5ToV6 = {\n    migrateSchema: async (_: LogContext, db: PostgresTransaction) => {\n      await db.unsafe(createBackfillTables(shard));\n    },\n  };\n\n  const schemaVersionMigrationMap: IncrementalMigrationMap = {\n    2: {migrateSchema: migrateV1toV2},\n    3: migrateV2ToV3,\n    4: migrateV3ToV4,\n    5: migrateV4ToV5,\n    6: migrateV5ToV6,\n  };\n\n  await runSchemaMigrations(\n    log,\n    'change-streamer',\n    schema,\n    db,\n    setupMigration,\n    schemaVersionMigrationMap,\n  );\n}\n\nexport async function getLastWatermarkV2(\n  db: PostgresDB,\n  shard: ShardID,\n): Promise<string> {\n  const schema = cdcSchema(shard);\n  const [{max}] = await db<{max: string | null}[]>`\n    SELECT MAX(watermark) as max FROM ${db(schema)}.\"changeLog\"`;\n  if (max !== null) {\n    return max;\n  }\n  // The changeLog is only empty if nothing has been synced since initial-sync.\n  // In this case, the last watermark is the replicaVersion.\n  const [{replicaVersion}] = await db<{replicaVersion: string}[]>`\n    SELECT \"replicaVersion\" FROM ${db(schema)}.\"replicationConfig\"\n    `;\n  return replicaVersion;\n}\n"],"names":["db"],"mappings":";;;AAeA,eAAe,yBACb,IACA,IACA,cACG,QACH;AACA,QAAM,OAAO,MAAM;AAAA;AAAA,yBAEI,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC,CAAC,GAAG,OAAA;AAEpD,QAAM,QAAQ,KAAK,KAAA;AACnB,MAAI,MAAM,SAAS,SAAS,GAAG;AAC7B;AAAA,EACF;AACA,aAAW,UAAU,QAAQ;AAC3B,QAAI,MAAM,SAAS,MAAM,GAAG;AAC1B,SAAG,OAAO,aAAa,MAAM,OAAO,SAAS,EAAE;AAC/C,YAAM,kBAAkB,GAAG,MAAM,CAAC,cAAc,GAAG,SAAS,CAAC;AAC7D;AAAA,IACF;AAAA,EACF;AACF;AAEA,eAAsB,yBACpB,KACA,IACA,OACe;AACf,QAAM,SAAS,UAAU,KAAK;AAC9B,QAAM,EAAC,UAAS;AAChB,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA,UAAU,SAAS,UAAU,OAAO,KAAK;AAAA,IACzC;AAAA,EAAA;AAGF,QAAM,iBAA4B;AAAA,IAChC,eAAe,CAAC,IAAI,OAAO,eAAe,IAAI,IAAI,KAAK;AAAA,IACvD,gBAAgB;AAAA,EAAA;AAGlB,iBAAe,cAAc,GAAeA,KAAyB;AACnE,UAAMA;AAAAA,kBACQA,IAAG,MAAM,CAAC;AAAA,EAC1B;AAEA,QAAM,gBAAgB;AAAA,IACpB,eAAe,OAAO,GAAeA,QAA4B;AAC/D,YAAMA,IAAG,OAAO,4BAA4B,KAAK,CAAC;AAAA,IACpD;AAAA,IAEA,aAAa,OAAO,GAAeA,QAA4B;AAC7D,YAAM,gBAAgB,MAAM,mBAAmBA,KAAI,KAAK;AACxD,YAAM,mBAA8C,EAAC,cAAA;AACrD,YAAMA;AAAAA,uBACWA,IAAG,MAAM,CAAC;AAC3B,YAAMA;AAAAA,oBACQA,IAAG,MAAM,CAAC,uBAAuBA,IAAG,gBAAgB,CAAC;AAAA,IACrE;AAAA,EAAA;AAGF,QAAM,gBAAgB;AAAA,IACpB,eAAe,OAAO,GAAeA,QAA4B;AAC/D,YAAMA;AAAAA,oBACQA,IAAG,MAAM,CAAC;AAAA;AAAA,IAE1B;AAAA,EAAA;AAGF,QAAM,gBAAgB;AAAA,IACpB,eAAe,OAAO,GAAeA,QAA4B;AAC/D,YAAMA;AAAAA,oBACQA,IAAG,MAAM,CAAC;AAAA;AAAA,IAE1B;AAAA,EAAA;AAGF,QAAM,gBAAgB;AAAA,IACpB,eAAe,OAAO,GAAeA,QAA4B;AAC/D,YAAMA,IAAG,OAAO,qBAAqB,KAAK,CAAC;AAAA,IAC7C;AAAA,EAAA;AAGF,QAAM,4BAAqD;AAAA,IACzD,GAAG,EAAC,eAAe,cAAA;AAAA,IACnB,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,EAAA;AAGL,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAEA,eAAsB,mBACpB,IACA,OACiB;AACjB,QAAM,SAAS,UAAU,KAAK;AAC9B,QAAM,CAAC,EAAC,KAAI,IAAI,MAAM;AAAA,wCACgB,GAAG,MAAM,CAAC;AAChD,MAAI,QAAQ,MAAM;AAChB,WAAO;AAAA,EACT;AAGA,QAAM,CAAC,EAAC,gBAAe,IAAI,MAAM;AAAA,mCACA,GAAG,MAAM,CAAC;AAAA;AAE3C,SAAO;AACT;"}
+{"version":3,"file":"init.js","names":[],"sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/init.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {\n  runSchemaMigrations,\n  type IncrementalMigrationMap,\n  type Migration,\n} from '../../../db/migration.ts';\nimport type {PostgresDB, PostgresTransaction} from '../../../types/pg.ts';\nimport {cdcSchema, type ShardID} from '../../../types/shards.ts';\nimport {\n  createBackfillTables,\n  createReplicationStateTable,\n  setupCDCTables,\n  type ReplicationState,\n} from './tables.ts';\n\nasync function migrateFromLegacySchemas(\n  lc: LogContext,\n  db: PostgresDB,\n  newSchema: string,\n  ...legacy: string[]\n) {\n  const rows = await db<{nspname: string}[]>`\n    SELECT nspname FROM pg_namespace \n      WHERE nspname IN ${db([newSchema, ...legacy])}`.values();\n  // oxlint-disable-next-line unicorn/prefer-set-has -- Small collection, array is more appropriate\n  const names = rows.flat();\n  if (names.includes(newSchema)) {\n    return; // already migrated\n  }\n  for (const schema of legacy) {\n    if (names.includes(schema)) {\n      lc.info?.(`Migrating ${schema} to ${newSchema}`);\n      await db`ALTER SCHEMA ${db(schema)} RENAME TO ${db(newSchema)}`;\n      break;\n    }\n  }\n}\n\nexport async function initChangeStreamerSchema(\n  log: LogContext,\n  db: PostgresDB,\n  shard: ShardID,\n): Promise<void> {\n  const schema = cdcSchema(shard);\n  const {appID} = shard;\n  await migrateFromLegacySchemas(\n    log,\n    db,\n    schema,\n    appID === 'zero' ? `cdc_0` : `cdc_${appID}`,\n    'cdc',\n  );\n\n  const setupMigration: Migration = {\n    migrateSchema: (lc, tx) => setupCDCTables(lc, tx, shard),\n    minSafeVersion: 1,\n  };\n\n  async function migrateV1toV2(_: LogContext, db: PostgresTransaction) {\n    await db`\n    ALTER TABLE ${db(schema)}.\"replicationConfig\" ADD \"resetRequired\" BOOL`;\n  }\n\n  const migrateV2ToV3 = {\n    migrateSchema: async (_: LogContext, db: PostgresTransaction) => {\n      await db.unsafe(createReplicationStateTable(shard));\n    },\n\n    migrateData: async (_: LogContext, db: PostgresTransaction) => {\n      const lastWatermark = await getLastWatermarkV2(db, shard);\n      const replicationState: Partial<ReplicationState> = {lastWatermark};\n      await db`\n      TRUNCATE TABLE ${db(schema)}.\"replicationState\"`;\n      await db`\n      INSERT INTO ${db(schema)}.\"replicationState\" ${db(replicationState)}`;\n    },\n  };\n\n  const migrateV3ToV4 = {\n    migrateSchema: async (_: LogContext, db: PostgresTransaction) => {\n      await db`\n      ALTER TABLE ${db(schema)}.\"changeLog\" ALTER \"change\" TYPE JSON;\n      `;\n    },\n  };\n\n  const migrateV4ToV5 = {\n    migrateSchema: async (_: LogContext, db: PostgresTransaction) => {\n      await db`\n      ALTER TABLE ${db(schema)}.\"replicationState\" ADD \"ownerAddress\" TEXT;\n      `;\n    },\n  };\n\n  const migrateV5ToV6 = {\n    migrateSchema: async (_: LogContext, db: PostgresTransaction) => {\n      await db.unsafe(createBackfillTables(shard));\n    },\n  };\n\n  const schemaVersionMigrationMap: IncrementalMigrationMap = {\n    2: {migrateSchema: migrateV1toV2},\n    3: migrateV2ToV3,\n    4: migrateV3ToV4,\n    5: migrateV4ToV5,\n    6: migrateV5ToV6,\n  };\n\n  await runSchemaMigrations(\n    log,\n    'change-streamer',\n    schema,\n    db,\n    setupMigration,\n    schemaVersionMigrationMap,\n  );\n}\n\nexport async function getLastWatermarkV2(\n  db: PostgresDB,\n  shard: ShardID,\n): Promise<string> {\n  const schema = cdcSchema(shard);\n  const [{max}] = await db<{max: string | null}[]>`\n    SELECT MAX(watermark) as max FROM ${db(schema)}.\"changeLog\"`;\n  if (max !== null) {\n    return max;\n  }\n  // The changeLog is only empty if nothing has been synced since initial-sync.\n  // In this case, the last watermark is the replicaVersion.\n  const [{replicaVersion}] = await db<{replicaVersion: string}[]>`\n    SELECT \"replicaVersion\" FROM ${db(schema)}.\"replicationConfig\"\n    `;\n  return replicaVersion;\n}\n"],"mappings":";;;;AAeA,eAAe,yBACb,IACA,IACA,WACA,GAAG,QACH;CAKA,MAAM,SAJO,MAAM,EAAuB;;yBAEnB,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,GAAG,QAAQ,EAEzC,MAAM;AACzB,KAAI,MAAM,SAAS,UAAU,CAC3B;AAEF,MAAK,MAAM,UAAU,OACnB,KAAI,MAAM,SAAS,OAAO,EAAE;AAC1B,KAAG,OAAO,aAAa,OAAO,MAAM,YAAY;AAChD,QAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,GAAG,UAAU;AAC7D;;;AAKN,eAAsB,yBACpB,KACA,IACA,OACe;CACf,MAAM,SAAS,UAAU,MAAM;CAC/B,MAAM,EAAC,UAAS;AAChB,OAAM,yBACJ,KACA,IACA,QACA,UAAU,SAAS,UAAU,OAAO,SACpC,MACD;CAED,MAAM,iBAA4B;EAChC,gBAAgB,IAAI,OAAO,eAAe,IAAI,IAAI,MAAM;EACxD,gBAAgB;EACjB;CAED,eAAe,cAAc,GAAe,IAAyB;AACnE,QAAM,EAAE;kBACM,GAAG,OAAO,CAAC;;CAG3B,MAAM,gBAAgB;EACpB,eAAe,OAAO,GAAe,OAA4B;AAC/D,SAAM,GAAG,OAAO,4BAA4B,MAAM,CAAC;;EAGrD,aAAa,OAAO,GAAe,OAA4B;GAE7D,MAAM,mBAA8C,EAAC,eAD/B,MAAM,mBAAmB,IAAI,MAAM,EACU;AACnE,SAAM,EAAE;uBACS,GAAG,OAAO,CAAC;AAC5B,SAAM,EAAE;oBACM,GAAG,OAAO,CAAC,sBAAsB,GAAG,iBAAiB;;EAEtE;CAED,MAAM,gBAAgB,EACpB,eAAe,OAAO,GAAe,OAA4B;AAC/D,QAAM,EAAE;oBACM,GAAG,OAAO,CAAC;;IAG5B;CAED,MAAM,gBAAgB,EACpB,eAAe,OAAO,GAAe,OAA4B;AAC/D,QAAM,EAAE;oBACM,GAAG,OAAO,CAAC;;IAG5B;CAED,MAAM,gBAAgB,EACpB,eAAe,OAAO,GAAe,OAA4B;AAC/D,QAAM,GAAG,OAAO,qBAAqB,MAAM,CAAC;IAE/C;AAUD,OAAM,oBACJ,KACA,mBACA,QACA,IACA,gBAbyD;EACzD,GAAG,EAAC,eAAe,eAAc;EACjC,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACJ,CASA;;AAGH,eAAsB,mBACpB,IACA,OACiB;CACjB,MAAM,SAAS,UAAU,MAAM;CAC/B,MAAM,CAAC,EAAC,SAAQ,MAAM,EAA0B;wCACV,GAAG,OAAO,CAAC;AACjD,KAAI,QAAQ,KACV,QAAO;CAIT,MAAM,CAAC,EAAC,oBAAmB,MAAM,EAA8B;mCAC9B,GAAG,OAAO,CAAC;;AAE5C,QAAO"}

package/out/zero-cache/src/services/change-streamer/schema/tables.d.ts

@@ -45,8 +45,27 @@ export type BackfillingColumn = {
 };
 export declare function setupCDCTables(lc: LogContext, db: postgres.TransactionSql, shard: ShardID): Promise<void>;
 export declare function markResetRequired(sql: PostgresDB, shard: ShardID): Promise<void>;
-export declare function ensureReplicationConfig(lc: LogContext, db: PostgresDB, subscriptionState: Pick<SubscriptionState, 'publications' | 'replicaVersion' | 'watermark'>, shard: ShardID, autoReset: boolean): Promise<void>;
+export declare function ensureReplicationConfig(lc: LogContext, db: PostgresDB, subscriptionState: Pick<SubscriptionState, 'publications' | 'replicaVersion' | 'watermark'>, shard: ShardID, autoReset: boolean, setTimeoutFn?: typeof setTimeout): Promise<void>;
+export declare const CHANGE_STREAMER_APP_NAME = "zero-change-streamer";
 export declare class AutoResetSignal extends AbortError {
     readonly name = "AutoResetSignal";
 }
+/**
+ * Terminates zero-cache backends that are blocking the current backend
+ * from acquiring locks on CDC tables (e.g., during TRUNCATE).
+ *
+ * This is used during change-DB takeover when the new replication-manager's
+ * `ensureReplicationConfig` needs to TRUNCATE tables, but the old
+ * replication-manager's storer is still reading from them (e.g., large
+ * catchup cursors).
+ *
+ * The function:
+ * 1. Finds backends waiting for a lock on a TRUNCATE in {schema}
+ * 2. Uses `pg_blocking_pids()` to identify which backends are blocking them
+ * 3. Terminates blocking backends that have `application_name = 'zero-change-streamer'`
+ *
+ * Must be called on a **separate connection** from the one that is blocked,
+ * since the blocked connection is inside a pending transaction.
+ */
+export declare function terminateChangeDBLockHolders(lc: LogContext, db: PostgresDB, shard: ShardID): Promise<void>;
 //# sourceMappingURL=tables.d.ts.map

package/out/zero-cache/src/services/change-streamer/schema/tables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/tables.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAErC,OAAO,EAAC,UAAU,EAAC,MAAM,0CAA0C,CAAC;AAGpE,OAAO,EAAC,KAAK,UAAU,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EACV,UAAU,EACV,MAAM,EACN,aAAa,EACd,MAAM,8CAA8C,CAAC;AACtD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,8CAA8C,CAAC;AAOpF,eAAO,MAAM,SAAS,QAAQ,CAAC;AAM/B,MAAM,MAAM,cAAc,GAAG;IAG3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAmBF;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,UASzD;AAED,wBAAsB,6BAA6B,CACjD,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAIxB;AAED;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;CACjC,CAAC;AAaF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,UAiBlD;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,aAAa,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAYF,wBAAsB,cAAc,CAClC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,QAAQ,CAAC,cAAc,EAC3B,KAAK,EAAE,OAAO,iBAIf;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,iBAKtE;AAED,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,iBAAiB,EAAE,IAAI,CACrB,iBAAiB,EACjB,cAAc,GAAG,gBAAgB,GAAG,WAAW,CAChD,EACD,KAAK,EAAE,OAAO,EACd,SAAS,EAAE,OAAO,iBAiGnB;AAED,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,IAAI,qBAAqB;CACnC"}
+{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/tables.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAErC,OAAO,EAAC,UAAU,EAAC,MAAM,0CAA0C,CAAC;AAGpE,OAAO,EAAC,KAAK,UAAU,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EACV,UAAU,EACV,MAAM,EACN,aAAa,EACd,MAAM,8CAA8C,CAAC;AACtD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,8CAA8C,CAAC;AAOpF,eAAO,MAAM,SAAS,QAAQ,CAAC;AAM/B,MAAM,MAAM,cAAc,GAAG;IAG3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAmBF;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,UASzD;AAED,wBAAsB,6BAA6B,CACjD,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAIxB;AAED;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;CACjC,CAAC;AAaF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,UAiBlD;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,aAAa,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAYF,wBAAsB,cAAc,CAClC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,QAAQ,CAAC,cAAc,EAC3B,KAAK,EAAE,OAAO,iBAIf;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,iBAKtE;AAED,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,iBAAiB,EAAE,IAAI,CACrB,iBAAiB,EACjB,cAAc,GAAG,gBAAgB,GAAG,WAAW,CAChD,EACD,KAAK,EAAE,OAAO,EACd,SAAS,EAAE,OAAO,EAClB,YAAY,GAAE,OAAO,UAAuB,iBAqH7C;AAMD,eAAO,MAAM,wBAAwB,yBAAyB,CAAC;AAE/D,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,IAAI,qBAAqB;CACnC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,4BAA4B,CAChD,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,iBA4Cf"}

package/out/zero-cache/src/services/change-streamer/schema/tables.js

@@ -1,23 +1,19 @@
-import { ident } from "pg-format";
-import "postgres";
 import { AbortError } from "../../../../../shared/src/abort-error.js";
 import { equals } from "../../../../../shared/src/set-utils.js";
-import { runTx } from "../../../db/run-transaction.js";
-import "../../../types/pg.js";
 import { cdcSchema } from "../../../types/shards.js";
+import "../../../types/pg.js";
+import { runTx } from "../../../db/run-transaction.js";
+import "postgres";
+import { ident } from "pg-format";
+//#region ../zero-cache/src/services/change-streamer/schema/tables.ts
 function schema(shard) {
-  return ident(cdcSchema(shard));
+	return ident(cdcSchema(shard));
 }
 function createSchema(shard) {
-  return (
-    /*sql*/
-    `CREATE SCHEMA IF NOT EXISTS ${schema(shard)};`
-  );
+	return `CREATE SCHEMA IF NOT EXISTS ${schema(shard)};`;
 }
 function createChangeLogTable(shard) {
-  return (
-    /*sql*/
-    `
+	return `
   CREATE TABLE ${schema(shard)}."changeLog" (
     watermark  TEXT,
     pos        INT8,
@@ -25,44 +21,34 @@ function createChangeLogTable(shard) {
     precommit  TEXT,  -- Only exists on commit entries. Purely for debugging.
     PRIMARY KEY (watermark, pos)
   );
-`
-  );
+`;
 }
 function createReplicationStateTable(shard) {
-  return (
-    /*sql*/
-    `
+	return `
   CREATE TABLE ${schema(shard)}."replicationState" (
     "lastWatermark" TEXT NOT NULL,
     "owner" TEXT,
     "ownerAddress" TEXT,
     "lock" INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)
   );
-`
-  );
+`;
 }
 async function discoverChangeStreamerAddress(shard, sql) {
-  const result = await sql`
-    SELECT "ownerAddress" FROM ${sql(cdcSchema(shard))}."replicationState"`;
-  return result[0].ownerAddress;
+	return (await sql`
+    SELECT "ownerAddress" FROM ${sql(cdcSchema(shard))}."replicationState"`)[0].ownerAddress;
 }
 function createReplicationConfigTable(shard) {
-  return (
-    /*sql*/
-    `
+	return `
   CREATE TABLE ${schema(shard)}."replicationConfig" (
     "replicaVersion" TEXT NOT NULL,
     "publications" TEXT[] NOT NULL,
     "resetRequired" BOOL,
     "lock" INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)
   );
-`
-  );
+`;
 }
 function createBackfillTables(shard) {
-  return (
-    /*sql*/
-    `
+	return `
   CREATE TABLE ${schema(shard)}."tableMetadata" (
     "schema" TEXT NOT NULL,
     "table" TEXT NOT NULL,
@@ -77,93 +63,129 @@ function createBackfillTables(shard) {
     "backfill" JSONB NOT NULL,
     PRIMARY KEY("schema", "table", "column")
   );
-  `
-  );
+  `;
 }
 function createTables(shard) {
-  return createSchema(shard) + createChangeLogTable(shard) + createReplicationStateTable(shard) + createReplicationConfigTable(shard) + createBackfillTables(shard);
+	return createSchema(shard) + createChangeLogTable(shard) + createReplicationStateTable(shard) + createReplicationConfigTable(shard) + createBackfillTables(shard);
 }
 async function setupCDCTables(lc, db, shard) {
-  lc.info?.(`Setting up CDC tables`);
-  await db.unsafe(createTables(shard));
+	lc.info?.(`Setting up CDC tables`);
+	await db.unsafe(createTables(shard));
 }
 async function markResetRequired(sql, shard) {
-  const schema2 = cdcSchema(shard);
-  await sql`
-  UPDATE ${sql(schema2)}."replicationConfig"
+	await sql`
+  UPDATE ${sql(cdcSchema(shard))}."replicationConfig"
     SET "resetRequired" = true`;
 }
-async function ensureReplicationConfig(lc, db, subscriptionState, shard, autoReset) {
-  const { publications, replicaVersion, watermark } = subscriptionState;
-  const replicaConfig = { publications, replicaVersion };
-  const replicationState = {
-    lastWatermark: replicaVersion,
-    owner: null,
-    ownerAddress: null
-  };
-  const schema2 = cdcSchema(shard);
-  await runTx(db, async (sql) => {
-    const stmts = [];
-    const results = await sql`
+async function ensureReplicationConfig(lc, db, subscriptionState, shard, autoReset, setTimeoutFn = setTimeout) {
+	const { publications, replicaVersion, watermark } = subscriptionState;
+	const replicaConfig = {
+		publications,
+		replicaVersion
+	};
+	const replicationState = {
+		lastWatermark: replicaVersion,
+		owner: null,
+		ownerAddress: null
+	};
+	const schema = cdcSchema(shard);
+	await runTx(db, async (sql) => {
+		const stmts = [];
+		let needsTruncate = false;
+		const results = await sql`
     SELECT "replicaVersion", "publications", "resetRequired" 
-      FROM ${sql(schema2)}."replicationConfig"`;
-    if (results.length) {
-      const { replicaVersion: replicaVersion2, publications: publications2 } = results[0];
-      if (replicaVersion2 !== replicaConfig.replicaVersion || !equals(new Set(publications2), new Set(replicaConfig.publications))) {
-        if (replicaConfig.replicaVersion !== watermark) {
-          throw new AutoResetSignal(
-            `Cannot reset change db@${replicaVersion2} to service replica@${replicaConfig.replicaVersion} from watermark ${watermark}`
-          );
-        }
-        lc.info?.(
-          `Data in cdc tables @${replicaVersion2} is incompatible with replica @${replicaConfig.replicaVersion}. Clearing tables.`
-        );
-        stmts.push(
-          sql`TRUNCATE TABLE ${sql(schema2)}."changeLog"`,
-          sql`TRUNCATE TABLE ${sql(schema2)}."replicationConfig"`,
-          sql`TRUNCATE TABLE ${sql(schema2)}."tableMetadata"`,
-          sql`TRUNCATE TABLE ${sql(schema2)}."backfilling"`
-        );
-      }
-    }
-    if (results.length === 0 || stmts.length > 0) {
-      const watermark2 = replicaConfig.replicaVersion;
-      const initialTx = [
-        { watermark: watermark2, pos: 0, change: { tag: "begin" } },
-        { watermark: watermark2, pos: 1, change: { tag: "commit" } }
-      ];
-      stmts.push(
-        sql`INSERT INTO ${sql(schema2)}."replicationConfig" ${sql(replicaConfig)}`,
-        sql`INSERT INTO ${sql(schema2)}."replicationState"  ${sql(replicationState)} 
-              ON CONFLICT (lock) DO UPDATE SET ${sql(replicationState)}`,
-        ...initialTx.map(
-          (change) => sql`INSERT INTO ${sql(schema2)}."changeLog" ${sql(change)}`
-        )
-      );
-      return Promise.all(stmts);
-    }
-    const { resetRequired } = results[0];
-    if (resetRequired) {
-      if (autoReset) {
-        throw new AutoResetSignal("reset required by replication stream");
-      }
-      lc.error?.(
-        "\n\n\nReset required but --auto-reset is not enabled.\nThis can happen for upstream databases that do not support event triggers.\nTo correct this, see https://zero.rocicorp.dev/docs/connecting-to-postgres#schema-changes\n\n\n"
-      );
-    }
-    return [];
-  });
-}
-class AutoResetSignal extends AbortError {
-  name = "AutoResetSignal";
+      FROM ${sql(schema)}."replicationConfig"`;
+		if (results.length) {
+			const { replicaVersion, publications } = results[0];
+			if (replicaVersion !== replicaConfig.replicaVersion || !equals(new Set(publications), new Set(replicaConfig.publications))) {
+				if (replicaConfig.replicaVersion !== watermark) throw new AutoResetSignal(`Cannot reset change db@${replicaVersion} to service replica@${replicaConfig.replicaVersion} from watermark ${watermark}`);
+				lc.info?.(`Data in cdc tables @${replicaVersion} is incompatible with replica @${replicaConfig.replicaVersion}. Clearing tables.`);
+				needsTruncate = true;
+				stmts.push(sql`TRUNCATE TABLE ${sql(schema)}."changeLog"`, sql`TRUNCATE TABLE ${sql(schema)}."replicationConfig"`, sql`TRUNCATE TABLE ${sql(schema)}."tableMetadata"`, sql`TRUNCATE TABLE ${sql(schema)}."backfilling"`);
+			}
+		}
+		if (results.length === 0 || needsTruncate) {
+			const watermark = replicaConfig.replicaVersion;
+			const initialTx = [{
+				watermark,
+				pos: 0,
+				change: { tag: "begin" }
+			}, {
+				watermark,
+				pos: 1,
+				change: { tag: "commit" }
+			}];
+			stmts.push(sql`INSERT INTO ${sql(schema)}."replicationConfig" ${sql(replicaConfig)}`, sql`INSERT INTO ${sql(schema)}."replicationState"  ${sql(replicationState)} 
+              ON CONFLICT (lock) DO UPDATE SET ${sql(replicationState)}`, ...initialTx.map((change) => sql`INSERT INTO ${sql(schema)}."changeLog" ${sql(change)}`));
+			if (needsTruncate) {
+				const timer = setTimeoutFn(async () => {
+					lc.info?.("ensureReplicationConfig blocked, terminating lock holders");
+					await terminateChangeDBLockHolders(lc, db, shard);
+				}, LOCK_HOLDER_TERMINATE_TIMEOUT_MS);
+				try {
+					return await Promise.all(stmts);
+				} finally {
+					clearTimeout(timer);
+				}
+			}
+			return Promise.all(stmts);
+		}
+		const { resetRequired } = results[0];
+		if (resetRequired) {
+			if (autoReset) throw new AutoResetSignal("reset required by replication stream");
+			lc.error?.("\n\n\nReset required but --auto-reset is not enabled.\nThis can happen for upstream databases that do not support event triggers.\nTo correct this, see https://zero.rocicorp.dev/docs/connecting-to-postgres#schema-changes\n\n\n");
+		}
+		return [];
+	});
 }
-export {
-  AutoResetSignal,
-  createBackfillTables,
-  createReplicationStateTable,
-  discoverChangeStreamerAddress,
-  ensureReplicationConfig,
-  markResetRequired,
-  setupCDCTables
+var LOCK_HOLDER_TERMINATE_TIMEOUT_MS = 5e3;
+var CHANGE_STREAMER_APP_NAME = "zero-change-streamer";
+var AutoResetSignal = class extends AbortError {
+	name = "AutoResetSignal";
 };
-//# sourceMappingURL=tables.js.map
+/**
+* Terminates zero-cache backends that are blocking the current backend
+* from acquiring locks on CDC tables (e.g., during TRUNCATE).
+*
+* This is used during change-DB takeover when the new replication-manager's
+* `ensureReplicationConfig` needs to TRUNCATE tables, but the old
+* replication-manager's storer is still reading from them (e.g., large
+* catchup cursors).
+*
+* The function:
+* 1. Finds backends waiting for a lock on a TRUNCATE in {schema}
+* 2. Uses `pg_blocking_pids()` to identify which backends are blocking them
+* 3. Terminates blocking backends that have `application_name = 'zero-change-streamer'`
+*
+* Must be called on a **separate connection** from the one that is blocked,
+* since the blocked connection is inside a pending transaction.
+*/
+async function terminateChangeDBLockHolders(lc, db, shard) {
+	const blocked = await db`
+    SELECT pid FROM pg_stat_activity
+      WHERE wait_event_type = 'Lock'
+        AND application_name = ${CHANGE_STREAMER_APP_NAME}
+        AND query LIKE ${"%TRUNCATE%" + cdcSchema(shard) + "%"}`;
+	if (blocked.length === 0) {
+		lc.info?.("no blocked TRUNCATE backends found");
+		return;
+	}
+	const blockedPids = blocked.map((r) => r.pid);
+	lc.info?.(`found blocked TRUNCATE backends: ${JSON.stringify(blockedPids)}`);
+	const terminated = await db`
+    SELECT pid, application_name as "applicationName", query,
+           pg_terminate_backend(pid) as terminated
+      FROM pg_stat_activity
+      WHERE pid = ANY(
+        SELECT unnest(pg_blocking_pids(blocked.pid))
+          FROM unnest(${blockedPids}::int[]) AS blocked(pid)
+      )
+      AND application_name = ${CHANGE_STREAMER_APP_NAME}
+      AND pid != ALL(${blockedPids}::int[])`;
+	if (terminated.length === 0) lc.info?.(`no ${CHANGE_STREAMER_APP_NAME} blockers found to terminate`);
+	else for (const { pid, applicationName, query, terminated: ok } of terminated) lc.info?.(`terminated blocking backend pid=${pid} app=${applicationName} ok=${ok} query=${query.slice(0, 200)}`);
+}
+//#endregion
+export { AutoResetSignal, CHANGE_STREAMER_APP_NAME, createBackfillTables, createReplicationStateTable, discoverChangeStreamerAddress, ensureReplicationConfig, markResetRequired, setupCDCTables };
+
+//# sourceMappingURL=tables.js.map

package/out/zero-cache/src/services/change-streamer/schema/tables.js.map

@@ -1 +1 @@
-{"version":3,"file":"tables.js","sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/tables.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {ident} from 'pg-format';\nimport type postgres from 'postgres';\nimport {type PendingQuery, type Row} from 'postgres';\nimport {AbortError} from '../../../../../shared/src/abort-error.ts';\nimport {equals} from '../../../../../shared/src/set-utils.ts';\nimport {runTx} from '../../../db/run-transaction.ts';\nimport {type PostgresDB} from '../../../types/pg.ts';\nimport {cdcSchema, type ShardID} from '../../../types/shards.ts';\nimport type {\n  BackfillID,\n  Change,\n  TableMetadata,\n} from '../../change-source/protocol/current/data.ts';\nimport type {SubscriptionState} from '../../replicator/schema/replication-state.ts';\n\n// For readability in the sql statements.\nfunction schema(shard: ShardID) {\n  return ident(cdcSchema(shard));\n}\n\nexport const PG_SCHEMA = 'cdc';\n\nfunction createSchema(shard: ShardID) {\n  return /*sql*/ `CREATE SCHEMA IF NOT EXISTS ${schema(shard)};`;\n}\n\nexport type ChangeLogEntry = {\n  // A strictly monotonically increasing, lexicographically sortable\n  // value that uniquely identifies a position in the change stream.\n  watermark: string;\n  change: Change;\n};\n\ntype FullChangeLogEntry = ChangeLogEntry & {pos: number};\n\nfunction createChangeLogTable(shard: ShardID) {\n  // Note: The \"change\" column used to be JSONB, but that was problematic in that\n  // it does not handle the NULL unicode character.\n  // https://vladimir.varank.in/notes/2021/01/you-dont-insert-unicode-null-character-as-postgres-jsonb/\n  return /*sql*/ `\n  CREATE TABLE ${schema(shard)}.\"changeLog\" (\n    watermark  TEXT,\n    pos        INT8,\n    change     JSON NOT NULL,\n    precommit  TEXT,  -- Only exists on commit entries. Purely for debugging.\n    PRIMARY KEY (watermark, pos)\n  );\n`;\n}\n\n/**\n * Tracks the watermark from which to resume the change stream and the\n * current owner (task ID) acting as the single writer to the changeLog.\n */\nexport type ReplicationState = {\n  lastWatermark: string;\n  owner: string | null;\n  ownerAddress: string | null;\n};\n\nexport function createReplicationStateTable(shard: ShardID) {\n  return /*sql*/ `\n  CREATE TABLE ${schema(shard)}.\"replicationState\" (\n    \"lastWatermark\" TEXT NOT NULL,\n    \"owner\" TEXT,\n    \"ownerAddress\" TEXT,\n    \"lock\" INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)\n  );\n`;\n}\n\nexport async function discoverChangeStreamerAddress(\n  shard: ShardID,\n  sql: PostgresDB,\n): Promise<string | null> {\n  const result = await sql<{ownerAddress: string | null}[]> /*sql*/ `\n    SELECT \"ownerAddress\" FROM ${sql(cdcSchema(shard))}.\"replicationState\"`;\n  return result[0].ownerAddress;\n}\n\n/**\n * This mirrors the analogously named table in the SQLite replica\n * (`services/replicator/schema/replication-state.ts`), and is used\n * to detect when the replica has been reset and is no longer compatible\n * with the current ChangeLog.\n */\nexport type ReplicationConfig = {\n  replicaVersion: string;\n  publications: readonly string[];\n};\n\nfunction createReplicationConfigTable(shard: ShardID) {\n  return /*sql*/ `\n  CREATE TABLE ${schema(shard)}.\"replicationConfig\" (\n    \"replicaVersion\" TEXT NOT NULL,\n    \"publications\" TEXT[] NOT NULL,\n    \"resetRequired\" BOOL,\n    \"lock\" INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)\n  );\n`;\n}\n\nexport function createBackfillTables(shard: ShardID) {\n  return /*sql*/ `\n  CREATE TABLE ${schema(shard)}.\"tableMetadata\" (\n    \"schema\" TEXT NOT NULL,\n    \"table\" TEXT NOT NULL,\n    \"metadata\" JSONB NOT NULL,\n    PRIMARY KEY(\"schema\", \"table\")\n  );\n\n  CREATE TABLE ${schema(shard)}.\"backfilling\" (\n    \"schema\" TEXT NOT NULL,\n    \"table\" TEXT NOT NULL,\n    \"column\" TEXT NOT NULL,\n    \"backfill\" JSONB NOT NULL,\n    PRIMARY KEY(\"schema\", \"table\", \"column\")\n  );\n  `;\n}\n\nexport type TableMetadataRow = {\n  schema: string;\n  table: string;\n  metadata: TableMetadata;\n};\n\nexport type BackfillingColumn = {\n  schema: string;\n  table: string;\n  column: string;\n  backfill: BackfillID;\n};\n\nfunction createTables(shard: ShardID) {\n  return (\n    createSchema(shard) +\n    createChangeLogTable(shard) +\n    createReplicationStateTable(shard) +\n    createReplicationConfigTable(shard) +\n    createBackfillTables(shard)\n  );\n}\n\nexport async function setupCDCTables(\n  lc: LogContext,\n  db: postgres.TransactionSql,\n  shard: ShardID,\n) {\n  lc.info?.(`Setting up CDC tables`);\n  await db.unsafe(createTables(shard));\n}\n\nexport async function markResetRequired(sql: PostgresDB, shard: ShardID) {\n  const schema = cdcSchema(shard);\n  await sql`\n  UPDATE ${sql(schema)}.\"replicationConfig\"\n    SET \"resetRequired\" = true`;\n}\n\nexport async function ensureReplicationConfig(\n  lc: LogContext,\n  db: PostgresDB,\n  subscriptionState: Pick<\n    SubscriptionState,\n    'publications' | 'replicaVersion' | 'watermark'\n  >,\n  shard: ShardID,\n  autoReset: boolean,\n) {\n  const {publications, replicaVersion, watermark} = subscriptionState;\n  const replicaConfig = {publications, replicaVersion};\n  const replicationState: ReplicationState = {\n    lastWatermark: replicaVersion,\n    owner: null,\n    ownerAddress: null,\n  };\n  const schema = cdcSchema(shard);\n\n  await runTx(db, async sql => {\n    const stmts: PendingQuery<Row[]>[] = [];\n    const results = await sql<\n      {\n        replicaVersion: string;\n        publications: string[];\n        resetRequired: boolean | null;\n      }[]\n    > /*sql*/ `\n    SELECT \"replicaVersion\", \"publications\", \"resetRequired\" \n      FROM ${sql(schema)}.\"replicationConfig\"`;\n\n    if (results.length) {\n      const {replicaVersion, publications} = results[0];\n      if (\n        replicaVersion !== replicaConfig.replicaVersion ||\n        !equals(new Set(publications), new Set(replicaConfig.publications))\n      ) {\n        if (replicaConfig.replicaVersion !== watermark) {\n          throw new AutoResetSignal(\n            `Cannot reset change db@${replicaVersion} to ` +\n              `service replica@${replicaConfig.replicaVersion} ` +\n              `from watermark ${watermark}`,\n          );\n        }\n        lc.info?.(\n          `Data in cdc tables @${replicaVersion} is incompatible ` +\n            `with replica @${replicaConfig.replicaVersion}. Clearing tables.`,\n        );\n        // Note: The replicationState table is explicitly not TRUNCATE'd.\n        //       Any existing row must be overwritten by an UPDATE or\n        //       INSERT ... ON CONFLICT clause in order to correctly abort\n        //       any pending transaction by a concurrently running\n        //       change-streamer. Deleting the existing row and creating\n        //       a new one, on the other hand, may not properly trigger the\n        //       SERIALIZATION failure necessary to abort the pending tx.\n        stmts.push(\n          sql`TRUNCATE TABLE ${sql(schema)}.\"changeLog\"`,\n          sql`TRUNCATE TABLE ${sql(schema)}.\"replicationConfig\"`,\n          sql`TRUNCATE TABLE ${sql(schema)}.\"tableMetadata\"`,\n          sql`TRUNCATE TABLE ${sql(schema)}.\"backfilling\"`,\n        );\n      }\n    }\n    // Initialize (or re-initialize TRUNCATED) tables\n    if (results.length === 0 || stmts.length > 0) {\n      // The storer uses the earliest changeLog entry as the safe watermark\n      // from which subscribers can be resumed. These initial entries ensure\n      // that subscribers can start from a freshly synced replica, even if\n      // new changes have been replicated and not purged from the changeLog.\n      //\n      // TODO: Replace this with an explicit `firstWatermark` column in the\n      //       change db.\n      const watermark = replicaConfig.replicaVersion;\n      const initialTx: FullChangeLogEntry[] = [\n        {watermark, pos: 0, change: {tag: 'begin'}},\n        {watermark, pos: 1, change: {tag: 'commit'}},\n      ];\n\n      stmts.push(\n        sql`INSERT INTO ${sql(schema)}.\"replicationConfig\" ${sql(replicaConfig)}`,\n        sql`INSERT INTO ${sql(schema)}.\"replicationState\"  ${sql(replicationState)} \n              ON CONFLICT (lock) DO UPDATE SET ${sql(replicationState)}`,\n        ...initialTx.map(\n          change => sql`INSERT INTO ${sql(schema)}.\"changeLog\" ${sql(change)}`,\n        ),\n      );\n      return Promise.all(stmts);\n    }\n\n    const {resetRequired} = results[0];\n    if (resetRequired) {\n      if (autoReset) {\n        throw new AutoResetSignal('reset required by replication stream');\n      }\n      lc.error?.(\n        '\\n\\n\\n' +\n          'Reset required but --auto-reset is not enabled.\\n' +\n          'This can happen for upstream databases that do not support event triggers.\\n' +\n          'To correct this, see https://zero.rocicorp.dev/docs/connecting-to-postgres#schema-changes' +\n          '\\n\\n\\n',\n      );\n    }\n\n    return [];\n  });\n}\n\nexport class AutoResetSignal extends AbortError {\n  readonly name = 'AutoResetSignal';\n}\n"],"names":["schema","replicaVersion","publications","watermark"],"mappings":"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"}
+{"version":3,"file":"tables.js","names":[],"sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/tables.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {ident} from 'pg-format';\nimport type postgres from 'postgres';\nimport {type PendingQuery, type Row} from 'postgres';\nimport {AbortError} from '../../../../../shared/src/abort-error.ts';\nimport {equals} from '../../../../../shared/src/set-utils.ts';\nimport {runTx} from '../../../db/run-transaction.ts';\nimport {type PostgresDB} from '../../../types/pg.ts';\nimport {cdcSchema, type ShardID} from '../../../types/shards.ts';\nimport type {\n  BackfillID,\n  Change,\n  TableMetadata,\n} from '../../change-source/protocol/current/data.ts';\nimport type {SubscriptionState} from '../../replicator/schema/replication-state.ts';\n\n// For readability in the sql statements.\nfunction schema(shard: ShardID) {\n  return ident(cdcSchema(shard));\n}\n\nexport const PG_SCHEMA = 'cdc';\n\nfunction createSchema(shard: ShardID) {\n  return /*sql*/ `CREATE SCHEMA IF NOT EXISTS ${schema(shard)};`;\n}\n\nexport type ChangeLogEntry = {\n  // A strictly monotonically increasing, lexicographically sortable\n  // value that uniquely identifies a position in the change stream.\n  watermark: string;\n  change: Change;\n};\n\ntype FullChangeLogEntry = ChangeLogEntry & {pos: number};\n\nfunction createChangeLogTable(shard: ShardID) {\n  // Note: The \"change\" column used to be JSONB, but that was problematic in that\n  // it does not handle the NULL unicode character.\n  // https://vladimir.varank.in/notes/2021/01/you-dont-insert-unicode-null-character-as-postgres-jsonb/\n  return /*sql*/ `\n  CREATE TABLE ${schema(shard)}.\"changeLog\" (\n    watermark  TEXT,\n    pos        INT8,\n    change     JSON NOT NULL,\n    precommit  TEXT,  -- Only exists on commit entries. Purely for debugging.\n    PRIMARY KEY (watermark, pos)\n  );\n`;\n}\n\n/**\n * Tracks the watermark from which to resume the change stream and the\n * current owner (task ID) acting as the single writer to the changeLog.\n */\nexport type ReplicationState = {\n  lastWatermark: string;\n  owner: string | null;\n  ownerAddress: string | null;\n};\n\nexport function createReplicationStateTable(shard: ShardID) {\n  return /*sql*/ `\n  CREATE TABLE ${schema(shard)}.\"replicationState\" (\n    \"lastWatermark\" TEXT NOT NULL,\n    \"owner\" TEXT,\n    \"ownerAddress\" TEXT,\n    \"lock\" INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)\n  );\n`;\n}\n\nexport async function discoverChangeStreamerAddress(\n  shard: ShardID,\n  sql: PostgresDB,\n): Promise<string | null> {\n  const result = await sql<{ownerAddress: string | null}[]> /*sql*/ `\n    SELECT \"ownerAddress\" FROM ${sql(cdcSchema(shard))}.\"replicationState\"`;\n  return result[0].ownerAddress;\n}\n\n/**\n * This mirrors the analogously named table in the SQLite replica\n * (`services/replicator/schema/replication-state.ts`), and is used\n * to detect when the replica has been reset and is no longer compatible\n * with the current ChangeLog.\n */\nexport type ReplicationConfig = {\n  replicaVersion: string;\n  publications: readonly string[];\n};\n\nfunction createReplicationConfigTable(shard: ShardID) {\n  return /*sql*/ `\n  CREATE TABLE ${schema(shard)}.\"replicationConfig\" (\n    \"replicaVersion\" TEXT NOT NULL,\n    \"publications\" TEXT[] NOT NULL,\n    \"resetRequired\" BOOL,\n    \"lock\" INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)\n  );\n`;\n}\n\nexport function createBackfillTables(shard: ShardID) {\n  return /*sql*/ `\n  CREATE TABLE ${schema(shard)}.\"tableMetadata\" (\n    \"schema\" TEXT NOT NULL,\n    \"table\" TEXT NOT NULL,\n    \"metadata\" JSONB NOT NULL,\n    PRIMARY KEY(\"schema\", \"table\")\n  );\n\n  CREATE TABLE ${schema(shard)}.\"backfilling\" (\n    \"schema\" TEXT NOT NULL,\n    \"table\" TEXT NOT NULL,\n    \"column\" TEXT NOT NULL,\n    \"backfill\" JSONB NOT NULL,\n    PRIMARY KEY(\"schema\", \"table\", \"column\")\n  );\n  `;\n}\n\nexport type TableMetadataRow = {\n  schema: string;\n  table: string;\n  metadata: TableMetadata;\n};\n\nexport type BackfillingColumn = {\n  schema: string;\n  table: string;\n  column: string;\n  backfill: BackfillID;\n};\n\nfunction createTables(shard: ShardID) {\n  return (\n    createSchema(shard) +\n    createChangeLogTable(shard) +\n    createReplicationStateTable(shard) +\n    createReplicationConfigTable(shard) +\n    createBackfillTables(shard)\n  );\n}\n\nexport async function setupCDCTables(\n  lc: LogContext,\n  db: postgres.TransactionSql,\n  shard: ShardID,\n) {\n  lc.info?.(`Setting up CDC tables`);\n  await db.unsafe(createTables(shard));\n}\n\nexport async function markResetRequired(sql: PostgresDB, shard: ShardID) {\n  const schema = cdcSchema(shard);\n  await sql`\n  UPDATE ${sql(schema)}.\"replicationConfig\"\n    SET \"resetRequired\" = true`;\n}\n\nexport async function ensureReplicationConfig(\n  lc: LogContext,\n  db: PostgresDB,\n  subscriptionState: Pick<\n    SubscriptionState,\n    'publications' | 'replicaVersion' | 'watermark'\n  >,\n  shard: ShardID,\n  autoReset: boolean,\n  setTimeoutFn: typeof setTimeout = setTimeout,\n) {\n  const {publications, replicaVersion, watermark} = subscriptionState;\n  const replicaConfig = {publications, replicaVersion};\n  const replicationState: ReplicationState = {\n    lastWatermark: replicaVersion,\n    owner: null,\n    ownerAddress: null,\n  };\n  const schema = cdcSchema(shard);\n\n  await runTx(db, async sql => {\n    const stmts: PendingQuery<Row[]>[] = [];\n    let needsTruncate = false;\n    const results = await sql<\n      {\n        replicaVersion: string;\n        publications: string[];\n        resetRequired: boolean | null;\n      }[]\n    > /*sql*/ `\n    SELECT \"replicaVersion\", \"publications\", \"resetRequired\" \n      FROM ${sql(schema)}.\"replicationConfig\"`;\n\n    if (results.length) {\n      const {replicaVersion, publications} = results[0];\n      if (\n        replicaVersion !== replicaConfig.replicaVersion ||\n        !equals(new Set(publications), new Set(replicaConfig.publications))\n      ) {\n        if (replicaConfig.replicaVersion !== watermark) {\n          throw new AutoResetSignal(\n            `Cannot reset change db@${replicaVersion} to ` +\n              `service replica@${replicaConfig.replicaVersion} ` +\n              `from watermark ${watermark}`,\n          );\n        }\n        lc.info?.(\n          `Data in cdc tables @${replicaVersion} is incompatible ` +\n            `with replica @${replicaConfig.replicaVersion}. Clearing tables.`,\n        );\n        // Note: The replicationState table is explicitly not TRUNCATE'd.\n        //       Any existing row must be overwritten by an UPDATE or\n        //       INSERT ... ON CONFLICT clause in order to correctly abort\n        //       any pending transaction by a concurrently running\n        //       change-streamer. Deleting the existing row and creating\n        //       a new one, on the other hand, may not properly trigger the\n        //       SERIALIZATION failure necessary to abort the pending tx.\n        needsTruncate = true;\n        stmts.push(\n          sql`TRUNCATE TABLE ${sql(schema)}.\"changeLog\"`,\n          sql`TRUNCATE TABLE ${sql(schema)}.\"replicationConfig\"`,\n          sql`TRUNCATE TABLE ${sql(schema)}.\"tableMetadata\"`,\n          sql`TRUNCATE TABLE ${sql(schema)}.\"backfilling\"`,\n        );\n      }\n    }\n    // Initialize (or re-initialize TRUNCATED) tables\n    if (results.length === 0 || needsTruncate) {\n      // The storer uses the earliest changeLog entry as the safe watermark\n      // from which subscribers can be resumed. These initial entries ensure\n      // that subscribers can start from a freshly synced replica, even if\n      // new changes have been replicated and not purged from the changeLog.\n      //\n      // TODO: Replace this with an explicit `firstWatermark` column in the\n      //       change db.\n      const watermark = replicaConfig.replicaVersion;\n      const initialTx: FullChangeLogEntry[] = [\n        {watermark, pos: 0, change: {tag: 'begin'}},\n        {watermark, pos: 1, change: {tag: 'commit'}},\n      ];\n\n      stmts.push(\n        sql`INSERT INTO ${sql(schema)}.\"replicationConfig\" ${sql(replicaConfig)}`,\n        sql`INSERT INTO ${sql(schema)}.\"replicationState\"  ${sql(replicationState)} \n              ON CONFLICT (lock) DO UPDATE SET ${sql(replicationState)}`,\n        ...initialTx.map(\n          change => sql`INSERT INTO ${sql(schema)}.\"changeLog\" ${sql(change)}`,\n        ),\n      );\n\n      if (needsTruncate) {\n        // The TRUNCATE statements require ACCESS EXCLUSIVE locks, which may\n        // be blocked by old storer catchup reads. Race against a timeout\n        // that terminates the blocking backends if the TRUNCATE takes too\n        // long.\n        const timer = setTimeoutFn(async () => {\n          lc.info?.(\n            'ensureReplicationConfig blocked, terminating lock holders',\n          );\n          await terminateChangeDBLockHolders(lc, db, shard);\n        }, LOCK_HOLDER_TERMINATE_TIMEOUT_MS);\n        try {\n          return await Promise.all(stmts);\n        } finally {\n          clearTimeout(timer);\n        }\n      }\n      return Promise.all(stmts);\n    }\n\n    const {resetRequired} = results[0];\n    if (resetRequired) {\n      if (autoReset) {\n        throw new AutoResetSignal('reset required by replication stream');\n      }\n      lc.error?.(\n        '\\n\\n\\n' +\n          'Reset required but --auto-reset is not enabled.\\n' +\n          'This can happen for upstream databases that do not support event triggers.\\n' +\n          'To correct this, see https://zero.rocicorp.dev/docs/connecting-to-postgres#schema-changes' +\n          '\\n\\n\\n',\n      );\n    }\n\n    return [];\n  });\n}\n\n// The time to wait for a TRUNCATE in ensureReplicationConfig before\n// terminating blocking backends via terminateChangeDBLockHolders.\nconst LOCK_HOLDER_TERMINATE_TIMEOUT_MS = 5_000;\n\nexport const CHANGE_STREAMER_APP_NAME = 'zero-change-streamer';\n\nexport class AutoResetSignal extends AbortError {\n  readonly name = 'AutoResetSignal';\n}\n\n/**\n * Terminates zero-cache backends that are blocking the current backend\n * from acquiring locks on CDC tables (e.g., during TRUNCATE).\n *\n * This is used during change-DB takeover when the new replication-manager's\n * `ensureReplicationConfig` needs to TRUNCATE tables, but the old\n * replication-manager's storer is still reading from them (e.g., large\n * catchup cursors).\n *\n * The function:\n * 1. Finds backends waiting for a lock on a TRUNCATE in {schema}\n * 2. Uses `pg_blocking_pids()` to identify which backends are blocking them\n * 3. Terminates blocking backends that have `application_name = 'zero-change-streamer'`\n *\n * Must be called on a **separate connection** from the one that is blocked,\n * since the blocked connection is inside a pending transaction.\n */\nexport async function terminateChangeDBLockHolders(\n  lc: LogContext,\n  db: PostgresDB,\n  shard: ShardID,\n) {\n  const schema = cdcSchema(shard);\n\n  // Step 1: Find backends that are blocked waiting for a lock,\n  // whose query involves a TRUNCATE on this shard's CDC schema.\n  const blocked = await db<{pid: number}[]>`\n    SELECT pid FROM pg_stat_activity\n      WHERE wait_event_type = 'Lock'\n        AND application_name = ${CHANGE_STREAMER_APP_NAME}\n        AND query LIKE ${'%TRUNCATE%' + schema + '%'}`;\n\n  if (blocked.length === 0) {\n    lc.info?.('no blocked TRUNCATE backends found');\n    return;\n  }\n\n  const blockedPids = blocked.map(r => r.pid);\n  lc.info?.(`found blocked TRUNCATE backends: ${JSON.stringify(blockedPids)}`);\n\n  // Step 2: For each blocked backend, find and terminate its blockers\n  // that are zero-change-streamer connections.\n  const terminated = await db<\n    {pid: number; applicationName: string; query: string; terminated: boolean}[]\n  >`\n    SELECT pid, application_name as \"applicationName\", query,\n           pg_terminate_backend(pid) as terminated\n      FROM pg_stat_activity\n      WHERE pid = ANY(\n        SELECT unnest(pg_blocking_pids(blocked.pid))\n          FROM unnest(${blockedPids}::int[]) AS blocked(pid)\n      )\n      AND application_name = ${CHANGE_STREAMER_APP_NAME}\n      AND pid != ALL(${blockedPids}::int[])`;\n\n  if (terminated.length === 0) {\n    lc.info?.(`no ${CHANGE_STREAMER_APP_NAME} blockers found to terminate`);\n  } else {\n    for (const {pid, applicationName, query, terminated: ok} of terminated) {\n      lc.info?.(\n        `terminated blocking backend pid=${pid} app=${applicationName} ok=${ok} query=${query.slice(0, 200)}`,\n      );\n    }\n  }\n}\n"],"mappings":";;;;;;;;AAiBA,SAAS,OAAO,OAAgB;AAC9B,QAAO,MAAM,UAAU,MAAM,CAAC;;AAKhC,SAAS,aAAa,OAAgB;AACpC,QAAe,+BAA+B,OAAO,MAAM,CAAC;;AAY9D,SAAS,qBAAqB,OAAgB;AAI5C,QAAe;iBACA,OAAO,MAAM,CAAC;;;;;;;;;AAoB/B,SAAgB,4BAA4B,OAAgB;AAC1D,QAAe;iBACA,OAAO,MAAM,CAAC;;;;;;;;AAS/B,eAAsB,8BACpB,OACA,KACwB;AAGxB,SAFe,MAAM,GAA6C;iCACnC,IAAI,UAAU,MAAM,CAAC,CAAC,sBACvC,GAAG;;AAcnB,SAAS,6BAA6B,OAAgB;AACpD,QAAe;iBACA,OAAO,MAAM,CAAC;;;;;;;;AAS/B,SAAgB,qBAAqB,OAAgB;AACnD,QAAe;iBACA,OAAO,MAAM,CAAC;;;;;;;iBAOd,OAAO,MAAM,CAAC;;;;;;;;;AAuB/B,SAAS,aAAa,OAAgB;AACpC,QACE,aAAa,MAAM,GACnB,qBAAqB,MAAM,GAC3B,4BAA4B,MAAM,GAClC,6BAA6B,MAAM,GACnC,qBAAqB,MAAM;;AAI/B,eAAsB,eACpB,IACA,IACA,OACA;AACA,IAAG,OAAO,wBAAwB;AAClC,OAAM,GAAG,OAAO,aAAa,MAAM,CAAC;;AAGtC,eAAsB,kBAAkB,KAAiB,OAAgB;AAEvE,OAAM,GAAG;WACA,IAFM,UAAU,MAAM,CAEX,CAAC;;;AAIvB,eAAsB,wBACpB,IACA,IACA,mBAIA,OACA,WACA,eAAkC,YAClC;CACA,MAAM,EAAC,cAAc,gBAAgB,cAAa;CAClD,MAAM,gBAAgB;EAAC;EAAc;EAAe;CACpD,MAAM,mBAAqC;EACzC,eAAe;EACf,OAAO;EACP,cAAc;EACf;CACD,MAAM,SAAS,UAAU,MAAM;AAE/B,OAAM,MAAM,IAAI,OAAM,QAAO;EAC3B,MAAM,QAA+B,EAAE;EACvC,IAAI,gBAAgB;EACpB,MAAM,UAAU,MAAM,GAMZ;;aAED,IAAI,OAAO,CAAC;AAErB,MAAI,QAAQ,QAAQ;GAClB,MAAM,EAAC,gBAAgB,iBAAgB,QAAQ;AAC/C,OACE,mBAAmB,cAAc,kBACjC,CAAC,OAAO,IAAI,IAAI,aAAa,EAAE,IAAI,IAAI,cAAc,aAAa,CAAC,EACnE;AACA,QAAI,cAAc,mBAAmB,UACnC,OAAM,IAAI,gBACR,0BAA0B,eAAe,sBACpB,cAAc,eAAe,kBAC9B,YACrB;AAEH,OAAG,OACD,uBAAuB,eAAe,iCACnB,cAAc,eAAe,oBACjD;AAQD,oBAAgB;AAChB,UAAM,KACJ,GAAG,kBAAkB,IAAI,OAAO,CAAC,eACjC,GAAG,kBAAkB,IAAI,OAAO,CAAC,uBACjC,GAAG,kBAAkB,IAAI,OAAO,CAAC,mBACjC,GAAG,kBAAkB,IAAI,OAAO,CAAC,gBAClC;;;AAIL,MAAI,QAAQ,WAAW,KAAK,eAAe;GAQzC,MAAM,YAAY,cAAc;GAChC,MAAM,YAAkC,CACtC;IAAC;IAAW,KAAK;IAAG,QAAQ,EAAC,KAAK,SAAQ;IAAC,EAC3C;IAAC;IAAW,KAAK;IAAG,QAAQ,EAAC,KAAK,UAAS;IAAC,CAC7C;AAED,SAAM,KACJ,GAAG,eAAe,IAAI,OAAO,CAAC,uBAAuB,IAAI,cAAc,IACvE,GAAG,eAAe,IAAI,OAAO,CAAC,uBAAuB,IAAI,iBAAiB,CAAC;iDAClC,IAAI,iBAAiB,IAC9D,GAAG,UAAU,KACX,WAAU,GAAG,eAAe,IAAI,OAAO,CAAC,eAAe,IAAI,OAAO,GACnE,CACF;AAED,OAAI,eAAe;IAKjB,MAAM,QAAQ,aAAa,YAAY;AACrC,QAAG,OACD,4DACD;AACD,WAAM,6BAA6B,IAAI,IAAI,MAAM;OAChD,iCAAiC;AACpC,QAAI;AACF,YAAO,MAAM,QAAQ,IAAI,MAAM;cACvB;AACR,kBAAa,MAAM;;;AAGvB,UAAO,QAAQ,IAAI,MAAM;;EAG3B,MAAM,EAAC,kBAAiB,QAAQ;AAChC,MAAI,eAAe;AACjB,OAAI,UACF,OAAM,IAAI,gBAAgB,uCAAuC;AAEnE,MAAG,QACD,qOAKD;;AAGH,SAAO,EAAE;GACT;;AAKJ,IAAM,mCAAmC;AAEzC,IAAa,2BAA2B;AAExC,IAAa,kBAAb,cAAqC,WAAW;CAC9C,OAAgB;;;;;;;;;;;;;;;;;;;AAoBlB,eAAsB,6BACpB,IACA,IACA,OACA;CAKA,MAAM,UAAU,MAAM,EAAmB;;;iCAGV,yBAAyB;yBACjC,eARR,UAAU,MAAM,GAQgB;AAE/C,KAAI,QAAQ,WAAW,GAAG;AACxB,KAAG,OAAO,qCAAqC;AAC/C;;CAGF,MAAM,cAAc,QAAQ,KAAI,MAAK,EAAE,IAAI;AAC3C,IAAG,OAAO,oCAAoC,KAAK,UAAU,YAAY,GAAG;CAI5E,MAAM,aAAa,MAAM,EAExB;;;;;;wBAMqB,YAAY;;+BAEL,yBAAyB;uBACjC,YAAY;AAEjC,KAAI,WAAW,WAAW,EACxB,IAAG,OAAO,MAAM,yBAAyB,8BAA8B;KAEvE,MAAK,MAAM,EAAC,KAAK,iBAAiB,OAAO,YAAY,QAAO,WAC1D,IAAG,OACD,mCAAmC,IAAI,OAAO,gBAAgB,MAAM,GAAG,SAAS,MAAM,MAAM,GAAG,IAAI,GACpG"}