From c2f01664c5d0efb3efd87c161c32e97f603570bd Mon Sep 17 00:00:00 2001 From: Marek Fedorovic Date: Thu, 14 Sep 2023 09:30:18 +1000 Subject: [PATCH] fix: Convert snapshot version to number in JS --- cohort_banking_initiator_js/src/banking-app.ts | 2 +- cohort_banking_replicator_js/src/database.ts | 3 ++- .../src/services/statemap_queue_service.rs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cohort_banking_initiator_js/src/banking-app.ts b/cohort_banking_initiator_js/src/banking-app.ts index ebe810b2..d95b58e4 100644 --- a/cohort_banking_initiator_js/src/banking-app.ts +++ b/cohort_banking_initiator_js/src/banking-app.ts @@ -192,7 +192,7 @@ export class BankingApp { } // Quickly grab the snapshot to check whether safepoint condition is satisfied. Any row can be used for that. - const snapshot = result.rows[0].snapshot + const snapshot = Number(result.rows[0].snapshot) if (snapshot < request.safepoint) { // safepoint condition return 2 diff --git a/cohort_banking_replicator_js/src/database.ts b/cohort_banking_replicator_js/src/database.ts index ea498f4b..160a05ab 100644 --- a/cohort_banking_replicator_js/src/database.ts +++ b/cohort_banking_replicator_js/src/database.ts @@ -50,7 +50,8 @@ export class Database { logger.warn("Database.getSnapshot(): %d", version) - return version + return Number(version) + } finally { cnn?.release() const metric = new MetricsSet() diff --git a/packages/talos_cohort_replicator/src/services/statemap_queue_service.rs b/packages/talos_cohort_replicator/src/services/statemap_queue_service.rs index 05cc9d13..9a9029fc 100644 --- a/packages/talos_cohort_replicator/src/services/statemap_queue_service.rs +++ b/packages/talos_cohort_replicator/src/services/statemap_queue_service.rs @@ -49,7 +49,7 @@ where let mut statemap_installer_queue = StatemapInstallerQueue::default(); //Gets snapshot initial version from db. - statemap_installer_queue.update_snapshot(snapshot_api.get_snapshot().await.unwrap_or(0)); + statemap_installer_queue.update_snapshot(snapshot_api.get_snapshot().await.unwrap()); // let mut last_item_send_for_install = 0;