Fix some post-merge conflicts.

Author: rkistner

modules/module-mongodb-storage/src/storage/implementation/MongoBucketBatch.ts

@@ -146,10 +146,6 @@ export class MongoBucketBatch
     return this.last_checkpoint_lsn;
   }
 
-  get noCheckpointBeforeLsn() {
-    return this.no_checkpoint_before_lsn;
-  }
-
   async flush(options?: storage.BatchBucketFlushOptions): Promise<storage.FlushedResult | null> {
     let result: storage.FlushedResult | null = null;
     // One flush may be split over multiple transactions.

modules/module-mssql/src/replication/CDCStream.ts

@@ -304,7 +304,7 @@ export class CDCStream {
       const postSnapshotLSN = await getLatestLSN(this.connections);
       // Side note: A ROLLBACK would probably also be fine here, since we only read in this transaction.
       await transaction.commit();
-      const [updatedSourceTable] = await batch.markSnapshotDone([table.sourceTable], postSnapshotLSN.toString());
+      const [updatedSourceTable] = await batch.markTableSnapshotDone([table.sourceTable], postSnapshotLSN.toString());
       this.tableCache.updateSourceTable(updatedSourceTable);
     } catch (e) {
       await transaction.rollback();
@@ -500,11 +500,11 @@ export class CDCStream {
 
         // This will not create a consistent checkpoint yet, but will persist the op.
         // Actual checkpoint will be created when streaming replication caught up.
+        const postSnapshotLSN = await getLatestLSN(this.connections);
+        await batch.markAllSnapshotDone(postSnapshotLSN.toString());
         await batch.commit(snapshotLSN);
 
-        this.logger.info(
-          `Snapshot done. Need to replicate from ${snapshotLSN} to ${batch.noCheckpointBeforeLsn} to be consistent`
-        );
+        this.logger.info(`Snapshot done. Need to replicate from ${snapshotLSN} to ${postSnapshotLSN} to be consistent`);
       }
     );
   }

modules/module-postgres-storage/src/storage/batch/PostgresBucketBatch.ts

@@ -111,10 +111,6 @@ export class PostgresBucketBatch
     return this.last_checkpoint_lsn;
   }
 
-  get noCheckpointBeforeLsn() {
-    return this.no_checkpoint_before_lsn;
-  }
-
   async [Symbol.asyncDispose]() {
     super.clearListeners();
   }

packages/service-core/src/storage/BucketStorageBatch.ts

@@ -87,8 +87,6 @@ export interface BucketStorageBatch extends ObserverClient<BucketBatchStorageLis
   markTableSnapshotRequired(table: SourceTable): Promise<void>;
   markAllSnapshotDone(no_checkpoint_before_lsn: string): Promise<void>;
 
-  noCheckpointBeforeLsn: string;
-
   updateTableProgress(table: SourceTable, progress: Partial<TableSnapshotStatus>): Promise<SourceTable>;
 
   /**