change the key for cache

Author: Eshanatnight

server/src/handlers/http/query.rs

@@ -43,7 +43,7 @@ use crate::option::{Mode, CONFIG};
 use crate::query::error::ExecuteError;
 use crate::query::Query as LogicalQuery;
 use crate::query::{TableScanVisitor, QUERY_SESSION};
-use crate::querycache::QueryCacheManager;
+use crate::querycache::{CacheMetadata, QueryCacheManager};
 use crate::rbac::role::{Action, Permission};
 use crate::rbac::Users;
 use crate::response::QueryResponse;
@@ -240,9 +240,12 @@ pub async fn get_results_from_cache(
             let mut query_cache = query_cache_manager.get_cache(stream, user_id).await?;
 
             let (start, end) = parse_human_time(start_time, end_time)?;
-            let key = format!("{}-{}-{}", start.to_rfc3339(), end.to_rfc3339(), query);
 
-            let file_path = query_cache.get_file(key);
+            let file_path = query_cache.get_file(CacheMetadata::new(
+                query.to_string(),
+                start.to_rfc3339(),
+                end.to_rfc3339(),
+            ));
             if let Some(file_path) = file_path {
                 let (records, fields) = query_cache.get_cached_records(&file_path).await?;
                 let response = QueryResponse {

server/src/querycache.rs

@@ -43,18 +43,28 @@ pub const CURRENT_QUERY_CACHE_VERSION: &str = "v1";
 // .cache.json
 #[derive(Default, Clone, serde::Deserialize, serde::Serialize, Debug, Hash, Eq, PartialEq)]
 pub struct CacheMetadata {
-    query: String,
+    pub query: String,
     pub start_time: String,
     pub end_time: String,
 }
 
+impl CacheMetadata {
+    pub const fn new(query: String, start_time: String, end_time: String) -> Self {
+        Self {
+            query,
+            start_time,
+            end_time,
+        }
+    }
+}
+
 #[derive(Debug, serde::Deserialize, serde::Serialize)]
 pub struct QueryCache {
     version: String,
     current_size: u64,
 
     /// Mapping between storage path and cache path.
-    files: Cache<String, PathBuf>,
+    files: Cache<CacheMetadata, PathBuf>,
 }
 
 impl QueryCache {
@@ -66,7 +76,7 @@ impl QueryCache {
         }
     }
 
-    pub fn get_file(&mut self, key: String) -> Option<PathBuf> {
+    pub fn get_file(&mut self, key: CacheMetadata) -> Option<PathBuf> {
         self.files.get(&key).cloned()
     }
 
@@ -245,7 +255,7 @@ impl QueryCacheManager {
     pub async fn move_to_cache(
         &self,
         stream: &str,
-        key: String,
+        key: CacheMetadata,
         file_path: &Path,
         user_id: &str,
     ) -> Result<(), CacheError> {
@@ -309,7 +319,7 @@ impl QueryCacheManager {
         arrow_writer.close().await?;
         self.move_to_cache(
             table_name,
-            format!("{}-{}-{}", start, end, query),
+            CacheMetadata::new(query, start, end),
             &parquet_path,
             user_id,
         )