revert: remove legacy store changes, diagnostics now live in current stores

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: zzylol

asap-query-engine/src/stores/simple_map_store/legacy/global.rs

@@ -56,51 +56,6 @@ impl LegacySimpleMapStoreGlobal {
         }
     }
 
-    /// Collect diagnostic info for memory leak investigation.
-    pub fn diagnostic_info(&self) -> super::per_key::StoreDiagnostics {
-        use super::per_key::{AggregationDiagnostic, StoreDiagnostics};
-
-        let data = self.lock.lock().unwrap();
-        let mut per_aggregation = Vec::new();
-        let mut total_time_map_entries: usize = 0;
-        let mut total_sketch_bytes: usize = 0;
-
-        for (&agg_id, time_map) in &data.store {
-            let time_map_len = time_map.len();
-            let read_counts_len = data
-                .read_counts
-                .get(&agg_id)
-                .map(|rc| rc.len())
-                .unwrap_or(0);
-            total_time_map_entries += time_map_len;
-
-            let mut num_aggregate_objects: usize = 0;
-            let mut agg_sketch_bytes: usize = 0;
-            for store_values in time_map.values() {
-                num_aggregate_objects += store_values.len();
-                for (_key, aggregate) in store_values {
-                    agg_sketch_bytes += aggregate.serialize_to_bytes().len();
-                }
-            }
-            total_sketch_bytes += agg_sketch_bytes;
-
-            per_aggregation.push(AggregationDiagnostic {
-                aggregation_id: agg_id,
-                time_map_len,
-                read_counts_len,
-                num_aggregate_objects,
-                sketch_bytes: agg_sketch_bytes,
-            });
-        }
-
-        StoreDiagnostics {
-            num_aggregations: data.store.len(),
-            total_time_map_entries,
-            total_sketch_bytes,
-            per_aggregation,
-        }
-    }
-
     fn create_table(&self, data: &mut StoreData, metric: &str) {
         // In the in-memory implementation, "creating a table" just means
         // marking the metric as known

asap-query-engine/src/stores/simple_map_store/legacy/mod.rs

@@ -2,4 +2,4 @@ mod global;
 mod per_key;
 
 pub use global::LegacySimpleMapStoreGlobal;
-pub use per_key::{AggregationDiagnostic, LegacySimpleMapStorePerKey, StoreDiagnostics};
+pub use per_key::LegacySimpleMapStorePerKey;

asap-query-engine/src/stores/simple_map_store/legacy/per_key.rs

@@ -48,23 +48,6 @@ pub struct LegacySimpleMapStorePerKey {
     cleanup_policy: CleanupPolicy,
 }
 
-/// Diagnostic snapshot from a single aggregation ID in the store.
-pub struct AggregationDiagnostic {
-    pub aggregation_id: u64,
-    pub time_map_len: usize,
-    pub read_counts_len: usize,
-    pub num_aggregate_objects: usize,
-    pub sketch_bytes: usize,
-}
-
-/// Diagnostic snapshot of the entire store.
-pub struct StoreDiagnostics {
-    pub num_aggregations: usize,
-    pub total_time_map_entries: usize,
-    pub total_sketch_bytes: usize,
-    pub per_aggregation: Vec<AggregationDiagnostic>,
-}
-
 impl LegacySimpleMapStorePerKey {
     pub fn new(streaming_config: Arc<StreamingConfig>, cleanup_policy: CleanupPolicy) -> Self {
         Self {
@@ -77,49 +60,6 @@ impl LegacySimpleMapStorePerKey {
         }
     }
 
-    /// Collect diagnostic info for memory leak investigation.
-    pub fn diagnostic_info(&self) -> StoreDiagnostics {
-        let mut per_aggregation = Vec::new();
-        let mut total_time_map_entries: usize = 0;
-        let mut total_sketch_bytes: usize = 0;
-
-        for entry in self.store.iter() {
-            let agg_id = *entry.key();
-            let data = match entry.value().read() {
-                Ok(d) => d,
-                Err(_) => continue,
-            };
-            let time_map_len = data.time_map.len();
-            let read_counts_len = data.read_counts.len();
-            total_time_map_entries += time_map_len;
-
-            let mut num_aggregate_objects: usize = 0;
-            let mut agg_sketch_bytes: usize = 0;
-            for store_values in data.time_map.values() {
-                num_aggregate_objects += store_values.len();
-                for (_key, aggregate) in store_values {
-                    agg_sketch_bytes += aggregate.serialize_to_bytes().len();
-                }
-            }
-            total_sketch_bytes += agg_sketch_bytes;
-
-            per_aggregation.push(AggregationDiagnostic {
-                aggregation_id: agg_id,
-                time_map_len,
-                read_counts_len,
-                num_aggregate_objects,
-                sketch_bytes: agg_sketch_bytes,
-            });
-        }
-
-        StoreDiagnostics {
-            num_aggregations: self.store.len(),
-            total_time_map_entries,
-            total_sketch_bytes,
-            per_aggregation,
-        }
-    }
-
     fn cleanup_old_aggregates_fixed_count(
         &self,
         data: &mut StoreKeyData,