From 7ca3761cab106960ad8dbf943e9a000bae3fdc83 Mon Sep 17 00:00:00 2001 From: Satyam Singh Date: Tue, 7 Feb 2023 12:11:00 +0530 Subject: [PATCH 1/3] Inline format arg --- server/build.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/build.rs b/server/build.rs index 167bb7b17..0e98aaec1 100644 --- a/server/build.rs +++ b/server/build.rs @@ -24,10 +24,7 @@ fn main() { *config.git_mut().sha_kind_mut() = ShaKind::Short; if let Err(e) = vergen(config) { - println!( - "cargo:warning=initializing vergen failed due to error: {}", - e - ); + println!("cargo:warning=initializing vergen failed due to error: {e}",); } println!("cargo:rerun-if-changed=build.rs"); From 1c2b2e205eb20546803b377cb2e1750a273ab30b Mon Sep 17 00:00:00 2001 From: Satyam Singh Date: Tue, 7 Feb 2023 12:51:00 +0530 Subject: [PATCH 2/3] Fix --- server/src/alerts/target.rs | 2 +- server/src/banner.rs | 11 +++++------ server/src/handlers/logstream.rs | 10 ++++------ server/src/main.rs | 4 ++-- server/src/option.rs | 3 +-- server/src/storage.rs | 2 +- server/src/storage/object_storage.rs | 2 +- server/src/storage/s3.rs | 2 +- server/src/utils.rs | 12 ++++++------ 9 files changed, 22 insertions(+), 26 deletions(-) diff --git a/server/src/alerts/target.rs b/server/src/alerts/target.rs index aaf8bd544..5373e20f2 100644 --- a/server/src/alerts/target.rs +++ b/server/src/alerts/target.rs @@ -106,7 +106,7 @@ impl Target { state.lock().unwrap().timed_out = false; let mut context = alert_context; context.message = format!( - "Triggering alert did not resolve itself after {} retries, This alert is paused until it resolves", RETRIES + "Triggering alert did not resolve itself after {RETRIES} retries, This alert is paused until it resolves", ); // Send and exit this task. call_target(target, context); diff --git a/server/src/banner.rs b/server/src/banner.rs index cbf0e299b..40a275baf 100644 --- a/server/src/banner.rs +++ b/server/src/banner.rs @@ -42,7 +42,7 @@ fn print_ascii_art() { .JMML. `Moo9^Yo..JMML. M9mmmP' `Mbmmd' `Moo9^Yo. P^YbmdP' .JMML. `Mbmmd' "#; - eprint!("{}", ascii_name); + eprint!("{ascii_name}"); eprintln!( " Welcome to Parseable Server!" @@ -107,8 +107,8 @@ pub mod about { impl fmt::Display for ParseableVersion { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - ParseableVersion::Version(v) => write!(f, "{}", v), - ParseableVersion::Prerelease(p) => write!(f, "{}", p), + ParseableVersion::Version(v) => write!(f, "{v}"), + ParseableVersion::Prerelease(p) => write!(f, "{p}"), } } } @@ -134,9 +134,8 @@ pub mod about { eprintln!( " - Commit: \"{}\" - Docs: \"https://www.parseable.io/docs\"", - commit_hash + Commit: \"{commit_hash}\" + Docs: \"https://www.parseable.io/docs\"" ); } diff --git a/server/src/handlers/logstream.rs b/server/src/handlers/logstream.rs index d9cdd45e9..71b2c99c1 100644 --- a/server/src/handlers/logstream.rs +++ b/server/src/handlers/logstream.rs @@ -61,7 +61,7 @@ pub async fn delete(req: HttpRequest) -> Result { } Ok(( - format!("log stream {} deleted", stream_name), + format!("log stream {stream_name} deleted"), StatusCode::OK, )) } @@ -135,8 +135,7 @@ pub async fn put_stream(req: HttpRequest) -> Result // Error if the log stream already exists return Err(StreamError::Custom { msg: format!( - "log stream {} already exists, please create a new log stream with unique name", - stream_name + "log stream {stream_name} already exists, please create a new log stream with unique name" ), status: StatusCode::BAD_REQUEST, }); @@ -194,7 +193,7 @@ pub async fn put_alert( .expect("alerts set on existing stream"); Ok(( - format!("set alert configuration for log stream {}", stream_name), + format!("set alert configuration for log stream {stream_name}"), StatusCode::OK, )) } @@ -256,8 +255,7 @@ pub async fn create_stream(stream_name: String) -> Result<(), StreamError> { // Fail if unable to create log stream on object store backend return Err(StreamError::Custom { msg: format!( - "failed to create log stream {} due to err: {}", - stream_name, e + "failed to create log stream {stream_name} due to err: {e}" ), status: StatusCode::INTERNAL_SERVER_ERROR, }); diff --git a/server/src/main.rs b/server/src/main.rs index 464b39307..e39d5c89d 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -321,14 +321,14 @@ macro_rules! create_app { } fn base_path() -> String { - format!("{}/{}", API_BASE_PATH, API_VERSION) + format!("{API_BASE_PATH}/{API_VERSION}") } fn logstream_path(stream_name: &str) -> String { if stream_name.is_empty() { "/logstream".to_string() } else { - format!("/logstream/{}", stream_name) + format!("/logstream/{stream_name}") } } diff --git a/server/src/option.rs b/server/src/option.rs index 0025517b8..9df303f6b 100644 --- a/server/src/option.rs +++ b/server/src/option.rs @@ -104,8 +104,7 @@ impl Config { cause = inner ), Err(ObjectStorageError::AuthenticationError(inner)) => panic!( - "Failed to authenticate. Please ensure credentials are valid\n Caused by: {cause}", - cause = inner + "Failed to authenticate. Please ensure credentials are valid\n Caused by: {inner}" ), Err(error) => { panic!("{error}") diff --git a/server/src/storage.rs b/server/src/storage.rs index 6f40d331a..ae6da4ed3 100644 --- a/server/src/storage.rs +++ b/server/src/storage.rs @@ -211,7 +211,7 @@ impl StorageDir { + &utils::minute_to_prefix(time.minute(), OBJECT_STORE_DATA_GRANULARITY).unwrap(); let local_uri = str::replace(&uri, "/", "."); let hostname = utils::hostname_unchecked(); - format!("{}{}.data.arrows", local_uri, hostname) + format!("{local_uri}{hostname}.data.arrows") } fn filename_by_current_time() -> String { diff --git a/server/src/storage/object_storage.rs b/server/src/storage/object_storage.rs index 0b70085e6..c946ec302 100644 --- a/server/src/storage/object_storage.rs +++ b/server/src/storage/object_storage.rs @@ -245,7 +245,7 @@ pub trait ObjectStorage: Sync + 'static { .to_str() .expect("filename is valid string"); let file_suffix = str::replacen(filename, ".", "/", 3); - let objectstore_path = format!("{}/{}", stream, file_suffix); + let objectstore_path = format!("{stream}/{file_suffix}"); CACHED_FILES .lock() diff --git a/server/src/storage/s3.rs b/server/src/storage/s3.rs index 0230c0e7d..1ba6adc1e 100644 --- a/server/src/storage/s3.rs +++ b/server/src/storage/s3.rs @@ -180,7 +180,7 @@ impl S3 { .client .list_objects_v2() .bucket(&self.bucket) - .prefix(format!("{}/", stream_name)) + .prefix(format!("{stream_name}/")) .into_paginator() .send(); diff --git a/server/src/utils.rs b/server/src/utils.rs index bc5fe2fa7..c49ba61a2 100644 --- a/server/src/utils.rs +++ b/server/src/utils.rs @@ -71,7 +71,7 @@ pub mod header_parsing { return Err(ParseHeaderError::SeperatorInValue(kv_separator)); } - labels.push(format!("{}={}", key, value)); + labels.push(format!("{key}={value}")); } if labels.len() > MAX_HEADERS_ALLOWED { @@ -233,20 +233,20 @@ pub fn minute_to_slot(minute: u32, data_granularity: u32) -> Option { let block_n = minute / data_granularity; let block_start = block_n * data_granularity; if data_granularity == 1 { - return Some(format!("{:02}", block_start)); + return Some(format!("{block_start:02}")); } let block_end = (block_n + 1) * data_granularity - 1; - Some(format!("{:02}-{:02}", block_start, block_end)) + Some(format!("{block_start:02}-{block_end:02}")) } pub fn date_to_prefix(date: NaiveDate) -> String { - let date = format!("date={}/", date); + let date = format!("date={date}/"); date.replace("UTC", "") } pub fn hour_to_prefix(hour: u32) -> String { - format!("hour={:02}/", hour) + format!("hour={hour:02}/") } pub fn minute_to_prefix(minute: u32, data_granularity: u32) -> Option { @@ -272,7 +272,7 @@ impl TimePeriod { } pub fn generate_prefixes(&self, prefix: &str) -> Vec { - let prefix = format!("{}/", prefix); + let prefix = format!("{prefix}/"); let end_minute = self.end.minute() + u32::from(self.end.second() > 0); From c4df3fcc15116a9e454aef4e66eee1fbee5a8901 Mon Sep 17 00:00:00 2001 From: Satyam Singh Date: Tue, 7 Feb 2023 12:53:05 +0530 Subject: [PATCH 3/3] Reformat --- server/src/handlers/logstream.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/server/src/handlers/logstream.rs b/server/src/handlers/logstream.rs index 71b2c99c1..aad2de257 100644 --- a/server/src/handlers/logstream.rs +++ b/server/src/handlers/logstream.rs @@ -60,10 +60,7 @@ pub async fn delete(req: HttpRequest) -> Result { ) } - Ok(( - format!("log stream {stream_name} deleted"), - StatusCode::OK, - )) + Ok((format!("log stream {stream_name} deleted"), StatusCode::OK)) } pub async fn list(_: HttpRequest) -> impl Responder { @@ -254,9 +251,7 @@ pub async fn create_stream(stream_name: String) -> Result<(), StreamError> { if let Err(e) = storage.create_stream(&stream_name).await { // Fail if unable to create log stream on object store backend return Err(StreamError::Custom { - msg: format!( - "failed to create log stream {stream_name} due to err: {e}" - ), + msg: format!("failed to create log stream {stream_name} due to err: {e}"), status: StatusCode::INTERNAL_SERVER_ERROR, }); }