WIP on binning for archeng

items/src/binnedevents.rs

@@ -2,13 +2,14 @@ use crate::xbinnedscalarevents::XBinnedScalarEvents;
 use crate::xbinnedwaveevents::XBinnedWaveEvents;
 use crate::{Appendable, Clearable, PushableIndex, WithLen, WithTimestamps};
 use netpod::{AggKind, HasScalarType, HasShape, ScalarType, Shape};
+use serde::{Deserialize, Serialize};
 
 use crate::{
     eventsitem::EventsItem,
     plainevents::{PlainEvents, ScalarPlainEvents},
 };
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub enum SingleBinWaveEvents {
     Byte(XBinnedScalarEvents<i8>),
     Short(XBinnedScalarEvents<i16>),
@@ -172,7 +173,7 @@ impl HasScalarType for SingleBinWaveEvents {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub enum MultiBinWaveEvents {
     Byte(XBinnedWaveEvents<i8>),
     Short(XBinnedWaveEvents<i16>),
@@ -336,7 +337,7 @@ impl HasScalarType for MultiBinWaveEvents {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub enum XBinnedEvents {
     Scalar(ScalarPlainEvents),
     SingleBinWave(SingleBinWaveEvents),

items/src/eventsitem.rs

@@ -1,14 +1,19 @@
 use crate::binnedevents::XBinnedEvents;
 use crate::plainevents::{PlainEvents, ScalarPlainEvents, WavePlainEvents};
-use crate::{Appendable, Clearable, PushableIndex, WithLen, WithTimestamps};
+use crate::{Appendable, Clearable, PushableIndex, SitemtyFrameType, WithLen, WithTimestamps};
 use netpod::{AggKind, HasScalarType, HasShape, ScalarType, Shape};
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub enum EventsItem {
     Plain(PlainEvents),
     XBinnedEvents(XBinnedEvents),
 }
 
+impl SitemtyFrameType for EventsItem {
+    const FRAME_TYPE_ID: u32 = crate::EVENTS_ITEM_FRAME_TYPE_ID;
+}
+
 impl EventsItem {
     pub fn is_wave(&self) -> bool {
         use EventsItem::*;

items/src/lib.rs

@@ -40,6 +40,7 @@ pub const X_BINNED_WAVE_EVENTS_FRAME_TYPE_ID: u32 = 0x900;
 pub const MIN_MAX_AVG_WAVE_BINS: u32 = 0xa00;
 pub const MIN_MAX_AVG_DIM_1_BINS_FRAME_TYPE_ID: u32 = 0xb00;
 pub const EVENT_FULL_FRAME_TYPE_ID: u32 = 0x2200;
+pub const EVENTS_ITEM_FRAME_TYPE_ID: u32 = 0x2300;
 
 pub fn bool_is_false(j: &bool) -> bool {
     *j == false

items/src/plainevents.rs

@@ -5,8 +5,9 @@ use crate::waveevents::{WaveEvents, WaveXBinner};
 use crate::{Appendable, Clearable, EventsNodeProcessor, PushableIndex, WithLen, WithTimestamps};
 use err::Error;
 use netpod::{AggKind, HasScalarType, HasShape, ScalarType, Shape};
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub enum ScalarPlainEvents {
     Byte(EventValues<i8>),
     Short(EventValues<i16>),
@@ -151,7 +152,7 @@ impl HasScalarType for ScalarPlainEvents {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub enum WavePlainEvents {
     Byte(WaveEvents<i8>),
     Short(WaveEvents<i16>),
@@ -346,7 +347,7 @@ impl HasScalarType for WavePlainEvents {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub enum PlainEvents {
     Scalar(ScalarPlainEvents),
     Wave(WavePlainEvents),