Refactor

daqbufp2/src/client.rs

@@ -69,7 +69,7 @@ pub async fn get_binned(
     };
     let agg_kind = AggKind::DimXBins1;
     let range = NanoRange::from_date_time(beg_date, end_date);
-    let mut query = BinnedQuery::new(channel, range, bin_count, agg_kind);
+    let mut query = BinnedQuery::new(channel, range, bin_count, Some(agg_kind));
     query.set_cache_usage(cache_usage);
     query.set_disk_stats_every(ByteSize(1024 * disk_stats_every_kb));
     let hp = HostPort { host: host, port: port };

daqbufp2/src/test/api4/binnedjson.rs

@@ -270,7 +270,7 @@ async fn get_binned_json(
     let beg_date: DateTime<Utc> = beg_date.parse()?;
     let end_date: DateTime<Utc> = end_date.parse()?;
     let range = NanoRange::from_date_time(beg_date, end_date);
-    let query = BinnedQuery::new(channel, range, bin_count, AggKind::TimeWeightedScalar);
+    let query = BinnedQuery::new(channel, range, bin_count, Some(AggKind::TimeWeightedScalar));
     let hp = HostPort::from_node(node0);
     let mut url = Url::parse(&format!("http://{}:{}/api/4/binned", hp.host, hp.port))?;
     query.append_to_url(&mut url);

daqbufp2/src/test/api4/eventsjson.rs

@@ -1,5 +1,3 @@
-use std::time::Duration;
-
 use crate::err::ErrConv;
 use crate::nodes::require_test_hosts_running;
 use crate::test::f32_iter_cmp_near;
@@ -105,14 +103,7 @@ async fn events_plain_json(
     let beg_date: DateTime<Utc> = beg_date.parse()?;
     let end_date: DateTime<Utc> = end_date.parse()?;
     let range = NanoRange::from_date_time(beg_date, end_date);
-    let query = PlainEventsQuery::new(
-        channel,
-        range,
-        AggKind::TimeWeightedScalar,
-        Duration::from_millis(10000),
-        None,
-        true,
-    );
+    let query = PlainEventsQuery::new(channel, range, Some(AggKind::TimeWeightedScalar), None, None);
     let hp = HostPort::from_node(node0);
     let mut url = Url::parse(&format!("http://{}:{}/api/4/events", hp.host, hp.port))?;
     query.append_to_url(&mut url);

daqbufp2/src/test/binnedbinary.rs

@@ -116,9 +116,9 @@ where
         series: None,
     };
     let range = NanoRange::from_date_time(beg_date, end_date);
-    let mut query = BinnedQuery::new(channel, range, bin_count, agg_kind);
+    let mut query = BinnedQuery::new(channel, range, bin_count, Some(agg_kind));
     query.set_cache_usage(CacheUsage::Ignore);
-    query.set_disk_io_buffer_size(1024 * 16);
+    query.set_buf_len_disk_io(1024 * 16);
     let hp = HostPort::from_node(node0);
     let mut url = Url::parse(&format!("http://{}:{}/api/4/binned", hp.host, hp.port))?;
     query.append_to_url(&mut url);

daqbufp2/src/test/events.rs

@@ -24,7 +24,6 @@ use netpod::APP_OCTET;
 use serde_json::Value as JsonValue;
 use std::fmt::Debug;
 use std::future::ready;
-use std::time::Duration;
 use streams::frames::inmem::InMemoryFrameAsyncReadStream;
 use tokio::io::AsyncRead;
 use url::Url;
@@ -88,14 +87,7 @@ async fn get_plain_events_binary(
         series: None,
     };
     let range = NanoRange::from_date_time(beg_date, end_date);
-    let query = PlainEventsQuery::new(
-        channel,
-        range,
-        AggKind::TimeWeightedScalar,
-        Duration::from_millis(10000),
-        None,
-        true,
-    );
+    let query = PlainEventsQuery::new(channel, range, Some(AggKind::TimeWeightedScalar), None, None);
     let hp = HostPort::from_node(node0);
     let mut url = Url::parse(&format!("http://{}:{}/api/4/events", hp.host, hp.port))?;
     query.append_to_url(&mut url);
@@ -268,14 +260,7 @@ pub async fn get_plain_events_json(
     let beg_date: DateTime<Utc> = beg_date.parse()?;
     let end_date: DateTime<Utc> = end_date.parse()?;
     let range = NanoRange::from_date_time(beg_date, end_date);
-    let query = PlainEventsQuery::new(
-        channel,
-        range,
-        AggKind::TimeWeightedScalar,
-        Duration::from_millis(10000),
-        None,
-        true,
-    );
+    let query = PlainEventsQuery::new(channel, range, Some(AggKind::TimeWeightedScalar), None, None);
     let hp = HostPort::from_node(node0);
     let mut url = Url::parse(&format!("http://{}:{}/api/4/events", hp.host, hp.port))?;
     query.append_to_url(&mut url);

daqbufp2/src/test/timeweightedjson.rs

@@ -102,7 +102,7 @@ async fn get_json_common(
         series: None,
     };
     let range = NanoRange::from_date_time(beg_date, end_date);
-    let mut query = BinnedQuery::new(channel, range, bin_count, agg_kind);
+    let mut query = BinnedQuery::new(channel, range, bin_count, Some(agg_kind));
     query.set_timeout(Duration::from_millis(40000));
     query.set_cache_usage(CacheUsage::Ignore);
     let mut url = Url::parse(&format!("http://{}:{}/api/4/binned", node0.host, node0.port))?;