Remove RawEventsQuery

streams/src/plaineventsjson.rs

@@ -2,15 +2,14 @@ use crate::tcprawclient::open_tcp_streams;
 use err::Error;
 #[allow(unused)]
 use netpod::log::*;
+use netpod::query::PlainEventsQuery;
 use netpod::Cluster;
-use serde::Serialize;
 use serde_json::Value as JsonValue;
-use std::time::{Duration, Instant};
+use std::time::Instant;
 
-pub async fn plain_events_json<SER>(query: SER, cluster: &Cluster) -> Result<JsonValue, Error>
-where
-    SER: Serialize,
-{
+pub async fn plain_events_json(query: &PlainEventsQuery, cluster: &Cluster) -> Result<JsonValue, Error> {
+    let deadline = Instant::now() + query.timeout();
+    let events_max = query.events_max().unwrap_or(1024 * 32);
     // TODO should be able to ask for data-events only, instead of mixed data and status events.
     let inps = open_tcp_streams::<_, items_2::channelevents::ChannelEvents>(&query, cluster).await?;
     //let inps = open_tcp_streams::<_, Box<dyn items_2::Events>>(&query, cluster).await?;
@@ -24,9 +23,7 @@ where
         let stream = inp0.chain(inp1).chain(inp2);
         stream
     };
-    let stream = { items_2::merger::Merger::new(inps, 1) };
-    let deadline = Instant::now() + Duration::from_millis(3500);
-    let events_max = 100;
+    let stream = { items_2::merger::Merger::new(inps, 512) };
     let collected = crate::collect::collect(stream, deadline, events_max).await?;
     let jsval = serde_json::to_value(&collected)?;
     Ok(jsval)

streams/src/tcprawclient.rs

@@ -14,7 +14,7 @@ use items::frame::{make_frame, make_term_frame};
 use items::sitem_data;
 use items::{EventQueryJsonStringFrame, EventsNodeProcessor, RangeCompletableItem, Sitemty, StreamItem};
 use netpod::log::*;
-use netpod::query::RawEventsQuery;
+use netpod::query::PlainEventsQuery;
 use netpod::Cluster;
 use netpod::{Node, PerfOpts};
 use std::pin::Pin;
@@ -22,7 +22,7 @@ use tokio::io::AsyncWriteExt;
 use tokio::net::TcpStream;
 
 pub async fn x_processed_stream_from_node<ENP>(
-    query: RawEventsQuery,
+    query: PlainEventsQuery,
     perf_opts: PerfOpts,
     node: Node,
 ) -> Result<Pin<Box<dyn Stream<Item = Sitemty<<ENP as EventsNodeProcessor>::Output>> + Send>>, Error>
@@ -49,7 +49,7 @@ where
 }
 
 pub async fn x_processed_event_blobs_stream_from_node(
-    query: RawEventsQuery,
+    query: PlainEventsQuery,
     perf_opts: PerfOpts,
     node: Node,
 ) -> Result<Pin<Box<dyn Stream<Item = Sitemty<EventFull>> + Send>>, Error> {

streams/src/timebinnedjson.rs

@@ -3,7 +3,7 @@ use err::Error;
 use futures_util::StreamExt;
 #[allow(unused)]
 use netpod::log::*;
-use netpod::query::{BinnedQuery, RawEventsQuery};
+use netpod::query::{BinnedQuery, PlainEventsQuery};
 use netpod::{BinnedRange, Cluster};
 use serde_json::Value as JsonValue;
 use std::time::{Duration, Instant};
@@ -12,8 +12,16 @@ pub async fn timebinned_json(query: &BinnedQuery, cluster: &Cluster) -> Result<J
     let binned_range = BinnedRange::covering_range(query.range().clone(), query.bin_count())?;
     let events_max = 10000;
     let do_time_weight = query.agg_kind().do_time_weighted();
-    let deadline = Instant::now() + Duration::from_millis(7500);
-    let rawquery = RawEventsQuery::new(query.channel().clone(), query.range().clone(), query.agg_kind().clone());
+    let timeout = Duration::from_millis(7500);
+    let deadline = Instant::now() + timeout;
+    let rawquery = PlainEventsQuery::new(
+        query.channel().clone(),
+        query.range().clone(),
+        query.agg_kind().clone(),
+        timeout,
+        None,
+        true,
+    );
     let inps = open_tcp_streams::<_, items_2::channelevents::ChannelEvents>(&rawquery, cluster).await?;
     // TODO propagate also the max-buf-len for the first stage event reader:
     let stream = { items_2::merger::Merger::new(inps, 1) };