From d6b0fd6046896eabdd02c8ac65d13a0a40b231fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karolis=20Gudi=C5=A1kis?= Date: Mon, 4 Mar 2024 16:04:09 +0200 Subject: [PATCH] Fixes --- dozer-ingestion/aerospike/src/connector.rs | 11 +++++++---- dozer-sink-aerospike/src/lib.rs | 7 ++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dozer-ingestion/aerospike/src/connector.rs b/dozer-ingestion/aerospike/src/connector.rs index 55fd6e9326..97956f7fd8 100644 --- a/dozer-ingestion/aerospike/src/connector.rs +++ b/dozer-ingestion/aerospike/src/connector.rs @@ -1,6 +1,6 @@ use dozer_ingestion_connector::dozer_types::errors::internal::BoxedError; use dozer_ingestion_connector::dozer_types::event::Event; -use dozer_ingestion_connector::dozer_types::log::{debug, error, info, warn}; +use dozer_ingestion_connector::dozer_types::log::{error, info, trace, warn}; use dozer_ingestion_connector::dozer_types::models::connection::AerospikeConnection; use dozer_ingestion_connector::dozer_types::models::ingestion_types::{ IngestionMessage, TransactionInfo, @@ -112,6 +112,9 @@ pub enum AerospikeConnectorError { #[error("Failed parsing timestamp: {0}")] TimestampParsingError(#[from] dozer_ingestion_connector::dozer_types::chrono::ParseError), + + #[error("Key is neither string or int")] + KeyNotSupported(Value), } #[derive(Deserialize, Debug)] @@ -314,7 +317,7 @@ async fn event_request_handler( let event = json.into_inner(); let state = data.into_inner(); - debug!("Event data: {:?}", event); + trace!("Event data: {:?}", event); // TODO: Handle delete if event.msg != "write" { return HttpResponse::Ok().finish(); @@ -322,7 +325,7 @@ async fn event_request_handler( let operation_events = map_events(event, &state.tables_index_map).await; - debug!("Mapped events {:?}", operation_events); + trace!("Mapped events {:?}", operation_events); match operation_events { Ok(None) => HttpResponse::Ok().finish(), Ok(Some(message)) => { @@ -646,7 +649,7 @@ async fn map_events( .ok_or(AerospikeConnectorError::ParsingUIntFailed)?, ); } - _ => todo!("Throw error when key is not a string or number"), + v => return Err(AerospikeConnectorError::KeyNotSupported(v)), } } else { return Err(AerospikeConnectorError::PkIsNone(key0, table_name, key2)); diff --git a/dozer-sink-aerospike/src/lib.rs b/dozer-sink-aerospike/src/lib.rs index fa0ca8f7d6..0ac4262f55 100644 --- a/dozer-sink-aerospike/src/lib.rs +++ b/dozer-sink-aerospike/src/lib.rs @@ -243,16 +243,13 @@ impl Client { response: &mut *mut i8, ) -> Result<(), AerospikeError> { as_try(|err| { - let res = aerospike_info_any( + aerospike_info_any( self.inner.as_ptr(), err, null(), request.as_ptr(), response as *mut *mut i8, - ); - let response_string = CStr::from_ptr(*response); - println!("response: [{:?}] {:?}", res, response_string); - res + ) }) } }