From 66ca6406cc93df2a68f1f60e631a8b15af5e80c2 Mon Sep 17 00:00:00 2001 From: Isanka Date: Sun, 24 Mar 2024 16:05:38 +0900 Subject: [PATCH 1/2] na --- historical_data/src/main.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/historical_data/src/main.rs b/historical_data/src/main.rs index dbe0c8d..281c063 100644 --- a/historical_data/src/main.rs +++ b/historical_data/src/main.rs @@ -353,11 +353,21 @@ async fn process_tenant_historical_data( } }; +<<<<<<< HEAD let total_docs = mongo_collection .count_documents(filter.clone(), None) .await .context("Failed to count documents in MongoDB")? as usize; info!("Total documents to process: {}", total_docs); +======= + match mongo_collection.find(None, options).await { + Ok(mut cursor) => { + while let Some(result) = cursor.next().await { + // print!("tent info: {:?}", &tenant_config.name); + if let Ok(doc) = result { + let record_id = doc.get("_id").and_then(|id| id.as_object_id()); + let statement = doc.get("statement").and_then(|s| s.as_document()); +>>>>>>> e07455a (na) let mut cursor = mongo_collection .find(filter, None) From 086a6410ffbd3126c3a685d0e2ce0d218aa8d0c9 Mon Sep 17 00:00:00 2001 From: Isanka Date: Fri, 18 Oct 2024 13:31:01 +0900 Subject: [PATCH 2/2] resolved conflicts --- historical_data/src/main.rs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/historical_data/src/main.rs b/historical_data/src/main.rs index 281c063..dbe0c8d 100644 --- a/historical_data/src/main.rs +++ b/historical_data/src/main.rs @@ -353,21 +353,11 @@ async fn process_tenant_historical_data( } }; -<<<<<<< HEAD let total_docs = mongo_collection .count_documents(filter.clone(), None) .await .context("Failed to count documents in MongoDB")? as usize; info!("Total documents to process: {}", total_docs); -======= - match mongo_collection.find(None, options).await { - Ok(mut cursor) => { - while let Some(result) = cursor.next().await { - // print!("tent info: {:?}", &tenant_config.name); - if let Ok(doc) = result { - let record_id = doc.get("_id").and_then(|id| id.as_object_id()); - let statement = doc.get("statement").and_then(|s| s.as_document()); ->>>>>>> e07455a (na) let mut cursor = mongo_collection .find(filter, None)