WIP

disk/src/agg/eventbatch.rs

@@ -15,6 +15,7 @@ pub struct MinMaxAvgScalarEventBatch {
     pub avgs: Vec<f32>,
     pub event_data_read_stats: EventDataReadStats,
     pub values_extract_stats: ValuesExtractStats,
+    pub range_complete_observed: bool,
 }
 
 impl MinMaxAvgScalarEventBatch {
@@ -26,8 +27,10 @@ impl MinMaxAvgScalarEventBatch {
             avgs: vec![],
             event_data_read_stats: EventDataReadStats::new(),
             values_extract_stats: ValuesExtractStats::new(),
+            range_complete_observed: false,
         }
     }
+
     #[allow(dead_code)]
     pub fn old_from_full_frame(buf: &Bytes) -> Self {
         info!("construct MinMaxAvgScalarEventBatch from full frame  len {}", buf.len());
@@ -151,6 +154,7 @@ pub struct MinMaxAvgScalarEventBatchAggregator {
     sum: f32,
     event_data_read_stats: EventDataReadStats,
     values_extract_stats: ValuesExtractStats,
+    range_complete_observed: bool,
 }
 
 impl MinMaxAvgScalarEventBatchAggregator {
@@ -164,6 +168,7 @@ impl MinMaxAvgScalarEventBatchAggregator {
             count: 0,
             event_data_read_stats: EventDataReadStats::new(),
             values_extract_stats: ValuesExtractStats::new(),
+            range_complete_observed: false,
         }
     }
 }
@@ -206,6 +211,9 @@ impl AggregatorTdim for MinMaxAvgScalarEventBatchAggregator {
         }
         self.event_data_read_stats.trans(&mut v.event_data_read_stats);
         self.values_extract_stats.trans(&mut v.values_extract_stats);
+        if v.range_complete_observed {
+            self.range_complete_observed = true;
+        }
         for i1 in 0..v.tss.len() {
             let ts = v.tss[i1];
             if ts < self.ts1 {
@@ -259,6 +267,7 @@ impl AggregatorTdim for MinMaxAvgScalarEventBatchAggregator {
             avgs: vec![avg],
             event_data_read_stats: std::mem::replace(&mut self.event_data_read_stats, EventDataReadStats::new()),
             values_extract_stats: std::mem::replace(&mut self.values_extract_stats, ValuesExtractStats::new()),
+            range_complete_observed: self.range_complete_observed,
         }
     }
 }

disk/src/agg/scalarbinbatch.rs

@@ -17,6 +17,7 @@ pub struct MinMaxAvgScalarBinBatch {
     pub avgs: Vec<f32>,
     pub event_data_read_stats: EventDataReadStats,
     pub values_extract_stats: ValuesExtractStats,
+    pub range_complete_observed: bool,
 }
 
 impl MinMaxAvgScalarBinBatch {
@@ -30,6 +31,7 @@ impl MinMaxAvgScalarBinBatch {
             avgs: vec![],
             event_data_read_stats: EventDataReadStats::new(),
             values_extract_stats: ValuesExtractStats::new(),
+            range_complete_observed: false,
         }
     }
 
@@ -114,6 +116,23 @@ impl MinMaxAvgScalarBinBatch {
     }
 }
 
+impl std::fmt::Debug for MinMaxAvgScalarBinBatch {
+    fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(
+            fmt,
+            "MinMaxAvgScalarBinBatch  count {}  ts1s {:?}  ts2s {:?}  counts {:?}  avgs {:?}  EDS {:?}  VXS {:?}  COMP {}",
+            self.ts1s.len(),
+            self.ts1s.iter().map(|k| k / SEC).collect::<Vec<_>>(),
+            self.ts2s.iter().map(|k| k / SEC).collect::<Vec<_>>(),
+            self.counts,
+            self.avgs,
+            self.event_data_read_stats,
+            self.values_extract_stats,
+            self.range_complete_observed,
+        )
+    }
+}
+
 impl FitsInside for MinMaxAvgScalarBinBatch {
     fn fits_inside(&self, range: NanoRange) -> Fits {
         if self.ts1s.is_empty() {
@@ -168,22 +187,6 @@ impl MinMaxAvgScalarBinBatch {
     }
 }
 
-impl std::fmt::Debug for MinMaxAvgScalarBinBatch {
-    fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(
-            fmt,
-            "MinMaxAvgScalarBinBatch  count {}  ts1s {:?}  ts2s {:?}  counts {:?}  avgs {:?}  EDS {:?}  VXS {:?}",
-            self.ts1s.len(),
-            self.ts1s.iter().map(|k| k / SEC).collect::<Vec<_>>(),
-            self.ts2s.iter().map(|k| k / SEC).collect::<Vec<_>>(),
-            self.counts,
-            self.avgs,
-            self.event_data_read_stats,
-            self.values_extract_stats,
-        )
-    }
-}
-
 impl AggregatableXdim1Bin for MinMaxAvgScalarBinBatch {
     type Output = MinMaxAvgScalarBinBatch;
     fn into_agg(self) -> Self::Output {
@@ -209,6 +212,7 @@ pub struct MinMaxAvgScalarBinBatchAggregator {
     sumc: u64,
     event_data_read_stats: EventDataReadStats,
     values_extract_stats: ValuesExtractStats,
+    range_complete_observed: bool,
 }
 
 impl MinMaxAvgScalarBinBatchAggregator {
@@ -223,6 +227,7 @@ impl MinMaxAvgScalarBinBatchAggregator {
             sumc: 0,
             event_data_read_stats: EventDataReadStats::new(),
             values_extract_stats: ValuesExtractStats::new(),
+            range_complete_observed: false,
         }
     }
 }
@@ -255,6 +260,9 @@ impl AggregatorTdim for MinMaxAvgScalarBinBatchAggregator {
     fn ingest(&mut self, v: &mut Self::InputValue) {
         self.event_data_read_stats.trans(&mut v.event_data_read_stats);
         self.values_extract_stats.trans(&mut v.values_extract_stats);
+        if v.range_complete_observed {
+            self.range_complete_observed = true;
+        }
         for i1 in 0..v.ts1s.len() {
             let ts1 = v.ts1s[i1];
             let ts2 = v.ts2s[i1];
@@ -289,6 +297,7 @@ impl AggregatorTdim for MinMaxAvgScalarBinBatchAggregator {
             avgs: vec![avg],
             event_data_read_stats: std::mem::replace(&mut self.event_data_read_stats, EventDataReadStats::new()),
             values_extract_stats: std::mem::replace(&mut self.values_extract_stats, ValuesExtractStats::new()),
+            range_complete_observed: self.range_complete_observed,
         }
     }
 }