Skip to content

Commit a1d48dc

Browse files
GordonYuanycclaude
andcommitted
style: apply cargo fmt
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent e6bf029 commit a1d48dc

7 files changed

Lines changed: 19 additions & 49 deletions

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

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use crate::data_model::{
33
MultipleSubpopulationAggregate, SerializableToSink,
44
};
55
use crate::precompute_operators::sketchlib_runtime::{
6-
RuntimeCountMin, cms_estimate, cms_from_matrix, cms_from_msgpack, cms_matrix,
7-
cms_merge_refs, cms_new, cms_to_msgpack, cms_update,
6+
cms_estimate, cms_from_matrix, cms_from_msgpack, cms_matrix, cms_merge_refs, cms_new,
7+
cms_to_msgpack, cms_update, RuntimeCountMin,
88
};
99
use serde_json::Value;
1010
use std::collections::HashMap;
@@ -241,8 +241,7 @@ impl MergeableAccumulator<CountMinSketchAccumulator> for CountMinSketchAccumulat
241241
if accumulators.is_empty() {
242242
return Err("No accumulators to merge".into());
243243
}
244-
let inner_refs: Vec<&RuntimeCountMin> =
245-
accumulators.iter().map(|acc| &acc.inner).collect();
244+
let inner_refs: Vec<&RuntimeCountMin> = accumulators.iter().map(|acc| &acc.inner).collect();
246245
let merged_inner = cms_merge_refs(&inner_refs)?;
247246
Ok(Self {
248247
inner: merged_inner,
@@ -292,18 +291,10 @@ mod tests {
292291
#[test]
293292
fn test_count_min_sketch_merge() {
294293
let cms1 = CountMinSketchAccumulator {
295-
inner: cms_from_matrix(
296-
vec![vec![5.0, 0.0, 0.0], vec![0.0, 0.0, 10.0]],
297-
2,
298-
3,
299-
),
294+
inner: cms_from_matrix(vec![vec![5.0, 0.0, 0.0], vec![0.0, 0.0, 10.0]], 2, 3),
300295
};
301296
let cms2 = CountMinSketchAccumulator {
302-
inner: cms_from_matrix(
303-
vec![vec![3.0, 7.0, 0.0], vec![0.0, 0.0, 0.0]],
304-
2,
305-
3,
306-
),
297+
inner: cms_from_matrix(vec![vec![3.0, 7.0, 0.0], vec![0.0, 0.0, 0.0]], 2, 3),
307298
};
308299

309300
let merged = CountMinSketchAccumulator::merge_accumulators(vec![cms1, cms2]).unwrap();
@@ -325,11 +316,7 @@ mod tests {
325316
#[test]
326317
fn test_count_min_sketch_serialization() {
327318
let cms = CountMinSketchAccumulator {
328-
inner: cms_from_matrix(
329-
vec![vec![0.0, 42.0, 0.0], vec![0.0, 0.0, 100.0]],
330-
2,
331-
3,
332-
),
319+
inner: cms_from_matrix(vec![vec![0.0, 42.0, 0.0], vec![0.0, 0.0, 100.0]], 2, 3),
333320
};
334321

335322
let bytes = cms.serialize_to_bytes();
@@ -402,25 +389,13 @@ mod tests {
402389
#[test]
403390
fn test_count_min_sketch_merge_multiple() {
404391
let cms1 = CountMinSketchAccumulator {
405-
inner: cms_from_matrix(
406-
vec![vec![5.0, 0.0, 0.0], vec![0.0, 0.0, 10.0]],
407-
2,
408-
3,
409-
),
392+
inner: cms_from_matrix(vec![vec![5.0, 0.0, 0.0], vec![0.0, 0.0, 10.0]], 2, 3),
410393
};
411394
let cms2 = CountMinSketchAccumulator {
412-
inner: cms_from_matrix(
413-
vec![vec![3.0, 7.0, 0.0], vec![0.0, 0.0, 0.0]],
414-
2,
415-
3,
416-
),
395+
inner: cms_from_matrix(vec![vec![3.0, 7.0, 0.0], vec![0.0, 0.0, 0.0]], 2, 3),
417396
};
418397
let cms3 = CountMinSketchAccumulator {
419-
inner: cms_from_matrix(
420-
vec![vec![2.0, 0.0, 0.0], vec![0.0, 0.0, 5.0]],
421-
2,
422-
3,
423-
),
398+
inner: cms_from_matrix(vec![vec![2.0, 0.0, 0.0], vec![0.0, 0.0, 5.0]], 2, 3),
424399
};
425400

426401
let boxed_accs: Vec<Box<dyn AggregateCore>> =

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ use crate::data_model::{
33
SingleSubpopulationAggregate,
44
};
55
use crate::precompute_operators::sketchlib_runtime::{
6-
RuntimeKll, kll_from_msgpack, kll_merge_refs, kll_new, kll_quantile, kll_sketch_bytes,
7-
kll_to_msgpack, kll_update,
6+
kll_from_msgpack, kll_merge_refs, kll_new, kll_quantile, kll_sketch_bytes, kll_to_msgpack,
7+
kll_update, RuntimeKll,
88
};
9-
use base64::{Engine as _, engine::general_purpose};
9+
use base64::{engine::general_purpose, Engine as _};
1010
use serde_json::Value;
1111
use std::collections::HashMap;
1212
#[cfg(feature = "extra_debugging")]
@@ -24,9 +24,7 @@ pub struct DatasketchesKLLAccumulator {
2424

2525
impl DatasketchesKLLAccumulator {
2626
pub fn new(k: u16) -> Self {
27-
Self {
28-
inner: kll_new(k),
29-
}
27+
Self { inner: kll_new(k) }
3028
}
3129

3230
pub fn update(&mut self, value: f64) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use crate::data_model::{
22
AggregateCore, AggregationType, KeyByLabelValues, MergeableAccumulator,
33
MultipleSubpopulationAggregate, SerializableToSink,
44
};
5-
use asap_sketchlib::DeltaResult;
65
use asap_sketchlib::message_pack_format::MessagePackCodec;
6+
use asap_sketchlib::DeltaResult;
77
use serde_json::Value;
88
use std::collections::{HashMap, HashSet};
99

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use crate::{
55
},
66
KeyByLabelValues,
77
};
8-
use asap_sketchlib::HydraKllSketch;
98
use asap_sketchlib::message_pack_format::MessagePackCodec;
9+
use asap_sketchlib::HydraKllSketch;
1010
use base64::{engine::general_purpose, Engine as _};
1111
use std::collections::HashMap;
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use crate::data_model::{
22
AggregateCore, AggregationType, KeyByLabelValues, MergeableAccumulator,
33
MultipleSubpopulationAggregate, SerializableToSink,
44
};
5-
use asap_sketchlib::SetAggregator;
65
use asap_sketchlib::message_pack_format::MessagePackCodec;
6+
use asap_sketchlib::SetAggregator;
77
use serde_json::Value;
88
use std::collections::{HashMap, HashSet};
99

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,7 @@ pub fn kll_merge_refs(
166166
let k = first.k();
167167
for s in sketches {
168168
if s.k() != k {
169-
return Err(format!(
170-
"KLL k mismatch in merge: expected {k}, got {}",
171-
s.k()
172-
)
173-
.into());
169+
return Err(format!("KLL k mismatch in merge: expected {k}, got {}", s.k()).into());
174170
}
175171
}
176172
let mut merged = kll_new(k as u16);

asap-query-engine/tests/e2e_precompute_equivalence.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ async fn e2e_kll_output_matches_arroyo() {
265265

266266
// Sketch contents
267267
assert_eq!(
268-
handcrafted_acc.inner.k(), arroyo_acc.inner.k(),
268+
handcrafted_acc.inner.k(),
269+
arroyo_acc.inner.k(),
269270
"KLL k mismatch"
270271
);
271272
assert_eq!(

0 commit comments

Comments
 (0)