fix(core-snapshots): don't append duplicate rounds rows to a snapshot (…

…ArkEcosystem#2662)

When appending to an existent snapshot, only append rows with higher id
than already in the (old) snapshot. Otherwise the snapshot would contain
rows with duplciate rounds.id values and would not be importable.

This patch assumes no gaps in rounds.id and monotonically increasing
rounds.id when new rounds are being added.

packages/core-snapshots/src/db/index.ts

@@ -82,18 +82,25 @@ export class Database {
         return this.getLastBlock();
     }
 
-    public async getExportQueries(startHeight, endHeight) {
-        const startBlock = await this.getBlockByHeight(startHeight);
-        const endBlock = await this.getBlockByHeight(endHeight);
+    public async getExportQueries(meta: {
+        startHeight: number,
+        endHeight: number,
+        startRoundId: number,
+        skipCompression: boolean,
+        folder: string
+    }) {
+
+        const startBlock = await this.getBlockByHeight(meta.startHeight);
+        const endBlock = await this.getBlockByHeight(meta.endHeight);
 
         if (!startBlock || !endBlock) {
             app.forceExit(
                 "Wrong input height parameters for building export queries. Blocks at height not found in db.",
             );
         }
 
-        const roundInfoStart: Shared.IRoundInfo = roundCalculator.calculateRound(startHeight);
-        const roundInfoEnd: Shared.IRoundInfo = roundCalculator.calculateRound(endHeight);
+        const roundInfoStart: Shared.IRoundInfo = roundCalculator.calculateRound(meta.startHeight);
+        const roundInfoEnd: Shared.IRoundInfo = roundCalculator.calculateRound(meta.endHeight);
 
         return {
             blocks: rawQuery(this.pgp, queries.blocks.heightRange, {
@@ -105,8 +112,9 @@ export class Database {
                 end: endBlock.timestamp,
             }),
             rounds: rawQuery(this.pgp, queries.rounds.roundRange, {
-                start: roundInfoStart.round,
-                end: roundInfoEnd.round,
+                startRound: roundInfoStart.round,
+                endRound: roundInfoEnd.round,
+                startId: meta.startRoundId
             }),
         };
     }

packages/core-snapshots/src/db/queries/rounds/round-range.sql

@@ -6,6 +6,7 @@ SELECT
 FROM
   rounds
 WHERE
-  round BETWEEN ${start} AND ${end}
+  round BETWEEN ${startRound} AND ${endRound} AND
+  id >= ${startId}
 ORDER BY
-  round
+  id

packages/core-snapshots/src/manager.ts

@@ -148,7 +148,7 @@ export class SnapshotManager {
             }
 
             params.meta = utils.setSnapshotInfo(params, lastBlock);
-            params.queries = await this.database.getExportQueries(params.meta.startHeight, params.meta.endHeight);
+            params.queries = await this.database.getExportQueries(params.meta);
 
             if (params.blocks) {
                 if (options.blocks === params.meta.folder) {

packages/core-snapshots/src/utils.ts

@@ -90,6 +90,7 @@ export const setSnapshotInfo = (options, lastBlock) => {
     const meta = {
         startHeight: options.start !== -1 ? options.start : 1,
         endHeight: options.end !== -1 ? options.end : lastBlock.height,
+        startRoundId: 1,
         skipCompression: options.skipCompression || false,
         folder: "",
     };
@@ -99,6 +100,7 @@ export const setSnapshotInfo = (options, lastBlock) => {
     if (options.blocks) {
         const oldMeta = this.getSnapshotInfo(options.blocks);
         meta.startHeight = oldMeta.endHeight + 1;
+        meta.startRoundId = oldMeta.rounds.count + 1;
         meta.folder = `${oldMeta.startHeight}-${meta.endHeight}`;
     }