WIP on get channel info for arch app

disk/src/raw.rs

@@ -1,61 +1,3 @@
-/*!
-Delivers event data.
-
-Delivers event data (not yet time-binned) from local storage and provides client functions
-to request such data from nodes.
-*/
-
-use crate::agg::streams::StreamItem;
-use crate::binned::{EventsNodeProcessor, RangeCompletableItem};
-use crate::frame::inmem::InMemoryFrameAsyncReadStream;
-use crate::frame::makeframe::{make_frame, make_term_frame, FrameType};
-use crate::raw::eventsfromframes::EventsFromFrames;
-use crate::Sitemty;
-use err::Error;
-use futures_core::Stream;
-use netpod::{AggKind, Channel, NanoRange, Node, PerfOpts};
-use serde::{Deserialize, Serialize};
-use std::pin::Pin;
-use tokio::io::AsyncWriteExt;
-use tokio::net::TcpStream;
-
+pub mod client;
 pub mod conn;
 pub mod eventsfromframes;
-
-/**
-Query parameters to request (optionally) X-processed, but not T-processed events.
-*/
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RawEventsQuery {
-    pub channel: Channel,
-    pub range: NanoRange,
-    pub agg_kind: AggKind,
-    pub disk_io_buffer_size: usize,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct EventQueryJsonStringFrame(String);
-
-pub async fn x_processed_stream_from_node<ENP>(
-    query: RawEventsQuery,
-    perf_opts: PerfOpts,
-    node: Node,
-) -> Result<Pin<Box<dyn Stream<Item = Sitemty<<ENP as EventsNodeProcessor>::Output>> + Send>>, Error>
-where
-    ENP: EventsNodeProcessor,
-    <ENP as EventsNodeProcessor>::Output: Unpin + 'static,
-    Result<StreamItem<RangeCompletableItem<<ENP as EventsNodeProcessor>::Output>>, err::Error>: FrameType,
-{
-    let net = TcpStream::connect(format!("{}:{}", node.host, node.port_raw)).await?;
-    let qjs = serde_json::to_string(&query)?;
-    let (netin, mut netout) = net.into_split();
-    let buf = make_frame(&EventQueryJsonStringFrame(qjs))?;
-    netout.write_all(&buf).await?;
-    let buf = make_term_frame();
-    netout.write_all(&buf).await?;
-    netout.flush().await?;
-    netout.forget();
-    let frames = InMemoryFrameAsyncReadStream::new(netin, perf_opts.inmem_bufcap);
-    let items = EventsFromFrames::new(frames);
-    Ok(Box::pin(items))
-}