more fixes

Author: milindsrivastava1997

asap-planner-rs/src/planner/cleanup.rs

@@ -28,7 +28,11 @@ pub fn get_cleanup_param(
     } else {
         match_result
             .get_range_duration()
-            .map(|d| d.num_milliseconds() as u64)
+            .map(|d| {
+                let ms = d.num_milliseconds();
+                debug_assert!(ms >= 0, "PromQL range duration should never be negative");
+                ms as u64
+            })
             .ok_or_else(|| "No range_vector token found".to_string())?
     };
 

asap-planner-rs/src/planner/elastic_dsl.rs

@@ -135,16 +135,16 @@ impl ElasticSingleQueryProcessor {
             })
             .and_then(|p| range_query_to_time_range(p, 0));
         let t_lookback = match time_range {
-            Some(tr) => tr.duration_ms().unwrap_or(self.t_repeat),
-            None => self.t_repeat, // Default to repetition delay if no time range found
+            Some(tr) => tr.duration_ms().unwrap_or(t_repeat_ms),
+            None => t_repeat_ms,
         };
 
         // Calculate cleanup param based on query's time window
         let cleanup_param = if self.cleanup_policy == CleanupPolicy::NoCleanup {
             None
         } else {
             Some(
-                get_sql_cleanup_param(self.cleanup_policy, t_lookback, self.t_repeat)
+                get_sql_cleanup_param(self.cleanup_policy, t_lookback, t_repeat_ms)
                     .map_err(ControllerError::PlannerError)?,
             )
         };