WIP on get channel info for arch app

disk/src/binned/binnedfrompbv.rs

@@ -1,15 +1,13 @@
 use crate::agg::binnedt::{TBinnerStream, TimeBinnableType};
-use crate::agg::streams::StreamItem;
 use crate::binned::query::{CacheUsage, PreBinnedQuery};
-use crate::binned::RangeCompletableItem;
 use crate::cache::{node_ix_for_patch, HttpBodyAsAsyncRead};
 use crate::frame::inmem::InMemoryFrameAsyncReadStream;
-use crate::frame::makeframe::{decode_frame, FrameType};
-use crate::Sitemty;
+use crate::frame::makeframe::decode_frame;
 use err::Error;
 use futures_core::Stream;
 use futures_util::{FutureExt, StreamExt};
 use http::{StatusCode, Uri};
+use items::{FrameType, RangeCompletableItem, Sitemty, StreamItem};
 use netpod::log::*;
 use netpod::{
     x_bin_count, AggKind, AppendToUrl, BinnedRange, ByteSize, Channel, NodeConfigCached, PerfOpts,

disk/src/binned/dim1.rs

@@ -5,9 +5,9 @@ use crate::agg::{Fits, FitsInside};
 use crate::binned::{
     Bool, FilterFittingInside, IsoDateTime, NumOps, RangeOverlapInfo, ReadPbv, ReadableFromFile, TimeBins, WithLen,
 };
-use crate::Sitemty;
 use chrono::{TimeZone, Utc};
 use err::Error;
+use items::{Sitemty, SitemtyFrameType, SubFrId};
 use netpod::log::*;
 use netpod::timeunits::SEC;
 use netpod::NanoRange;
@@ -27,6 +27,13 @@ pub struct MinMaxAvgDim1Bins<NTY> {
     pub avgs: Vec<Option<Vec<f32>>>,
 }
 
+impl<NTY> SitemtyFrameType for MinMaxAvgDim1Bins<NTY>
+where
+    NTY: SubFrId,
+{
+    const FRAME_TYPE_ID: u32 = 0xb00 + NTY::SUB;
+}
+
 impl<NTY> fmt::Debug for MinMaxAvgDim1Bins<NTY>
 where
     NTY: fmt::Debug,

disk/src/binned/pbv.rs

@@ -1,19 +1,18 @@
 use crate::agg::binnedt::{TBinnerStream, TimeBinnableType};
-use crate::agg::streams::{Appendable, StreamItem};
+use crate::agg::streams::Appendable;
 use crate::binned::binnedfrompbv::FetchedPreBinned;
 use crate::binned::query::{CacheUsage, PreBinnedQuery};
-use crate::binned::{EventsNodeProcessor, NumOps, PushableIndex, RangeCompletableItem, ReadableFromFile, WithLen};
+use crate::binned::{EventsNodeProcessor, NumOps, PushableIndex, ReadableFromFile, WithLen};
 use crate::cache::{write_pb_cache_min_max_avg_scalar, CacheFileDesc, WrittenPbCache};
 use crate::decode::{Endianness, EventValueFromBytes, EventValueShape, NumFromBytes};
-use crate::frame::makeframe::FrameType;
 use crate::merge::mergedfromremotes::MergedFromRemotes;
-use crate::raw::RawEventsQuery;
 use crate::streamlog::Streamlog;
-use crate::Sitemty;
 use err::Error;
 use futures_core::Stream;
 use futures_util::{FutureExt, StreamExt};
+use items::{FrameType, RangeCompletableItem, Sitemty, StreamItem};
 use netpod::log::*;
+use netpod::query::RawEventsQuery;
 use netpod::{
     x_bin_count, AggKind, BinnedRange, NodeConfigCached, PerfOpts, PreBinnedPatchIterator, PreBinnedPatchRange, Shape,
 };

disk/src/binned/prebinned.rs

@@ -8,12 +8,11 @@ use crate::decode::{
     BigEndian, Endianness, EventValueFromBytes, EventValueShape, EventValuesDim0Case, EventValuesDim1Case,
     LittleEndian, NumFromBytes,
 };
-use crate::frame::makeframe::{Framable, FrameType};
-use crate::Sitemty;
 use bytes::Bytes;
 use err::Error;
 use futures_core::Stream;
 use futures_util::StreamExt;
+use items::{Framable, FrameType, Sitemty};
 use netpod::{AggKind, BoolNum, ByteOrder, NodeConfigCached, ScalarType, Shape};
 use parse::channelconfig::{extract_matching_config_entry, read_local_config, MatchingConfigEntry};
 use serde::de::DeserializeOwned;