Refactor

streams/src/timebinnedjson.rs

@@ -11,31 +11,29 @@ use netpod::BinnedRange;
 use netpod::ChConf;
 use netpod::Cluster;
 use serde_json::Value as JsonValue;
-use std::time::Duration;
 use std::time::Instant;
 
 pub async fn timebinned_json(query: &BinnedQuery, chconf: &ChConf, cluster: &Cluster) -> Result<JsonValue, Error> {
     let binned_range = BinnedRange::covering_range(query.range().clone(), query.bin_count())?;
     let bins_max = 10000;
     let do_time_weight = query.agg_kind().do_time_weighted();
-    let timeout = Duration::from_millis(7500);
-    let deadline = Instant::now() + timeout;
-    let empty = items_2::empty_events_dyn_ev(&chconf.scalar_type, &chconf.shape, query.agg_kind())?;
+    let deadline = Instant::now() + query.timeout_value();
+    let empty = items_2::empty_events_dyn_ev(&chconf.scalar_type, &chconf.shape, &query.agg_kind())?;
     let empty = ChannelEvents::Events(empty);
     let empty = items::sitem_data(empty);
-    let rawquery = PlainEventsQuery::new(
+    let evquery = PlainEventsQuery::new(
         query.channel().clone(),
         query.range().clone(),
-        query.agg_kind().clone(),
-        timeout,
+        Some(query.agg_kind()),
+        query.timeout(),
         None,
-        true,
     );
-    let inps = open_tcp_streams::<_, items_2::channelevents::ChannelEvents>(&rawquery, cluster).await?;
+    let inps = open_tcp_streams::<_, items_2::channelevents::ChannelEvents>(&evquery, cluster).await?;
     // TODO propagate also the max-buf-len for the first stage event reader:
     info!("timebinned_json with empty item {empty:?}");
     let stream = items_2::merger::Merger::new(inps, 128);
     let stream = stream::iter([empty]).chain(stream);
+    let stream = crate::rangefilter2::RangeFilter2::new(stream, query.range().clone(), evquery.one_before_range());
     let stream = Box::pin(stream);
     let stream = crate::timebin::TimeBinnedStream::new(stream, binned_range.edges(), do_time_weight, deadline);
     if false {