From 88419dad222331525763afeb6091fa0832407449 Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Mon, 19 Sep 2022 19:49:56 +0530 Subject: [PATCH] This PR fixes code style and anti patterns reported by DeepSource Fixes #109 Fixes #108 --- server/build.rs | 10 +++++++--- server/src/handlers/logstream.rs | 2 +- server/src/metadata.rs | 4 ---- server/src/query.rs | 2 +- server/src/s3.rs | 3 +-- server/src/validator.rs | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/server/build.rs b/server/build.rs index 29bc241a8..8c6885a2f 100644 --- a/server/build.rs +++ b/server/build.rs @@ -36,6 +36,10 @@ mod ui { use static_files::resource_dir; use ureq::get as get_from_url; + const CARGO_MANIFEST_DIR: &str = "CARGO_MANIFEST_DIR"; + const OUT_DIR: &str = "OUT_DIR"; + const LOCAL_ASSETS_PATH: &str = "LOCAL_ASSETS_PATH"; + fn build_resource_from(local_path: impl AsRef) -> io::Result<()> { let local_path = local_path.as_ref(); if local_path.exists() { @@ -49,9 +53,9 @@ mod ui { } pub fn setup() -> io::Result<()> { - let cargo_manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()); + let cargo_manifest_dir = PathBuf::from(env::var(CARGO_MANIFEST_DIR).unwrap()); let cargo_toml = cargo_manifest_dir.join("Cargo.toml"); - let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap()); + let out_dir = PathBuf::from(env::var(OUT_DIR).unwrap()); let parseable_ui_path = out_dir.join("ui"); let checksum_path = out_dir.join("parseable_ui.sha1"); @@ -69,7 +73,7 @@ mod ui { // try fetching frontend path from env var let local_assets_path: Option = - env::var("LOCAL_ASSETS_PATH").ok().map(PathBuf::from); + env::var(LOCAL_ASSETS_PATH).ok().map(PathBuf::from); // If local build of ui is to be used if let Some(ref path) = local_assets_path { diff --git a/server/src/handlers/logstream.rs b/server/src/handlers/logstream.rs index ff0b59af0..fc084eac7 100644 --- a/server/src/handlers/logstream.rs +++ b/server/src/handlers/logstream.rs @@ -173,7 +173,7 @@ pub async fn put(req: HttpRequest) -> HttpResponse { // Proceed to create log stream if it doesn't exist if s3.get_schema(&stream_name).await.is_err() { if let Err(e) = - metadata::STREAM_INFO.add_stream(stream_name.to_string(), None, Default::default()) + metadata::STREAM_INFO.add_stream(stream_name.to_string(), None, Alerts::default()) { return response::ServerResponse { msg: format!( diff --git a/server/src/metadata.rs b/server/src/metadata.rs index f8916f0be..e173dd9e7 100644 --- a/server/src/metadata.rs +++ b/server/src/metadata.rs @@ -129,7 +129,6 @@ impl STREAM_INFO { alerts, ..Default::default() }; - // TODO: Add check to confirm data insertion map.insert(stream_name, metadata); Ok(()) @@ -137,7 +136,6 @@ impl STREAM_INFO { pub fn delete_stream(&self, stream_name: &str) -> Result<(), Error> { let mut map = self.write().unwrap(); - // TODO: Add check to confirm data deletion map.remove(stream_name); Ok(()) @@ -147,8 +145,6 @@ impl STREAM_INFO { for stream in storage.list_streams().await? { // Ignore S3 errors here, because we are just trying // to load the stream metadata based on whatever is available. - // - // TODO: ignore failure(s) if any and skip to next stream let alerts = storage .get_alerts(&stream.name) .await diff --git a/server/src/query.rs b/server/src/query.rs index 2bad7e9a3..d655dc111 100644 --- a/server/src/query.rs +++ b/server/src/query.rs @@ -69,7 +69,7 @@ impl Query { } /// Execute query on object storage(and if necessary on cache as well) with given stream information - /// TODO: find a way to query all selected parquet files together in a single context. + /// TODO: Query local and remote S3 parquet files in a single context pub async fn execute(&self, storage: &impl ObjectStorage) -> Result, Error> { let mut results = vec![]; storage.query(self, &mut results).await?; diff --git a/server/src/s3.rs b/server/src/s3.rs index afd44493e..37a4fa007 100644 --- a/server/src/s3.rs +++ b/server/src/s3.rs @@ -276,8 +276,7 @@ impl S3 { #[allow(dead_code)] async fn prefix_exists(&self, prefix: &str) -> Result { - // TODO check if head object is faster compared to - // list objects + // TODO check if head object is faster compared to list objects let resp = self .client .list_objects_v2() diff --git a/server/src/validator.rs b/server/src/validator.rs index f763cdf0b..031ace6e1 100644 --- a/server/src/validator.rs +++ b/server/src/validator.rs @@ -26,7 +26,7 @@ use crate::metadata::STREAM_INFO; use crate::query::Query; use crate::Error; -// TODO: add more sql keywords here in lower case +// Add more sql keywords here in lower case const DENIED_NAMES: &[&str] = &[ "select", "from", "where", "group", "by", "order", "limit", "offset", "join", "and", ];