WIP refactor data event pipeline

httpret/src/events.rs

@@ -6,8 +6,8 @@ use http::{Method, Request, Response, StatusCode};
 use hyper::Body;
 use items_2::merger::ChannelEventsMerger;
 use items_2::{binned_collected, empty_events_dyn, empty_events_dyn_2, ChannelEvents};
-use netpod::log::*;
 use netpod::query::{BinnedQuery, ChannelStateEventsQuery, PlainEventsQuery};
+use netpod::{log::*, HasBackend};
 use netpod::{AggKind, BinnedRange, FromUrl, NodeConfigCached};
 use netpod::{ACCEPT_ALL, APP_JSON, APP_OCTET};
 use scyllaconn::create_scy_session;
@@ -116,31 +116,35 @@ async fn plain_events_json(
     let query = query;
     // ---
 
-    let op = disk::channelexec::PlainEventsJson::new(
-        // TODO pass only the query, not channel, range again:
-        query.clone(),
-        query.channel().clone(),
-        query.range().clone(),
-        query.timeout(),
-        node_config.clone(),
-        query.events_max().unwrap_or(u64::MAX),
-        query.do_log(),
-    );
-    let s = disk::channelexec::channel_exec(
-        op,
-        query.channel(),
-        query.range(),
-        chconf.scalar_type,
-        chconf.shape,
-        AggKind::Plain,
-        node_config,
-    )
-    .await?;
-    let ret = response(StatusCode::OK).body(BodyStream::wrapped(
-        s.map_err(Error::from),
-        format!("plain_events_json"),
-    ))?;
-    Ok(ret)
+    if query.backend() == "testbackend" {
+        err::todoval()
+    } else {
+        let op = disk::channelexec::PlainEventsJson::new(
+            // TODO pass only the query, not channel, range again:
+            query.clone(),
+            query.channel().clone(),
+            query.range().clone(),
+            query.timeout(),
+            node_config.clone(),
+            query.events_max().unwrap_or(u64::MAX),
+            query.do_log(),
+        );
+        let s = disk::channelexec::channel_exec(
+            op,
+            query.channel(),
+            query.range(),
+            chconf.scalar_type,
+            chconf.shape,
+            AggKind::Plain,
+            node_config,
+        )
+        .await?;
+        let ret = response(StatusCode::OK).body(BodyStream::wrapped(
+            s.map_err(Error::from),
+            format!("plain_events_json"),
+        ))?;
+        Ok(ret)
+    }
 }
 
 pub struct EventsHandlerScylla {}
@@ -248,7 +252,7 @@ impl EventsHandlerScylla {
                 Ok(k) => match k {
                     ChannelEvents::Events(mut item) => {
                         if coll.is_none() {
-                            coll = Some(item.new_collector(0));
+                            coll = Some(item.new_collector());
                         }
                         let cl = coll.as_mut().unwrap();
                         cl.ingest(item.as_collectable_mut());

httpret/src/evinfo.rs

@@ -3,7 +3,6 @@ use crate::err::Error;
 use crate::response;
 use bytes::Bytes;
 use disk::channelexec::channel_exec;
-use disk::channelexec::collect_plain_events_json;
 use disk::channelexec::ChannelExecFunction;
 use disk::decode::Endianness;
 use disk::decode::EventValueFromBytes;
@@ -16,6 +15,7 @@ use futures_util::TryStreamExt;
 use http::{Method, StatusCode};
 use hyper::{Body, Request, Response};
 use items::numops::NumOps;
+use items::streams::collect_plain_events_json;
 use items::streams::Collectable;
 use items::Clearable;
 use items::EventsNodeProcessor;