clean up for better readablility

Author: Eshanatnight

server/src/handlers/airplane.rs

@@ -252,7 +252,8 @@ impl FlightService for AirServiceImpl {
             query.end.to_rfc3339(),
             ticket.query,
         )
-        .await {
+        .await
+        {
             log::error!("{}", err);
         };
 

server/src/handlers/http/cache.rs

@@ -50,11 +50,11 @@ pub async fn list(req: HttpRequest) -> Result<impl Responder, PostError> {
             .await
             .map_err(PostError::CacheError)?;
 
-        let size = cache.current_size();
+        let size = cache.used_cache_size();
         let queries = cache.queries();
 
         let out = json!({
-            "current_cache_size": size,
+            "used_capacity": size,
             "cache": queries
         });
 

server/src/handlers/http/ingest.rs

@@ -433,8 +433,6 @@ pub enum PostError {
     Invalid(#[from] anyhow::Error),
     #[error("{0}")]
     CreateStream(#[from] CreateStreamError),
-    #[error("Error: {0}")]
-    Error(std::io::Error),
     #[allow(unused)]
     #[error("Error: {0}")]
     CustomError(String),
@@ -467,7 +465,6 @@ impl actix_web::ResponseError for PostError {
             PostError::ObjectStorageError(_) => StatusCode::INTERNAL_SERVER_ERROR,
             PostError::DashboardError(_) => StatusCode::INTERNAL_SERVER_ERROR,
             PostError::FiltersError(_) => StatusCode::INTERNAL_SERVER_ERROR,
-            PostError::Error(_) => StatusCode::INTERNAL_SERVER_ERROR,
             PostError::CacheError(_) => StatusCode::INTERNAL_SERVER_ERROR,
         }
     }

server/src/handlers/http/modal/query_server.rs

@@ -22,9 +22,9 @@ use crate::handlers::http::middleware::RouteExt;
 use crate::handlers::http::{base_path, cross_origin_config, API_BASE_PATH, API_VERSION};
 
 use crate::rbac::role::Action;
+use crate::sync;
 use crate::users::dashboards::DASHBOARDS;
 use crate::users::filters::FILTERS;
-use crate::sync;
 use crate::{analytics, banner, metadata, metrics, migration, rbac, storage};
 use actix_web::web;
 use actix_web::web::ServiceConfig;

server/src/handlers/http/query.rs

@@ -141,7 +141,8 @@ pub async fn query(req: HttpRequest, query_request: Query) -> Result<impl Respon
         query.end.to_rfc3339(),
         query_request.query,
     )
-    .await {
+    .await
+    {
         log::error!("{}", err);
     };
 
@@ -198,10 +199,11 @@ pub async fn put_results_in_cache(
         }
         // do cache
         (Some(should_cache), Some(query_cache_manager)) => {
-
             if should_cache != "true" {
                 log::error!("value of cache results header is false");
-                return Err(QueryError::CacheError(CacheError::Other("should not cache results")));
+                return Err(QueryError::CacheError(CacheError::Other(
+                    "should not cache results",
+                )));
             }
 
             let user_id = user_id.ok_or(CacheError::Other("User Id not provided"))?;
@@ -222,9 +224,7 @@ pub async fn put_results_in_cache(
             // fallthrough
             Ok(())
         }
-        (None, _) => {
-            Ok(())
-        }
+        (None, _) => Ok(()),
     }
 }
 
@@ -250,7 +250,9 @@ pub async fn get_results_from_cache(
         (Some(should_show), Some(query_cache_manager)) => {
             if should_show != "true" {
                 log::error!("value of show cached header is false");
-                return Err(QueryError::CacheError(CacheError::Other("should not return cached results")));
+                return Err(QueryError::CacheError(CacheError::Other(
+                    "should not return cached results",
+                )));
             }
 
             let user_id =

server/src/querycache.rs

@@ -40,7 +40,6 @@ pub const QUERY_CACHE_FILENAME: &str = ".cache.json";
 pub const QUERY_CACHE_META_FILENAME: &str = ".cache_meta.json";
 pub const CURRENT_QUERY_CACHE_VERSION: &str = "v1";
 
-// .cache.json
 #[derive(Default, Clone, serde::Deserialize, serde::Serialize, Debug, Hash, Eq, PartialEq)]
 pub struct CacheMetadata {
     pub query: String,
@@ -80,7 +79,7 @@ impl QueryCache {
         self.files.get(&key).cloned()
     }
 
-    pub fn current_size(&self) -> u64 {
+    pub fn used_cache_size(&self) -> u64 {
         self.current_size
     }
 
@@ -137,7 +136,7 @@ impl QueryCacheMeta {
 pub struct QueryCacheManager {
     filesystem: LocalFileSystem,
     cache_path: PathBuf, // refers to the path passed in the env var
-    cache_capacity: u64,
+    total_cache_capacity: u64,
     semaphore: Mutex<()>,
 }
 
@@ -151,7 +150,7 @@ impl QueryCacheManager {
             &format!(
                 "{}.{}.parquet",
                 hostname_unchecked(),
-                Utc::now().timestamp().to_string()
+                Utc::now().timestamp()
             ),
         ])
     }
@@ -172,7 +171,7 @@ impl QueryCacheManager {
             Self {
                 filesystem: LocalFileSystem::new(),
                 cache_path,
-                cache_capacity: CONFIG.parseable.query_cache_size,
+                total_cache_capacity: CONFIG.parseable.query_cache_size,
                 semaphore: Mutex::new(()),
             }
         });
@@ -292,7 +291,7 @@ impl QueryCacheManager {
         let file_size = std::fs::metadata(file_path)?.len();
         let mut cache = self.get_cache(stream, user_id).await?;
 
-        while cache.current_size + file_size > self.cache_capacity {
+        while cache.current_size + file_size > self.total_cache_capacity {
             if let Some((_, file_for_removal)) = cache.files.pop_lru() {
                 let lru_file_size = fs::metadata(&file_for_removal).await?.len();
                 cache.current_size = cache.current_size.saturating_sub(lru_file_size);