From 05fbc957320fc1f7856f25fcb31d70c5ac9c68c6 Mon Sep 17 00:00:00 2001 From: Satyam Singh Date: Tue, 5 Sep 2023 12:39:25 +0530 Subject: [PATCH 1/2] Fix formatting --- server/src/analytics.rs | 4 +++- server/src/event/format/json.rs | 4 +++- server/src/query/filter_optimizer.rs | 8 ++++++-- server/src/storage/retention.rs | 14 +++++++++++--- server/src/storage/staging.rs | 10 ++++++---- server/src/utils.rs | 4 +++- server/src/utils/json/flatten.rs | 24 ++++++++++++++++++------ 7 files changed, 50 insertions(+), 18 deletions(-) diff --git a/server/src/analytics.rs b/server/src/analytics.rs index f156cc627..ae0529813 100644 --- a/server/src/analytics.rs +++ b/server/src/analytics.rs @@ -113,7 +113,9 @@ fn total_event_stats() -> (u64, u64, u64) { let mut total_json_bytes: u64 = 0; for stream in metadata::STREAM_INFO.list_streams() { - let Some(stats) = stats::get_current_stats(&stream, "json") else {continue;}; + let Some(stats) = stats::get_current_stats(&stream, "json") else { + continue; + }; total_events += stats.events; total_parquet_bytes += stats.storage; total_json_bytes += stats.ingestion; diff --git a/server/src/event/format/json.rs b/server/src/event/format/json.rs index 256c7f49e..a9922eb4b 100644 --- a/server/src/event/format/json.rs +++ b/server/src/event/format/json.rs @@ -158,7 +158,9 @@ fn fields_mismatch(schema: &[Arc], body: &Value) -> bool { if val.is_null() { continue; } - let Some(field) = get_field(schema, name) else { return true }; + let Some(field) = get_field(schema, name) else { + return true; + }; if !valid_type(field.data_type(), val) { return true; } diff --git a/server/src/query/filter_optimizer.rs b/server/src/query/filter_optimizer.rs index 4427445ce..f13858b00 100644 --- a/server/src/query/filter_optimizer.rs +++ b/server/src/query/filter_optimizer.rs @@ -43,7 +43,9 @@ impl OptimizerRule for FilterOptimizerRule { config: &dyn datafusion::optimizer::OptimizerConfig, ) -> datafusion::error::Result> { // if there are no patterns then the rule cannot be performed - let Some(filter_expr) = self.expr() else { return Ok(None); }; + let Some(filter_expr) = self.expr() else { + return Ok(None); + }; if let LogicalPlan::Filter(filter) = plan { if filter.predicate == filter_expr { @@ -115,7 +117,9 @@ impl FilterOptimizerRule { Expr::Column(Column::from_name(&self.column)).like(lit(format!("%{}%", literal))) }); - let Some(mut filter_expr) = patterns.next() else { return None }; + let Some(mut filter_expr) = patterns.next() else { + return None; + }; for expr in patterns { filter_expr = or(filter_expr, expr) } diff --git a/server/src/storage/retention.rs b/server/src/storage/retention.rs index a3402ba34..26a60b2b4 100644 --- a/server/src/storage/retention.rs +++ b/server/src/storage/retention.rs @@ -133,7 +133,9 @@ impl TryFrom> for Retention { if !duration.ends_with('d') { return Err("missing 'd' suffix for duration value".to_string()); } - let Ok(days) = duration[0..duration.len() - 1].parse() else { return Err("could not convert duration to an unsigned number".to_string());}; + let Ok(days) = duration[0..duration.len() - 1].parse() else { + return Err("could not convert duration to an unsigned number".to_string()); + }; if set.contains(&task.action) { return Err(format!( @@ -184,8 +186,14 @@ mod action { log::info!("running retention task - delete"); let retain_until = get_retain_until(Utc::now().date_naive(), days as u64); - let Ok(dates) = CONFIG.storage().get_object_store().list_dates(&stream_name) - .await else { return }; + let Ok(dates) = CONFIG + .storage() + .get_object_store() + .list_dates(&stream_name) + .await + else { + return; + }; let dates_to_delete = dates .into_iter() diff --git a/server/src/storage/staging.rs b/server/src/storage/staging.rs index 90bc0fcf1..65d65f97c 100644 --- a/server/src/storage/staging.rs +++ b/server/src/storage/staging.rs @@ -87,8 +87,9 @@ impl StorageDir { } pub fn arrow_files(&self) -> Vec { - let Ok(dir) = self.data_path - .read_dir() else { return vec![] }; + let Ok(dir) = self.data_path.read_dir() else { + return vec![]; + }; let paths: Vec = dir .flatten() @@ -143,8 +144,9 @@ impl StorageDir { } pub fn parquet_files(&self) -> Vec { - let Ok(dir) = self.data_path - .read_dir() else { return vec![] }; + let Ok(dir) = self.data_path.read_dir() else { + return vec![]; + }; dir.flatten() .map(|file| file.path()) diff --git a/server/src/utils.rs b/server/src/utils.rs index 29cf982d3..bc8bbded6 100644 --- a/server/src/utils.rs +++ b/server/src/utils.rs @@ -43,7 +43,9 @@ pub fn capitalize_ascii(s: &str) -> String { } pub fn validate_path_is_writeable(path: &Path) -> anyhow::Result<()> { - let Ok(md) = std::fs::metadata(path) else { anyhow::bail!("Could not read metadata for staging dir") }; + let Ok(md) = std::fs::metadata(path) else { + anyhow::bail!("Could not read metadata for staging dir") + }; let permissions = md.permissions(); if permissions.readonly() { anyhow::bail!("Staging directory {} is unwritable", path.display()) diff --git a/server/src/utils/json/flatten.rs b/server/src/utils/json/flatten.rs index 190831dd5..08c42b043 100644 --- a/server/src/utils/json/flatten.rs +++ b/server/src/utils/json/flatten.rs @@ -32,7 +32,9 @@ pub fn flatten(nested_value: Value, separator: &str) -> Result Date: Tue, 5 Sep 2023 12:43:19 +0530 Subject: [PATCH 2/2] Set resolver to 2 --- Cargo.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 964c1bd5b..156820ec5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,3 @@ [workspace] -members = [ - "server", -] \ No newline at end of file +members = ["server"] +resolver = "2"