From e467538e90767730a4cb0baedc33db0d02a90f66 Mon Sep 17 00:00:00 2001
From: Dennis Zhuang <killme2008@gmail.com>
Date: Wed, 21 Oct 2026 15:46:01 +0800
Subject: [PATCH] perf(promql): walk quantile groups by a position heap

Signed-off-by: Dennis Zhuang <killme2008@gmail.com>
---
 src/promql/src/aggregate.rs       | 44 ++++++++++++++++++++-----------
 src/promql/src/aggregate/tests.rs | 26 ++++++++++++++++++
 2 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/src/promql/src/aggregate.rs b/src/promql/src/aggregate.rs
index 20bcc9a32e0..8c9e37f2aeb 100644
--- a/src/promql/src/aggregate.rs
+++ b/src/promql/src/aggregate.rs
@@ -19,8 +19,9 @@
 #[cfg(test)]
 mod tests;
 
+use std::cmp::Reverse;
 use std::collections::hash_map::Entry;
-use std::collections::{BTreeMap, HashMap};
+use std::collections::{BTreeMap, BinaryHeap, HashMap};
 use std::sync::Arc;
 
 use datafusion::error::{DataFusionError, Result};
@@ -198,21 +199,38 @@ pub fn aggregate_quantile(
     let (mut values, mut sorted, mut row) = (Vec::new(), Vec::new(), Vec::with_capacity(width));
     for (metric, members) in groups {
         builder.begin_series();
-        // Points are visited in order with one forward cursor per member and field, so only one
-        // point's values are held at a time.
+        // Each member's next position waits in a min-heap, so a point costs the members present
+        // there and not the whole group: a group of short-lived series stays linear in its
+        // samples. Ties pop in member order, the input order Prometheus appends values in.
         let mut positions: Vec<_> = members
             .iter()
-            .map(|series| series.time.positions().peekable())
+            .map(|series| series.time.positions())
             .collect();
         let mut cursors: Vec<Vec<_>> = members
             .iter()
             .map(|series| series.fields.iter().map(|field| field.cursor()).collect())
             .collect();
-        while let Some(point) = positions
+        let mut next: BinaryHeap<Reverse<(usize, usize, usize)>> = positions
             .iter_mut()
-            .filter_map(|positions| positions.peek().map(|&(point, _)| point))
-            .min()
-        {
+            .enumerate()
+            .filter_map(|(member, positions)| {
+                positions
+                    .next()
+                    .map(|(point, row)| Reverse((point, member, row)))
+            })
+            .collect();
+        let mut present = Vec::new();
+        while let Some(&Reverse((point, _, _))) = next.peek() {
+            present.clear();
+            while let Some(&Reverse((at, member, row))) = next.peek()
+                && at == point
+            {
+                next.pop();
+                present.push((member, row));
+                if let Some((point, row)) = positions[member].next() {
+                    next.push(Reverse((point, member, row)));
+                }
+            }
             let q = q
                 .binary_search_by_key(&point, |&(point, _)| point)
                 .ok()
@@ -220,11 +238,8 @@ pub fn aggregate_quantile(
             row.clear();
             for field in 0..width {
                 values.clear();
-                for (positions, cursors) in positions.iter_mut().zip(&mut cursors) {
-                    if let Some(&(at, row)) = positions.peek()
-                        && at == point
-                        && let Some(SampleRef::Float(value)) = cursors[field].at(row)
-                    {
+                for &(member, member_row) in &present {
+                    if let Some(SampleRef::Float(value)) = cursors[member][field].at(member_row) {
                         values.push(value);
                     }
                 }
@@ -233,9 +248,6 @@ pub fn aggregate_quantile(
                     _ => None,
                 });
             }
-            for positions in &mut positions {
-                positions.next_if(|&(at, _)| at == point);
-            }
             builder.push(point, &row)?;
         }
         output.extend(builder.finish(metric)?);
diff --git a/src/promql/src/aggregate/tests.rs b/src/promql/src/aggregate/tests.rs
index b482f7c5d70..31f5a2217ed 100644
--- a/src/promql/src/aggregate/tests.rs
+++ b/src/promql/src/aggregate/tests.rs
@@ -995,3 +995,29 @@ fn a_rejected_series_leaves_the_aggregator_unchanged() {
     let output = aggregator.finish().unwrap();
     assert_eq!(values_of(&output, 0, 128), (10, vec![Some(3.0)]));
 }
+
+/// A group of short-lived series, one sample each at its own point: every point aggregates the one
+/// member present there, the shape whose cost must follow the samples and not members × points.
+#[test]
+fn quantile_over_one_point_members_reads_each_member_at_its_point() {
+    let schema = schema(&["value"]);
+    let series: Vec<Series> = (0..128)
+        .map(|point| {
+            input(
+                &schema,
+                metric("m", &[("i", &point.to_string())]),
+                point,
+                &[vec![Some(point as f64)]],
+            )
+        })
+        .collect();
+    let q = input(
+        &schema,
+        MetricName::try_new(None, Vec::new()).unwrap(),
+        0,
+        &[vec![Some(0.5); 128]],
+    );
+    let output = aggregate_quantile(&schema, &series, &q, Grouping::By(&[])).unwrap();
+    let expected: Vec<Option<f64>> = (0..128).map(|point| Some(point as f64)).collect();
+    assert_eq!(values_of(&output, 0, 128), (0, expected));
+}