This commit is contained in:
Dominik Werder
2023-02-24 13:32:19 +01:00
parent 0f29eac2b5
commit 2e286eb28e
23 changed files with 399 additions and 257 deletions

View File

@@ -134,8 +134,6 @@ impl Stream for EventChunkerMultifile {
}
}
if max >= self.range.end {
info!("REACHED RANGE END, TRUNCATE");
info!("{:20} ... {:20}", self.range.beg, self.range.end);
self.range_final = true;
h.truncate_ts(self.range.end);
self.evs = None;
@@ -187,7 +185,6 @@ impl Stream for EventChunkerMultifile {
path.clone(),
self.expand,
self.do_decompress,
format!("{:?}", path),
);
let filtered = RangeFilter::new(chunker, self.range.clone(), self.expand);
self.evs = Some(Box::pin(filtered));
@@ -223,7 +220,6 @@ impl Stream for EventChunkerMultifile {
of.path.clone(),
self.expand,
self.do_decompress,
format!("{:?}", of.path),
);
chunkers.push(chunker);
}

View File

@@ -154,6 +154,8 @@ where
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
use Poll::*;
let span = netpod::log::span!(Level::INFO, "disk::merge");
let _spg = span.enter();
'outer: loop {
break if self.completed {
panic!("poll_next on completed");
@@ -390,7 +392,6 @@ mod test {
dbg_path.clone(),
expand,
do_decompress,
format!("{:?}", dbg_path),
);
chunker
})