Refactor

items_2/src/eventsdim0.rs

@@ -207,7 +207,6 @@ pub struct EventsDim0CollectorOutput<NTY> {
     timed_out: bool,
     #[serde(rename = "continueAt", default, skip_serializing_if = "Option::is_none")]
     continue_at: Option<IsoDateTime>,
-    dummy_marker: u32,
 }
 
 impl<NTY: ScalarOps> EventsDim0CollectorOutput<NTY> {
@@ -377,7 +376,6 @@ impl<NTY: ScalarOps> items_0::collect_s::CollectorType for EventsDim0Collector<N
             range_final: self.range_final,
             timed_out: self.timed_out,
             continue_at,
-            dummy_marker: 4242,
         };
         if !ret.is_valid() {
             error!("invalid:\n{}", ret.info_str());

items_2/src/eventtransform.rs

@@ -0,0 +1,19 @@
+use items_0::Events;
+
+pub trait EventTransform {
+    fn transform(&mut self, src: Box<dyn Events>) -> Box<dyn Events>;
+}
+
+pub struct IdentityTransform {}
+
+impl IdentityTransform {
+    pub fn default() -> Self {
+        Self {}
+    }
+}
+
+impl EventTransform for IdentityTransform {
+    fn transform(&mut self, src: Box<dyn Events>) -> Box<dyn Events> {
+        src
+    }
+}

items_2/src/items_2.rs

@@ -5,6 +5,7 @@ pub mod databuffereventblobs;
 pub mod eventsdim0;
 pub mod eventsdim1;
 pub mod eventsxbindim0;
+pub mod eventtransform;
 pub mod merger;
 pub mod streams;
 #[cfg(test)]
@@ -251,7 +252,7 @@ pub fn empty_events_dyn_ev(
             }
         },
         Shape::Wave(..) => match agg_kind {
-            AggKind::Plain => {
+            AggKind::Plain | AggKind::TimeWeightedScalar => {
                 use ScalarType::*;
                 type K<T> = eventsdim1::EventsDim1<T>;
                 match scalar_type {

items_2/src/merger.rs

@@ -367,7 +367,7 @@ where
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
         use Poll::*;
         self.poll_count += 1;
-        let span1 = span!(Level::INFO, "Merger", pc = self.poll_count);
+        let span1 = span!(Level::TRACE, "Merger", pc = self.poll_count);
         let _spg = span1.enter();
         loop {
             trace3!("poll");