Not bad, I get Streamlog LogItem in the test

disk/src/merge.rs

@@ -1,9 +1,11 @@
 use crate::agg::eventbatch::{MinMaxAvgScalarEventBatch, MinMaxAvgScalarEventBatchStreamItem};
 use crate::agg::{Dim1F32Stream, Dim1F32StreamItem, ValuesDim1};
 use crate::eventchunker::EventChunkerItem;
+use crate::streamlog::LogItem;
 use err::Error;
 use futures_core::Stream;
 use futures_util::StreamExt;
+use std::collections::VecDeque;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 #[allow(unused_imports)]
@@ -163,6 +165,7 @@ where
     range_complete_observed_all_emitted: bool,
     data_emit_complete: bool,
     batch_size: usize,
+    logitems: VecDeque<LogItem>,
 }
 
 impl<S> MergedMinMaxAvgScalarStream<S>
@@ -188,6 +191,7 @@ where
             range_complete_observed_all_emitted: false,
             data_emit_complete: false,
             batch_size: 64,
+            logitems: VecDeque::new(),
         }
     }
 
@@ -219,6 +223,10 @@ where
                                     }
                                     continue 'l1;
                                 }
+                                MinMaxAvgScalarEventBatchStreamItem::Log(item) => {
+                                    self.logitems.push_back(item);
+                                    continue 'l1;
+                                }
                                 MinMaxAvgScalarEventBatchStreamItem::EventDataReadStats(_stats) => {
                                     // TODO merge also the stats: either just sum, or sum up by input index.
                                     todo!();
@@ -265,6 +273,9 @@ where
             self.completed = true;
             return Ready(None);
         }
+        if let Some(item) = self.logitems.pop_front() {
+            return Ready(Some(Ok(MinMaxAvgScalarEventBatchStreamItem::Log(item))));
+        }
         'outer: loop {
             break if self.data_emit_complete {
                 if self.range_complete_observed_all {