@rocicorp/zero 0.17.2025022800 → 0.17.2025030600

package/out/zero-cache/src/services/change-source/pg/schema/ddl.js

@@ -1,5 +1,6 @@
 import { literal as lit } from 'pg-format';
 import * as v from "../../../../../../shared/src/valita.js";
+import { upstreamSchema } from "../../../../types/shards.js";
 import { id } from "../../../../types/sql.js";
 import { indexDefinitionsQuery, publishedSchema, publishedTableQuery, } from "./published.js";
 // Sent in the 'version' tag of "ddlStart" and "ddlUpdate" event messages.
@@ -96,9 +97,10 @@ export const ddlUpdateEventSchema = ddlEventSchema.extend({
     event: v.union(tableEvent, indexEvent, dropEvent, publicationEvent),
 });
 export const replicationEventSchema = v.union(ddlStartEventSchema, ddlUpdateEventSchema);
-// Creates a function that appends `_SHARD_ID` to the input.
-export function append(shardID) {
-    return (name) => id(name + '_' + shardID);
+// Creates a function that appends `_{shard-num}` to the input and
+// quotes the result to be a valid identifier.
+function append(shardNum) {
+    return (name) => id(name + '_' + String(shardNum));
 }
 /**
  * Event trigger functions contain the core logic that are invoked by triggers.
@@ -117,8 +119,9 @@ export function append(shardID) {
  * Instead, we opt for the simplicity and isolation of having each shard
  * completely own (and maintain) the entirety of its trigger/function stack.
  */
-function createEventFunctionStatements(appID, shardID, publications) {
-    const schema = append(shardID)(appID); // e.g. "{APP_ID}_{SHARD_ID}"
+function createEventFunctionStatements(shard) {
+    const { appID, shardNum, publications } = shard;
+    const schema = id(upstreamSchema(shard)); // e.g. "{APP_ID}_{SHARD_ID}"
     return `
 CREATE SCHEMA IF NOT EXISTS ${schema};
 
@@ -136,7 +139,7 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION ${schema}.notice_ignore(object_id TEXT)
 RETURNS void AS $$
 BEGIN
-  RAISE NOTICE 'zero(%) ignoring %', ${lit(shardID)}, object_id;
+  RAISE NOTICE 'zero(%) ignoring %', ${lit(shardNum)}, object_id;
 END
 $$ LANGUAGE plpgsql;
 
@@ -172,7 +175,7 @@ BEGIN
     'context', ${schema}.get_trigger_context()
   ) INTO message;
 
-  PERFORM pg_logical_emit_message(true, ${lit('zero/' + shardID)}, message);
+  PERFORM pg_logical_emit_message(true, ${lit(`${appID}/${shardNum}`)}, message);
 END
 $$ LANGUAGE plpgsql;
 
@@ -270,7 +273,7 @@ BEGIN
     'context', ${schema}.get_trigger_context()
   ) INTO message;
 
-  PERFORM pg_logical_emit_message(true, ${lit('zero/' + shardID)}, message);
+  PERFORM pg_logical_emit_message(true, ${lit(`${appID}/${shardNum}`)}, message);
 END
 $$ LANGUAGE plpgsql;
 `;
@@ -284,17 +287,19 @@ export const TAGS = [
     'DROP INDEX',
     'ALTER PUBLICATION',
 ];
-export function createEventTriggerStatements(appID, shardID, publications) {
+export function createEventTriggerStatements(shard) {
     // Unlike functions, which are namespaced in shard-specific schemas,
-    // EVENT TRIGGER names are in the global namespace and instead have the shardID appended.
-    const sharded = append(shardID);
-    const schema = sharded(appID);
+    // EVENT TRIGGER names are in the global namespace and thus must include
+    // the appID and shardNum.
+    const { appID, shardNum } = shard;
+    const sharded = append(shardNum);
+    const schema = id(upstreamSchema(shard));
     const triggers = [
-        createEventFunctionStatements(appID, shardID, publications),
+        dropEventTriggerStatements(shard.appID, shard.shardNum),
+        createEventFunctionStatements(shard),
     ];
     // A single ddl_command_start trigger covering all relevant tags.
     triggers.push(`
-DROP EVENT TRIGGER IF EXISTS ${sharded(`${appID}_ddl_start`)};
 CREATE EVENT TRIGGER ${sharded(`${appID}_ddl_start`)}
   ON ddl_command_start
   WHEN TAG IN (${lit(TAGS)})
@@ -311,8 +316,6 @@ BEGIN
 END
 $$ LANGUAGE plpgsql;
 
-
-DROP EVENT TRIGGER IF EXISTS ${sharded(`${appID}_${tagID}`)};
 CREATE EVENT TRIGGER ${sharded(`${appID}_${tagID}`)}
   ON ddl_command_end
   WHEN TAG IN (${lit(tag)})
@@ -321,4 +324,20 @@ CREATE EVENT TRIGGER ${sharded(`${appID}_${tagID}`)}
     }
     return triggers.join('');
 }
+// Exported for testing.
+export function dropEventTriggerStatements(appID, shardID) {
+    const stmts = [];
+    // A single ddl_command_start trigger covering all relevant tags.
+    stmts.push(`
+    DROP EVENT TRIGGER IF EXISTS ${id(`${appID}_ddl_start_${shardID}`)};
+  `);
+    // A per-tag ddl_command_end trigger that dispatches to ${schema}.emit_ddl_end(tag)
+    for (const tag of TAGS) {
+        const tagID = tag.toLowerCase().replace(' ', '_');
+        stmts.push(`
+      DROP EVENT TRIGGER IF EXISTS ${id(`${appID}_${tagID}_${shardID}`)};
+    `);
+    }
+    return stmts.join('');
+}
 //# sourceMappingURL=ddl.js.map

package/out/zero-cache/src/services/change-source/pg/schema/ddl.js.map

@@ -1 +1 @@
-{"version":3,"file":"ddl.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/ddl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ddl.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/ddl.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/services/change-source/pg/schema/init.d.ts

@@ -1,13 +1,14 @@
 import type { LogContext } from '@rocicorp/logger';
 import type { PostgresDB } from '../../../../types/pg.ts';
-import type { ShardConfig } from '../shard-config.ts';
+import { type ShardConfig } from '../../../../types/shards.ts';
 /**
  * Initializes a shard for initial sync.
  * This will drop any existing shard setup.
  */
-export declare function initShardSchema(lc: LogContext, db: PostgresDB, appID: string, shardConfig: ShardConfig): Promise<void>;
+export declare function initShardSchema(lc: LogContext, db: PostgresDB, shard: ShardConfig): Promise<void>;
 /**
  * Updates the schema for an existing shard.
  */
-export declare function updateShardSchema(lc: LogContext, db: PostgresDB, appID: string, shardConfig: ShardConfig): Promise<void>;
+export declare function updateShardSchema(lc: LogContext, db: PostgresDB, shard: ShardConfig, replicaVersion: string): Promise<void>;
+export declare function decommissionLegacyShard(lc: LogContext, db: PostgresDB, shard: ShardConfig): Promise<void>;
 //# sourceMappingURL=init.d.ts.map

package/out/zero-cache/src/services/change-source/pg/schema/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,yBAAyB,CAAC;AAExD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAOpD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC,CAYf"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAQjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAiB,KAAK,WAAW,EAAC,MAAM,6BAA6B,CAAC;AAK7E;;;GAGG;AACH,wBAAsB,eAAe,CACnC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,WAAW,GACjB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC,CAaf;AA6DD,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,WAAW,iBAYnB"}

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

@@ -1,28 +1,34 @@
+import { assert } from "../../../../../../shared/src/asserts.js";
 import { getVersionHistory, runSchemaMigrations, } from "../../../../db/migration.js";
+import { upstreamSchema } from "../../../../types/shards.js";
 import { AutoResetSignal } from "../../../change-streamer/schema/tables.js";
-import { dropShard, setupTablesAndReplication, unescapedSchema, } from "./shard.js";
+import { decommissionShard } from "../decommission.js";
+import { dropShard, setupTablesAndReplication } from "./shard.js";
 /**
  * Initializes a shard for initial sync.
  * This will drop any existing shard setup.
  */
-export async function initShardSchema(lc, db, appID, shardConfig) {
-    await db.unsafe(dropShard(appID, shardConfig.id));
-    return runShardMigrations(lc, db, appID, shardConfig);
+export async function initShardSchema(lc, db, shard) {
+    await db.unsafe(dropShard(shard.appID, shard.shardNum));
+    return runShardMigrations(lc, db, shard);
 }
 /**
  * Updates the schema for an existing shard.
  */
-export async function updateShardSchema(lc, db, appID, shardConfig) {
-    const { id } = shardConfig;
-    const { schemaVersion } = await getVersionHistory(db, unescapedSchema(appID, id));
-    if (schemaVersion === 0) {
-        throw new AutoResetSignal(`upstream shard ${appID}_${id} is not initialized`);
+export async function updateShardSchema(lc, db, shard, replicaVersion) {
+    const { appID, shardNum } = shard;
+    const versionHistory = await getVersionHistory(db, upstreamSchema(shard));
+    if (versionHistory === null) {
+        throw new AutoResetSignal(`upstream shard ${appID}_${shardNum} is not initialized`);
     }
-    return runShardMigrations(lc, db, appID, shardConfig);
+    await runShardMigrations(lc, db, shard, replicaVersion);
+    // The decommission check is run in updateShardSchema so that it happens
+    // after initial sync, and not when the shard schema is initially set up.
+    await decommissionLegacyShard(lc, db, shard);
 }
-async function runShardMigrations(lc, db, appID, shard) {
+async function runShardMigrations(lc, db, shard, replicaVersion) {
     const setupMigration = {
-        migrateSchema: (lc, tx) => setupTablesAndReplication(lc, tx, appID, shard),
+        migrateSchema: (lc, tx) => setupTablesAndReplication(lc, tx, shard),
         minSafeVersion: 1,
     };
     const schemaVersionMigrationMap = {
@@ -32,7 +38,41 @@ async function runShardMigrations(lc, db, appID, shard) {
             },
             minSafeVersion: 3,
         },
+        // v5 changes the upstream schema organization from "zero_{SHARD_ID}" to
+        // the "{APP_ID}_0". An incremental migration indicates that the previous
+        // SHARD_ID was "0" and the new APP_ID is "zero" (i.e. the default values
+        // for those options). In this case, the upstream format is identical, and
+        // no migration is necessary. However, the version is bumped to v5 to
+        // indicate that it was created with the {APP_ID} configuration and should
+        // not be decommissioned as a legacy shard.
+        5: {},
+        6: {
+            migrateSchema: async (lc, tx) => {
+                assert(replicaVersion, `replicaVersion is always passed for incremental migrations`);
+                await Promise.all([
+                    tx `
+          ALTER TABLE ${tx(upstreamSchema(shard))}."shardConfig" 
+            ADD "replicaVersion" TEXT`,
+                    tx `
+          UPDATE ${tx(upstreamSchema(shard))}."shardConfig" 
+            SET ${tx({ replicaVersion })}`,
+                ]);
+                lc.info?.(`Recorded replicaVersion ${replicaVersion} in upstream shardConfig`);
+            },
+        },
     };
-    await runSchemaMigrations(lc, `upstream-shard-${shard.id}`, unescapedSchema(appID, shard.id), db, setupMigration, schemaVersionMigrationMap);
+    await runSchemaMigrations(lc, `upstream-shard-${shard.appID}`, upstreamSchema(shard), db, setupMigration, schemaVersionMigrationMap);
+}
+export async function decommissionLegacyShard(lc, db, shard) {
+    if (shard.appID !== 'zero') {
+        // When migration from non-default shard ids, e.g. "zero_prod" => "prod_0",
+        // clean up the old "zero_prod" shard if it is pre-v5. Note that the v5
+        // check is important to guard against cleaning up a **new** "zero_0" app
+        // that coexists with the current App (with app-id === "0").
+        const versionHistory = await getVersionHistory(db, `zero_${shard.appID}`);
+        if (versionHistory !== null && versionHistory.schemaVersion < 5) {
+            await decommissionShard(lc, db, 'zero', shard.appID);
+        }
+    }
 }
 //# sourceMappingURL=init.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/init.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,mBAAmB,GAGpB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAC,eAAe,EAAC,MAAM,2CAA2C,CAAC;AAE1E,OAAO,EACL,SAAS,EACT,yBAAyB,EACzB,eAAe,GAChB,MAAM,YAAY,CAAC;AAEpB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,EAAc,EACd,EAAc,EACd,KAAa,EACb,WAAwB;IAExB,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,OAAO,kBAAkB,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;AACxD,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,EAAc,EACd,EAAc,EACd,KAAa,EACb,WAAwB;IAExB,MAAM,EAAC,EAAE,EAAC,GAAG,WAAW,CAAC;IACzB,MAAM,EAAC,aAAa,EAAC,GAAG,MAAM,iBAAiB,CAC7C,EAAE,EACF,eAAe,CAAC,KAAK,EAAE,EAAE,CAAC,CAC3B,CAAC;IACF,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,eAAe,CACvB,kBAAkB,KAAK,IAAI,EAAE,qBAAqB,CACnD,CAAC;IACJ,CAAC;IACD,OAAO,kBAAkB,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;AACxD,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,EAAc,EACd,EAAc,EACd,KAAa,EACb,KAAkB;IAElB,MAAM,cAAc,GAAc;QAChC,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,yBAAyB,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC;QAC1E,cAAc,EAAE,CAAC;KAClB,CAAC;IAEF,MAAM,yBAAyB,GAA4B;QACzD,CAAC,EAAE;YACD,aAAa,EAAE,GAAG,EAAE;gBAClB,MAAM,IAAI,eAAe,CAAC,mCAAmC,CAAC,CAAC;YACjE,CAAC;YACD,cAAc,EAAE,CAAC;SAClB;KACF,CAAC;IAEF,MAAM,mBAAmB,CACvB,EAAE,EACF,kBAAkB,KAAK,CAAC,EAAE,EAAE,EAC5B,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,EAChC,EAAE,EACF,cAAc,EACd,yBAAyB,CAC1B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/init.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/services/change-source/pg/schema/published.d.ts

@@ -1,7 +1,7 @@
 import type postgres from 'postgres';
 import * as v from '../../../../../../shared/src/valita.ts';
-export declare function publishedTableQuery(publications: string[]): string;
-export declare function indexDefinitionsQuery(publications: string[]): string;
+export declare function publishedTableQuery(publications: readonly string[]): string;
+export declare function indexDefinitionsQuery(publications: readonly string[]): string;
 export declare const publishedSchema: v.ObjectType<Omit<{
     tables: v.ArrayType<v.ObjectType<Omit<Omit<{
         name: v.Type<string>;

package/out/zero-cache/src/services/change-source/pg/schema/published.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"published.d.ts","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/published.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAErC,OAAO,KAAK,CAAC,MAAM,wCAAwC,CAAC;AAG5D,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,UA6EzD;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,UAyE3D;AAKD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAE3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAY9D,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAEzB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,QAAQ,CAAC,GAAG,EACjB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,eAAe,CAAC,CAiD1B"}
+{"version":3,"file":"published.d.ts","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/published.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAErC,OAAO,KAAK,CAAC,MAAM,wCAAwC,CAAC;AAG5D,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,UA6ElE;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,UAyEpE;AAKD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAE3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAY9D,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAEzB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,QAAQ,CAAC,GAAG,EACjB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,eAAe,CAAC,CAiD1B"}

package/out/zero-cache/src/services/change-source/pg/schema/published.js.map

@@ -1 +1 @@
-{"version":3,"file":"published.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/published.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"published.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/published.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/services/change-source/pg/schema/shard.d.ts

@@ -1,20 +1,18 @@
 import type { LogContext } from '@rocicorp/logger';
 import * as v from '../../../../../../shared/src/valita.ts';
 import type { PostgresDB, PostgresTransaction } from '../../../../types/pg.ts';
-import type { ShardConfig } from '../shard-config.ts';
+import type { AppID, ShardConfig, ShardID } from '../../../../types/shards.ts';
 import { type PublicationInfo, type PublishedSchema } from './published.ts';
-export declare function append(shardID: string): (name: string) => string;
-export declare function schemaFor(appID: string, shardID: string): string;
-export declare function unescapedSchema(appID: string, shardID: string): string;
-export declare function internalPublicationPrefix(appID: string): string;
-export declare function globalSetup(appID: string): string;
-export declare function ensureGlobalTables(db: PostgresDB, appID: string): Promise<void>;
+export declare function internalPublicationPrefix({ appID }: AppID): string;
+export declare function ensureGlobalTables(db: PostgresDB, appID: AppID): Promise<void>;
 export declare function getClientsTableDefinition(schema: string): string;
-export declare function shardSetup(appID: string, shardID: string, publications: string[]): string;
-export declare function dropShard(appID: string, shardID: string): string;
+export declare const SHARD_CONFIG_TABLE = "shardConfig";
+export declare function shardSetup(shardConfig: ShardConfig, metadataPublication: string): string;
+export declare function dropShard(appID: string, shardID: string | number): string;
 declare const internalShardConfigSchema: v.ObjectType<{
     publications: v.ArrayType<v.Type<string>>;
     ddlDetection: v.Type<boolean>;
+    replicaVersion: v.Type<string | null>;
     initialSchema: v.Type<{
         tables: {
             primaryKey?: string[] | undefined;
@@ -47,13 +45,13 @@ declare const internalShardConfigSchema: v.ObjectType<{
     } | null>;
 }, undefined>;
 export type InternalShardConfig = v.Infer<typeof internalShardConfigSchema>;
-export declare function setInitialSchema(db: PostgresDB, appID: string, shardID: string, { tables, indexes }: PublishedSchema): Promise<void>;
-export declare function getInternalShardConfig(db: PostgresDB, appID: string, shardID: string): Promise<InternalShardConfig>;
+export declare function setInitialSchema(db: PostgresDB, shard: ShardID, replicaVersion: string, { tables, indexes }: PublishedSchema): Promise<void>;
+export declare function getInternalShardConfig(db: PostgresDB, shard: ShardID): Promise<InternalShardConfig>;
 /**
  * Sets up and returns all publications (including internal ones) for
  * the given shard.
  */
-export declare function setupTablesAndReplication(lc: LogContext, tx: PostgresTransaction, appID: string, { id, publications }: ShardConfig): Promise<void>;
+export declare function setupTablesAndReplication(lc: LogContext, tx: PostgresTransaction, requested: ShardConfig): Promise<void>;
 export declare function validatePublications(lc: LogContext, published: PublicationInfo): void;
 type ReplicaIdentities = {
     apply(lc: LogContext, db: PostgresDB): Promise<void>;

package/out/zero-cache/src/services/change-source/pg/schema/shard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shard.d.ts","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/shard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAIjD,OAAO,KAAK,CAAC,MAAM,wCAAwC,CAAC;AAE5D,OAAO,KAAK,EAAC,UAAU,EAAE,mBAAmB,EAAC,MAAM,yBAAyB,CAAC;AAE7E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AAIxB,wBAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,UACtB,MAAM,YACrB;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAEvD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAE7D;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,UAEtD;AAYD,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CA6CjD;AAED,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,iBAErE;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,UAQvD;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EAAE,GACrB,MAAM,CAmCR;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAYhE;AAED,QAAA,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAI7B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAkB5E,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,eAAe,iBAKnC;AAED,wBAAsB,sBAAsB,CAC1C,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CAO9B;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,mBAAmB,EACvB,KAAK,EAAE,MAAM,EACb,EAAC,EAAE,EAAE,YAAY,EAAC,EAAE,WAAW,iBAgEhC;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,UAAU,EACd,SAAS,EAAE,eAAe,QAkB3B;AAED,KAAK,iBAAiB,GAAG;IACvB,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD,CAAC;AAEF,wBAAgB,4CAA4C,CAC1D,IAAI,EAAE,eAAe,GACpB,iBAAiB,GAAG,SAAS,CA+C/B"}
+{"version":3,"file":"shard.d.ts","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/shard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAIjD,OAAO,KAAK,CAAC,MAAM,wCAAwC,CAAC;AAE5D,OAAO,KAAK,EAAC,UAAU,EAAE,mBAAmB,EAAC,MAAM,yBAAyB,CAAC;AAC7E,OAAO,KAAK,EAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAC,MAAM,6BAA6B,CAAC;AAI7E,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AAGxB,wBAAgB,yBAAyB,CAAC,EAAC,KAAK,EAAC,EAAE,KAAK,UAEvD;AAyDD,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,iBAEpE;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,UAQvD;AAED,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAEhD,wBAAgB,UAAU,CACxB,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,MAAM,GAC1B,MAAM,CAkCR;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAYzE;AAED,QAAA,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAK7B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAc5E,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,EACd,cAAc,EAAE,MAAM,EACtB,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,eAAe,iBAQnC;AAED,wBAAsB,sBAAsB,CAC1C,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,mBAAmB,CAAC,CAO9B;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,mBAAmB,EACvB,SAAS,EAAE,WAAW,iBA0EvB;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,UAAU,EACd,SAAS,EAAE,eAAe,QAkB3B;AAED,KAAK,iBAAiB,GAAG;IACvB,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD,CAAC;AAEF,wBAAgB,4CAA4C,CAC1D,IAAI,EAAE,eAAe,GACpB,iBAAiB,GAAG,SAAS,CA+C/B"}

package/out/zero-cache/src/services/change-source/pg/schema/shard.js

@@ -4,21 +4,12 @@ import postgres from 'postgres';
 import { assert } from "../../../../../../shared/src/asserts.js";
 import * as v from "../../../../../../shared/src/valita.js";
 import { Default } from "../../../../db/postgres-replica-identity-enum.js";
+import { appSchema, upstreamSchema } from "../../../../types/shards.js";
 import { id } from "../../../../types/sql.js";
 import { createEventTriggerStatements } from "./ddl.js";
 import { getPublicationInfo, publishedSchema, } from "./published.js";
-import { ALLOWED_APP_ID_CHARACTERS, validate } from "./validation.js";
-// Creates a function that appends `_SHARD_ID` to the input.
-export function append(shardID) {
-    return (name) => id(name + '_' + shardID);
-}
-export function schemaFor(appID, shardID) {
-    return append(shardID)(appID);
-}
-export function unescapedSchema(appID, shardID) {
-    return `${appID}_${shardID}`;
-}
-export function internalPublicationPrefix(appID) {
+import { validate } from "./validation.js";
+export function internalPublicationPrefix({ appID }) {
     return `_${appID}_`;
 }
 function defaultPublicationName(appID, shardID) {
@@ -28,14 +19,12 @@ function metadataPublicationName(appID, shardID) {
     return `_${appID}_metadata_${shardID}`;
 }
 // The GLOBAL_SETUP must be idempotent as it can be run multiple times for different shards.
-// Exported for testing.
-export function globalSetup(appID) {
-    // Sanity check; should already be validated upstream.
-    assert(ALLOWED_APP_ID_CHARACTERS.test(appID), `Invalid App ID ${appID}`);
+function globalSetup(appID) {
+    const app = id(appSchema(appID));
     return `
-  CREATE SCHEMA IF NOT EXISTS ${appID};
+  CREATE SCHEMA IF NOT EXISTS ${app};
 
-  CREATE TABLE IF NOT EXISTS ${appID}."schemaVersions" (
+  CREATE TABLE IF NOT EXISTS ${app}."schemaVersions" (
     "minSupportedVersion" INT4,
     "maxSupportedVersion" INT4,
 
@@ -45,10 +34,10 @@ export function globalSetup(appID) {
     "lock" BOOL PRIMARY KEY DEFAULT true CHECK (lock)
   );
 
-  INSERT INTO ${appID}."schemaVersions" ("lock", "minSupportedVersion", "maxSupportedVersion")
+  INSERT INTO ${app}."schemaVersions" ("lock", "minSupportedVersion", "maxSupportedVersion")
     VALUES (true, 1, 1) ON CONFLICT DO NOTHING;
 
-  CREATE TABLE IF NOT EXISTS ${appID}.permissions (
+  CREATE TABLE IF NOT EXISTS ${app}.permissions (
     "permissions" JSONB,
     "hash"        TEXT,
 
@@ -58,7 +47,7 @@ export function globalSetup(appID) {
     "lock" BOOL PRIMARY KEY DEFAULT true CHECK (lock)
   );
 
-  CREATE OR REPLACE FUNCTION ${appID}.set_permissions_hash()
+  CREATE OR REPLACE FUNCTION ${app}.set_permissions_hash()
   RETURNS TRIGGER AS $$
   BEGIN
       NEW.hash = md5(NEW.permissions::text);
@@ -67,11 +56,11 @@ export function globalSetup(appID) {
   $$ LANGUAGE plpgsql;
 
   CREATE OR REPLACE TRIGGER on_set_permissions 
-    BEFORE INSERT OR UPDATE ON ${appID}.permissions
+    BEFORE INSERT OR UPDATE ON ${app}.permissions
     FOR EACH ROW
-    EXECUTE FUNCTION ${appID}.set_permissions_hash();
+    EXECUTE FUNCTION ${app}.set_permissions_hash();
 
-  INSERT INTO ${appID}.permissions (permissions) VALUES (NULL) ON CONFLICT DO NOTHING;
+  INSERT INTO ${app}.permissions (permissions) VALUES (NULL) ON CONFLICT DO NOTHING;
 `;
 }
 export async function ensureGlobalTables(db, appID) {
@@ -86,40 +75,42 @@ export function getClientsTableDefinition(schema) {
     PRIMARY KEY("clientGroupID", "clientID")
   );`;
 }
-export function shardSetup(appID, shardID, publications) {
-    assert(ALLOWED_APP_ID_CHARACTERS.test(appID), `Invalid App ID ${appID}`);
-    const schema = schemaFor(appID, shardID);
-    const metadataPublication = metadataPublicationName(appID, shardID);
-    publications.push(metadataPublication);
-    publications.sort();
+export const SHARD_CONFIG_TABLE = 'shardConfig';
+export function shardSetup(shardConfig, metadataPublication) {
+    const app = id(appSchema(shardConfig));
+    const shard = id(upstreamSchema(shardConfig));
+    const pubs = [...shardConfig.publications].sort();
+    assert(pubs.includes(metadataPublication));
     return `
-  CREATE SCHEMA IF NOT EXISTS ${schema};
+  CREATE SCHEMA IF NOT EXISTS ${shard};
 
-  ${getClientsTableDefinition(schema)}
+  ${getClientsTableDefinition(shard)}
 
   CREATE PUBLICATION ${id(metadataPublication)}
-    FOR TABLE ${appID}."schemaVersions", ${appID}."permissions", TABLE ${schema}."clients";
+    FOR TABLE ${app}."schemaVersions", ${app}."permissions", TABLE ${shard}."clients";
 
-  CREATE TABLE ${schema}."shardConfig" (
+  CREATE TABLE ${shard}."${SHARD_CONFIG_TABLE}" (
     "publications"  TEXT[] NOT NULL,
     "ddlDetection"  BOOL NOT NULL,
+    "replicaVersion" TEXT,
     "initialSchema" JSON,
 
     -- Ensure that there is only a single row in the table.
     "lock" BOOL PRIMARY KEY DEFAULT true CHECK (lock)
   );
 
-  INSERT INTO ${schema}."shardConfig" 
-    ("lock", "publications", "ddlDetection", "initialSchema")
+  INSERT INTO ${shard}."${SHARD_CONFIG_TABLE}" 
+    ("lock", "publications", "ddlDetection", "replicaVersion", "initialSchema")
     VALUES (true, 
-      ARRAY[${literal(publications)}], 
+      ARRAY[${literal(pubs)}], 
       false,  -- set in SAVEPOINT with triggerSetup() statements
-      null    -- set in initial-sync at consistent_point LSN.
+      null,   -- set in initial-sync at consistent_point LSN.
+      null    -- set in initial-sync at consistent_ponit LSN.
     );
   `;
 }
 export function dropShard(appID, shardID) {
-    const schema = schemaFor(appID, shardID);
+    const schema = `${appID}_${shardID}`;
     const metadataPublication = metadataPublicationName(appID, shardID);
     const defaultPublication = defaultPublicationName(appID, shardID);
     // DROP SCHEMA ... CASCADE does not drop dependent PUBLICATIONS,
@@ -127,32 +118,36 @@ export function dropShard(appID, shardID) {
     return `
     DROP PUBLICATION IF EXISTS ${id(defaultPublication)};
     DROP PUBLICATION IF EXISTS ${id(metadataPublication)};
-    DROP SCHEMA IF EXISTS ${schema} CASCADE;
+    DROP SCHEMA IF EXISTS ${id(schema)} CASCADE;
   `;
 }
 const internalShardConfigSchema = v.object({
     publications: v.array(v.string()),
     ddlDetection: v.boolean(),
+    replicaVersion: v.string().nullable(),
     initialSchema: publishedSchema.nullable(),
 });
 // triggerSetup is run separately in a sub-transaction (i.e. SAVEPOINT) so
 // that a failure (e.g. due to lack of superuser permissions) can be handled
 // by continuing in a degraded mode (ddlDetection = false).
-function triggerSetup(appID, shardID, publications) {
-    const schema = schemaFor(appID, shardID);
-    return (createEventTriggerStatements(appID, shardID, publications) +
+function triggerSetup(shard) {
+    const schema = id(upstreamSchema(shard));
+    return (createEventTriggerStatements(shard) +
         `UPDATE ${schema}."shardConfig" SET "ddlDetection" = true;`);
 }
 // Called in initial-sync to store the exact schema that was initially synced.
-export async function setInitialSchema(db, appID, shardID, { tables, indexes }) {
-    const schema = unescapedSchema(appID, shardID);
+export async function setInitialSchema(db, shard, replicaVersion, { tables, indexes }) {
+    const schema = upstreamSchema(shard);
     const synced = { tables, indexes };
-    await db `UPDATE ${db(schema)}."shardConfig" SET "initialSchema" = ${synced}`;
+    await db `
+  UPDATE ${db(schema)}."shardConfig" 
+     SET "replicaVersion" = ${replicaVersion},
+          "initialSchema" = ${synced}`;
 }
-export async function getInternalShardConfig(db, appID, shardID) {
+export async function getInternalShardConfig(db, shard) {
     const result = await db `
-    SELECT "publications", "ddlDetection", "initialSchema" 
-      FROM ${db(unescapedSchema(appID, shardID))}."shardConfig";
+    SELECT "publications", "ddlDetection", "replicaVersion", "initialSchema"
+      FROM ${db(upstreamSchema(shard))}."shardConfig";
   `;
     assert(result.length === 1);
     return v.parse(result[0], internalShardConfigSchema, 'passthrough');
@@ -161,7 +156,8 @@ export async function getInternalShardConfig(db, appID, shardID) {
  * Sets up and returns all publications (including internal ones) for
  * the given shard.
  */
-export async function setupTablesAndReplication(lc, tx, appID, { id, publications }) {
+export async function setupTablesAndReplication(lc, tx, requested) {
+    const { publications } = requested;
     // Validate requested publications.
     for (const pub of publications) {
         if (pub.startsWith('_')) {
@@ -180,7 +176,7 @@ export async function setupTablesAndReplication(lc, tx, appID, { id, publication
         allPublications.push(...publications);
     }
     else {
-        const defaultPublication = defaultPublicationName(appID, id);
+        const defaultPublication = defaultPublicationName(requested.appID, requested.shardNum);
         // Note: For re-syncing, this publication is dropped in dropShard(), so an existence
         //       check is unnecessary.
         await tx `
@@ -189,12 +185,15 @@ export async function setupTablesAndReplication(lc, tx, appID, { id, publication
         WITH (publish_via_partition_root = true)`;
         allPublications.push(defaultPublication);
     }
+    const metadataPublication = metadataPublicationName(requested.appID, requested.shardNum);
+    allPublications.push(metadataPublication);
+    const shard = { ...requested, publications: allPublications };
     // Setup the global tables and shard tables / publications.
-    await tx.unsafe(globalSetup(appID) + shardSetup(appID, id, allPublications));
+    await tx.unsafe(globalSetup(shard) + shardSetup(shard, metadataPublication));
     const pubs = await getPublicationInfo(tx, allPublications);
     await replicaIdentitiesForTablesWithoutPrimaryKeys(pubs)?.apply(lc, tx);
     try {
-        await tx.savepoint(sub => sub.unsafe(triggerSetup(appID, id, allPublications)));
+        await tx.savepoint(sub => sub.unsafe(triggerSetup(shard)));
     }
     catch (e) {
         if (!(e instanceof postgres.PostgresError &&