Factor out query type

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;