From 2d1a77d14007ea593da6e93f189583e0994b5307 Mon Sep 17 00:00:00 2001 From: Zeying Zhu Date: Sat, 18 Apr 2026 13:05:26 -0400 Subject: [PATCH] refactor(sketch-db): merge simple_map_store into sketch_db module tree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The sketch DB has two structurally-layered pieces that have been living as sibling modules: - `src/stores/sketch_db/` (logical layer: schemas, timelines, backfill) - `src/stores/simple_map_store/` (physical layer: per-key storage backend) This sibling layout hid the dependency direction: `sketch_db` depends on the `Store` trait implemented by `SimpleMapStore`, not vice versa. The physical store is one concrete implementation of the sketch DB's storage abstraction, not a peer concept. Move `simple_map_store/` INTO `sketch_db/` as a submodule so the module tree reflects the layering: everything sketch-DB-related, including its physical backend, lives under one umbrella. ## What changed - `git mv asap-query-engine/src/stores/simple_map_store → asap-query-engine/src/stores/sketch_db/simple_map_store` - `stores::simple_map_store::*` → `stores::sketch_db::simple_map_store::*` across 20 files (16 backend + 1 bench + 3 internal self-references inside the moved directory). - `stores/mod.rs` drops the `pub mod simple_map_store` declaration but keeps `pub use ... SimpleMapStore` re-export so `crate::stores::SimpleMapStore` still works for all callers. - `sketch_db/mod.rs` adds `pub mod simple_map_store` + `pub use simple_map_store::SimpleMapStore`. ## What didn't change - `crate::stores::SimpleMapStore` public path — callers that import via the top-level `stores::` continue to work unchanged. - `Store` trait still lives at `stores::traits` — it's the neutral interface both the logical layer and the physical impl share. - No code logic changed. No tests added or removed. ## Test plan - [x] Pure rename, zero logic delta. - [x] 647 lib tests pass (same count as PR #32). - [x] `cargo clippy --workspace --all-targets --tests -- -D warnings` clean. - [x] `cargo fmt -- --check` clean. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../benches/simple_store_bench.rs | 2 +- .../src/bin/precompute_engine.rs | 2 +- .../src/drivers/query/servers/http.rs | 2 +- .../src/engines/simple_engine.rs | 6 ++--- asap-query-engine/src/main.rs | 2 +- asap-query-engine/src/stores/mod.rs | 22 ++++++++++++++++--- .../stores/sketch_db/backfill_processor.rs | 2 +- .../src/stores/sketch_db/backfill_service.rs | 2 +- asap-query-engine/src/stores/sketch_db/mod.rs | 2 ++ .../simple_map_store/INDEX_DESIGN.md | 0 .../simple_map_store/common.rs | 0 .../simple_map_store/global.rs | 2 +- .../simple_map_store/legacy/global.rs | 0 .../simple_map_store/legacy/mod.rs | 0 .../simple_map_store/legacy/per_key.rs | 0 .../{ => sketch_db}/simple_map_store/mod.rs | 0 .../simple_map_store/per_key.rs | 2 +- .../simple_map_store/persistence/cache.rs | 0 .../simple_map_store/persistence/config.rs | 0 .../simple_map_store/persistence/flusher.rs | 4 +++- .../simple_map_store/persistence/manifest.rs | 0 .../simple_map_store/persistence/mod.rs | 0 .../simple_map_store/persistence/part.rs | 2 +- .../simple_map_store/persistence/recovery.rs | 10 ++++++--- .../simple_map_store/persistence/source.rs | 0 .../src/tests/capability_matching_tests.rs | 2 +- .../src/tests/clickhouse_forwarding_tests.rs | 2 +- .../src/tests/elastic_forwarding_tests.rs | 2 +- .../tests/persistence_integration_tests.rs | 4 ++-- .../src/tests/persistence_perf_tests.rs | 4 ++-- .../src/tests/prometheus_forwarding_tests.rs | 2 +- .../src/tests/sql_pattern_matching_tests.rs | 2 +- .../tests/test_utilities/engine_factories.rs | 2 +- 33 files changed, 53 insertions(+), 29 deletions(-) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/INDEX_DESIGN.md (100%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/common.rs (100%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/global.rs (99%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/legacy/global.rs (100%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/legacy/mod.rs (100%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/legacy/per_key.rs (100%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/mod.rs (100%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/per_key.rs (99%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/persistence/cache.rs (100%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/persistence/config.rs (100%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/persistence/flusher.rs (99%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/persistence/manifest.rs (100%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/persistence/mod.rs (100%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/persistence/part.rs (99%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/persistence/recovery.rs (95%) rename asap-query-engine/src/stores/{ => sketch_db}/simple_map_store/persistence/source.rs (100%) diff --git a/asap-query-engine/benches/simple_store_bench.rs b/asap-query-engine/benches/simple_store_bench.rs index ef49abc4..a7969b15 100644 --- a/asap-query-engine/benches/simple_store_bench.rs +++ b/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; diff --git a/asap-query-engine/src/bin/precompute_engine.rs b/asap-query-engine/src/bin/precompute_engine.rs index 2cc83576..cbabaf06 100644 --- a/asap-query-engine/src/bin/precompute_engine.rs +++ b/asap-query-engine/src/bin/precompute_engine.rs @@ -120,7 +120,7 @@ async fn main() -> Result<(), Box> { // Create the store let store: Arc = 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() diff --git a/asap-query-engine/src/drivers/query/servers/http.rs b/asap-query-engine/src/drivers/query/servers/http.rs index e9ab25f5..5ad577c2 100644 --- a/asap-query-engine/src/drivers/query/servers/http.rs +++ b/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; diff --git a/asap-query-engine/src/engines/simple_engine.rs b/asap-query-engine/src/engines/simple_engine.rs index e931b57f..b12bd4fc 100644 --- a/asap-query-engine/src/engines/simple_engine.rs +++ b/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 { diff --git a/asap-query-engine/src/main.rs b/asap-query-engine/src/main.rs index f6ebc326..e874b515 100644 --- a/asap-query-engine/src/main.rs +++ b/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() diff --git a/asap-query-engine/src/stores/mod.rs b/asap-query-engine/src/stores/mod.rs index 66f43955..9e21c02f 100644 --- a/asap-query-engine/src/stores/mod.rs +++ b/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::*; diff --git a/asap-query-engine/src/stores/sketch_db/backfill_processor.rs b/asap-query-engine/src/stores/sketch_db/backfill_processor.rs index fa2bde9b..00ff5562 100644 --- a/asap-query-engine/src/stores/sketch_db/backfill_processor.rs +++ b/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; diff --git a/asap-query-engine/src/stores/sketch_db/backfill_service.rs b/asap-query-engine/src/stores/sketch_db/backfill_service.rs index e3b150f6..8cc661c1 100644 --- a/asap-query-engine/src/stores/sketch_db/backfill_service.rs +++ b/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; diff --git a/asap-query-engine/src/stores/sketch_db/mod.rs b/asap-query-engine/src/stores/sketch_db/mod.rs index a695706e..469a1c3a 100644 --- a/asap-query-engine/src/stores/sketch_db/mod.rs +++ b/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; diff --git a/asap-query-engine/src/stores/simple_map_store/INDEX_DESIGN.md b/asap-query-engine/src/stores/sketch_db/simple_map_store/INDEX_DESIGN.md similarity index 100% rename from asap-query-engine/src/stores/simple_map_store/INDEX_DESIGN.md rename to asap-query-engine/src/stores/sketch_db/simple_map_store/INDEX_DESIGN.md diff --git a/asap-query-engine/src/stores/simple_map_store/common.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/common.rs similarity index 100% rename from asap-query-engine/src/stores/simple_map_store/common.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/common.rs diff --git a/asap-query-engine/src/stores/simple_map_store/global.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/global.rs similarity index 99% rename from asap-query-engine/src/stores/simple_map_store/global.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/global.rs index e539ae89..adabdf5a 100644 --- a/asap-query-engine/src/stores/simple_map_store/global.rs +++ b/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}; diff --git a/asap-query-engine/src/stores/simple_map_store/legacy/global.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/legacy/global.rs similarity index 100% rename from asap-query-engine/src/stores/simple_map_store/legacy/global.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/legacy/global.rs diff --git a/asap-query-engine/src/stores/simple_map_store/legacy/mod.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/legacy/mod.rs similarity index 100% rename from asap-query-engine/src/stores/simple_map_store/legacy/mod.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/legacy/mod.rs diff --git a/asap-query-engine/src/stores/simple_map_store/legacy/per_key.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/legacy/per_key.rs similarity index 100% rename from asap-query-engine/src/stores/simple_map_store/legacy/per_key.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/legacy/per_key.rs diff --git a/asap-query-engine/src/stores/simple_map_store/mod.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/mod.rs similarity index 100% rename from asap-query-engine/src/stores/simple_map_store/mod.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/mod.rs diff --git a/asap-query-engine/src/stores/simple_map_store/per_key.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/per_key.rs similarity index 99% rename from asap-query-engine/src/stores/simple_map_store/per_key.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/per_key.rs index c344f42c..6e618811 100644 --- a/asap-query-engine/src/stores/simple_map_store/per_key.rs +++ b/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}; diff --git a/asap-query-engine/src/stores/simple_map_store/persistence/cache.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/cache.rs similarity index 100% rename from asap-query-engine/src/stores/simple_map_store/persistence/cache.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/cache.rs diff --git a/asap-query-engine/src/stores/simple_map_store/persistence/config.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/config.rs similarity index 100% rename from asap-query-engine/src/stores/simple_map_store/persistence/config.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/config.rs diff --git a/asap-query-engine/src/stores/simple_map_store/persistence/flusher.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/flusher.rs similarity index 99% rename from asap-query-engine/src/stores/simple_map_store/persistence/flusher.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/flusher.rs index eb1f23d5..bd5ec636 100644 --- a/asap-query-engine/src/stores/simple_map_store/persistence/flusher.rs +++ b/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; diff --git a/asap-query-engine/src/stores/simple_map_store/persistence/manifest.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/manifest.rs similarity index 100% rename from asap-query-engine/src/stores/simple_map_store/persistence/manifest.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/manifest.rs diff --git a/asap-query-engine/src/stores/simple_map_store/persistence/mod.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/mod.rs similarity index 100% rename from asap-query-engine/src/stores/simple_map_store/persistence/mod.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/mod.rs diff --git a/asap-query-engine/src/stores/simple_map_store/persistence/part.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/part.rs similarity index 99% rename from asap-query-engine/src/stores/simple_map_store/persistence/part.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/part.rs index dc297309..ab655591 100644 --- a/asap-query-engine/src/stores/simple_map_store/persistence/part.rs +++ b/asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/part.rs @@ -594,7 +594,7 @@ fn map_file(path: &Path) -> PersistResult { 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 { diff --git a/asap-query-engine/src/stores/simple_map_store/persistence/recovery.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/recovery.rs similarity index 95% rename from asap-query-engine/src/stores/simple_map_store/persistence/recovery.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/recovery.rs index a0b47995..0c7684cf 100644 --- a/asap-query-engine/src/stores/simple_map_store/persistence/recovery.rs +++ b/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, diff --git a/asap-query-engine/src/stores/simple_map_store/persistence/source.rs b/asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/source.rs similarity index 100% rename from asap-query-engine/src/stores/simple_map_store/persistence/source.rs rename to asap-query-engine/src/stores/sketch_db/simple_map_store/persistence/source.rs diff --git a/asap-query-engine/src/tests/capability_matching_tests.rs b/asap-query-engine/src/tests/capability_matching_tests.rs index 9cc8d3fb..acab2aa6 100644 --- a/asap-query-engine/src/tests/capability_matching_tests.rs +++ b/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; diff --git a/asap-query-engine/src/tests/clickhouse_forwarding_tests.rs b/asap-query-engine/src/tests/clickhouse_forwarding_tests.rs index 899e987e..769974df 100644 --- a/asap-query-engine/src/tests/clickhouse_forwarding_tests.rs +++ b/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; diff --git a/asap-query-engine/src/tests/elastic_forwarding_tests.rs b/asap-query-engine/src/tests/elastic_forwarding_tests.rs index b1c7b2fb..714f439a 100644 --- a/asap-query-engine/src/tests/elastic_forwarding_tests.rs +++ b/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; diff --git a/asap-query-engine/src/tests/persistence_integration_tests.rs b/asap-query-engine/src/tests/persistence_integration_tests.rs index 12f42b8e..3eb02071 100644 --- a/asap-query-engine/src/tests/persistence_integration_tests.rs +++ b/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}; diff --git a/asap-query-engine/src/tests/persistence_perf_tests.rs b/asap-query-engine/src/tests/persistence_perf_tests.rs index 4a9108f4..13753168 100644 --- a/asap-query-engine/src/tests/persistence_perf_tests.rs +++ b/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}; diff --git a/asap-query-engine/src/tests/prometheus_forwarding_tests.rs b/asap-query-engine/src/tests/prometheus_forwarding_tests.rs index c65f5a61..e711357b 100644 --- a/asap-query-engine/src/tests/prometheus_forwarding_tests.rs +++ b/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; diff --git a/asap-query-engine/src/tests/sql_pattern_matching_tests.rs b/asap-query-engine/src/tests/sql_pattern_matching_tests.rs index 44db4fc2..d0b20d12 100644 --- a/asap-query-engine/src/tests/sql_pattern_matching_tests.rs +++ b/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}; diff --git a/asap-query-engine/src/tests/test_utilities/engine_factories.rs b/asap-query-engine/src/tests/test_utilities/engine_factories.rs index 25947214..80cc67b8 100644 --- a/asap-query-engine/src/tests/test_utilities/engine_factories.rs +++ b/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;