@rocicorp/zero 0.5.2024103100 → 0.6.2024111600

package/out/zero-cache/src/services/change-streamer/pg/initial-sync.js

@@ -12,11 +12,16 @@ import { initReplicationState, ZERO_VERSION_COLUMN_NAME, } from '../../replicato
 import { toLexiVersion } from './lsn.js';
 import { initShardSchema } from './schema/init.js';
 import { getPublicationInfo } from './schema/published.js';
-import { getShardConfig } from './schema/shard.js';
+import { getInternalShardConfig, setInitialSchema, validatePublications, } from './schema/shard.js';
+// https://www.postgresql.org/docs/current/warm-standby.html#STREAMING-REPLICATION-SLOTS-MANIPULATION
+const ALLOWED_SHARD_ID_CHARACTERS = /^[a-z0-9_]+$/;
 export function replicationSlot(shardID) {
     return `zero_${shardID}`;
 }
 export async function initialSync(lc, shard, tx, upstreamURI) {
+    if (!ALLOWED_SHARD_ID_CHARACTERS.test(shard.id)) {
+        throw new Error('A shard ID may only consist of lower-case letters, numbers, and the underscore character');
+    }
     const upstreamDB = pgClient(lc, upstreamURI, {
         max: MAX_WORKERS,
     });
@@ -27,25 +32,35 @@ export async function initialSync(lc, shard, tx, upstreamURI) {
     });
     try {
         await checkUpstreamConfig(upstreamDB);
-        const { publications, tables, indices } = await ensurePublishedTables(lc, upstreamDB, shard);
-        const pubNames = publications.map(p => p.pubname);
-        lc.info?.(`Upstream is setup with publications [${pubNames}]`);
-        createLiteTables(tx, tables);
-        createLiteIndices(tx, indices);
+        const { publications } = await ensurePublishedTables(lc, upstreamDB, shard);
+        lc.info?.(`Upstream is setup with publications [${publications}]`);
         const { database, host } = upstreamDB.options;
         lc.info?.(`opening replication session to ${database}@${host}`);
         const { snapshot_name: snapshot, consistent_point: lsn } = await createReplicationSlot(lc, shard.id, replicationSession);
         // Run up to MAX_WORKERS to copy of tables at the replication slot's snapshot.
-        const copiers = startTableCopyWorkers(lc, upstreamDB, tables.length, snapshot);
-        await Promise.all(tables.map(table => copiers.process(db => copy(lc, table, db, tx).then(() => []))));
-        copiers.setDone();
-        initReplicationState(tx, pubNames, toLexiVersion(lsn));
+        const copiers = startTableCopyWorkers(lc, upstreamDB, snapshot);
+        let published;
+        try {
+            // Retrieve the published schema at the consistent_point.
+            published = await copiers.processReadTask(db => getPublicationInfo(db, publications));
+            // Note: If this throws, initial-sync is aborted.
+            validatePublications(lc, shard.id, published);
+            // Now that tables have been validated, kick off the copiers.
+            const { tables, indexes } = published;
+            createLiteTables(tx, tables);
+            createLiteIndices(tx, indexes);
+            await Promise.all(tables.map(table => copiers.process(db => copy(lc, table, db, tx).then(() => []))));
+        }
+        finally {
+            copiers.setDone();
+        }
+        await setInitialSchema(upstreamDB, shard.id, published);
+        initReplicationState(tx, publications, toLexiVersion(lsn));
         initChangeLog(tx);
-        lc.info?.(`Synced initial data from ${pubNames} up to ${lsn}`);
+        lc.info?.(`Synced initial data from ${publications} up to ${lsn}`);
         await copiers.done();
     }
     finally {
-        // Close the upstream connections.
         await replicationSession.end();
         await upstreamDB.end();
     }
