From 071f2226bb739005bdb00261462e330f75f17236 Mon Sep 17 00:00:00 2001 From: Stanislav Cherviakov Date: Thu, 30 Jan 2025 16:37:55 +0000 Subject: [PATCH 1/3] using the last seen finalized slot to distinguish between the final data --- rocks-db/src/clients/asset_streaming_client.rs | 2 +- rocks-db/src/sequence_consistent.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rocks-db/src/clients/asset_streaming_client.rs b/rocks-db/src/clients/asset_streaming_client.rs index 64c9208f..b09c9146 100644 --- a/rocks-db/src/clients/asset_streaming_client.rs +++ b/rocks-db/src/clients/asset_streaming_client.rs @@ -201,7 +201,7 @@ async fn get_complete_asset_details( .get(url.clone().value)? .map(Into::into); let cutoff_slot = Storage::column::>(backend.clone(), metrics.clone()) - .get(Parameter::TopSeenSlot)? + .get(Parameter::LastBackfilledSlot)? .flatten() .unwrap_or_default() .wrapping_sub(OFFSET_SLOTS); diff --git a/rocks-db/src/sequence_consistent.rs b/rocks-db/src/sequence_consistent.rs index 706dcf69..16fbe87d 100644 --- a/rocks-db/src/sequence_consistent.rs +++ b/rocks-db/src/sequence_consistent.rs @@ -41,7 +41,7 @@ impl SequenceConsistentManager for Storage { #[async_trait] impl LastProcessedSlotGetter for Storage { async fn get_last_ingested_slot(&self) -> Result, interface::error::StorageError> { - self.get_parameter::(crate::parameters::Parameter::TopSeenSlot) + self.get_parameter::(crate::parameters::Parameter::LastBackfilledSlot) .await .map_err(|e| e.into()) } From 61e837784b6dfb68b18eb264572fc7eaab16efae Mon Sep 17 00:00:00 2001 From: Stanislav Cherviakov Date: Thu, 30 Jan 2025 21:02:18 +0000 Subject: [PATCH 2/3] changed the test --- rocks-db/tests/parameters_tests.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rocks-db/tests/parameters_tests.rs b/rocks-db/tests/parameters_tests.rs index 5b1d60ff..f20bd7a0 100644 --- a/rocks-db/tests/parameters_tests.rs +++ b/rocks-db/tests/parameters_tests.rs @@ -30,18 +30,18 @@ mod tests { assert!(response == None); let last_seen_slot = 242827927u64; - storage.merge_top_parameter::(Parameter::TopSeenSlot, last_seen_slot).await.unwrap(); + storage.merge_top_parameter::(Parameter::LastBackfilledSlot, last_seen_slot).await.unwrap(); let response = storage.get_last_ingested_slot().await.unwrap(); assert!(response == Some(last_seen_slot)); let some_old_slot = 137_827_927u64; - storage.merge_top_parameter::(Parameter::TopSeenSlot, some_old_slot).await.unwrap(); + storage.merge_top_parameter::(Parameter::LastBackfilledSlot, some_old_slot).await.unwrap(); let response = storage.get_last_ingested_slot().await.unwrap(); assert!(response == Some(last_seen_slot)); let some_new_slot = 243_827_927u64; - storage.merge_top_parameter::(Parameter::TopSeenSlot, some_new_slot).await.unwrap(); + storage.merge_top_parameter::(Parameter::LastBackfilledSlot, some_new_slot).await.unwrap(); let response = storage.get_last_ingested_slot().await.unwrap(); assert!(response == Some(some_new_slot)); } From 37d5f1a8c9f80a845ecb2de1d1f388047a73bb60 Mon Sep 17 00:00:00 2001 From: Stanislav Cherviakov Date: Thu, 30 Jan 2025 22:05:26 +0000 Subject: [PATCH 3/3] fmt --- rocks-db/tests/parameters_tests.rs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/rocks-db/tests/parameters_tests.rs b/rocks-db/tests/parameters_tests.rs index f20bd7a0..22e3fecc 100644 --- a/rocks-db/tests/parameters_tests.rs +++ b/rocks-db/tests/parameters_tests.rs @@ -30,18 +30,27 @@ mod tests { assert!(response == None); let last_seen_slot = 242827927u64; - storage.merge_top_parameter::(Parameter::LastBackfilledSlot, last_seen_slot).await.unwrap(); + storage + .merge_top_parameter::(Parameter::LastBackfilledSlot, last_seen_slot) + .await + .unwrap(); let response = storage.get_last_ingested_slot().await.unwrap(); assert!(response == Some(last_seen_slot)); let some_old_slot = 137_827_927u64; - storage.merge_top_parameter::(Parameter::LastBackfilledSlot, some_old_slot).await.unwrap(); + storage + .merge_top_parameter::(Parameter::LastBackfilledSlot, some_old_slot) + .await + .unwrap(); let response = storage.get_last_ingested_slot().await.unwrap(); assert!(response == Some(last_seen_slot)); let some_new_slot = 243_827_927u64; - storage.merge_top_parameter::(Parameter::LastBackfilledSlot, some_new_slot).await.unwrap(); + storage + .merge_top_parameter::(Parameter::LastBackfilledSlot, some_new_slot) + .await + .unwrap(); let response = storage.get_last_ingested_slot().await.unwrap(); assert!(response == Some(some_new_slot)); }