From 1973e8bc0f66a88849d66ae82492010a4e34859f Mon Sep 17 00:00:00 2001 From: Yuun Lim <38443641+yuunlimm@users.noreply.github.com> Date: Tue, 17 Dec 2024 14:22:27 -0800 Subject: [PATCH] fix parquet token datas none data handling (#649) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Description The None data wasn't properly handled for TokenDataV2 model. - updated parquet models to handle None values to have None, not the default String. Screenshot 2024-12-16 at 4 42 19 PM ### Test Plan ran a processor for 10 mins with no issues. ![Screenshot 2024-12-16 at 4 43 12 PM](https://github.com/user-attachments/assets/14681237-c586-4e2a-a998-51fe8486b922) --- .../models/ans_models/raw_ans_lookup_v2.rs | 4 +- .../ans_models/raw_ans_primary_name_v2.rs | 4 +- .../raw_block_metadata_transactions.rs | 2 +- .../models/ans_models/ans_lookup_v2.rs | 24 +++++----- .../models/ans_models/ans_primary_name_v2.rs | 24 +++++----- .../parquet_block_metadata_transactions.rs | 12 ++--- .../parquet_v2_fungible_asset_activities.rs | 4 +- .../models/token_v2_models/token_claims.rs | 1 - .../models/token_v2_models/v2_token_datas.rs | 45 +++++++++---------- .../token_v2_models/v2_token_metadata.rs | 13 ++++-- .../models/ans_models/ans_lookup_v2.rs | 24 +++++----- .../models/ans_models/ans_primary_name_v2.rs | 24 +++++----- .../block_metadata_transactions.rs | 6 +-- .../processor/src/processors/ans_processor.rs | 15 +++---- .../src/processors/default_processor.rs | 2 +- .../src/steps/ans_processor/ans_extractor.rs | 6 +-- .../default_processor/default_extractor.rs | 2 +- .../parquet_ans_extractor.rs | 8 ++-- .../parquet_default_extractor.rs | 2 +- 19 files changed, 113 insertions(+), 109 deletions(-) diff --git a/rust/processor/src/db/common/models/ans_models/raw_ans_lookup_v2.rs b/rust/processor/src/db/common/models/ans_models/raw_ans_lookup_v2.rs index 9de93e81c..fbc231128 100644 --- a/rust/processor/src/db/common/models/ans_models/raw_ans_lookup_v2.rs +++ b/rust/processor/src/db/common/models/ans_models/raw_ans_lookup_v2.rs @@ -40,7 +40,7 @@ pub struct RawAnsLookupV2 { } pub trait AnsLookupV2Convertible { - fn from_raw(raw_item: &RawAnsLookupV2) -> Self; + fn from_raw(raw_item: RawAnsLookupV2) -> Self; } #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)] @@ -165,5 +165,5 @@ impl RawCurrentAnsLookupV2 { } pub trait CurrentAnsLookupV2Convertible { - fn from_raw(raw_item: &RawCurrentAnsLookupV2) -> Self; + fn from_raw(raw_item: RawCurrentAnsLookupV2) -> Self; } diff --git a/rust/processor/src/db/common/models/ans_models/raw_ans_primary_name_v2.rs b/rust/processor/src/db/common/models/ans_models/raw_ans_primary_name_v2.rs index 44a177699..a906224da 100644 --- a/rust/processor/src/db/common/models/ans_models/raw_ans_primary_name_v2.rs +++ b/rust/processor/src/db/common/models/ans_models/raw_ans_primary_name_v2.rs @@ -32,7 +32,7 @@ pub struct RawAnsPrimaryNameV2 { } pub trait AnsPrimaryNameV2Convertible { - fn from_raw(raw_item: &RawAnsPrimaryNameV2) -> Self; + fn from_raw(raw_item: RawAnsPrimaryNameV2) -> Self; } #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)] @@ -158,5 +158,5 @@ impl RawCurrentAnsPrimaryNameV2 { } pub trait CurrentAnsPrimaryNameV2Convertible { - fn from_raw(raw_item: &RawCurrentAnsPrimaryNameV2) -> Self; + fn from_raw(raw_item: RawCurrentAnsPrimaryNameV2) -> Self; } diff --git a/rust/processor/src/db/common/models/default_models/raw_block_metadata_transactions.rs b/rust/processor/src/db/common/models/default_models/raw_block_metadata_transactions.rs index 19b083904..1e53e4da6 100644 --- a/rust/processor/src/db/common/models/default_models/raw_block_metadata_transactions.rs +++ b/rust/processor/src/db/common/models/default_models/raw_block_metadata_transactions.rs @@ -56,5 +56,5 @@ impl RawBlockMetadataTransaction { pub type RawBlockMetadataTransactionModel = RawBlockMetadataTransaction; pub trait BlockMetadataTransactionConvertible { - fn from_raw(raw_item: &RawBlockMetadataTransaction) -> Self; + fn from_raw(raw_item: RawBlockMetadataTransaction) -> Self; } diff --git a/rust/processor/src/db/parquet/models/ans_models/ans_lookup_v2.rs b/rust/processor/src/db/parquet/models/ans_models/ans_lookup_v2.rs index 27013e9bd..728c88db0 100644 --- a/rust/processor/src/db/parquet/models/ans_models/ans_lookup_v2.rs +++ b/rust/processor/src/db/parquet/models/ans_models/ans_lookup_v2.rs @@ -49,16 +49,16 @@ impl GetTimeStamp for AnsLookupV2 { } impl AnsLookupV2Convertible for AnsLookupV2 { - fn from_raw(raw_item: &RawAnsLookupV2) -> Self { + fn from_raw(raw_item: RawAnsLookupV2) -> Self { AnsLookupV2 { transaction_version: raw_item.transaction_version, write_set_change_index: raw_item.write_set_change_index, - domain: raw_item.domain.clone(), - subdomain: raw_item.subdomain.clone(), - token_standard: raw_item.token_standard.clone(), - registered_address: raw_item.registered_address.clone(), + domain: raw_item.domain, + subdomain: raw_item.subdomain, + token_standard: raw_item.token_standard, + registered_address: raw_item.registered_address, expiration_timestamp: raw_item.expiration_timestamp, - token_name: raw_item.token_name.clone(), + token_name: raw_item.token_name, is_deleted: raw_item.is_deleted, subdomain_expiration_policy: raw_item.subdomain_expiration_policy, } @@ -97,15 +97,15 @@ impl GetTimeStamp for CurrentAnsLookupV2 { } impl CurrentAnsLookupV2Convertible for CurrentAnsLookupV2 { - fn from_raw(raw_item: &RawCurrentAnsLookupV2) -> Self { + fn from_raw(raw_item: RawCurrentAnsLookupV2) -> Self { CurrentAnsLookupV2 { - domain: raw_item.domain.clone(), - subdomain: raw_item.subdomain.clone(), - token_standard: raw_item.token_standard.clone(), - registered_address: raw_item.registered_address.clone(), + domain: raw_item.domain, + subdomain: raw_item.subdomain, + token_standard: raw_item.token_standard, + registered_address: raw_item.registered_address, last_transaction_version: raw_item.last_transaction_version, expiration_timestamp: raw_item.expiration_timestamp, - token_name: raw_item.token_name.clone(), + token_name: raw_item.token_name, is_deleted: raw_item.is_deleted, subdomain_expiration_policy: raw_item.subdomain_expiration_policy, } diff --git a/rust/processor/src/db/parquet/models/ans_models/ans_primary_name_v2.rs b/rust/processor/src/db/parquet/models/ans_models/ans_primary_name_v2.rs index e9aa7b882..473352f4e 100644 --- a/rust/processor/src/db/parquet/models/ans_models/ans_primary_name_v2.rs +++ b/rust/processor/src/db/parquet/models/ans_models/ans_primary_name_v2.rs @@ -46,15 +46,15 @@ impl GetTimeStamp for AnsPrimaryNameV2 { } impl AnsPrimaryNameV2Convertible for AnsPrimaryNameV2 { - fn from_raw(raw_item: &RawAnsPrimaryNameV2) -> Self { + fn from_raw(raw_item: RawAnsPrimaryNameV2) -> Self { AnsPrimaryNameV2 { txn_version: raw_item.transaction_version, write_set_change_index: raw_item.write_set_change_index, - registered_address: raw_item.registered_address.clone(), - token_standard: raw_item.token_standard.clone(), - domain: raw_item.domain.clone(), - subdomain: raw_item.subdomain.clone(), - token_name: raw_item.token_name.clone(), + registered_address: raw_item.registered_address, + token_standard: raw_item.token_standard, + domain: raw_item.domain, + subdomain: raw_item.subdomain, + token_name: raw_item.token_name, is_deleted: raw_item.is_deleted, block_timestamp: raw_item.transaction_timestamp, } @@ -90,13 +90,13 @@ impl GetTimeStamp for CurrentAnsPrimaryNameV2 { } impl CurrentAnsPrimaryNameV2Convertible for CurrentAnsPrimaryNameV2 { - fn from_raw(raw_item: &RawCurrentAnsPrimaryNameV2) -> Self { + fn from_raw(raw_item: RawCurrentAnsPrimaryNameV2) -> Self { CurrentAnsPrimaryNameV2 { - registered_address: raw_item.registered_address.clone(), - token_standard: raw_item.token_standard.clone(), - domain: raw_item.domain.clone(), - subdomain: raw_item.subdomain.clone(), - token_name: raw_item.token_name.clone(), + registered_address: raw_item.registered_address, + token_standard: raw_item.token_standard, + domain: raw_item.domain, + subdomain: raw_item.subdomain, + token_name: raw_item.token_name, is_deleted: raw_item.is_deleted, last_transaction_version: raw_item.last_transaction_version, } diff --git a/rust/processor/src/db/parquet/models/default_models/parquet_block_metadata_transactions.rs b/rust/processor/src/db/parquet/models/default_models/parquet_block_metadata_transactions.rs index 5d8552e7e..0de7cff24 100644 --- a/rust/processor/src/db/parquet/models/default_models/parquet_block_metadata_transactions.rs +++ b/rust/processor/src/db/parquet/models/default_models/parquet_block_metadata_transactions.rs @@ -50,16 +50,16 @@ impl GetTimeStamp for BlockMetadataTransaction { } impl BlockMetadataTransactionConvertible for BlockMetadataTransaction { - fn from_raw(raw_item: &RawBlockMetadataTransaction) -> Self { + fn from_raw(raw_item: RawBlockMetadataTransaction) -> Self { BlockMetadataTransaction { txn_version: raw_item.version, block_height: raw_item.block_height, - block_id: raw_item.id.clone(), + block_id: raw_item.id, round: raw_item.round, epoch: raw_item.epoch, - previous_block_votes_bitvec: raw_item.previous_block_votes_bitvec.clone(), - proposer: raw_item.proposer.clone(), - failed_proposer_indices: raw_item.failed_proposer_indices.clone(), + previous_block_votes_bitvec: raw_item.previous_block_votes_bitvec, + proposer: raw_item.proposer, + failed_proposer_indices: raw_item.failed_proposer_indices, block_timestamp: raw_item.timestamp, since_unix_epoch: raw_item.ns_since_unix_epoch, } @@ -120,7 +120,7 @@ mod tests { ns_since_unix_epoch: compute_nanos_since_epoch(time_stamp), }; - let block_metadata_transaction = BlockMetadataTransaction::from_raw(&raw); + let block_metadata_transaction = BlockMetadataTransaction::from_raw(raw); assert_eq!(block_metadata_transaction.txn_version, 1); assert_eq!(block_metadata_transaction.block_height, 1); diff --git a/rust/processor/src/db/parquet/models/fungible_asset_models/parquet_v2_fungible_asset_activities.rs b/rust/processor/src/db/parquet/models/fungible_asset_models/parquet_v2_fungible_asset_activities.rs index 70def2b3b..75b2c292f 100644 --- a/rust/processor/src/db/parquet/models/fungible_asset_models/parquet_v2_fungible_asset_activities.rs +++ b/rust/processor/src/db/parquet/models/fungible_asset_models/parquet_v2_fungible_asset_activities.rs @@ -80,8 +80,8 @@ impl FungibleAssetActivityConvertible for FungibleAssetActivity { storage_id: raw_item.storage_id, asset_type: raw_item.asset_type, is_frozen: raw_item.is_frozen, - amount: Some(raw_item.amount.clone().unwrap().to_string()), - event_type: raw_item.event_type.clone(), + amount: raw_item.amount.map(|v| v.to_string()), + event_type: raw_item.event_type, is_gas_fee: raw_item.is_gas_fee, gas_fee_payer_address: raw_item.gas_fee_payer_address, is_transaction_success: raw_item.is_transaction_success, diff --git a/rust/processor/src/db/parquet/models/token_v2_models/token_claims.rs b/rust/processor/src/db/parquet/models/token_v2_models/token_claims.rs index e4ed3d32f..26f148d89 100644 --- a/rust/processor/src/db/parquet/models/token_v2_models/token_claims.rs +++ b/rust/processor/src/db/parquet/models/token_v2_models/token_claims.rs @@ -55,7 +55,6 @@ impl GetTimeStamp for CurrentTokenPendingClaim { } impl CurrentTokenPendingClaimConvertible for CurrentTokenPendingClaim { - // TODO: consider returning a Result fn from_raw(raw_item: RawCurrentTokenPendingClaim) -> Self { Self { token_data_id_hash: raw_item.token_data_id_hash, diff --git a/rust/processor/src/db/parquet/models/token_v2_models/v2_token_datas.rs b/rust/processor/src/db/parquet/models/token_v2_models/v2_token_datas.rs index eb7fd8170..cca78c2b3 100644 --- a/rust/processor/src/db/parquet/models/token_v2_models/v2_token_datas.rs +++ b/rust/processor/src/db/parquet/models/token_v2_models/v2_token_datas.rs @@ -17,9 +17,9 @@ use crate::{ }; use allocative_derive::Allocative; use anyhow::Context; -use bigdecimal::ToPrimitive; use parquet_derive::ParquetRecordWriter; use serde::{Deserialize, Serialize}; +use tracing::error; #[derive(Allocative, Clone, Debug, Default, Deserialize, ParquetRecordWriter, Serialize)] pub struct TokenDataV2 { @@ -28,7 +28,7 @@ pub struct TokenDataV2 { pub token_data_id: String, pub collection_id: String, pub token_name: String, - pub largest_property_version_v1: Option, + pub largest_property_version_v1: Option, // String format of BigDecimal pub token_uri: String, pub token_properties: String, pub description: String, @@ -63,13 +63,9 @@ impl TokenDataV2Convertible for TokenDataV2 { token_data_id: raw_item.token_data_id, collection_id: raw_item.collection_id, token_name: raw_item.token_name, - largest_property_version_v1: Some( - raw_item - .largest_property_version_v1 - .unwrap() - .to_u64() - .unwrap(), - ), + largest_property_version_v1: raw_item + .largest_property_version_v1 + .map(|v| v.to_string()), token_uri: raw_item.token_uri, token_properties: canonical_json::to_string(&raw_item.token_properties.clone()) .context("Failed to serialize token properties") @@ -88,9 +84,9 @@ pub struct CurrentTokenDataV2 { pub token_data_id: String, pub collection_id: String, pub token_name: String, - pub maximum: Option, // BigDecimal - pub supply: Option, - pub largest_property_version_v1: Option, + pub maximum: Option, // BigDecimal + pub supply: Option, // BigDecimal + pub largest_property_version_v1: Option, // String format of BigDecimal pub token_uri: String, pub token_properties: String, // serde_json::Value, pub description: String, @@ -126,25 +122,28 @@ impl CurrentTokenDataV2Convertible for CurrentTokenDataV2 { token_data_id: raw_item.token_data_id, collection_id: raw_item.collection_id, token_name: raw_item.token_name, - maximum: raw_item - .maximum - .map_or(Some(DEFAULT_NONE.to_string()), |v| Some(v.to_string())), - supply: raw_item - .supply - .map_or(Some(DEFAULT_NONE.to_string()), |v| Some(v.to_string())), + maximum: raw_item.maximum.map(|v| v.to_string()), + supply: raw_item.supply.map(|v| v.to_string()), largest_property_version_v1: raw_item .largest_property_version_v1 - .map(|v| v.to_u64().unwrap_or(0)), + .map(|v| v.to_string()), token_uri: raw_item.token_uri, - token_properties: canonical_json::to_string(&raw_item.token_properties) - .unwrap_or_else(|_| DEFAULT_NONE.to_string()), + token_properties: canonical_json::to_string(&raw_item.token_properties).unwrap_or_else( + |_| { + error!( + "Failed to serialize token_properties to JSON: {:?}", + raw_item.token_properties + ); + DEFAULT_NONE.to_string() + }, + ), description: raw_item.description, token_standard: raw_item.token_standard, - is_fungible_v2: raw_item.is_fungible_v2.or(Some(false)), // Defaulting to false if None + is_fungible_v2: raw_item.is_fungible_v2, last_transaction_version: raw_item.last_transaction_version, last_transaction_timestamp: raw_item.last_transaction_timestamp, decimals: raw_item.decimals, - is_deleted_v2: raw_item.is_deleted_v2.or(Some(false)), // Defaulting to false if None + is_deleted_v2: raw_item.is_deleted_v2, } } } diff --git a/rust/processor/src/db/parquet/models/token_v2_models/v2_token_metadata.rs b/rust/processor/src/db/parquet/models/token_v2_models/v2_token_metadata.rs index 058b300e0..3db1bf630 100644 --- a/rust/processor/src/db/parquet/models/token_v2_models/v2_token_metadata.rs +++ b/rust/processor/src/db/parquet/models/token_v2_models/v2_token_metadata.rs @@ -7,14 +7,18 @@ use crate::{ bq_analytics::generic_parquet_processor::{GetTimeStamp, HasVersion, NamedTable}, - db::common::models::token_v2_models::raw_v2_token_metadata::{ - CurrentTokenV2MetadataConvertible, RawCurrentTokenV2Metadata, + db::{ + common::models::token_v2_models::raw_v2_token_metadata::{ + CurrentTokenV2MetadataConvertible, RawCurrentTokenV2Metadata, + }, + parquet::models::DEFAULT_NONE, }, }; use allocative_derive::Allocative; use field_count::FieldCount; use parquet_derive::ParquetRecordWriter; use serde::{Deserialize, Serialize}; +use tracing::error; #[derive( Allocative, Clone, Debug, Default, Deserialize, FieldCount, ParquetRecordWriter, Serialize, @@ -50,7 +54,10 @@ impl CurrentTokenV2MetadataConvertible for CurrentTokenV2Metadata { Self { object_address: raw_item.object_address, resource_type: raw_item.resource_type, - data: canonical_json::to_string(&raw_item.data).unwrap(), // TODO: handle better + data: canonical_json::to_string(&raw_item.data).unwrap_or_else(|_| { + error!("Failed to serialize data to JSON: {:?}", raw_item.data); + DEFAULT_NONE.to_string() + }), state_key_hash: raw_item.state_key_hash, last_transaction_version: raw_item.last_transaction_version, last_transaction_timestamp: raw_item.last_transaction_timestamp, diff --git a/rust/processor/src/db/postgres/models/ans_models/ans_lookup_v2.rs b/rust/processor/src/db/postgres/models/ans_models/ans_lookup_v2.rs index 3d14fd360..19c9f9481 100644 --- a/rust/processor/src/db/postgres/models/ans_models/ans_lookup_v2.rs +++ b/rust/processor/src/db/postgres/models/ans_models/ans_lookup_v2.rs @@ -34,16 +34,16 @@ pub struct AnsLookupV2 { } impl AnsLookupV2Convertible for AnsLookupV2 { - fn from_raw(raw_item: &RawAnsLookupV2) -> Self { + fn from_raw(raw_item: RawAnsLookupV2) -> Self { AnsLookupV2 { transaction_version: raw_item.transaction_version, write_set_change_index: raw_item.write_set_change_index, - domain: raw_item.domain.clone(), - subdomain: raw_item.subdomain.clone(), - token_standard: raw_item.token_standard.clone(), - registered_address: raw_item.registered_address.clone(), + domain: raw_item.domain, + subdomain: raw_item.subdomain, + token_standard: raw_item.token_standard, + registered_address: raw_item.registered_address, expiration_timestamp: raw_item.expiration_timestamp, - token_name: raw_item.token_name.clone(), + token_name: raw_item.token_name, is_deleted: raw_item.is_deleted, subdomain_expiration_policy: raw_item.subdomain_expiration_policy, } @@ -78,15 +78,15 @@ pub struct CurrentAnsLookupV2 { } impl CurrentAnsLookupV2Convertible for CurrentAnsLookupV2 { - fn from_raw(raw_item: &RawCurrentAnsLookupV2) -> Self { + fn from_raw(raw_item: RawCurrentAnsLookupV2) -> Self { CurrentAnsLookupV2 { - domain: raw_item.domain.clone(), - subdomain: raw_item.subdomain.clone(), - token_standard: raw_item.token_standard.clone(), - registered_address: raw_item.registered_address.clone(), + domain: raw_item.domain, + subdomain: raw_item.subdomain, + token_standard: raw_item.token_standard, + registered_address: raw_item.registered_address, last_transaction_version: raw_item.last_transaction_version, expiration_timestamp: raw_item.expiration_timestamp, - token_name: raw_item.token_name.clone(), + token_name: raw_item.token_name, is_deleted: raw_item.is_deleted, subdomain_expiration_policy: raw_item.subdomain_expiration_policy, } diff --git a/rust/processor/src/db/postgres/models/ans_models/ans_primary_name_v2.rs b/rust/processor/src/db/postgres/models/ans_models/ans_primary_name_v2.rs index 49d6073cc..5ee18bba2 100644 --- a/rust/processor/src/db/postgres/models/ans_models/ans_primary_name_v2.rs +++ b/rust/processor/src/db/postgres/models/ans_models/ans_primary_name_v2.rs @@ -31,15 +31,15 @@ pub struct AnsPrimaryNameV2 { } impl AnsPrimaryNameV2Convertible for AnsPrimaryNameV2 { - fn from_raw(raw_item: &RawAnsPrimaryNameV2) -> Self { + fn from_raw(raw_item: RawAnsPrimaryNameV2) -> Self { AnsPrimaryNameV2 { transaction_version: raw_item.transaction_version, write_set_change_index: raw_item.write_set_change_index, - registered_address: raw_item.registered_address.clone(), - token_standard: raw_item.token_standard.clone(), - domain: raw_item.domain.clone(), - subdomain: raw_item.subdomain.clone(), - token_name: raw_item.token_name.clone(), + registered_address: raw_item.registered_address, + token_standard: raw_item.token_standard, + domain: raw_item.domain, + subdomain: raw_item.subdomain, + token_name: raw_item.token_name, is_deleted: raw_item.is_deleted, } } @@ -71,13 +71,13 @@ pub struct CurrentAnsPrimaryNameV2 { } impl CurrentAnsPrimaryNameV2Convertible for CurrentAnsPrimaryNameV2 { - fn from_raw(raw_item: &RawCurrentAnsPrimaryNameV2) -> Self { + fn from_raw(raw_item: RawCurrentAnsPrimaryNameV2) -> Self { CurrentAnsPrimaryNameV2 { - registered_address: raw_item.registered_address.clone(), - token_standard: raw_item.token_standard.clone(), - domain: raw_item.domain.clone(), - subdomain: raw_item.subdomain.clone(), - token_name: raw_item.token_name.clone(), + registered_address: raw_item.registered_address, + token_standard: raw_item.token_standard, + domain: raw_item.domain, + subdomain: raw_item.subdomain, + token_name: raw_item.token_name, is_deleted: raw_item.is_deleted, last_transaction_version: raw_item.last_transaction_version, } diff --git a/rust/processor/src/db/postgres/models/default_models/block_metadata_transactions.rs b/rust/processor/src/db/postgres/models/default_models/block_metadata_transactions.rs index ea7a4b660..ae036c08b 100644 --- a/rust/processor/src/db/postgres/models/default_models/block_metadata_transactions.rs +++ b/rust/processor/src/db/postgres/models/default_models/block_metadata_transactions.rs @@ -30,11 +30,11 @@ pub struct BlockMetadataTransactionPG { } impl BlockMetadataTransactionConvertible for BlockMetadataTransactionPG { - fn from_raw(raw_item: &RawBlockMetadataTransaction) -> Self { + fn from_raw(raw_item: RawBlockMetadataTransaction) -> Self { BlockMetadataTransactionPG { version: raw_item.version, block_height: raw_item.block_height, - id: raw_item.id.clone(), + id: raw_item.id, round: raw_item.round, epoch: raw_item.epoch, previous_block_votes_bitvec: serde_json::from_str( @@ -45,7 +45,7 @@ impl BlockMetadataTransactionConvertible for BlockMetadataTransactionPG { raw_item.failed_proposer_indices.as_str(), ) .unwrap(), - proposer: raw_item.proposer.clone(), + proposer: raw_item.proposer, timestamp: raw_item.timestamp, } } diff --git a/rust/processor/src/processors/ans_processor.rs b/rust/processor/src/processors/ans_processor.rs index a67d7b50b..79bd6f61b 100644 --- a/rust/processor/src/processors/ans_processor.rs +++ b/rust/processor/src/processors/ans_processor.rs @@ -394,7 +394,7 @@ impl ProcessorTrait for AnsProcessor { all_current_ans_lookups_v2, all_ans_lookups_v2, all_current_ans_primary_names_v2, - mut all_ans_primary_names_v2, + all_ans_primary_names_v2, ) = parse_ans( &transactions, self.config.ans_v1_primary_names_table_handle.clone(), @@ -403,23 +403,22 @@ impl ProcessorTrait for AnsProcessor { ); let postgres_current_ans_lookup_v2: Vec = all_current_ans_lookups_v2 - .iter() + .into_iter() .map(CurrentAnsLookupV2::from_raw) .collect(); let postgres_ans_lookup_v2: Vec = all_ans_lookups_v2 - .iter() + .into_iter() .map(AnsLookupV2::from_raw) .collect(); - let postgres_current_ans_primary_name_v2: Vec = all_current_ans_primary_names_v2 - .iter() + .into_iter() .map(CurrentAnsPrimaryNameV2::from_raw) .collect(); - let postgres_ans_primary_name_v2: Vec = all_ans_primary_names_v2 - .iter() + let mut postgres_ans_primary_name_v2: Vec = all_ans_primary_names_v2 + .into_iter() .map(AnsPrimaryNameV2::from_raw) .collect(); @@ -436,7 +435,7 @@ impl ProcessorTrait for AnsProcessor { .deprecated_tables .contains(TableFlags::ANS_PRIMARY_NAME_V2) { - all_ans_primary_names_v2.clear(); + postgres_ans_primary_name_v2.clear(); } if self.deprecated_tables.contains(TableFlags::ANS_LOOKUP) { all_ans_lookups.clear(); diff --git a/rust/processor/src/processors/default_processor.rs b/rust/processor/src/processors/default_processor.rs index de3d655b6..4808993b0 100644 --- a/rust/processor/src/processors/default_processor.rs +++ b/rust/processor/src/processors/default_processor.rs @@ -244,7 +244,7 @@ impl ProcessorTrait for DefaultProcessor { let postgres_block_metadata_transactions: Vec = raw_block_metadata_transactions - .iter() + .into_iter() .map(BlockMetadataTransactionModel::from_raw) .collect(); diff --git a/rust/sdk-processor/src/steps/ans_processor/ans_extractor.rs b/rust/sdk-processor/src/steps/ans_processor/ans_extractor.rs index 9f733f877..9a67f2aa5 100644 --- a/rust/sdk-processor/src/steps/ans_processor/ans_extractor.rs +++ b/rust/sdk-processor/src/steps/ans_processor/ans_extractor.rs @@ -124,18 +124,18 @@ impl Processable for AnsExtractor { } let postgres_current_ans_lookups_v2: Vec = raw_current_ans_lookups_v2 - .iter() + .into_iter() .map(CurrentAnsLookupV2::from_raw) .collect(); let postgres_ans_lookups_v2: Vec = raw_ans_lookups_v2 - .iter() + .into_iter() .map(AnsLookupV2::from_raw) .collect(); let postgres_current_ans_primary_names_v2: Vec = raw_current_ans_primary_names_v2 - .iter() + .into_iter() .map(CurrentAnsPrimaryNameV2::from_raw) .collect(); diff --git a/rust/sdk-processor/src/steps/default_processor/default_extractor.rs b/rust/sdk-processor/src/steps/default_processor/default_extractor.rs index da0ce400a..300c26a4b 100644 --- a/rust/sdk-processor/src/steps/default_processor/default_extractor.rs +++ b/rust/sdk-processor/src/steps/default_processor/default_extractor.rs @@ -68,7 +68,7 @@ impl Processable for DefaultExtractor { .collect(); let postgres_block_metadata_transactions: Vec = raw_block_metadata_transactions - .iter() + .into_iter() .map(BlockMetadataTransactionModel::from_raw) .collect(); let postgres_table_metadata = raw_table_metadata diff --git a/rust/sdk-processor/src/steps/parquet_ans_processor/parquet_ans_extractor.rs b/rust/sdk-processor/src/steps/parquet_ans_processor/parquet_ans_extractor.rs index 9cde54e72..b05a3ffbe 100644 --- a/rust/sdk-processor/src/steps/parquet_ans_processor/parquet_ans_extractor.rs +++ b/rust/sdk-processor/src/steps/parquet_ans_processor/parquet_ans_extractor.rs @@ -67,23 +67,23 @@ impl Processable for ParquetAnsExtractor { ); let parquet_ans_lookup_v2: Vec = raw_ans_lookups_v2 - .iter() + .into_iter() .map(AnsLookupV2::from_raw) .collect(); let parquet_current_ans_lookup_v2: Vec = raw_current_ans_lookups_v2 - .iter() + .into_iter() .map(CurrentAnsLookupV2::from_raw) .collect(); let parquet_current_ans_primary_name_v2: Vec = raw_current_ans_primary_names_v2 - .iter() + .into_iter() .map(CurrentAnsPrimaryNameV2::from_raw) .collect(); let parquet_ans_primary_name_v2: Vec = raw_ans_primary_name_v2 - .iter() + .into_iter() .map(AnsPrimaryNameV2::from_raw) .collect(); diff --git a/rust/sdk-processor/src/steps/parquet_default_processor/parquet_default_extractor.rs b/rust/sdk-processor/src/steps/parquet_default_processor/parquet_default_extractor.rs index 7df426e3f..6a78ec5dd 100644 --- a/rust/sdk-processor/src/steps/parquet_default_processor/parquet_default_extractor.rs +++ b/rust/sdk-processor/src/steps/parquet_default_processor/parquet_default_extractor.rs @@ -66,7 +66,7 @@ impl Processable for ParquetDefaultExtractor { .collect(); let parquet_block_metadata_transactions: Vec = raw_block_metadata_transactions - .iter() + .into_iter() .map(BlockMetadataTransaction::from_raw) .collect(); let parquet_table_metadata: Vec = raw_table_metadata