@@ -66,8 +81,7 @@ async function ensurePublishedTables(lc, upstreamDB, shard) {
     const { database, host } = upstreamDB.options;
     lc.info?.(`Ensuring upstream PUBLICATION on ${database}@${host}`);
     await initShardSchema(lc, upstreamDB, shard);
-    const { publications } = await getShardConfig(upstreamDB, shard.id);
-    return getPublicationInfo(upstreamDB, publications);
+    return getInternalShardConfig(upstreamDB, shard.id);
 }
 /* eslint-enable @typescript-eslint/naming-convention */
 async function createReplicationSlot(lc, shardID, session) {
@@ -88,19 +102,19 @@ async function createReplicationSlot(lc, shardID, session) {
         lc.info?.(`Dropping existing replication slot ${slotName}`);
         await session.unsafe(`DROP_REPLICATION_SLOT ${slotName} WAIT`);
     }
-    const slot = (await session.unsafe(`CREATE_REPLICATION_SLOT ${slotName} LOGICAL pgoutput`))[0];
+    const slot = (await session.unsafe(`CREATE_REPLICATION_SLOT "${slotName}" LOGICAL pgoutput`))[0];
     lc.info?.(`Created replication slot ${slotName}`, slot);
     return slot;
 }
 // TODO: Consider parameterizing these.
 const MAX_WORKERS = 5;
 const BATCH_SIZE = 100_000;
