refactor(database, rpc-server): Update read queries related to states to use i64 instead of BigDecimal

Author: khorolets

database/src/postgres/rpc_server.rs

@@ -88,7 +88,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 ",
         )
         .bind(account_id.to_string())
-        .bind(bigdecimal::BigDecimal::from(block_height))
+        .bind(block_height as i64) // Convert to i64 for database compatibility
         .bind(page_state.last_data_key.clone())
         .bind(page_state.page_size)
         .fetch(shard_id_pool.pool);
@@ -141,7 +141,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
         )
         .bind(account_id.to_string())
         .bind(format!("{}%", hex::encode(prefix)))
-        .bind(bigdecimal::BigDecimal::from(block_height))
+        .bind(block_height as i64) // Convert to i64 for database compatibility
         .fetch(shard_id_pool.pool);
         while let Some(row) = stream.next().await {
             let (key, value): (String, Vec<u8>) = row?;
@@ -177,7 +177,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 ",
         )
         .bind(account_id.to_string())
-        .bind(bigdecimal::BigDecimal::from(block_height))
+        .bind(block_height as i64) // Convert to i64 for database compatibility
         .fetch(shard_id_pool.pool);
         while let Some(row) = stream.next().await {
             let (key, value): (String, Vec<u8>) = row?;
@@ -218,7 +218,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
         )
         .bind(account_id.to_string())
         .bind(hex::encode(&key_data).to_string())
-        .bind(bigdecimal::BigDecimal::from(block_height))
+        .bind(block_height as i64) // Convert to i64 for database compatibility
         .fetch_one(shard_id_pool.pool)
         .await?;
         Ok((key_data, data_value))
@@ -244,7 +244,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 "state_changes_account",
             ])
             .inc();
-        let result: (Vec<u8>, bigdecimal::BigDecimal) = sqlx::query_as(
+        let result: (Vec<u8>, i64) = sqlx::query_as(
             "
                 SELECT data_value, block_height_from
                 FROM state_changes_account_compact
@@ -256,7 +256,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 ",
         )
         .bind(account_id.to_string())
-        .bind(bigdecimal::BigDecimal::from(request_block_height))
+        .bind(request_block_height as i64) // Convert to i64 for database compatibility
         .fetch_one(shard_id_pool.pool)
         .await?;
         tracing::debug!(
@@ -282,7 +282,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 "state_changes_contract",
             ])
             .inc();
-        let result: (Vec<u8>, bigdecimal::BigDecimal) = sqlx::query_as(
+        let result: (Vec<u8>, i64) = sqlx::query_as(
             "
                 SELECT data_value, block_height_from
                 FROM state_changes_contract_compact
@@ -294,7 +294,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 ",
         )
         .bind(account_id.to_string())
-        .bind(bigdecimal::BigDecimal::from(request_block_height))
+        .bind(request_block_height as i64) // Convert to i64 for database compatibility
         .fetch_one(shard_id_pool.pool)
         .await?;
 
@@ -317,7 +317,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
             ])
             .inc();
         let key_data = borsh::to_vec(&public_key)?;
-        let result: (Vec<u8>, bigdecimal::BigDecimal) = sqlx::query_as(
+        let result: (Vec<u8>, i64) = sqlx::query_as(
             "
                 SELECT data_value, block_height_from
                 FROM state_changes_access_key_compact
@@ -331,7 +331,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
         )
         .bind(account_id.to_string())
         .bind(hex::encode(&key_data).to_string())
-        .bind(bigdecimal::BigDecimal::from(request_block_height))
+        .bind(request_block_height as i64) // Convert to i64 for database compatibility
         .fetch_one(shard_id_pool.pool)
         .await?;
         readnode_primitives::QueryData::<near_primitives::account::AccessKey>::try_from(result)
@@ -362,7 +362,7 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 ",
         )
         .bind(account_id.to_string())
