Skip to content

fix(query-engine): honor CountMinSketch sum/count subtype #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
milindsrivastava1997 merged 6 commits into from
Sep 2, 2026
Merged

fix(query-engine): honor CountMinSketch sum/count subtype #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b25a655
fix(query-engine): honor CountMinSketch sum/count subtype
milindsrivastava1997 Sep 2, 2026
2f0c913
fix(query-engine): invalidate changed aggregation state
milindsrivastava1997 Sep 2, 2026
de1f4a1
fix(query-engine): apply plans transactionally
milindsrivastava1997 Sep 2, 2026
de32080
refactor(query-engine): separate runtime reconfiguration work
milindsrivastava1997 Sep 2, 2026
69d6ac3
fix(query-engine): validate heap CMS configuration
milindsrivastava1997 Sep 2, 2026
e770f08
fix(query-engine): make CMS startup validation deterministic
milindsrivastava1997 Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
196 changes: 186 additions & 10 deletions asap-common/dependencies/rs/asap_types/src/capability_matching.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ use promql_utilities::query_logics::enums::AggregationType;
/// Returns the aggregation types that can serve this statistic.
pub fn compatible_agg_types(stat: Statistic) -> &'static [AggregationType] {
match stat {
Statistic::Sum => &[AggregationType::Sum, AggregationType::MultipleSum],
Statistic::Sum => &[
AggregationType::Sum,
AggregationType::MultipleSum,
AggregationType::CountMinSketch,
],
Statistic::Count => &[
AggregationType::CountMinSketch,
AggregationType::CountMinSketchWithHeap,
Expand Down Expand Up @@ -187,6 +191,23 @@ pub fn topk_weighting_compatible(
}
}

/// Plain Count-Min Sketches are value-weighted or event-weighted according to
/// their subtype. A sketch with the other subtype cannot serve this statistic.
fn plain_cms_sub_type_compatible(stat: Statistic, config: &AggregationConfig) -> bool {
if config.aggregation_type != AggregationType::CountMinSketch {
return true;
}

let expected_sub_type = match stat {
Statistic::Sum => "sum",
Statistic::Count => "count",
_ => unreachable!("plain CMS matching only supports SUM and COUNT"),
};
config
.aggregation_sub_type
.eq_ignore_ascii_case(expected_sub_type)
}

/// Aggregation priority comparator: prefer larger `window_size_ms` (descending).
/// This is a separate function so callers can swap the policy without touching matching logic.
pub fn aggregation_priority(a: &AggregationConfig, b: &AggregationConfig) -> Ordering {
Expand Down Expand Up @@ -244,6 +265,7 @@ pub fn find_compatible_aggregation(
&c.spatial_filter_normalized,
&requirements.spatial_filter_normalized,
)
&& plain_cms_sub_type_compatible(stat, c)
&& topk_weighting_compatible(stat, c, requirements.topk_count_events);
if !ok {
debug!(
Expand Down Expand Up @@ -466,6 +488,88 @@ mod tests {
assert_eq!(result.unwrap().aggregation_id_for_value, 1);
}

#[test]
fn plain_cms_matching_respects_sum_and_count_subtypes() {
let mut configs = HashMap::new();
configs.insert(
1,
make_config(
1,
"cpu",
"CountMinSketch",
"sum",
300_000,
"tumbling",
&[],
"",
),
);
configs.insert(
2,
make_config(
2,
"cpu",
"CountMinSketch",
"count",
300_000,
"tumbling",
&[],
"",
),
);
configs.insert(
9,
make_config(
9,
"cpu",
"DeltaSetAggregator",
"",
300_000,
"tumbling",
&[],
"",
),
);

let sum =
find_compatible_aggregation(&configs, &req("cpu", &[Statistic::Sum], 300_000, &[], ""))
.expect("SUM should select the value-weighted sketch");
assert_eq!(sum.aggregation_id_for_value, 1);

let count = find_compatible_aggregation(
&configs,
&req("cpu", &[Statistic::Count], 300_000, &[], ""),
)
.expect("COUNT should select the event-weighted sketch");
assert_eq!(count.aggregation_id_for_value, 2);
}

#[test]
fn plain_cms_with_invalid_subtypes_is_excluded_from_matching() {
for invalid_sub_type in ["", "unknown", " sum "] {
let configs = single_config(make_config(
1,
"cpu",
"CountMinSketch",
invalid_sub_type,
300_000,
"tumbling",
&[],
"",
));

let result = find_compatible_aggregation(
&configs,
&req("cpu", &[Statistic::Sum], 300_000, &[], ""),
);

assert!(
result.is_none(),
"invalid plain CMS subtype {invalid_sub_type:?} must not match SUM"
);
}
}

#[test]
fn quantile_any_value_finds_kll() {
let configs = single_config(make_config(
Expand Down Expand Up @@ -1076,7 +1180,16 @@ mod tests {

#[test]
fn multi_pop_rejects_tumbling_delta_set_that_cannot_partition_sliding_value_window() {
let mut value = make_config(10, "req", "CountMinSketch", "", 6_000, "sliding", &[], "");
let mut value = make_config(
10,
"req",
"CountMinSketch",
"count",
6_000,
"sliding",
&[],
"",
);
value.slide_interval_ms = 1_000;
let delta_keys = make_config(
11,
Expand All @@ -1102,7 +1215,16 @@ mod tests {

#[test]
fn multi_pop_accepts_tumbling_delta_set_that_partitions_sliding_value_grid() {
let mut value = make_config(10, "req", "CountMinSketch", "", 6_000, "sliding", &[], "");
let mut value = make_config(
10,
"req",
"CountMinSketch",
"count",
6_000,
"sliding",
&[],
"",
);
value.slide_interval_ms = 1_000;
let delta_keys = make_config(
11,
Expand All @@ -1127,7 +1249,16 @@ mod tests {

#[test]
fn multi_pop_rejects_tumbling_set_key_on_mismatched_nonzero_grid_step() {
let value = make_config(10, "req", "CountMinSketch", "", 5_000, "tumbling", &[], "");
let value = make_config(
10,
"req",
"CountMinSketch",
"count",
5_000,
"tumbling",
&[],
"",
);
let mut keys = make_config(11, "req", "SetAggregator", "", 5_000, "tumbling", &[], "");
keys.slide_interval_ms = 1_000;
let configs = HashMap::from([(10, value), (11, keys)]);
Expand All @@ -1141,7 +1272,16 @@ mod tests {

#[test]
fn tumbling_set_pairing_normalizes_zero_slide_to_window_size() {
let mut value = make_config(10, "req", "CountMinSketch", "", 5_000, "tumbling", &[], "");
let mut value = make_config(
10,
"req",
"CountMinSketch",
"count",
5_000,
"tumbling",
&[],
"",
);
let mut key = make_config(11, "req", "SetAggregator", "", 5_000, "tumbling", &[], "");
value.slide_interval_ms = 0;
key.slide_interval_ms = 0;
Expand All @@ -1152,7 +1292,16 @@ mod tests {

#[test]
fn set_pairing_rejects_each_grid_mismatch_dimension() {
let value = make_config(10, "req", "CountMinSketch", "", 5_000, "sliding", &[], "");
let value = make_config(
10,
"req",
"CountMinSketch",
"count",
5_000,
"sliding",
&[],
"",
);
let mut key = make_config(11, "req", "SetAggregator", "", 5_000, "sliding", &[], "");
key.slide_interval_ms = 1_000;
assert!(!key_agg_compatible_with_value(&value, &key));
Expand All @@ -1166,7 +1315,16 @@ mod tests {

#[test]
fn delta_set_pairing_truth_table_checks_both_divisors() {
let mut value = make_config(10, "req", "CountMinSketch", "", 6_000, "sliding", &[], "");
let mut value = make_config(
10,
"req",
"CountMinSketch",
"count",
6_000,
"sliding",
&[],
"",
);
value.slide_interval_ms = 2_000;
let key_valid = make_config(
11,
Expand Down Expand Up @@ -1212,7 +1370,16 @@ mod tests {

#[test]
fn delta_set_pairing_for_tumbling_values_does_not_apply_sliding_rules() {
let value = make_config(10, "req", "CountMinSketch", "", 6_000, "tumbling", &[], "");
let value = make_config(
10,
"req",
"CountMinSketch",
"count",
6_000,
"tumbling",
&[],
"",
);
let key = make_config(
11,
"req",
Expand All @@ -1228,7 +1395,16 @@ mod tests {

#[test]
fn matching_skips_incompatible_key_candidate_and_selects_compatible_one() {
let value = make_config(10, "req", "CountMinSketch", "", 6_000, "sliding", &[], "");
let value = make_config(
10,
"req",
"CountMinSketch",
"count",
6_000,
"sliding",
&[],
"",
);
let mut incompatible =
make_config(11, "req", "SetAggregator", "", 6_000, "sliding", &[], "");
incompatible.slide_interval_ms = 2_000;
Expand All @@ -1255,7 +1431,7 @@ mod tests {
2,
"cpu",
"CountMinSketch",
"",
"count",
300_000,
"tumbling",
&["job"],
Expand Down
Loading
Loading