-function startTableCopyWorkers(lc, db, numTables, snapshot) {
+function startTableCopyWorkers(lc, db, snapshot) {
     const { init } = importSnapshot(snapshot);
-    const numWorkers = Math.min(numTables, MAX_WORKERS);
+    const numWorkers = MAX_WORKERS;
     const tableCopiers = new TransactionPool(lc, Mode.READONLY, init, undefined, numWorkers);
     tableCopiers.run(db);
-    lc.info?.(`Started ${numWorkers} workers to copy ${numTables} tables`);
+    lc.info?.(`Started ${numWorkers} workers to copy tables`);
     return tableCopiers;
 }
 function createLiteTables(tx, tables) {

package/out/zero-cache/src/services/change-streamer/pg/initial-sync.js.map

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

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

@@ -1,40 +1,12 @@
 import * as v from '../../../../../../shared/src/valita.js';
 export declare const PROTOCOL_VERSION = 1;
-declare const publishedSchema: v.ObjectType<{
-    tables: v.ArrayType<v.ObjectType<Omit<Omit<{
-        name: v.Type<string>;
-        columns: v.Type<Record<string, {
-            characterMaximumLength?: number | null | undefined;
-            notNull?: boolean | null | undefined;
-            dflt?: string | null | undefined;
-            pos: number;
-            dataType: string;
-        }>>;
-        primaryKey: v.ArrayType<v.Type<string>>;
-    }, "schema"> & {
-        schema: v.Type<string>;
-    }, "publications"> & {
-        publications: v.Type<Record<string, {
-            rowFilter: string | null;
-        }>>;
-    }, undefined>>;
-    indexes: v.ArrayType<v.ObjectType<Omit<{
-        name: v.Type<string>;
-        tableName: v.Type<string>;
-        unique: v.Type<boolean>;
-        columns: v.Type<Record<string, "ASC" | "DESC">>;
-    }, "schema"> & {
-        schema: v.Type<string>;
-    }, undefined>>;
-}, undefined>;
-export type PublishedSchema = v.Infer<typeof publishedSchema>;
 export declare const ddlEventSchema: v.ObjectType<Omit<{
     context: v.ObjectType<{
         query: v.Type<string>;
     }, v.Type<string>>;
 }, "schema" | "version"> & {
     version: v.Type<1>;
-    schema: v.ObjectType<{
+    schema: v.ObjectType<Omit<{
         tables: v.ArrayType<v.ObjectType<Omit<Omit<{
             name: v.Type<string>;
             columns: v.Type<Record<string, {
@@ -47,11 +19,21 @@ export declare const ddlEventSchema: v.ObjectType<Omit<{
             primaryKey: v.ArrayType<v.Type<string>>;
         }, "schema"> & {
             schema: v.Type<string>;
-        }, "publications"> & {
+        }, "publications" | "columns" | "oid"> & {
+            oid: v.Type<number>;
+            columns: v.Type<Record<string, {
+                characterMaximumLength?: number | null | undefined;
+                notNull?: boolean | null | undefined;
+                dflt?: string | null | undefined;
+                pos: number;
+                dataType: string;
+                typeOID: number;
+            }>>;
             publications: v.Type<Record<string, {
                 rowFilter: string | null;
             }>>;
         }, undefined>>;
+    }, "indexes"> & {
         indexes: v.ArrayType<v.ObjectType<Omit<{
             name: v.Type<string>;
             tableName: v.Type<string>;
@@ -68,7 +50,7 @@ export declare const ddlStartEventSchema: v.ObjectType<Omit<Omit<{
     }, v.Type<string>>;
 }, "schema" | "version"> & {
     version: v.Type<1>;
-    schema: v.ObjectType<{
+    schema: v.ObjectType<Omit<{
         tables: v.ArrayType<v.ObjectType<Omit<Omit<{
             name: v.Type<string>;
             columns: v.Type<Record<string, {
@@ -81,11 +63,21 @@ export declare const ddlStartEventSchema: v.ObjectType<Omit<Omit<{
             primaryKey: v.ArrayType<v.Type<string>>;
         }, "schema"> & {
             schema: v.Type<string>;
-        }, "publications"> & {
+        }, "publications" | "columns" | "oid"> & {
+            oid: v.Type<number>;
+            columns: v.Type<Record<string, {
+                characterMaximumLength?: number | null | undefined;
+                notNull?: boolean | null | undefined;
+                dflt?: string | null | undefined;
+                pos: number;
+                dataType: string;
+                typeOID: number;
+            }>>;
             publications: v.Type<Record<string, {
                 rowFilter: string | null;
             }>>;
         }, undefined>>;
+    }, "indexes"> & {
         indexes: v.ArrayType<v.ObjectType<Omit<{
             name: v.Type<string>;
             tableName: v.Type<string>;
@@ -117,7 +109,7 @@ export declare const ddlUpdateEventSchema: v.ObjectType<Omit<Omit<{
     }, v.Type<string>>;
 }, "schema" | "version"> & {
     version: v.Type<1>;
-    schema: v.ObjectType<{
+    schema: v.ObjectType<Omit<{
         tables: v.ArrayType<v.ObjectType<Omit<Omit<{
             name: v.Type<string>;
             columns: v.Type<Record<string, {
@@ -130,11 +122,21 @@ export declare const ddlUpdateEventSchema: v.ObjectType<Omit<Omit<{
             primaryKey: v.ArrayType<v.Type<string>>;
         }, "schema"> & {
             schema: v.Type<string>;
-        }, "publications"> & {
+        }, "publications" | "columns" | "oid"> & {
+            oid: v.Type<number>;
+            columns: v.Type<Record<string, {
+                characterMaximumLength?: number | null | undefined;
+                notNull?: boolean | null | undefined;
+                dflt?: string | null | undefined;
+                pos: number;
+                dataType: string;
+                typeOID: number;
+            }>>;
             publications: v.Type<Record<string, {
                 rowFilter: string | null;
             }>>;
         }, undefined>>;
+    }, "indexes"> & {
         indexes: v.ArrayType<v.ObjectType<Omit<{
             name: v.Type<string>;
             tableName: v.Type<string>;
@@ -171,7 +173,7 @@ export declare const replicationEventSchema: v.UnionType<[v.ObjectType<Omit<Omit
     }, v.Type<string>>;
 }, "schema" | "version"> & {
     version: v.Type<1>;
-    schema: v.ObjectType<{
+    schema: v.ObjectType<Omit<{
         tables: v.ArrayType<v.ObjectType<Omit<Omit<{
             name: v.Type<string>;
             columns: v.Type<Record<string, {
@@ -184,11 +186,21 @@ export declare const replicationEventSchema: v.UnionType<[v.ObjectType<Omit<Omit
             primaryKey: v.ArrayType<v.Type<string>>;
         }, "schema"> & {
             schema: v.Type<string>;
-        }, "publications"> & {
+        }, "publications" | "columns" | "oid"> & {
+            oid: v.Type<number>;
+            columns: v.Type<Record<string, {
+                characterMaximumLength?: number | null | undefined;
+                notNull?: boolean | null | undefined;
+                dflt?: string | null | undefined;
+                pos: number;
+                dataType: string;
+                typeOID: number;
+            }>>;
             publications: v.Type<Record<string, {
                 rowFilter: string | null;
             }>>;
         }, undefined>>;
+    }, "indexes"> & {
         indexes: v.ArrayType<v.ObjectType<Omit<{
             name: v.Type<string>;
             tableName: v.Type<string>;
@@ -206,7 +218,7 @@ export declare const replicationEventSchema: v.UnionType<[v.ObjectType<Omit<Omit
     }, v.Type<string>>;
 }, "schema" | "version"> & {
     version: v.Type<1>;
-    schema: v.ObjectType<{
+    schema: v.ObjectType<Omit<{
         tables: v.ArrayType<v.ObjectType<Omit<Omit<{
             name: v.Type<string>;
             columns: v.Type<Record<string, {
@@ -219,11 +231,21 @@ export declare const replicationEventSchema: v.UnionType<[v.ObjectType<Omit<Omit
             primaryKey: v.ArrayType<v.Type<string>>;
         }, "schema"> & {
             schema: v.Type<string>;
-        }, "publications"> & {
+        }, "publications" | "columns" | "oid"> & {
+            oid: v.Type<number>;
+            columns: v.Type<Record<string, {
+                characterMaximumLength?: number | null | undefined;
+                notNull?: boolean | null | undefined;
+                dflt?: string | null | undefined;
+                pos: number;
+                dataType: string;
+                typeOID: number;
+            }>>;
             publications: v.Type<Record<string, {
                 rowFilter: string | null;
             }>>;
         }, undefined>>;
+    }, "indexes"> & {
         indexes: v.ArrayType<v.ObjectType<Omit<{
             name: v.Type<string>;
             tableName: v.Type<string>;
@@ -254,6 +276,7 @@ export declare const replicationEventSchema: v.UnionType<[v.ObjectType<Omit<Omit
     }, undefined>]>;
 }, undefined>]>;
 export type ReplicationEvent = v.Infer<typeof replicationEventSchema>;
+export declare function append(shardID: string): (name: string) => string;
+export declare const TAGS: readonly ["CREATE TABLE", "ALTER TABLE", "CREATE INDEX", "DROP TABLE", "DROP INDEX", "ALTER PUBLICATION"];
 export declare function createEventTriggerStatements(shardID: string, publications: string[]): string;
-export {};
 //# sourceMappingURL=ddl.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ddl.d.ts","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-streamer/pg/schema/ddl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,wCAAwC,CAAC;AAW5D,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAQlC,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;aAGnB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAI9D,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAGzB,CAAC;AASH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAE9B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAyDhE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAG/B,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAGlC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAiMtE,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EAAE,UAgDvB"}
+{"version":3,"file":"ddl.d.ts","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-streamer/pg/schema/ddl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,wCAAwC,CAAC;AAc5D,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAQlC,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAGzB,CAAC;AASH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAE9B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAyDhE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAG/B,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAGlC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAGtE,wBAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,UACtB,MAAM,YACrB;AAsLD,eAAO,MAAM,IAAI,2GAOP,CAAC;AAEX,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EAAE,UAsCvB"}

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

@@ -1,8 +1,7 @@
 import { literal as lit } from 'pg-format';
 import * as v from '../../../../../../shared/src/valita.js';
-import { filteredTableSpec, indexSpec } from '../../../../db/specs.js';
 import { id } from '../../../../types/sql.js';
-import { indexDefinitionsQuery, publishedTableQuery } from './published.js';
+import { indexDefinitionsQuery, publishedSchema, publishedTableQuery, } from './published.js';
 // Sent in the 'version' tag of "ddlStart" and "ddlUpdate" event messages.
 // This is used to ensure that the message constructed in the upstream
 // Trigger function is compatible with the code processing it in the zero-cache.
@@ -13,12 +12,6 @@ export const PROTOCOL_VERSION = 1;
 const triggerEvent = v.object({
     context: v.object({ query: v.string() }).rest(v.string()),
 });
-// The Schema type encapsulates a snapshot of the tables and indexes that
-// are published / relevant to the shard.
-const publishedSchema = v.object({
-    tables: v.array(filteredTableSpec),
-    indexes: v.array(indexSpec),
-});
 // All DDL events contain a snapshot of the current tables and indexes that
 // are published / relevant to the shard.
 export const ddlEventSchema = triggerEvent.extend({
@@ -104,7 +97,7 @@ export const ddlUpdateEventSchema = ddlEventSchema.extend({
 });
 export const replicationEventSchema = v.union(ddlStartEventSchema, ddlUpdateEventSchema);
 // Creates a function that appends `_SHARD_ID` to the input.
-function append(shardID) {
+export function append(shardID) {
     return (name) => id(name + '_' + shardID);
 }
 /**
@@ -258,9 +251,11 @@ BEGIN
 
   -- Construct and emit the DdlUpdateEvent message.
 
-  IF target IS NOT NULL
-  THEN
+  IF target IS NOT NULL THEN
     SELECT json_build_object('tag', tag, cmd.object_type, target) INTO event;
+  ELSIF tag LIKE 'CREATE %' THEN
+    PERFORM ${schema}.notice_ignore('noop ' || tag);
+    RETURN;
   ELSE
     SELECT json_build_object('tag', tag) INTO event;
   END IF;
@@ -280,7 +275,8 @@ END
 $$ LANGUAGE plpgsql;
 `;
 }
-const TAGS = [
+// Exported for testing.
+export const TAGS = [
     'CREATE TABLE',
     'ALTER TABLE',
     'CREATE INDEX',
@@ -321,34 +317,6 @@ CREATE EVENT TRIGGER ${sharded(`zero_${tagID}`)}
   EXECUTE PROCEDURE ${schema}.emit_${tagID}();
 `);
     }
-    // Delete legacy triggers/functions. This should be removable once all early
-    // testers have updated.
-    for (const trigger of LEGACY_TRIGGER_NAMES) {
-        triggers.push(`DROP EVENT TRIGGER IF EXISTS ${sharded(trigger)};`);
-    }
-    for (const fn of LEGACY_FUNCTION_NAMES) {
-        triggers.push(`DROP FUNCTION IF EXISTS zero.${fn};`);
-        triggers.push(`DROP FUNCTION IF EXISTS zero.${sharded(fn)};`);
-    }
     return triggers.join('');
 }
-const LEGACY_TRIGGER_NAMES = [
-    'zero_replicate_create_or_alter_table',
-    'zero_replicate_create_index',
-    'zero_replicate_alter_publication',
-    'zero_replicate_alter_publication_drop',
-    'zero_replicate_drop_table',
-    'zero_replicate_drop_index',
-];
-const LEGACY_FUNCTION_NAMES = [
-    'replicate_create_or_alter_table',
-    'replicate_create_index',
-    'replicate_alter_publication',
-    'replicate_alter_publication_drop',
-    'replicate_drop_event',
-    'replicate_drop_table',
-    'replicate_drop_index',
-    'get_trigger_context',
-    'emit_all_publications',
-];
 //# sourceMappingURL=ddl.js.map

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-streamer/pg/schema/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAMjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAGpD,wBAAsB,eAAe,CACnC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC,CAuBf"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-streamer/pg/schema/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAMjD,OAAO,KAAK,EAAC,UAAU,EAAsB,MAAM,yBAAyB,CAAC;AAC7E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAQpD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC,CAkBf"}

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

@@ -1,18 +1,51 @@
 import { runSchemaMigrations, } from '../../../../db/migration.js';
-import { setupTablesAndReplication, unescapedSchema } from './shard.js';
+import { getPublicationInfo } from './published.js';
+import { dropShard, setupTablesAndReplication, unescapedSchema, } from './shard.js';
+/**
+ * Initializes a shard for initial sync.
+ * This will drop any existing shard setup.
+ */
 export async function initShardSchema(lc, db, shardConfig) {
+    await db.unsafe(dropShard(shardConfig.id));
+    return updateShardSchema(lc, db, shardConfig);
+}
+/**
+ * Updates the schema for an existing shard.
+ */
+export async function updateShardSchema(lc, db, shardConfig) {
     const setupMigration = {
         migrateSchema: (lc, tx) => setupTablesAndReplication(lc, tx, shardConfig),
         minSafeVersion: 1,
     };
     const schemaVersionMigrationMap = {
-        1: setupMigration,
-        // There are no incremental migrations yet, but if we were to, say introduce
-        // another column, setupTablesAndReplication would be updated the table with
-        // the new column, and then there would be an incremental migration here at
-        // version `2` that adds the column for databases that were initialized to
-        // version `1`.
+        2: { migrateSchema: (_, tx) => migrateV1toV2(tx, shardConfig.id) },
     };
-    await runSchemaMigrations(lc, 'upstream-shard', unescapedSchema(shardConfig.id), db, setupMigration, schemaVersionMigrationMap);
+    await runSchemaMigrations(lc, `upstream-shard-${shardConfig.id}`, unescapedSchema(shardConfig.id), db, setupMigration, schemaVersionMigrationMap);
+}
+// v1 required superuser / event trigger installation.
+// Therefore, to migrate from v1 to v2:
+//
+// - Add the "ddlDetection" and "initialSchema" columns to "shardConfig"
+// - Set "ddlDetection" to true
+// - Populate the "initialSchema" to the current published schema
+//
+// The last step technically may not match the "initial" schema, but
+// currently it is only used for "ddlDetection = false" setups, so
+// it does not matter.
+async function migrateV1toV2(tx, shardID) {
+    const s = unescapedSchema(shardID);
+    const [{ publications }] = await tx `
+    SELECT publications FROM ${tx(s)}."shardConfig"
+  `;
+    const { tables, indexes } = await getPublicationInfo(tx, publications);
+    const publishedSchema = { tables, indexes };
+    void tx `
+  ALTER TABLE ${tx(s)}."shardConfig" ADD "ddlDetection" BOOL`.execute();
+    void tx `
+  ALTER TABLE ${tx(s)}."shardConfig" ADD "initialSchema" JSON`.execute();
+    await tx `
+    UPDATE ${tx(s)}."shardConfig"
+      SET "ddlDetection"  = true, 
+          "initialSchema" = ${publishedSchema}`;
 }
 //# sourceMappingURL=init.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-streamer/pg/schema/init.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAGpB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAAC,yBAAyB,EAAE,eAAe,EAAC,MAAM,YAAY,CAAC;AAEtE,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,EAAc,EACd,EAAc,EACd,WAAwB;IAExB,MAAM,cAAc,GAAc;QAChC,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,yBAAyB,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC;QACzE,cAAc,EAAE,CAAC;KAClB,CAAC;IAEF,MAAM,yBAAyB,GAA4B;QACzD,CAAC,EAAE,cAAc;QACjB,4EAA4E;QAC5E,4EAA4E;QAC5E,2EAA2E;QAC3E,0EAA0E;QAC1E,eAAe;KAChB,CAAC;IAEF,MAAM,mBAAmB,CACvB,EAAE,EACF,gBAAgB,EAChB,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC,EAC/B,EAAE,EACF,cAAc,EACd,yBAAyB,CAC1B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-streamer/pg/schema/init.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAGpB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAAC,kBAAkB,EAAuB,MAAM,gBAAgB,CAAC;AACxE,OAAO,EACL,SAAS,EACT,yBAAyB,EACzB,eAAe,GAChB,MAAM,YAAY,CAAC;AAEpB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,EAAc,EACd,EAAc,EACd,WAAwB;IAExB,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3C,OAAO,iBAAiB,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC;AAChD,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,EAAc,EACd,EAAc,EACd,WAAwB;IAExB,MAAM,cAAc,GAAc;QAChC,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,yBAAyB,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC;QACzE,cAAc,EAAE,CAAC;KAClB,CAAC;IAEF,MAAM,yBAAyB,GAA4B;QACzD,CAAC,EAAE,EAAC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC,EAAC;KACjE,CAAC;IAEF,MAAM,mBAAmB,CACvB,EAAE,EACF,kBAAkB,WAAW,CAAC,EAAE,EAAE,EAClC,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC,EAC/B,EAAE,EACF,cAAc,EACd,yBAAyB,CAC1B,CAAC;AACJ,CAAC;AAED,sDAAsD;AACtD,uCAAuC;AACvC,EAAE;AACF,wEAAwE;AACxE,+BAA+B;AAC/B,iEAAiE;AACjE,EAAE;AACF,oEAAoE;AACpE,kEAAkE;AAClE,sBAAsB;AACtB,KAAK,UAAU,aAAa,CAAC,EAAuB,EAAE,OAAe;IACnE,MAAM,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,CAAC,EAAC,YAAY,EAAC,CAAC,GAAG,MAAM,EAAE,CAA4B;+BAChC,EAAE,CAAC,CAAC,CAAC;GACjC,CAAC;IACF,MAAM,EAAC,MAAM,EAAE,OAAO,EAAC,GAAG,MAAM,kBAAkB,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;IACrE,MAAM,eAAe,GAAoB,EAAC,MAAM,EAAE,OAAO,EAAC,CAAC;IAE3D,KAAK,EAAE,CAAA;gBACO,EAAE,CAAC,CAAC,CAAC,wCAAwC,CAAC,OAAO,EAAE,CAAC;IACtE,KAAK,EAAE,CAAA;gBACO,EAAE,CAAC,CAAC,CAAC,yCAAyC,CAAC,OAAO,EAAE,CAAC;IACvE,MAAM,EAAE,CAAA;aACG,EAAE,CAAC,CAAC,CAAC;;8BAEY,eAAe,EAAE,CAAC;AAChD,CAAC"}