fix(deps): pin asap_sketchlib to crates.io v0.2.2 and update imports

Cargo.toml

@@ -37,6 +37,7 @@ asap_types = { path = "asap-common/dependencies/rs/asap_types" }
 datafusion_summary_library = { path = "asap-common/dependencies/rs/datafusion_summary_library" }
 elastic_dsl_utilities = { path = "asap-common/dependencies/rs/elastic_dsl_utilities" }
 asap_planner = { path = "asap-planner-rs" }
+asap_sketchlib = "0.2.2"
 indexmap = { version = "2.0", features = ["serde"] }
 
 [profile.release]

asap-query-engine/Cargo.toml

@@ -59,7 +59,7 @@ figment = { version = "0.10", features = ["yaml"] }
 arc-swap = "1"
 csv = "1"
 elastic_dsl_utilities.workspace = true
-asap_sketchlib = { git = "https://github.com/ProjectASAP/asap_sketchlib" }
+asap_sketchlib.workspace = true
 
 [[bin]]
 name = "precompute_engine"

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

@@ -776,7 +776,7 @@ mod tests {
     use crate::precompute_operators::datasketches_kll_accumulator::DatasketchesKLLAccumulator;
     use crate::precompute_operators::multiple_sum_accumulator::MultipleSumAccumulator;
     use crate::precompute_operators::sum_accumulator::SumAccumulator;
-    use asap_sketchlib::sketches::kll::KllSketch;
+    use asap_sketchlib::KllSketch;
     use asap_types::enums::{AggregationType, WindowType};
 
     fn make_agg_config(

asap-query-engine/src/precompute_operators/count_min_sketch_accumulator.rs

@@ -2,7 +2,7 @@ use crate::data_model::{
     AggregateCore, AggregationType, KeyByLabelValues, MergeableAccumulator,
     MultipleSubpopulationAggregate, SerializableToSink,
 };
-use asap_sketchlib::sketches::countminsketch::CountMinSketch;
+use asap_sketchlib::{message_pack_format::MessagePackCodec, CountMinSketch};
 use serde_json::Value;
 use std::collections::HashMap;
 
@@ -64,7 +64,7 @@ impl CountMinSketchAccumulator {
         buffer: &[u8],
     ) -> Result<Self, Box<dyn std::error::Error>> {
         Ok(Self {
-            inner: CountMinSketch::deserialize_msgpack(buffer)
+            inner: CountMinSketch::from_msgpack(buffer)
                 .map_err(|e| -> Box<dyn std::error::Error> { e.to_string().into() })?,
         })
     }
@@ -166,7 +166,7 @@ impl SerializableToSink for CountMinSketchAccumulator {
     }
 
     fn serialize_to_bytes(&self) -> Vec<u8> {
-        self.inner.serialize_msgpack().unwrap_or_default()
+        self.inner.to_msgpack().unwrap_or_default()
     }
 }
 

asap-query-engine/src/precompute_operators/count_min_sketch_with_heap_accumulator.rs

@@ -2,7 +2,7 @@ use crate::data_model::{
     AggregateCore, AggregationType, KeyByLabelValues, MergeableAccumulator,
     MultipleSubpopulationAggregate, SerializableToSink,
 };
-use asap_sketchlib::sketches::countminsketch_topk::{CmsHeapItem, CountMinSketchWithHeap};
+use asap_sketchlib::{message_pack_format::MessagePackCodec, CmsHeapItem, CountMinSketchWithHeap};
 use serde_json::Value;
 use std::collections::HashMap;
 
@@ -17,7 +17,7 @@ pub struct CountMinSketchWithHeapAccumulator {
 }
 
 // Re-export HeapItem so existing code using CountMinSketchWithHeapAccumulator::HeapItem still works.
-pub use asap_sketchlib::sketches::countminsketch_topk::CmsHeapItem as HeapItemReexport;
+pub use asap_sketchlib::CmsHeapItem as HeapItemReexport;
 
 impl CountMinSketchWithHeapAccumulator {
     pub fn new(row_num: usize, col_num: usize, heap_size: usize) -> Self {
@@ -85,7 +85,7 @@ impl CountMinSketchWithHeapAccumulator {
         buffer: &[u8],
     ) -> Result<Self, Box<dyn std::error::Error>> {
         Ok(Self {
-            inner: CountMinSketchWithHeap::deserialize_msgpack(buffer)
+            inner: CountMinSketchWithHeap::from_msgpack(buffer)
                 .map_err(|e| -> Box<dyn std::error::Error> { e.to_string().into() })?,
         })
     }
@@ -131,7 +131,7 @@ impl SerializableToSink for CountMinSketchWithHeapAccumulator {
     }
 
     fn serialize_to_bytes(&self) -> Vec<u8> {
-        self.inner.serialize_msgpack().unwrap_or_default()
+        self.inner.to_msgpack().unwrap_or_default()
     }
 }
 

asap-query-engine/src/precompute_operators/datasketches_kll_accumulator.rs

@@ -2,7 +2,7 @@ use crate::data_model::{
     AggregateCore, AggregationType, MergeableAccumulator, SerializableToSink,
     SingleSubpopulationAggregate,
 };
-use asap_sketchlib::sketches::kll::KllSketch;
+use asap_sketchlib::{message_pack_format::MessagePackCodec, KllSketch};
 use base64::{engine::general_purpose, Engine as _};
 use serde_json::Value;
 use std::collections::HashMap;
@@ -42,7 +42,7 @@ impl DatasketchesKLLAccumulator {
             buffer.len()
         );
         Ok(Self {
-            inner: KllSketch::deserialize_msgpack(buffer)
+            inner: KllSketch::from_msgpack(buffer)
                 .map_err(|e| -> Box<dyn std::error::Error> { e.to_string().into() })?,
         })
     }
@@ -113,7 +113,7 @@ impl SerializableToSink for DatasketchesKLLAccumulator {
     }
 
     fn serialize_to_bytes(&self) -> Vec<u8> {
-        self.inner.serialize_msgpack().unwrap_or_default()
+        self.inner.to_msgpack().unwrap_or_default()
     }
 }
 

