Remove StreamKind

disk/src/agg/binnedt4.rs

@@ -1,15 +1,6 @@
-use crate::agg::enp::XBinnedScalarEvents;
-use crate::agg::eventbatch::MinMaxAvgScalarEventBatch;
-use crate::agg::scalarbinbatch::MinMaxAvgScalarBinBatch;
 use crate::agg::streams::{Appendable, StreamItem};
-use crate::binned::{
-    FilterFittingInside, MinMaxAvgAggregator, MinMaxAvgBins, NumOps, RangeCompletableItem, RangeOverlapInfo, ReadPbv,
-    ReadableFromFile, SingleXBinAggregator,
-};
-use crate::decode::EventValues;
-use crate::frame::makeframe::Framable;
+use crate::binned::{FilterFittingInside, RangeCompletableItem, RangeOverlapInfo, ReadableFromFile};
 use crate::Sitemty;
-use err::Error;
 use futures_core::Stream;
 use futures_util::StreamExt;
 use netpod::log::*;
@@ -19,7 +10,6 @@ use std::collections::VecDeque;
 use std::marker::PhantomData;
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use tokio::fs::File;
 
 pub struct DefaultBinsTimeBinner<NTY> {
     _m1: PhantomData<NTY>,

disk/src/agg/enp.rs

@@ -7,7 +7,6 @@ use crate::binned::{
 use crate::decode::EventValues;
 use err::Error;
 use netpod::NanoRange;
-use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
 use tokio::fs::File;
@@ -23,7 +22,7 @@ where
     type Input = NTY;
     type Output = EventValues<NTY>;
 
-    fn process(inp: EventValues<Self::Input>) -> Self::Output {
+    fn process(_inp: EventValues<Self::Input>) -> Self::Output {
         todo!()
     }
 }
@@ -85,7 +84,7 @@ impl<NTY> RangeOverlapInfo for XBinnedScalarEvents<NTY> {
 }
 
 impl<NTY> FilterFittingInside for XBinnedScalarEvents<NTY> {
-    fn filter_fitting_inside(self, fit_range: NanoRange) -> Option<Self> {
+    fn filter_fitting_inside(self, _fit_range: NanoRange) -> Option<Self> {
         todo!()
     }
 }
@@ -124,12 +123,13 @@ impl<NTY> ReadableFromFile for XBinnedScalarEvents<NTY>
 where
     NTY: NumOps,
 {
-    fn read_from_file(file: File) -> Result<ReadPbv<Self>, Error> {
-        todo!()
+    fn read_from_file(_file: File) -> Result<ReadPbv<Self>, Error> {
+        // TODO refactor types such that this impl is not needed.
+        panic!()
     }
 
-    fn from_buf(buf: &[u8]) -> Result<Self, Error> {
-        todo!()
+    fn from_buf(_buf: &[u8]) -> Result<Self, Error> {
+        panic!()
     }
 }
 

disk/src/agg/eventbatch.rs

@@ -1,6 +1,5 @@
-use crate::agg::scalarbinbatch::MinMaxAvgScalarBinBatch;
 use crate::agg::streams::{Appendable, StreamItem};
-use crate::binned::{MakeBytesFrame, RangeCompletableItem, RangeOverlapInfo, StreamKind};
+use crate::binned::{MakeBytesFrame, RangeCompletableItem, RangeOverlapInfo};
 use crate::frame::makeframe::make_frame;
 use bytes::{BufMut, Bytes, BytesMut};
 use err::Error;
@@ -124,30 +123,6 @@ impl MinMaxAvgScalarEventBatch {
     }
 }
 
-pub struct MinMaxAvgScalarEventBatchAggregator {
-    ts1: u64,
-    ts2: u64,
-    count: u64,
-    min: f32,
-    max: f32,
-    sum: f32,
-    sumc: u64,
-}
-
-impl MinMaxAvgScalarEventBatchAggregator {
-    pub fn new(ts1: u64, ts2: u64) -> Self {
-        Self {
-            ts1,
-            ts2,
-            count: 0,
-            min: f32::MAX,
-            max: f32::MIN,
-            sum: f32::NAN,
-            sumc: 0,
-        }
-    }
-}
-
 impl MakeBytesFrame for Result<StreamItem<RangeCompletableItem<MinMaxAvgScalarEventBatch>>, Error> {
     fn make_bytes_frame(&self) -> Result<Bytes, Error> {
         Ok(make_frame(self)?.freeze())

disk/src/agg/scalarbinbatch.rs

@@ -1,6 +1,6 @@
 use crate::agg::streams::{Appendable, StreamItem, ToJsonBytes};
 use crate::agg::{Fits, FitsInside};
-use crate::binned::{MakeBytesFrame, RangeCompletableItem, StreamKind};
+use crate::binned::{MakeBytesFrame, RangeCompletableItem};
 use crate::frame::makeframe::make_frame;
 use bytes::{BufMut, Bytes, BytesMut};
 use err::Error;
@@ -184,30 +184,6 @@ impl MinMaxAvgScalarBinBatch {
     }
 }
 
-pub struct MinMaxAvgScalarBinBatchAggregator {
-    ts1: u64,
-    ts2: u64,
-    count: u64,
-    min: f32,
-    max: f32,
-    sum: f32,
-    sumc: u64,
-}
-
-impl MinMaxAvgScalarBinBatchAggregator {
-    pub fn new(ts1: u64, ts2: u64) -> Self {
-        Self {
-            ts1,
-            ts2,
-            count: 0,
-            min: f32::MAX,
-            max: f32::MIN,
-            sum: 0f32,
-            sumc: 0,
-        }
-    }
-}
-
 impl MakeBytesFrame for Result<StreamItem<RangeCompletableItem<MinMaxAvgScalarBinBatch>>, Error> {
     fn make_bytes_frame(&self) -> Result<Bytes, Error> {
         Ok(make_frame(self)?.freeze())

disk/src/agg/streams.rs

@@ -3,7 +3,6 @@ use crate::streamlog::LogItem;
 use err::Error;
 use netpod::EventDataReadStats;
 use serde::{Deserialize, Serialize};
-use std::any::Any;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub enum StatsItem {