Skip to content

Commit e2e4b67

Browse files
zzylolclaude
andcommitted
refactor: switch consumer imports to asap_sketchlib::sketches::*
Update PR #307 against the reorganized asap_sketchlib (PR #36) — runtime sketches now live in the existing src/sketches/ layout (single home per sketch concept), not under a separate `asap::` namespace. Path swaps in asap-query-engine (legacy fork; smaller surface than ASAPQuery-backend — no DDSketch / CountSketch / HllSketch accumulators): - asap_sketchlib::asap::count_min::* → ::sketches::countmin::* - asap_sketchlib::asap::kll::* → ::sketches::kll::* - asap_sketchlib::asap::count_min_with_heap::* → ::sketches::cms_heap::* - asap_sketchlib::asap::hydra_kll::* → ::sketches::hydra_kll::* - asap_sketchlib::asap::set_aggregator::* → ::sketches::set_aggregator::* - asap_sketchlib::asap::delta_set_aggregator::* → ::sketches::delta_set_aggregator::* - asap_sketchlib::asap::config::* → ::asap_runtime::* Rename carried through: - HeapItem → CmsHeapItem (avoids common::input::HeapItem collision) main.rs aliases asap_runtime as `config` so existing clap-derive references keep working. Tests: - cargo check -p query_engine_rust → clean - cargo test -p query_engine_rust --lib precompute_operators → 87 passed, 0 failed Depends on ProjectASAP/asap_sketchlib#36 (force-pushed e473ccc). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 5f50ff9 commit e2e4b67

13 files changed

Lines changed: 121 additions & 371 deletions

Cargo.lock

Lines changed: 14 additions & 175 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

asap-query-engine/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ urlencoding = "2.1"
3838
flate2 = "1.0"
3939
async-trait = "0.1"
4040
xxhash-rust = { version = "0.8", features = ["xxh32", "xxh64"] }
41-
dsrs = { git = "https://github.com/ProjectASAP/datasketches-rs", rev = "d748ec75c80fff21f7b24897244dd1c895df2e9a" }
4241
base64 = "0.21"
4342
hex = "0.4"
4443
sqlparser = "0.59.0"
@@ -59,7 +58,7 @@ tracing-appender = "0.2"
5958
arc-swap = "1"
6059
csv = "1"
6160
elastic_dsl_utilities.workspace = true
62-
asap_sketchlib = { git = "https://github.com/ProjectASAP/asap_sketchlib", branch = "refactor/adopt-sketch-core-modules", features = ["asap-cli"] }
61+
asap_sketchlib = { git = "https://github.com/ProjectASAP/asap_sketchlib", branch = "refactor/adopt-sketch-core-modules" }
6362

6463
[[bin]]
6564
name = "precompute_engine"
@@ -78,7 +77,6 @@ name = "e2e_quickstart_resource_test"
7877
path = "src/bin/e2e_quickstart_resource_test.rs"
7978

8079
[dev-dependencies]
81-
ctor = "0.2"
8280
tempfile = "3.20.0"
8381
criterion = { version = "0.5", features = ["html_reports"] }
8482

@@ -93,4 +91,3 @@ default = []
9391
lock_profiling = []
9492
# Enable extra debugging output
9593
extra_debugging = []
96-
sketchlib-tests = []

0 commit comments

Comments
 (0)