diff --git a/src/binning/timeweight/timeweight_bins.rs b/src/binning/timeweight/timeweight_bins.rs index 040426e..062b9b6 100644 --- a/src/binning/timeweight/timeweight_bins.rs +++ b/src/binning/timeweight/timeweight_bins.rs @@ -9,11 +9,12 @@ use items_0::timebin::BinningggError; use items_0::timebin::BinsBoxed; use netpod::BinnedRange; use netpod::TsNano; +use serde::Serialize; use std::any; -macro_rules! trace_init { ($($arg:tt)*) => ( if true { trace!($($arg)*); }) } +macro_rules! trace_init { ($($arg:expr),*) => ( if true { trace!($($arg),*); }) } -macro_rules! trace_ingest_bin { ($($arg:tt)*) => ( if false { trace!($($arg)*); }) } +macro_rules! trace_ingest_bin { ($($arg:expr),*) => ( if false { trace!($($arg),*); }) } autoerr::create_error_v1!( name(Error, "BinBinsTimeweight"), @@ -22,7 +23,7 @@ autoerr::create_error_v1!( }, ); -#[derive(Debug)] +#[derive(Debug, Serialize)] pub struct BinnedBinsTimeweight where EVT: EventValueType, @@ -35,6 +36,8 @@ where min: Option, max: Option, lst: Option, + // TODO + #[serde(skip)] agg: ::AggregatorTw, non_fnl: bool, out: ContainerBins, diff --git a/src/binning/timeweight/timeweight_events.rs b/src/binning/timeweight/timeweight_events.rs index e731b8a..893e1f2 100644 --- a/src/binning/timeweight/timeweight_events.rs +++ b/src/binning/timeweight/timeweight_events.rs @@ -11,6 +11,7 @@ use items_0::timebin::IngestReport; use netpod::BinnedRange; use netpod::DtNano; use netpod::TsNano; +use serde::Serialize; use std::fmt; use std::mem; @@ -408,14 +409,18 @@ where } } +#[derive(Serialize)] pub struct BinnedEventsTimeweight where EVT: EventValueType, { range: BinnedRange, produce_cnt_zero: bool, + #[serde(skip)] lst: Option>, + #[serde(skip)] inner_a: InnerA, + #[serde(skip)] out: ContainerBins, }