Factor out query type

streams/src/eventchunker.rs

@@ -96,7 +96,7 @@ impl EventChunker {
         expand: bool,
         do_decompress: bool,
     ) -> Self {
-        trace!("EventChunker::from_start");
+        info!("EventChunker::{}  do_decompress {}", "from_start", do_decompress);
         let mut inp = NeedMinBuffer::new(inp);
         inp.set_need_min(6);
         Self {
@@ -136,6 +136,10 @@ impl EventChunker {
         expand: bool,
         do_decompress: bool,
     ) -> Self {
+        info!(
+            "EventChunker::{}  do_decompress {}",
+            "from_event_boundary", do_decompress
+        );
         let mut ret = Self::from_start(inp, channel_config, range, stats_conf, dbg_path, expand, do_decompress);
         ret.state = DataFileState::Event;
         ret.need_min = 4;

streams/src/plaineventsjson.rs

@@ -6,10 +6,9 @@ use futures_util::StreamExt;
 use items_0::streamitem::sitem_data;
 use items_2::channelevents::ChannelEvents;
 use netpod::log::*;
-use netpod::query::PlainEventsQuery;
-use netpod::AggKind;
 use netpod::ChConf;
 use netpod::Cluster;
+use query::api4::events::PlainEventsQuery;
 use serde_json::Value as JsonValue;
 use std::time::Duration;
 use std::time::Instant;

streams/src/tcprawclient.rs

@@ -20,10 +20,10 @@ use items_2::framable::EventQueryJsonStringFrame;
 use items_2::frame::make_frame;
 use items_2::frame::make_term_frame;
 use netpod::log::*;
-use netpod::query::PlainEventsQuery;
 use netpod::Cluster;
 use netpod::Node;
 use netpod::PerfOpts;
+use query::api4::events::PlainEventsQuery;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 use std::fmt;

streams/src/timebinnedjson.rs

@@ -8,13 +8,12 @@ use items_0::streamitem::sitem_data;
 use items_0::streamitem::Sitemty;
 use items_2::channelevents::ChannelEvents;
 use items_2::merger::Merger;
-#[allow(unused)]
 use netpod::log::*;
-use netpod::query::BinnedQuery;
-use netpod::query::PlainEventsQuery;
 use netpod::BinnedRangeEnum;
 use netpod::ChConf;
 use netpod::Cluster;
+use query::api4::binned::BinnedQuery;
+use query::api4::events::PlainEventsQuery;
 use serde_json::Value as JsonValue;
 use std::time::Instant;