asap-query-engine/src/precompute_operators/delta_set_aggregator_accumulator.rs

@@ -2,7 +2,7 @@ use crate::data_model::{
     AggregateCore, AggregationType, KeyByLabelValues, MergeableAccumulator,
     MultipleSubpopulationAggregate, SerializableToSink,
 };
-use asap_sketchlib::sketches::delta_set_aggregator::{deserialize_msgpack, serialize_msgpack};
+use asap_sketchlib::{message_pack_format::MessagePackCodec, DeltaResult};
 use serde_json::Value;
 use std::collections::{HashMap, HashSet};
 use tracing::warn;
@@ -154,7 +154,7 @@ impl DeltaSetAggregatorAccumulator {
         buffer: &[u8],
     ) -> Result<Self, Box<dyn std::error::Error>> {
         // Delegate to sketch-core canonical DeltaResult msgpack format
-        let delta = deserialize_msgpack(buffer)
+        let delta = DeltaResult::from_msgpack(buffer)
             .map_err(|e| -> Box<dyn std::error::Error> { e.to_string().into() })?;
 
         let mut added = HashSet::new();
@@ -204,7 +204,9 @@ impl SerializableToSink for DeltaSetAggregatorAccumulator {
             .iter()
             .map(|key| key.to_semicolon_str())
             .collect();
-        serialize_msgpack(&added, &removed).unwrap_or_default()
+        DeltaResult { added, removed }
+            .to_msgpack()
+            .unwrap_or_default()
     }
 }
 

asap-query-engine/src/precompute_operators/hll_accumulator.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use asap_sketchlib::sketches::hll::{HllSketch, HllVariant};
+use asap_sketchlib::{message_pack_format::MessagePackCodec, HllSketch, HllVariant};
 use base64::{engine::general_purpose, Engine as _};
 use serde_json::Value;
 
@@ -48,7 +48,7 @@ impl HllAccumulator {
     pub fn deserialize_from_bytes_arroyo(
         buffer: &[u8],
     ) -> Result<Self, Box<dyn std::error::Error>> {
-        let inner = HllSketch::deserialize_msgpack(buffer)
+        let inner = HllSketch::from_msgpack(buffer)
             .map_err(|e| -> Box<dyn std::error::Error> { e.to_string().into() })?;
         Ok(Self { inner })
     }
@@ -62,7 +62,7 @@ impl Default for HllAccumulator {
 
 impl SerializableToSink for HllAccumulator {
     fn serialize_to_json(&self) -> Value {
-        let bytes = self.inner.serialize_msgpack().unwrap_or_default();
+        let bytes = self.inner.to_msgpack().unwrap_or_default();
         let b64 = general_purpose::STANDARD.encode(&bytes);
         serde_json::json!({
             "sketch": b64,
@@ -72,7 +72,7 @@ impl SerializableToSink for HllAccumulator {
     }
 
     fn serialize_to_bytes(&self) -> Vec<u8> {
-        self.inner.serialize_msgpack().unwrap_or_default()
+        self.inner.to_msgpack().unwrap_or_default()
     }
 }
 

asap-query-engine/src/precompute_operators/hydra_kll_accumulator.rs

@@ -5,7 +5,7 @@ use crate::{
     },
     KeyByLabelValues,
 };
-use asap_sketchlib::sketches::hydra_kll::HydraKllSketch;
+use asap_sketchlib::{message_pack_format::MessagePackCodec, HydraKllSketch};
 use base64::{engine::general_purpose, Engine as _};
 use std::collections::HashMap;
 
@@ -38,7 +38,7 @@ impl HydraKllSketchAccumulator {
         buffer: &[u8],
     ) -> Result<Self, Box<dyn std::error::Error>> {
         Ok(Self {
-            inner: HydraKllSketch::deserialize_msgpack(buffer)
+            inner: HydraKllSketch::from_msgpack(buffer)
                 .map_err(|e| -> Box<dyn std::error::Error> { e.to_string().into() })?,
         })
     }
@@ -51,13 +51,13 @@ impl HydraKllSketchAccumulator {
 impl SerializableToSink for HydraKllSketchAccumulator {
     fn serialize_to_json(&self) -> serde_json::Value {
         // Mirror Python implementation: {"sketch": base64_encoded_string}
-        let sketch_bytes = self.inner.serialize_msgpack().unwrap_or_default();
+        let sketch_bytes = self.inner.to_msgpack().unwrap_or_default();
         let sketch_b64 = general_purpose::STANDARD.encode(&sketch_bytes);
         serde_json::json!({ "sketch": sketch_b64 })
     }
 
     fn serialize_to_bytes(&self) -> Vec<u8> {
-        self.inner.serialize_msgpack().unwrap_or_default()
+        self.inner.to_msgpack().unwrap_or_default()
     }
 }