Move query types to module

daqbuffer/src/bin/daqbuffer.rs

@@ -1,5 +1,5 @@
 use chrono::{DateTime, Duration, Utc};
-use disk::cache::CacheUsage;
+use disk::binned::query::CacheUsage;
 use err::Error;
 use netpod::log::*;
 use netpod::{NodeConfig, NodeConfigCached};

daqbuffer/src/client.rs

@@ -1,8 +1,8 @@
 use chrono::{DateTime, Utc};
 use disk::agg::scalarbinbatch::MinMaxAvgScalarBinBatch;
 use disk::agg::streams::StreamItem;
+use disk::binned::query::{BinnedQuery, CacheUsage};
 use disk::binned::RangeCompletableItem;
-use disk::cache::{BinnedQuery, CacheUsage};
 use disk::frame::inmem::InMemoryFrameAsyncReadStream;
 use disk::frame::makeframe::FrameType;
 use disk::streamlog::Streamlog;

daqbuffer/src/test.rs

@@ -3,8 +3,8 @@ use bytes::BytesMut;
 use chrono::{DateTime, Utc};
 use disk::agg::scalarbinbatch::MinMaxAvgScalarBinBatch;
 use disk::agg::streams::{Bins, StatsItem, StreamItem};
+use disk::binned::query::{BinnedQuery, CacheUsage};
 use disk::binned::RangeCompletableItem;
-use disk::cache::{BinnedQuery, CacheUsage};
 use disk::frame::inmem::InMemoryFrameAsyncReadStream;
 use disk::streamlog::Streamlog;
 use err::Error;

daqbuffer/src/test/json.rs

@@ -1,6 +1,6 @@
 use crate::test::require_test_hosts_running;
 use chrono::{DateTime, Utc};
-use disk::cache::BinnedQuery;
+use disk::binned::query::BinnedQuery;
 use err::Error;
 use http::StatusCode;
 use hyper::Body;