refactor(sketch-db): merge simple_map_store into sketch_db module tree

asap-query-engine/benches/simple_store_bench.rs

@@ -31,7 +31,7 @@ use query_engine_rust::data_model::{
     WindowType,
 };
 use query_engine_rust::precompute_operators::{DatasketchesKLLAccumulator, SumAccumulator};
-use query_engine_rust::stores::simple_map_store::legacy::{
+use query_engine_rust::stores::sketch_db::simple_map_store::legacy::{
     LegacySimpleMapStoreGlobal, LegacySimpleMapStorePerKey,
 };
 use query_engine_rust::stores::Store;

asap-query-engine/src/bin/precompute_engine.rs

@@ -120,7 +120,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 
     // Create the store
     let store: Arc<dyn query_engine_rust::stores::Store> = if args.persistence_enabled {
-        use query_engine_rust::stores::simple_map_store::persistence::SimpleMapStorePersistenceConfig;
+        use query_engine_rust::stores::sketch_db::simple_map_store::persistence::SimpleMapStorePersistenceConfig;
         let disk_path = args
             .persistence_dir
             .clone()

asap-query-engine/src/drivers/query/servers/http.rs

@@ -698,7 +698,7 @@ mod tests {
     use super::*;
     use crate::data_model::{HotReloadStreamingConfig, InferenceConfig, StreamingConfig};
     use crate::engines::SimpleEngine;
-    use crate::stores::simple_map_store::SimpleMapStore;
+    use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
     use reqwest::Client;
     use std::sync::Arc;
 

asap-query-engine/src/engines/simple_engine.rs

@@ -4667,7 +4667,7 @@ mod hot_reload_phase2_tests {
         AggregationType, CleanupPolicy, HotReloadStreamingConfig, InferenceConfig, QueryLanguage,
         StreamingConfig, WindowType,
     };
-    use crate::stores::simple_map_store::SimpleMapStore;
+    use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
     use promql_utilities::data_model::key_by_label_names::KeyByLabelNames;
 
     fn dummy_agg(id: u64, metric: &str) -> crate::data_model::AggregationConfig {
@@ -4829,7 +4829,7 @@ mod e2e_feedback_loop_tests {
         StreamingConfig, WindowType,
     };
     use crate::drivers::query::controller_client::ControllerClient;
-    use crate::stores::simple_map_store::SimpleMapStore;
+    use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
     use async_trait::async_trait;
     use promql_utilities::data_model::key_by_label_names::KeyByLabelNames;
     use promql_utilities::query_logics::enums::Statistic;
@@ -5233,7 +5233,7 @@ mod aux_pushdown_tests {
             CleanupPolicy, HotReloadStreamingConfig, InferenceConfig, PromQLSchema, QueryLanguage,
             SchemaConfig, StreamingConfig,
         };
-        use crate::stores::simple_map_store::SimpleMapStore;
+        use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
 
         let ic = InferenceConfig {
             schema: SchemaConfig::PromQL(PromQLSchema {

asap-query-engine/src/main.rs

@@ -314,7 +314,7 @@ async fn main() -> Result<()> {
     let cleanup_policy = inference_config.cleanup_policy;
     info!("Using cleanup policy: {:?}", cleanup_policy);
     let store = if args.persistence_enabled {
-        use query_engine_rust::stores::simple_map_store::persistence::SimpleMapStorePersistenceConfig;
+        use query_engine_rust::stores::sketch_db::simple_map_store::persistence::SimpleMapStorePersistenceConfig;
         let disk_path = args
             .persistence_dir
             .clone()

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

@@ -1,9 +1,25 @@
+//! Store layer — the sketch DB.
+//!
+//! This module houses the sketch DB's physical + logical layers:
+//!
+//! * `traits` — the `Store` trait every concrete store implements.
+//! * `sketch_db` — the top-level sketch DB module. Logical
+//!   layer (schema registry, schema timeline, backfill types /
+//!   workers / HTTP endpoints) AND the physical storage backend
+//!   (`sketch_db::simple_map_store`) are co-located under this
+//!   path so the project's identity is unambiguous.
+//! * `promsketch_store` — legacy alternative store, currently
+//!   commented out of the public API. Kept for reference.
+//!
+//! `SimpleMapStore` is re-exported at the top level
+//! (`crate::stores::SimpleMapStore`) for call-site stability:
+//! callers should not care whether it lives under `sketch_db` or
+//! at the `stores` top level.
+
 pub mod promsketch_store;
-pub mod simple_map_store;
 pub mod sketch_db;
 pub mod traits;
 
 // pub use promsketch_store::PromSketchStore;
-pub use simple_map_store::SimpleMapStore;
-pub use sketch_db::{AggSchema, AggStatus, SchemaRegistry};
+pub use sketch_db::{AggSchema, AggStatus, SchemaRegistry, SimpleMapStore};
 pub use traits::*;

asap-query-engine/src/stores/sketch_db/backfill_processor.rs

@@ -260,10 +260,10 @@ impl WindowProcessor for BackfillWindowProcessor {
 mod tests {
     use super::*;
     use crate::data_model::StreamingConfig;
-    use crate::stores::simple_map_store::SimpleMapStore;
     use crate::stores::sketch_db::backfill::BackfillSource;
     use crate::stores::sketch_db::backfill_worker::BackfillWorker;
     use crate::stores::sketch_db::raw_sample_reader::{LabelFilter, MockRawSampleReader};
+    use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
     use asap_types::enums::{AggregationType, WindowType};
     use promql_utilities::data_model::key_by_label_names::KeyByLabelNames;
     use std::sync::Arc;

asap-query-engine/src/stores/sketch_db/backfill_service.rs

@@ -268,8 +268,8 @@ pub fn noop_reader_factory() -> ReaderFactory {
 mod tests {
     use super::*;
     use crate::data_model::StreamingConfig;
-    use crate::stores::simple_map_store::SimpleMapStore;
     use crate::stores::sketch_db::raw_sample_reader::{MockRawSampleReader, RawSample};
+    use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
     use asap_types::aggregation_config::AggregationConfig;
     use asap_types::enums::{AggregationType, WindowType};
     use promql_utilities::data_model::key_by_label_names::KeyByLabelNames;

asap-query-engine/src/stores/sketch_db/mod.rs

@@ -35,6 +35,7 @@ pub mod backfill_window_builder;
 pub mod backfill_worker;
 pub mod raw_sample_reader;
 pub mod schema;
+pub mod simple_map_store;
 
 pub use backfill::{
     BackfillJob, BackfillRegistry, BackfillSource, BackfillStatus, Coverage, CreateError,
@@ -50,3 +51,4 @@ pub use raw_sample_reader::{
     LabelFilter, MockRawSampleReader, RawSample, RawSampleReader, RawSampleReaderError,
 };
 pub use schema::{AggSchema, AggStatus, SchemaRegistry, TimelineCoverage, TimelineSegment};
+pub use simple_map_store::SimpleMapStore;

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

@@ -1,7 +1,7 @@
 use crate::data_model::{
     AggregateCore, AggregationType, CleanupPolicy, PrecomputedOutput, StreamingConfig,
 };
-use crate::stores::simple_map_store::common::{
+use crate::stores::sketch_db::simple_map_store::common::{
     EpochID, InternTable, MetricBucketMap, MutableEpoch, SealedEpoch, TimestampRange,
 };
 use crate::stores::{Store, StoreResult, TimestampedBucketsMap};

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

@@ -3,7 +3,7 @@ use crate::data_model::{
     StreamingConfig,
 };
 use crate::engines::physical::accumulator_serde;
-use crate::stores::simple_map_store::common::{
+use crate::stores::sketch_db::simple_map_store::common::{
     EpochID, InternTable, MetricBucketMap, MetricID, MutableEpoch, SealedEpoch, TimestampRange,
 };
 use crate::stores::{Store, StoreResult, TimestampedBucketsMap};

asap-query-engine/src/stores/simple_map_store/persistence/flusher.rs → asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/flusher.rs

@@ -425,7 +425,9 @@ fn now_ms() -> u64 {
 mod tests {
     use super::*;
     use crate::data_model::KeyByLabelValues;
-    use crate::stores::simple_map_store::persistence::source::{EpochSnapshot, EpochSnapshotEntry};
+    use crate::stores::sketch_db::simple_map_store::persistence::source::{
+        EpochSnapshot, EpochSnapshotEntry,
+    };
     use std::sync::Mutex as StdMutex;
     use std::time::Duration;
     use tempfile::TempDir;

asap-query-engine/src/stores/simple_map_store/persistence/part.rs → asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/part.rs

@@ -594,7 +594,7 @@ fn map_file(path: &Path) -> PersistResult<Mmap> {
 mod tests {
     use super::*;
     use crate::data_model::KeyByLabelValues;
-    use crate::stores::simple_map_store::persistence::source::EpochSnapshotEntry;
+    use crate::stores::sketch_db::simple_map_store::persistence::source::EpochSnapshotEntry;
     use tempfile::TempDir;
 
     fn make_snapshot() -> EpochSnapshot {

asap-query-engine/src/stores/simple_map_store/persistence/recovery.rs → asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/recovery.rs

@@ -118,8 +118,12 @@ pub fn recover(disk_path: &Path) -> PersistResult<(Manifest, RecoveryReport)> {
 mod tests {
     use super::*;
     use crate::data_model::KeyByLabelValues;
-    use crate::stores::simple_map_store::persistence::part::{part_dir_path, PartWriter};
-    use crate::stores::simple_map_store::persistence::source::{EpochSnapshot, EpochSnapshotEntry};
+    use crate::stores::sketch_db::simple_map_store::persistence::part::{
+        part_dir_path, PartWriter,
+    };
+    use crate::stores::sketch_db::simple_map_store::persistence::source::{
+        EpochSnapshot, EpochSnapshotEntry,
+    };
     use tempfile::TempDir;
 
     fn dummy_snapshot() -> EpochSnapshot {
@@ -179,7 +183,7 @@ mod tests {
         let report_write = PartWriter::write_part(&part_dir, 42, &[dummy_snapshot()]).unwrap();
         manifest
             .append_add(
-                crate::stores::simple_map_store::persistence::manifest::PartEntry {
+                crate::stores::sketch_db::simple_map_store::persistence::manifest::PartEntry {
                     part_id: 42,
                     min_ts: report_write.min_ts,
                     max_ts: report_write.max_ts,

asap-query-engine/src/tests/capability_matching_tests.rs

@@ -12,7 +12,7 @@ use crate::data_model::{
 use crate::engines::simple_engine::SimpleEngine;
 use crate::precompute_operators::datasketches_kll_accumulator::DatasketchesKLLAccumulator;
 use crate::precompute_operators::sum_accumulator::SumAccumulator;
-use crate::stores::simple_map_store::SimpleMapStore;
+use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
 use crate::stores::traits::Store;
 use promql_utilities::data_model::KeyByLabelNames;
 use std::collections::HashMap;

asap-query-engine/src/tests/clickhouse_forwarding_tests.rs

@@ -3,7 +3,7 @@ use crate::data_model::{CleanupPolicy, InferenceConfig, QueryLanguage, Streaming
 use crate::drivers::query::adapters::AdapterConfig;
 use crate::drivers::query::servers::http::{HttpServer, HttpServerConfig};
 use crate::engines::SimpleEngine;
-use crate::stores::simple_map_store::SimpleMapStore;
+use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
 use reqwest::Client;
 use std::sync::Arc;
 use tokio::net::TcpListener;

asap-query-engine/src/tests/elastic_forwarding_tests.rs

@@ -3,7 +3,7 @@ use crate::data_model::{CleanupPolicy, InferenceConfig, QueryLanguage, Streaming
 use crate::drivers::query::adapters::AdapterConfig;
 use crate::drivers::query::servers::http::{HttpServer, HttpServerConfig};
 use crate::engines::SimpleEngine;
-use crate::stores::simple_map_store::SimpleMapStore;
+use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
 use reqwest::Client;
 use serde_json::{json, Value};
 use std::sync::Arc;

asap-query-engine/src/tests/persistence_integration_tests.rs

@@ -16,8 +16,8 @@ use crate::data_model::{
     AggregationType, CleanupPolicy, PrecomputedOutput, StreamingConfig, WindowType,
 };
 use crate::precompute_operators::SumAccumulator;
-use crate::stores::simple_map_store::per_key::SimpleMapStorePerKey;
-use crate::stores::simple_map_store::persistence::SimpleMapStorePersistenceConfig;
+use crate::stores::sketch_db::simple_map_store::per_key::SimpleMapStorePerKey;
+use crate::stores::sketch_db::simple_map_store::persistence::SimpleMapStorePersistenceConfig;
 use crate::stores::Store;
 use crate::{AggregateCore, AggregationConfig};
 

asap-query-engine/src/tests/persistence_perf_tests.rs

@@ -39,8 +39,8 @@ use crate::data_model::{
     AggregationType, CleanupPolicy, PrecomputedOutput, StreamingConfig, WindowType,
 };
 use crate::precompute_operators::SumAccumulator;
-use crate::stores::simple_map_store::per_key::SimpleMapStorePerKey;
-use crate::stores::simple_map_store::persistence::SimpleMapStorePersistenceConfig;
+use crate::stores::sketch_db::simple_map_store::per_key::SimpleMapStorePerKey;
+use crate::stores::sketch_db::simple_map_store::persistence::SimpleMapStorePersistenceConfig;
 use crate::stores::Store;
 use crate::{AggregateCore, AggregationConfig};
 

asap-query-engine/src/tests/prometheus_forwarding_tests.rs

@@ -3,7 +3,7 @@ use crate::data_model::{CleanupPolicy, InferenceConfig, QueryLanguage, Streaming
 use crate::drivers::query::adapters::AdapterConfig;
 use crate::drivers::query::servers::http::{HttpServer, HttpServerConfig};
 use crate::engines::SimpleEngine;
-use crate::stores::simple_map_store::SimpleMapStore;
+use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
 use reqwest::Client;
 use serde_json::Value;
 use std::sync::Arc;

asap-query-engine/src/tests/sql_pattern_matching_tests.rs

@@ -10,7 +10,7 @@ mod tests {
         QueryConfig, QueryLanguage, SchemaConfig, StreamingConfig, WindowType,
     };
     use crate::engines::simple_engine::SimpleEngine;
-    use crate::stores::simple_map_store::SimpleMapStore;
+    use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
     use promql_utilities::data_model::KeyByLabelNames;
     use sql_utilities::sqlhelper::{SQLSchema, Table};
     use std::collections::{HashMap, HashSet};

asap-query-engine/src/tests/test_utilities/engine_factories.rs

@@ -12,7 +12,7 @@ use crate::data_model::{
 };
 use crate::engines::query_result::InstantVectorElement;
 use crate::engines::simple_engine::SimpleEngine;
-use crate::stores::simple_map_store::SimpleMapStore;
+use crate::stores::sketch_db::simple_map_store::SimpleMapStore;
 use crate::stores::Store;
 use crate::AggregateCore;
 use promql_utilities::data_model::KeyByLabelNames;