From 686d3f5b8a98dcddc745d1a976716c3b6e6f91f8 Mon Sep 17 00:00:00 2001 From: Dennis Zhuang Date: Wed, 21 Oct 2026 11:25:01 +0800 Subject: [PATCH] fix(promql): let count_values group by its own value label Signed-off-by: Dennis Zhuang --- src/promql/src/aggregate.rs | 16 +++++++++++++++- src/promql/src/aggregate/tests.rs | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/promql/src/aggregate.rs b/src/promql/src/aggregate.rs index eb6e96ab58a..48527cde3ce 100644 --- a/src/promql/src/aggregate.rs +++ b/src/promql/src/aggregate.rs @@ -195,7 +195,21 @@ pub fn count_values( label: &str, grouping: Grouping<'_>, ) -> Result> { - validate_input(schema, input, grouping)?; + // `by` may list the value label, which this operator writes itself, even when an input field + // has that name; grouping by any other field name stays unsupported. + let other_labels: Vec<&str>; + let checked = match grouping { + Grouping::By(labels) => { + other_labels = labels + .iter() + .copied() + .filter(|name| *name != label) + .collect(); + Grouping::By(&other_labels) + } + without => without, + }; + validate_input(schema, input, checked)?; if label.is_empty() { return Err(DataFusionError::Execution(format!( "invalid label name {label:?}" diff --git a/src/promql/src/aggregate/tests.rs b/src/promql/src/aggregate/tests.rs index 03a582a32ae..541a76a81df 100644 --- a/src/promql/src/aggregate/tests.rs +++ b/src/promql/src/aggregate/tests.rs @@ -945,3 +945,30 @@ fn quantile_without_q_at_a_point_has_no_result() { let (start, values) = values_of(&output, 0, 128); assert_eq!((start, values), (10, vec![Some(2.0), None, Some(2.0)])); } + +/// Listing the value label in `by` repeats what `count_values` adds to the grouping, also when an +/// input field has that name; listing another field name is still unsupported. +#[test] +fn count_values_accepts_its_own_label_in_by() { + let schema = schema(&["value"]); + let series = [ + input(&schema, metric("m", &[("i", "0")]), 10, &[vec![Some(1.0)]]), + input(&schema, metric("m", &[("i", "1")]), 10, &[vec![Some(2.0)]]), + ]; + let rendered = |grouping| { + let mut output: Vec<_> = count_values(&schema, &series, "value", grouping) + .unwrap() + .iter() + .map(|series| (format!("{:?}", series.metric), values(series, 0))) + .collect(); + output.sort_by(|a, b| a.0.cmp(&b.0)); + output + }; + let implicit = rendered(Grouping::By(&[])); + assert_eq!(implicit.len(), 2); + assert_eq!(implicit, rendered(Grouping::By(&["value"]))); + assert!(matches!( + count_values(&schema, &series, "c", Grouping::By(&["value"])), + Err(DataFusionError::NotImplemented(_)) + )); +}