Fix clippy errors: type_complexity, unused_mut, collapsible_if, deprecated

- Add MetricBucketMap type alias in common.rs to fix type_complexity
- Use MetricBucketMap in global.rs and per_key.rs
- Remove unused `mut` from `results` in global.rs
- Collapse nested `if` into single condition in per_key.rs
- Add #[allow(deprecated)] to impl blocks in per_key_legacy.rs
- Add #![allow(deprecated)] to benchmark file for legacy store usage

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: zzylol

asap-query-engine/benches/simple_map_store_benchmark.rs

@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
 use std::collections::HashMap;
 use std::sync::{Arc, Barrier};

asap-query-engine/src/stores/simple_map_store/common.rs

@@ -5,6 +5,7 @@ use std::sync::Arc;
 pub type MetricID = u32;
 pub type EpochID = u64;
 pub type TimestampRange = (u64, u64);
+pub type MetricBucketMap = HashMap<MetricID, Vec<(TimestampRange, Arc<dyn AggregateCore>)>>;
 
 /// Assigns a compact MetricID (u32) to each unique label combination.
 /// Label strings stored once; all internal maps use MetricID (O(1) key ops).
@@ -122,7 +123,7 @@ impl EpochData {
         &self,
         start: u64,
         end: u64,
-        out: &mut HashMap<MetricID, Vec<(TimestampRange, Arc<dyn AggregateCore>)>>,
+        out: &mut MetricBucketMap,
         matched_windows: &mut Vec<TimestampRange>,
     ) {
         for (&metric_id, btree) in &self.label_map {

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

@@ -1,6 +1,6 @@
 use crate::data_model::{AggregateCore, CleanupPolicy, PrecomputedOutput, StreamingConfig};
 use crate::stores::simple_map_store::common::{
-    EpochData, EpochID, InternTable, MetricID, TimestampRange,
+    EpochData, EpochID, InternTable, MetricBucketMap, TimestampRange,
 };
 use crate::stores::{Store, StoreResult, TimestampedBucketsMap};
 use std::collections::{BTreeMap, HashMap, HashSet};
@@ -402,7 +402,7 @@ impl Store for SimpleMapStoreGlobal {
         let range_scan_start_time = Instant::now();
 
         // Accumulate by MetricID first (no intermediate flat Vec allocation).
-        let mut mid: HashMap<MetricID, Vec<(TimestampRange, Arc<dyn AggregateCore>)>> = {
+        let mut mid: MetricBucketMap = {
             let per_key = match data.stores.get(&store_key) {
                 Some(pk) => pk,
                 None => {
@@ -411,8 +411,7 @@ impl Store for SimpleMapStoreGlobal {
                 }
             };
 
-            let mut mid: HashMap<MetricID, Vec<(TimestampRange, Arc<dyn AggregateCore>)>> =
-                HashMap::with_capacity(per_key.intern.len());
+            let mut mid: MetricBucketMap = HashMap::with_capacity(per_key.intern.len());
 
             for epoch in per_key.epochs.values() {
                 // Skip epoch if it has no windows overlapping [start, end]
@@ -433,7 +432,7 @@ impl Store for SimpleMapStoreGlobal {
         };
 
         // Resolve MetricIDs → labels in a single pass (scope ends before read_counts borrow)
-        let mut results: TimestampedBucketsMap = {
+        let results: TimestampedBucketsMap = {
             let per_key = data.stores.get(&store_key).unwrap();
             let mut r = HashMap::with_capacity(mid.len());
             for (metric_id, buckets) in mid.drain() {

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

@@ -1,6 +1,6 @@
 use crate::data_model::{AggregateCore, CleanupPolicy, PrecomputedOutput, StreamingConfig};
 use crate::stores::simple_map_store::common::{
-    EpochData, EpochID, InternTable, MetricID, TimestampRange,
+    EpochData, EpochID, InternTable, MetricBucketMap, MetricID, TimestampRange,
 };
 use crate::stores::{Store, StoreResult, TimestampedBucketsMap};
 use dashmap::DashMap;
@@ -292,10 +292,10 @@ impl SimpleMapStorePerKey {
             epoch.insert(metric_id, timestamp_range, Arc::from(precompute));
 
             // After each item, check if we should rotate (CircularBuffer, Optimization 2)
-            if aggregation_config.aggregation_type != "DeltaSetAggregator" {
-                if matches!(self.cleanup_policy, CleanupPolicy::CircularBuffer) {
-                    data.maybe_rotate_epoch();
-                }
+            if aggregation_config.aggregation_type != "DeltaSetAggregator"
+                && matches!(self.cleanup_policy, CleanupPolicy::CircularBuffer)
+            {
+                data.maybe_rotate_epoch();
             }
         }
 
@@ -460,8 +460,7 @@ impl Store for SimpleMapStorePerKey {
         let range_scan_start_time = Instant::now();
 
         // Accumulate by MetricID first (no intermediate flat Vec allocation).
-        let mut mid: HashMap<MetricID, Vec<(TimestampRange, Arc<dyn AggregateCore>)>> =
-            HashMap::with_capacity(data.intern.len());
+        let mut mid: MetricBucketMap = HashMap::with_capacity(data.intern.len());
 
         // Query each epoch; skip if time_ranges don't overlap [start, end]
         for epoch in data.epochs.values() {

asap-query-engine/src/stores/simple_map_store/per_key_legacy.rs

@@ -50,6 +50,7 @@ pub struct LegacySimpleMapStorePerKey {
     cleanup_policy: CleanupPolicy,
 }
 
+#[allow(deprecated)]
 impl LegacySimpleMapStorePerKey {
     pub fn new(streaming_config: Arc<StreamingConfig>, cleanup_policy: CleanupPolicy) -> Self {
         Self {
@@ -303,6 +304,7 @@ impl LegacySimpleMapStorePerKey {
     }
 }
 
+#[allow(deprecated)]
 #[async_trait::async_trait]
 impl Store for LegacySimpleMapStorePerKey {
     fn insert_precomputed_output(