From 4761d396908dc2ef6b33cf0354901f222dfbd39d Mon Sep 17 00:00:00 2001 From: Dennis Zhuang Date: Sun, 18 Oct 2026 01:37:40 +0800 Subject: [PATCH] refactor(promql): drop a redundant field reset and a duplicate range window test Signed-off-by: Dennis Zhuang --- src/promql/src/range_eval.rs | 5 ----- src/promql/src/range_eval/tests.rs | 23 ----------------------- 2 files changed, 28 deletions(-) diff --git a/src/promql/src/range_eval.rs b/src/promql/src/range_eval.rs index 38cdcb258c1..dd877cf1408 100644 --- a/src/promql/src/range_eval.rs +++ b/src/promql/src/range_eval.rs @@ -268,11 +268,6 @@ impl RangeEvaluator { fn finish_series(&mut self) -> Result> { self.evaluate(None)?; let mut state = self.series.take().expect("set by the caller"); - for field in &mut self.fields { - field.timestamps.clear(); - field.values.clear(); - field.head = 0; - } if self.drops_metric_name { state.metric.remove_all(&METADATA_LABELS); } diff --git a/src/promql/src/range_eval/tests.rs b/src/promql/src/range_eval/tests.rs index 379e73444d4..d404e1a1aa9 100644 --- a/src/promql/src/range_eval/tests.rs +++ b/src/promql/src/range_eval/tests.rs @@ -65,10 +65,6 @@ fn probe(window: FloatWindow<'_>) -> Option { Some((hash >> 11) as f64) } -fn sum(window: FloatWindow<'_>) -> Option { - Some(window.values.iter().sum()) -} - fn raw_schema(fields: usize) -> SeriesSchema { SeriesSchema { fields: (0..fields) @@ -484,25 +480,6 @@ fn functions_match_range_udfs() { } } -#[test] -fn overlapping_window_spans_chunks() { - let window = RangeWindow { - range_ms: 15, - offset_ms: 0, - anchor_ms: None, - }; - let kernel: WindowKernel = Box::new(sum); - let mut evaluator = - RangeEvaluator::with_kernel(&raw_schema(1), grid(10, 10, 3), window, kernel, true).unwrap(); - let first = chunk(&[(5, vec![Some(1.0)]), (12, vec![Some(2.0)])], 1, 0, false); - let second = chunk(&[(18, vec![Some(4.0)]), (25, vec![Some(8.0)])], 1, 0, true); - assert!(evaluator.push(&first).unwrap().is_none()); - let series = evaluator.push(&second).unwrap(); - // Windows (-5, 10], (5, 20] and (15, 30]. - let expected = vec![vec![Some(1.0)], vec![Some(6.0)], vec![Some(12.0)]]; - assert_series_eq(series.as_ref(), &expected, &metric(0)); -} - #[test] fn empty_input_and_series_without_results() { let window = RangeWindow {