@powersync/service-module-mongodb-storage 0.17.0 → 0.18.0

package/dist/storage/implementation/v3/MongoBucketBatchV3.js

@@ -3,39 +3,86 @@ import { ReplicationAssertionError } from '@powersync/lib-services-framework';
 import { storage } from '@powersync/service-core';
 import * as bson from 'bson';
 import { mongoTableId } from '../../../utils/util.js';
-import { calculateCheckpointState } from '../CheckpointState.js';
+import { canCheckpointState } from '../CheckpointState.js';
 import { MongoBucketBatch } from '../MongoBucketBatch.js';
 import { syncRuleStateUpdatePipeline } from '../SyncRuleStateUpdate.js';
 import { PersistedBatchV3 } from './PersistedBatchV3.js';
 import { SourceRecordStoreV3 } from './SourceRecordStoreV3.js';
-function sameStringArray(left, right) {
-    return left.length == right.length && left.every((value, index) => value == right[index]);
-}
+import { createNewSourceTable, designateEventCarrier, overlappingSourceTableFilter, planSourceTableReconciliation, sourceTableDesiredResolution, sourceTableFromDocument } from './source-table-utils.js';
 export class MongoBucketBatchV3 extends MongoBucketBatch {
     store;
-    syncConfigId;
+    syncConfigIds;
     needsActivationV3 = true;
     lastWaitingLogThrottledV3 = 0;
     constructor(options) {
         super(options);
-        if (options.syncConfigId == null) {
+        const syncConfigIds = options.syncConfigIds ?? [];
+        if (syncConfigIds.length == 0) {
             throw new ReplicationAssertionError('Missing sync config id for v3 batch');
         }
-        this.syncConfigId = options.syncConfigId;
-        this.store = new SourceRecordStoreV3(this.db, this.group_id, this.mapping);
+        this.syncConfigIds = syncConfigIds;
+        this.store = new SourceRecordStoreV3(this.db, this.replicationStreamId, this.mapping);
     }
     createPersistedBatch(writtenSize) {
-        return new PersistedBatchV3(this.db, this.group_id, this.mapping, writtenSize, {
+        return new PersistedBatchV3(this.db, this.replicationStreamId, this.mapping, writtenSize, {
             logger: this.logger
         });
     }
     get sourceRecordStore() {
         return this.store;
     }
+    async onReplicationTransactionFlush(session, lastOp) {
+        // Durably advance the stream-level head of persisted ops within the flush transaction.
+        // This ensures a checkpoint created later (even by an empty commit, or by a freshly-appended
+        // config that replicates nothing) covers all ops persisted before a potential crash.
+        await this.db.sync_rules.updateOne({
+            _id: this.replicationStreamId
+        }, {
+            $max: {
+                last_persisted_op: lastOp
+            }
+        }, { session });
+    }
+    selectedSyncConfigObjectIds(syncConfigIds) {
+        const selectedIds = new Set(this.syncConfigIds.map((id) => id.toHexString()));
+        return syncConfigIds
+            .filter((id) => selectedIds.has(id) && bson.ObjectId.isValid(id))
+            .map((id) => new bson.ObjectId(id));
+    }
+    relevantSyncConfigIds(table) {
+        const bucketDataSourceIds = table.bucketDataSources.map((source) => this.mapping.bucketSourceId(source));
+        const parameterLookupSourceIds = table.parameterLookupSources.map((source) => this.mapping.parameterLookupId(source));
+        return this.selectedSyncConfigObjectIds(this.mapping.syncConfigIdsForSourceTable(this.syncConfigIds.map((id) => id.toHexString()), table.ref, bucketDataSourceIds, parameterLookupSourceIds));
+    }
+    relevantSyncConfigIdsForTables(tables) {
+        const ids = new Map();
+        for (const table of tables) {
+            for (const id of this.relevantSyncConfigIds(table)) {
+                ids.set(id.toHexString(), id);
+            }
+        }
+        return [...ids.values()];
+    }
+    snapshotBlockingSourceTablesFilter() {
+        const clauses = this.syncConfigIds.flatMap((syncConfigId) => {
+            const filter = this.mapping.snapshotBlockingSourceTablesFilter(syncConfigId.toHexString());
+            return filter.$or ?? [];
+        });
+        if (clauses.length == 0) {
+            return {
+                snapshot_done: false,
+                _id: { $exists: false }
+            };
+        }
+        return {
+            snapshot_done: false,
+            $or: clauses
+        };
+    }
     async cleanupDroppedSourceTables(sourceTables) {
         for (const table of sourceTables) {
             await this.db
-                .sourceRecordsV3(this.group_id, mongoTableId(table.id))
+                .sourceRecords(this.replicationStreamId, mongoTableId(table.id))
                 .drop()
                 .catch((error) => {
                 if (lib_mongo.isMongoServerError(error) && error.codeName === 'NamespaceNotFound') {
@@ -46,178 +93,86 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
         }
     }
     async resolveTables(options) {
-        const ref = options.source;
-        const syncRules = options.syncRules ?? this.sync_rules;
-        const matchingSources = syncRules.getMatchingSources(ref);
+        // The test-only override is a whole parsed set, so the sync rules and the mapping
+        // used below always come from the same parse.
+        const parsedOverride = options.parsedSyncConfig;
+        const syncConfig = parsedOverride?.hydratedSyncConfig ?? this.sync_rules;
+        const mapping = parsedOverride?.mapping ?? this.mapping;
         const { connection_id, source } = options;
-        const { schema, name, objectId, replicaIdColumns, connectionTag, sendsCompleteRows } = source;
-        const normalizedReplicaIdColumns = replicaIdColumns.map((column) => ({
-            name: column.name,
-            type: column.type,
-            type_oid: column.typeId
-        }));
+        const context = {
+            connectionId: connection_id,
+            connectionTag: source.connectionTag,
+            identity: {
+                schema: source.schema,
+                name: source.name,
+                objectId: source.objectId,
+                replicaIdColumns: source.replicaIdColumns.map((column) => ({
+                    name: column.name,
+                    type: column.type,
+                    type_oid: column.typeId
+                }))
+            },
+            storeCurrentData: source.sendsCompleteRows !== true,
+            syncConfig,
+            mapping,
+            desired: sourceTableDesiredResolution(syncConfig, source, mapping)
+        };
         let result = null;
-        const initializeSourceRecordsFor = [];
-        await this.db.client.withSession(async (session) => {
-            const col = this.db.commonSourceTables(this.group_id);
-            const exactFilter = {
-                connection_id,
-                schema_name: schema,
-                table_name: name,
-                replica_id_columns2: normalizedReplicaIdColumns
-            };
-            if (objectId != null) {
-                exactFilter.relation_id = objectId;
-            }
-            const exactDocs = (await col.find(exactFilter, { session }).toArray());
-            const bucketSourceById = new Map(matchingSources.bucketDataSources.map((source) => [this.mapping.bucketSourceId(source), source]));
-            const parameterLookupSourceById = new Map(matchingSources.parameterLookupSources.map((source) => [this.mapping.parameterLookupId(source), source]));
-            const desiredBucketIds = new Set(bucketSourceById.keys());
-            const desiredLookupIds = new Set(parameterLookupSourceById.keys());
-            const desiredHasMembership = desiredBucketIds.size > 0 || desiredLookupIds.size > 0;
-            const triggersEvent = syncRules.tableTriggersEvent(ref);
-            const coveredBucketIds = new Set();
-            const coveredLookupIds = new Set();
-            const retainedDocIds = [];
-            const tables = [];
-            let retainedEventOnlyTable = false;
-            for (const doc of exactDocs) {
-                const bucketDataSourceIds = doc.bucket_data_source_ids.filter((id) => desiredBucketIds.has(id));
-                const parameterLookupSourceIds = doc.parameter_lookup_source_ids.filter((id) => desiredLookupIds.has(id));
-                const coversDesiredMembership = bucketDataSourceIds.length > 0 || parameterLookupSourceIds.length > 0;
-                const coversEventOnlyTable = !desiredHasMembership && triggersEvent && !retainedEventOnlyTable;
-                for (const id of bucketDataSourceIds) {
-                    coveredBucketIds.add(id);
-                }
-                for (const id of parameterLookupSourceIds) {
-                    coveredLookupIds.add(id);
-                }
-                const updates = {};
-                if (!sameStringArray(doc.bucket_data_source_ids, bucketDataSourceIds) ||
-                    !sameStringArray(doc.parameter_lookup_source_ids, parameterLookupSourceIds)) {
-                    updates.bucket_data_source_ids = bucketDataSourceIds;
-                    updates.parameter_lookup_source_ids = parameterLookupSourceIds;
-                }
-                if (Object.keys(updates).length > 0) {
-                    await col.updateOne({ _id: doc._id }, { $set: updates }, { session });
-                }
-                if (coversDesiredMembership || coversEventOnlyTable) {
-                    if (coversEventOnlyTable) {
-                        retainedEventOnlyTable = true;
+        const session = this.db.client.startSession();
+        await using _ = { [Symbol.asyncDispose]: () => session.endSession() };
+        await session.withTransaction(async () => {
+            const col = this.db.sourceTables(this.replicationStreamId);
+            // Fetch every persisted source-table doc that can overlap this physical table.
+            // Exact-identity docs are candidates for reuse; non-exact overlaps are possible drops.
+            const candidateDocs = await col
+                .find(overlappingSourceTableFilter(connection_id, context.identity), { session })
+                .toArray();
+            // Pure planning: which docs to retain (and narrow), whether a new doc is needed for
+            // uncovered memberships, and which docs conflict with the current identity.
+            const plan = planSourceTableReconciliation(candidateDocs, context);
+            // Persist narrowing for incomplete snapshots only. Snapshot-complete docs keep stale
+            // coverage ids so compatible future configs can reuse already-snapshotted data.
+            // Narrowing occurs after removing a sync config, meaning we don't process those
+            // definitions anymore.
+            for (const update of plan.narrowingUpdates) {
+                await col.updateOne({ _id: update.id }, {
+                    $set: {
+                        bucket_data_source_ids: update.memberships.bucketDataSourceIds,
+                        parameter_lookup_source_ids: update.memberships.parameterLookupSourceIds
                     }
-                    retainedDocIds.push(doc._id);
-                    const table = this.sourceTableFromDocument({
-                        ...doc,
-                        bucket_data_source_ids: bucketDataSourceIds,
-                        parameter_lookup_source_ids: parameterLookupSourceIds
-                    }, connectionTag, syncRules, {
-                        bucketDataSources: bucketDataSourceIds.map((id) => bucketSourceById.get(id)),
-                        parameterLookupSources: parameterLookupSourceIds.map((id) => parameterLookupSourceById.get(id))
-                    });
-                    table.storeCurrentData = sendsCompleteRows !== true;
-                    tables.push(table);
-                }
+                }, { session });
             }
-            const uncoveredBucketIds = [...desiredBucketIds].filter((id) => !coveredBucketIds.has(id));
-            const uncoveredLookupIds = [...desiredLookupIds].filter((id) => !coveredLookupIds.has(id));
-            if (uncoveredBucketIds.length > 0 || uncoveredLookupIds.length > 0 || (triggersEvent && tables.length == 0)) {
+            // Any desired membership not covered by an existing doc gets a new source table.
+            // That table snapshots only the uncovered memberships.
+            if (plan.newTableMemberships != null) {
                 const id = options.idGenerator ? options.idGenerator() : new bson.ObjectId();
-                const sourceTable = new storage.SourceTable({
-                    id,
-                    ref,
-                    objectId,
-                    replicaIdColumns,
-                    snapshotComplete: false,
-                    bucketDataSources: uncoveredBucketIds.map((id) => bucketSourceById.get(id)),
-                    parameterLookupSources: uncoveredLookupIds.map((id) => parameterLookupSourceById.get(id))
-                });
-                sourceTable.syncData = uncoveredBucketIds.length > 0;
-                sourceTable.syncParameters = uncoveredLookupIds.length > 0;
-                sourceTable.syncEvent = triggersEvent;
-                sourceTable.storeCurrentData = sendsCompleteRows !== true;
-                const createDoc = {
-                    _id: id,
-                    connection_id,
-                    relation_id: objectId,
-                    schema_name: schema,
-                    table_name: name,
-                    replica_id_columns: null,
-                    replica_id_columns2: normalizedReplicaIdColumns,
-                    snapshot_done: false,
-                    snapshot_status: undefined,
-                    bucket_data_source_ids: uncoveredBucketIds,
-                    parameter_lookup_source_ids: uncoveredLookupIds
-                };
-                await col.insertOne(createDoc, { session });
-                initializeSourceRecordsFor.push(createDoc._id);
-                retainedDocIds.push(createDoc._id);
-                tables.push(sourceTable);
-            }
-            const conflictFilter = [{ schema_name: schema, table_name: name }];
-            if (objectId != null) {
-                conflictFilter.push({ relation_id: objectId });
+                const { doc, table } = createNewSourceTable(id, plan.newTableMemberships, context);
+                await col.insertOne(doc, { session });
+                await this.db.initializeSourceRecordsCollection(this.replicationStreamId, doc._id, session);
+                plan.tables.push(table);
             }
-            const dropTables = await col
-                .find({
-                connection_id,
-                _id: { $nin: retainedDocIds },
-                $or: conflictFilter
-            }, { session })
-                .toArray();
+            // If memberships are split across multiple source tables, only one may fire events.
+            designateEventCarrier(plan.tables, context.desired.triggersEvent);
             result = {
-                tables,
-                dropTables: dropTables.map((doc) => this.sourceTableFromDocument(doc, connectionTag, syncRules))
+                tables: plan.tables,
+                dropTables: plan.dropDocs.map((doc) => sourceTableFromDocument(doc, context.connectionTag, syncConfig, mapping))
             };
         });
-        for (const sourceTableId of initializeSourceRecordsFor) {
-            await this.db.initializeSourceRecordsCollection(this.group_id, sourceTableId);
-        }
         return result;
     }
-    sourceTableFromDocument(doc, connectionTag, syncRules, memberships) {
-        const resolvedMemberships = memberships ?? this.sourceTableMembershipsFromDocument(doc, syncRules);
-        const table = new storage.SourceTable({
-            id: doc._id,
-            ref: {
-                connectionTag,
-                schema: doc.schema_name,
-                name: doc.table_name
-            },
-            objectId: doc.relation_id,
-            replicaIdColumns: doc.replica_id_columns2.map((c) => ({ name: c.name, typeId: c.type_oid, type: c.type })),
-            snapshotComplete: doc.snapshot_done ?? true,
-            bucketDataSources: resolvedMemberships.bucketDataSources,
-            parameterLookupSources: resolvedMemberships.parameterLookupSources
-        });
-        table.syncData = table.bucketDataSources.length > 0;
-        table.syncParameters = table.parameterLookupSources.length > 0;
-        table.syncEvent = syncRules.tableTriggersEvent(table.ref);
-        table.snapshotStatus =
-            doc.snapshot_status == null
-                ? undefined
-                : {
-                    lastKey: doc.snapshot_status.last_key?.buffer ?? null,
-                    totalEstimatedCount: doc.snapshot_status.total_estimated_count,
-                    replicatedCount: doc.snapshot_status.replicated_count
-                };
-        return table;
-    }
-    sourceTableMembershipsFromDocument(doc, syncRules) {
-        const bucketDataSourceIds = new Set(doc.bucket_data_source_ids);
-        const parameterLookupSourceIds = new Set(doc.parameter_lookup_source_ids);
-        return {
-            bucketDataSources: syncRules.bucketDataSources.filter((source) => bucketDataSourceIds.has(this.mapping.bucketSourceId(source))),
-            parameterLookupSources: syncRules.bucketParameterLookupSources.filter((source) => parameterLookupSourceIds.has(this.mapping.parameterLookupId(source)))
-        };
-    }
     async getSourceTableStatus(table) {
         const doc = (await this.db
-            .commonSourceTables(this.group_id)
+            .sourceTables(this.replicationStreamId)
             .findOne({ _id: mongoTableId(table.id) }, { session: this.session }));
         if (doc == null) {
             return null;
         }
-        return this.sourceTableFromDocument(doc, table.ref.connectionTag, this.sync_rules);
+        const refreshed = sourceTableFromDocument(doc, table.ref.connectionTag, this.sync_rules, this.mapping);
+        // The event-carrier designation is decided per resolveTables result and not persisted -
+        // preserve the caller's designation instead of recomputing it from the ref, so that
+        // refreshing a non-carrier table does not make it fire events.
+        refreshed.syncEvent = table.syncEvent;
+        return refreshed;
     }
     async commit(lsn, options) {
         const { createEmptyCheckpoints } = { ...storage.DEFAULT_BUCKET_BATCH_COMMIT_OPTIONS, ...options };
@@ -233,80 +188,125 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
         }, {
             session: this.session
         });
-        const preUpdateDocument = await this.db.sync_rules.findOne({
-            _id: this.group_id,
-            'sync_configs._id': this.syncConfigId
+        const preUpdateDocument = (await this.db.sync_rules.findOne({
+            _id: this.replicationStreamId,
+            'sync_configs._id': { $in: this.syncConfigIds }
         }, {
             session: this.session,
             projection: {
-                snapshot_lsn: 1,
-                sync_configs: {
-                    $elemMatch: {
-                        _id: this.syncConfigId
-                    }
-                }
+                sync_configs: 1,
+                last_persisted_op: 1
             }
-        });
-        const state = preUpdateDocument?.sync_configs?.[0];
-        if (state == null) {
-            throw new ReplicationAssertionError(`Failed to update checkpoint - no matching sync_config for _id: ${this.group_id}/${this.syncConfigId.toHexString()}`);
+        }));
+        const states = preUpdateDocument?.sync_configs?.filter((config) => this.syncConfigIds.some((id) => id.equals(config._id))) ?? [];
+        if (states.length == 0) {
+            throw new ReplicationAssertionError(`Failed to update checkpoint - no matching sync_config for _id: ${this.replicationStreamId}/${this.syncConfigIds
+                .map((id) => id.toHexString())
+                .join(',')}`);
         }
-        const checkpointState = calculateCheckpointState({
-            lsn,
-            snapshotDone: state.snapshot_done === true,
-            lastCheckpointLsn: state.last_checkpoint_lsn,
-            noCheckpointBefore: state.no_checkpoint_before,
-            keepaliveOp: state.keepalive_op == null ? null : BigInt(state.keepalive_op),
-            lastCheckpoint: state.last_checkpoint,
-            persistedOp: this.persisted_op,
-            createEmptyCheckpoints
-        });
-        const updateSet = {
-            last_keepalive_ts: now,
-            last_fatal_error: null,
-            last_fatal_error_ts: null,
-            'sync_configs.$[config].keepalive_op': checkpointState.newKeepaliveOp,
-            'sync_configs.$[config].last_checkpoint': checkpointState.newLastCheckpoint
-        };
-        if (checkpointState.checkpointCreated) {
-            updateSet['sync_configs.$[config].last_checkpoint_lsn'] = lsn;
-            updateSet['snapshot_lsn'] = null;
-            updateSet['last_checkpoint_ts'] = now;
+        // The replication job / MongoBucketBatch must be constructed with all replicating (PROCESSING / ACTIVE)
+        // sync configs in the stream, otherwise we'll get inconsistencies. Configs in other states (e.g. STOP)
+        // remain embedded in the document and are ignored here.
+        const missingSyncConfig = preUpdateDocument.sync_configs.find((config) => [storage.SyncRuleState.PROCESSING, storage.SyncRuleState.ACTIVE].includes(config.state) &&
+            !this.syncConfigIds.some((id) => id.equals(config._id)));
+        if (missingSyncConfig != null) {
+            throw new ReplicationAssertionError(`Replication job not configured for sync config ${missingSyncConfig._id}`);
         }
-        await this.db.sync_rules.updateOne({
-            _id: this.group_id,
-            'sync_configs._id': this.syncConfigId
-        }, {
-            $set: updateSet
-        }, {
-            session: this.session,
-            arrayFilters: [{ 'config._id': this.syncConfigId }]
-        });
-        if (checkpointState.checkpointBlocked) {
-            if (Date.now() - this.lastWaitingLogThrottledV3 > 5_000) {
-                this.logger.info(`Waiting before creating checkpoint, currently at ${lsn} / ${checkpointState.newKeepaliveOp}. Current state: ${JSON.stringify({
+        // Effective head of the stream's op sequence.
+        // last_persisted_op is $max-advanced durably in the same transaction as every flush, and this
+        // read uses the same session, so it covers all ops persisted by this batch.
+        const newCheckpoint = preUpdateDocument?.last_persisted_op == null ? 0n : BigInt(preUpdateDocument.last_persisted_op);
+        let checkpointBlocked = false;
+        let checkpointCreated = false;
+        let checkpointLogState = null;
+        const unblockedConfigIds = [];
+        for (const state of states) {
+            if (state.last_checkpoint != null && state.last_checkpoint > newCheckpoint) {
+                // last_persisted_op is $max-advanced durably in the same transaction as every flush, and
+                // checkpoints are only ever created at that head, so a checkpoint past the head means the
+                // op sequence or the stored state is corrupt.
+                throw new ReplicationAssertionError(`Invariant violation: sync config ${state._id} has last_checkpoint ${state.last_checkpoint} > stream head ${newCheckpoint}`);
+            }
+            const canCheckpoint = canCheckpointState(lsn, {
+                snapshotDone: state.snapshot_done === true,
+                lastCheckpointLsn: state.last_checkpoint_lsn,
+                noCheckpointBefore: state.no_checkpoint_before
+            });
+            if (!canCheckpoint) {
+                checkpointBlocked = true;
+                // Log the first blocked config's state.
+                checkpointLogState ??= {
                     snapshot_done: state.snapshot_done,
                     last_checkpoint_lsn: state.last_checkpoint_lsn,
                     no_checkpoint_before: state.no_checkpoint_before
-                })}`);
+                };
+                continue;
+            }
+            checkpointCreated ||= createEmptyCheckpoints || state.last_checkpoint !== newCheckpoint;
+            unblockedConfigIds.push(state._id);
+        }
+        // Every commit advances the stream's resume position: commit() flushes first, so all
+        // source changes up to this lsn have been persisted, even when checkpoints are blocked.
+        // In the future we could also advance this on flush, when the connector provides the
+        // current position (see setResumeLsn, which connectors may already call after flushing).
+        const resumeLsnUpdate = { resume_lsn: lsn };
+        if (unblockedConfigIds.length > 0) {
+            // All unblocked configs get the SAME new value, so we apply it with a single updateOne
+            // (single-document atomicity).
+            const updateSet = {
+                last_keepalive_ts: now,
+                last_fatal_error: null,
+                last_fatal_error_ts: null
+            };
+            // Only advance checkpoint fields when an actual (non-empty) checkpoint is created, matching
+            // the previous per-config / v1 behaviour.
+            if (checkpointCreated) {
+                updateSet['sync_configs.$[config].last_checkpoint'] = newCheckpoint;
+                updateSet['sync_configs.$[config].last_checkpoint_lsn'] = lsn;
+                updateSet['last_checkpoint_ts'] = now;
+            }
+            await this.db.sync_rules.updateOne({
+                _id: this.replicationStreamId,
+                'sync_configs._id': { $in: unblockedConfigIds }
+            }, { $set: updateSet, $max: resumeLsnUpdate }, {
+                session: this.session,
+                arrayFilters: checkpointCreated ? [{ 'config._id': { $in: unblockedConfigIds } }] : undefined
+            });
+        }
+        else {
+            // All selected configs are blocked - only update keepalive/error tracking and the
+            // resume position.
+            await this.db.sync_rules.updateOne({
+                _id: this.replicationStreamId
+            }, {
+                $set: {
+                    last_keepalive_ts: now,
+                    last_fatal_error: null,
+                    last_fatal_error_ts: null
+                },
+                $max: resumeLsnUpdate
+            }, { session: this.session });
+        }
+        if (checkpointBlocked) {
+            if (Date.now() - this.lastWaitingLogThrottledV3 > 5_000) {
+                this.logger.info(`Waiting before creating checkpoint, currently at ${lsn}. Current state: ${JSON.stringify(checkpointLogState)}`);
                 this.lastWaitingLogThrottledV3 = Date.now();
             }
         }
         else {
-            if (checkpointState.checkpointCreated) {
-                this.logger.debug(`Created checkpoint at ${lsn} / ${checkpointState.newLastCheckpoint}`);
+            if (checkpointCreated) {
+                this.logger.debug(`Created checkpoint at ${lsn}`);
             }
             await this.autoActivateV3(lsn);
+            // All configs are now checkpointed at newCheckpoint (the stream head).
+            await this.sourceRecordStore.postCommitCleanup(newCheckpoint, this.logger);
+        }
+        if (checkpointCreated) {
             await this.db.notifyCheckpoint();
-            this.persisted_op = null;
-            this.last_checkpoint_lsn = lsn;
-            if (checkpointState.newLastCheckpoint != null) {
-                await this.sourceRecordStore.postCommitCleanup(checkpointState.newLastCheckpoint, this.logger);
-            }
         }
         return {
-            checkpointBlocked: checkpointState.checkpointBlocked,
-            checkpointCreated: checkpointState.checkpointCreated
+            checkpointBlocked,
+            checkpointCreated
         };
     }
     async keepalive(lsn) {
@@ -314,11 +314,10 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
     }
     async setResumeLsn(lsn) {
         await this.db.sync_rules.updateOne({
-            _id: this.group_id,
-            'sync_configs._id': this.syncConfigId
+            _id: this.replicationStreamId
         }, {
             $set: {
-                snapshot_lsn: lsn
+                resume_lsn: lsn
             }
         }, { session: this.session });
     }
@@ -330,28 +329,26 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
         let activated = false;
         await session.withTransaction(async () => {
             const doc = await this.db.sync_rules.findOne({
-                _id: this.group_id,
-                'sync_configs._id': this.syncConfigId
+                _id: this.replicationStreamId,
+                'sync_configs._id': { $in: this.syncConfigIds }
             }, {
                 session,
                 projection: {
                     state: 1,
-                    sync_configs: {
-                        $elemMatch: {
-                            _id: this.syncConfigId
-                        }
-                    }
+                    sync_configs: 1
                 }
             });
-            const state = doc?.sync_configs?.[0];
-            if (doc &&
-                doc.state == storage.SyncRuleState.PROCESSING &&
-                state?.state == storage.SyncRuleState.PROCESSING &&
-                state.snapshot_done &&
-                state.last_checkpoint != null) {
+            const states = doc?.sync_configs?.filter((config) => this.syncConfigIds.some((id) => id.equals(config._id))) ?? [];
+            if (doc == null || states.length == 0) {
+                return;
+            }
+            const processingStates = states.filter((state) => state.state == storage.SyncRuleState.PROCESSING);
+            if (doc.state == storage.SyncRuleState.PROCESSING &&
+                processingStates.length == states.length &&
+                states.every((state) => state.snapshot_done && state.last_checkpoint != null)) {
                 await this.db.sync_rules.updateOne({
-                    _id: this.group_id,
-                    'sync_configs._id': this.syncConfigId
+                    _id: this.replicationStreamId,
+                    'sync_configs._id': { $in: this.syncConfigIds }
                 }, {
                     $set: {
                         state: storage.SyncRuleState.ACTIVE,
@@ -359,15 +356,35 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
                     }
                 }, {
                     session,
-                    arrayFilters: [{ 'config._id': this.syncConfigId }]
+                    arrayFilters: [{ 'config._id': { $in: this.syncConfigIds } }]
                 });
                 await this.db.sync_rules.updateMany({
-                    _id: { $ne: this.group_id },
+                    _id: { $ne: this.replicationStreamId },
                     state: { $in: [storage.SyncRuleState.ACTIVE, storage.SyncRuleState.ERRORED] }
                 }, syncRuleStateUpdatePipeline(storage.SyncRuleState.STOP), { session });
                 activated = true;
             }
-            else if (doc?.state != storage.SyncRuleState.PROCESSING) {
+            else if (doc.state == storage.SyncRuleState.ACTIVE &&
+                processingStates.length > 0 &&
+                processingStates.every((state) => state.snapshot_done && state.last_checkpoint != null)) {
+                await this.db.sync_rules.updateOne({
+                    _id: this.replicationStreamId,
+                    'sync_configs._id': { $in: processingStates.map((state) => state._id) }
+                }, {
+                    $set: {
+                        'sync_configs.$[activeConfig].state': storage.SyncRuleState.STOP,
+                        'sync_configs.$[processingConfig].state': storage.SyncRuleState.ACTIVE
+                    }
+                }, {
+                    session,
+                    arrayFilters: [
+                        { 'activeConfig.state': storage.SyncRuleState.ACTIVE },
+                        { 'processingConfig._id': { $in: processingStates.map((state) => state._id) } }
+                    ]
+                });
+                activated = true;
+            }
+            else if (doc.state != storage.SyncRuleState.PROCESSING && doc.state != storage.SyncRuleState.ACTIVE) {
                 this.needsActivationV3 = false;
             }
         });
@@ -379,8 +396,8 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
     }
     async markAllSnapshotDone(no_checkpoint_before_lsn) {
         await this.db.sync_rules.updateOne({
-            _id: this.group_id,
-            'sync_configs._id': this.syncConfigId
+            _id: this.replicationStreamId,
+            'sync_configs._id': { $in: this.syncConfigIds }
         }, {
             $set: {
                 'sync_configs.$[config].snapshot_done': true,
@@ -391,18 +408,22 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
             }
         }, {
             session: this.session,
-            arrayFilters: [{ 'config._id': this.syncConfigId }]
+            arrayFilters: [{ 'config._id': { $in: this.syncConfigIds } }]
         });
     }
     async markSnapshotDone(no_checkpoint_before_lsn, options) {
         await this.withTransaction(async () => {
             // Protect against race conditions
-            const count = await this.db.sourceTablesV3(this.group_id).countDocuments({
-                snapshot_done: false
-            }, { session: this.session });
-            if (count > 0) {
+            const blockingTables = await this.db
+                .sourceTables(this.replicationStreamId)
+                .find(this.snapshotBlockingSourceTablesFilter(), {
+                session: this.session,
+                projection: { schema_name: 1, table_name: 1 }
+            })
+                .toArray();
+            if (blockingTables.length > 0) {
                 if (options?.throwOnConflict ?? true) {
-                    throw new ReplicationAssertionError(`Cannot mark snapshot done while ${count} source table${count == 1 ? '' : 's'} still require snapshotting`);
+                    throw new ReplicationAssertionError(`Cannot mark snapshot done while source tables still require snapshotting. Tables: ${blockingTables.map((t) => `${t.schema_name}.${t.table_name}`).join(', ')}`);
                 }
                 else {
                     return;
@@ -411,24 +432,29 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
             await this.markAllSnapshotDone(no_checkpoint_before_lsn);
         });
     }
-    async markTableSnapshotRequired(_table) {
+    async markTableSnapshotRequired(table) {
+        const syncConfigIds = this.relevantSyncConfigIds(table);
+        if (syncConfigIds.length == 0) {
+            return;
+        }
         await this.db.sync_rules.updateOne({
-            _id: this.group_id,
-            'sync_configs._id': this.syncConfigId
+            _id: this.replicationStreamId,
+            'sync_configs._id': { $in: syncConfigIds }
         }, {
             $set: {
                 'sync_configs.$[config].snapshot_done': false
             }
         }, {
             session: this.session,
-            arrayFilters: [{ 'config._id': this.syncConfigId }]
+            arrayFilters: [{ 'config._id': { $in: syncConfigIds } }]
         });
     }
     async markTableSnapshotDone(tables, no_checkpoint_before_lsn) {
         const session = this.session;
         const ids = tables.map((table) => mongoTableId(table.id));
+        const syncConfigIds = this.relevantSyncConfigIdsForTables(tables);
         await this.withTransaction(async () => {
-            await this.db.commonSourceTables(this.group_id).updateMany({ _id: { $in: ids } }, {
+            await this.db.sourceTables(this.replicationStreamId).updateMany({ _id: { $in: ids } }, {
                 $set: {
                     snapshot_done: true
                 },
@@ -436,10 +462,10 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
                     snapshot_status: 1
                 }
             }, { session });
-            if (no_checkpoint_before_lsn != null) {
+            if (no_checkpoint_before_lsn != null && syncConfigIds.length > 0) {
                 await this.db.sync_rules.updateOne({
-                    _id: this.group_id,
-                    'sync_configs._id': this.syncConfigId
+                    _id: this.replicationStreamId,
+                    'sync_configs._id': { $in: syncConfigIds }
                 }, {
                     $set: {
                         last_keepalive_ts: new Date()
@@ -449,7 +475,8 @@ export class MongoBucketBatchV3 extends MongoBucketBatch {
                     }
                 }, {
                     session: this.session,
-                    arrayFilters: [{ 'config._id': this.syncConfigId }]
+                    // Only set for sync configs that use this table
+                    arrayFilters: [{ 'config._id': { $in: syncConfigIds } }]
                 });
             }
         });