diff --git a/crates/disk/src/aggtest.rs b/crates/disk/src/aggtest.rs index b0aeb66..161b818 100644 --- a/crates/disk/src/aggtest.rs +++ b/crates/disk/src/aggtest.rs @@ -1,5 +1,5 @@ -use crate::eventblobs::EventChunkerMultifile; use crate::eventchunker::EventChunkerConf; +use crate::eventchunkermultifile::EventChunkerMultifile; use crate::AggQuerySingleChannel; use crate::SfDbChConf; use err::Error; @@ -140,7 +140,7 @@ async fn agg_x_dim_1_inner() { // TODO let upstream already provide DiskIoTune: let mut disk_io_tune = DiskIoTune::default_for_testing(); disk_io_tune.read_buffer_len = query.buffer_size as usize; - let fut1 = super::eventblobs::EventChunkerMultifile::new( + let fut1 = super::eventchunkermultifile::EventChunkerMultifile::new( range.clone(), fetch_info, node.clone(), diff --git a/crates/disk/src/decode.rs b/crates/disk/src/decode.rs index bb23505..6726e79 100644 --- a/crates/disk/src/decode.rs +++ b/crates/disk/src/decode.rs @@ -1,4 +1,4 @@ -use crate::eventblobs::EventChunkerMultifile; +use crate::eventchunkermultifile::EventChunkerMultifile; use err::Error; use futures_util::Stream; use futures_util::StreamExt; diff --git a/crates/disk/src/disk.rs b/crates/disk/src/disk.rs index 82e6aad..0125486 100644 --- a/crates/disk/src/disk.rs +++ b/crates/disk/src/disk.rs @@ -5,8 +5,8 @@ pub mod cache; pub mod channelconfig; pub mod dataopen; pub mod decode; -pub mod eventblobs; pub mod eventchunker; +pub mod eventchunkermultifile; pub mod frame; pub mod gen; pub mod index; diff --git a/crates/disk/src/eventblobs.rs b/crates/disk/src/eventchunkermultifile.rs similarity index 97% rename from crates/disk/src/eventblobs.rs rename to crates/disk/src/eventchunkermultifile.rs index 1c071c8..b9e6647 100644 --- a/crates/disk/src/eventblobs.rs +++ b/crates/disk/src/eventchunkermultifile.rs @@ -185,7 +185,7 @@ impl Stream for EventChunkerMultifile { let mut ofs = ofs; let file = ofs.files.pop().unwrap(); let path = file.path; - let msg = format!("handle OFS {:?}", ofs); + let msg = format!("use opened files {:?}", ofs); let item = LogItem::from_node(self.node_ix, Level::DEBUG, msg); match file.file { Some(file) => { @@ -211,12 +211,12 @@ impl Stream for EventChunkerMultifile { } Ready(Some(Ok(StreamItem::Log(item)))) } else if ofs.files.len() == 0 { - let msg = format!("handle OFS {:?} NO FILES", ofs); + let msg = format!("use opened files {:?} no files", ofs); let item = LogItem::from_node(self.node_ix, Level::DEBUG, msg); Ready(Some(Ok(StreamItem::Log(item)))) } else { - let paths: Vec<_> = ofs.files.iter().map(|x| &x.path).collect(); - let msg = format!("handle OFS MERGED timebin {} {:?}", ofs.timebin, paths); + // let paths: Vec<_> = ofs.files.iter().map(|x| &x.path).collect(); + let msg = format!("use opened files {:?} locally merged", ofs); let item = LogItem::from_node(self.node_ix, Level::DEBUG, msg); let mut chunkers = Vec::new(); for of in ofs.files { @@ -277,8 +277,8 @@ impl Stream for EventChunkerMultifile { #[cfg(DISABLED)] #[cfg(test)] mod test { - use crate::eventblobs::EventChunkerMultifile; use crate::eventchunker::EventChunkerConf; + use crate::eventchunkermultifile::EventChunkerMultifile; use crate::SfDbChConf; use err::Error; use futures_util::StreamExt; diff --git a/crates/disk/src/raw/conn.rs b/crates/disk/src/raw/conn.rs index ee197f3..ed9311a 100644 --- a/crates/disk/src/raw/conn.rs +++ b/crates/disk/src/raw/conn.rs @@ -1,5 +1,5 @@ -use crate::eventblobs::EventChunkerMultifile; use crate::eventchunker::EventChunkerConf; +use crate::eventchunkermultifile::EventChunkerMultifile; use crate::raw::generated::EventBlobsGeneratorI32Test00; use crate::raw::generated::EventBlobsGeneratorI32Test01; use err::Error;