-        .bind(bigdecimal::BigDecimal::from(block_height))
+        .bind(block_height as i64) // Convert to i64 for database compatibility
         .fetch(shard_id_pool.pool);
         while let Some(row) = stream.next().await {
             let (public_key_hex, access_key): (String, Vec<u8>) = row?;

database/src/postgres/state_indexer/helpers.rs

@@ -4,6 +4,13 @@ use std::time::Instant;
 use futures::future::try_join_all;
 use sqlx::Row;
 
+type StateChangeKeyDataAtBlockHeight = (
+    String,  // account_id
+    String,  // data_key
+    Vec<u8>, // data_value
+    i64,     // block_height_from
+);
+
 /// PostgreSQL State Indexer Implementation
 ///
 /// ARCHITECTURAL OVERVIEW:
@@ -66,7 +73,7 @@ impl crate::PostgresDBManager {
 
         // Compute partition assignments for all account_ids using PostgreSQL's hashtext() function
         // This ensures consistent partition distribution matching the table partitioning scheme
-        let partition_map = self.partition_map(&shard_id, &pool, &account_ids).await?;
+        let partition_map = self.partition_map(&shard_id, pool, &account_ids).await?;
 
         // Group account_ids by their target partition for batch processing
         // This reduces the number of database queries by updating entire partitions at once
@@ -183,7 +190,7 @@ impl crate::PostgresDBManager {
             ])
             .inc();
 
-        let partition_map = self.partition_map(&shard_id, &pool, &account_ids).await?;
+        let partition_map = self.partition_map(&shard_id, pool, &account_ids).await?;
 
         // Group updates per partition
         let mut updates_per_partition: HashMap<i32, Vec<(String, String, i64)>> = HashMap::new();
@@ -309,10 +316,10 @@ impl crate::PostgresDBManager {
             ])
             .inc();
 
-        let partition_map = self.partition_map(&shard_id, &pool, &account_ids).await?;
+        let partition_map = self.partition_map(&shard_id, pool, &account_ids).await?;
 
         // Group inserts by partition for efficient batch processing
-        let mut inserts_per_partition: HashMap<i32, Vec<(String, String, Vec<u8>, i64)>> =
+        let mut inserts_per_partition: HashMap<i32, Vec<StateChangeKeyDataAtBlockHeight>> =
             HashMap::new();
         for (account_id, data_key, data_value, block_height) in inserts {
             if let Some(&partition) = partition_map.get(&account_id) {
@@ -433,7 +440,7 @@ impl crate::PostgresDBManager {
                 &account_ids.len().to_string(),
             ])
             .inc();
-        let partition_map = self.partition_map(&shard_id, &pool, &account_ids).await?;
+        let partition_map = self.partition_map(&shard_id, pool, &account_ids).await?;
 
         // Group inserts per partition
         let mut inserts_per_partition: HashMap<i32, Vec<(String, Vec<u8>, i64)>> = HashMap::new();

database/src/postgres/state_indexer/mod.rs

@@ -1,8 +1,7 @@
-use std::collections::HashMap;
 use std::time::Instant;
 
 use bigdecimal::ToPrimitive;
-use futures::{future::try_join_all, FutureExt};
+use futures::FutureExt;
 
 mod helpers;
 

readnode-primitives/src/lib.rs

@@ -299,19 +299,16 @@ where
     }
 }
 
-impl<T, B> TryFrom<(Vec<u8>, B)> for QueryData<T>
+impl<T> TryFrom<(Vec<u8>, i64)> for QueryData<T>
 where
     T: borsh::BorshDeserialize,
-    B: ToPrimitive,
 {
     type Error = anyhow::Error;
 
-    fn try_from(value: (Vec<u8>, B)) -> Result<Self, Self::Error> {
+    fn try_from(value: (Vec<u8>, i64)) -> Result<Self, Self::Error> {
         let data = T::try_from_slice(&value.0)?;
-        let block_height = value
-            .1
-            .to_u64()
-            .ok_or_else(|| anyhow::anyhow!("Failed to parse `block_height` to u64"))?;
+        let block_height = u64::try_from(value.1)
+            .map_err(|_| anyhow::anyhow!("Failed to cast `block_height` from i64 to u64"))?;
         Ok(Self { data, block_height })
     }
 }