From 54a1af50de72e4896d13ece0d5b2b6824029fa48 Mon Sep 17 00:00:00 2001 From: Dominik Werder Date: Wed, 6 Oct 2021 12:39:19 +0200 Subject: [PATCH] Adapt test --- disk/src/eventblobs.rs | 27 +++------------------------ disk/src/eventchunker.rs | 12 +----------- disk/src/lib.rs | 4 ---- disk/src/merge.rs | 12 ------------ disk/src/mergeblobs.rs | 12 ------------ parse/src/channelconfig.rs | 7 ++++--- 6 files changed, 8 insertions(+), 66 deletions(-) diff --git a/disk/src/eventblobs.rs b/disk/src/eventblobs.rs index 5cdfe5c..eec9a12 100644 --- a/disk/src/eventblobs.rs +++ b/disk/src/eventblobs.rs @@ -1,7 +1,7 @@ use crate::dataopen::{open_expanded_files, open_files, OpenedFileSet}; use crate::eventchunker::{EventChunker, EventChunkerConf, EventFull}; +use crate::file_content_stream; use crate::merge::MergedStream; -use crate::{file_content_stream, HasSeenBeforeRangeCount}; use err::Error; use futures_core::Stream; use futures_util::StreamExt; @@ -14,9 +14,9 @@ use std::sync::atomic::AtomicU64; use std::sync::Arc; use std::task::{Context, Poll}; -pub trait InputTraits: Stream> + HasSeenBeforeRangeCount {} +pub trait InputTraits: Stream> {} -impl InputTraits for T where T: Stream> + HasSeenBeforeRangeCount {} +impl InputTraits for T where T: Stream> {} pub struct EventChunkerMultifile { channel_config: ChannelConfig, @@ -31,8 +31,6 @@ pub struct EventChunkerMultifile { max_ts: Arc, files_count: u32, node_ix: usize, - seen_before_range_count: usize, - seen_after_range_count: usize, expand: bool, do_decompress: bool, } @@ -66,28 +64,10 @@ impl EventChunkerMultifile { max_ts: Arc::new(AtomicU64::new(0)), files_count: 0, node_ix, - seen_before_range_count: 0, - seen_after_range_count: 0, expand, do_decompress, } } - - pub fn seen_before_range_count(&self) -> usize { - self.seen_before_range_count - } - - pub fn seen_after_range_count(&self) -> usize { - self.seen_after_range_count - } - - // TODO remove or use Drop impl? - pub fn close(&mut self) { - if let Some(evs) = &mut self.evs { - self.seen_before_range_count += evs.seen_before_range_count(); - self.evs = None; - } - } } impl Stream for EventChunkerMultifile { @@ -119,7 +99,6 @@ impl Stream for EventChunkerMultifile { Ready(Some(k)) } Ready(None) => { - self.seen_before_range_count += evs.seen_before_range_count(); self.evs = None; continue 'outer; } diff --git a/disk/src/eventchunker.rs b/disk/src/eventchunker.rs index 04f3b8b..298af19 100644 --- a/disk/src/eventchunker.rs +++ b/disk/src/eventchunker.rs @@ -1,4 +1,4 @@ -use crate::{FileChunkRead, HasSeenBeforeRangeCount, NeedMinBuffer}; +use crate::{FileChunkRead, NeedMinBuffer}; use bitshuffle::bitshuffle_decompress; use bytes::{Buf, BytesMut}; use err::Error; @@ -428,10 +428,6 @@ impl EventChunker { parsed_bytes, }) } - - pub fn seen_before_range_count(&self) -> usize { - self.seen_before_range_count - } } #[derive(Debug, Serialize, Deserialize)] @@ -701,12 +697,6 @@ impl Stream for EventChunker { } } -impl HasSeenBeforeRangeCount for EventChunker { - fn seen_before_range_count(&self) -> usize { - self.seen_before_range_count() - } -} - #[cfg(test)] mod test { //use err::Error; diff --git a/disk/src/lib.rs b/disk/src/lib.rs index 7da788f..58259df 100644 --- a/disk/src/lib.rs +++ b/disk/src/lib.rs @@ -403,7 +403,3 @@ impl ChannelConfigExt for ChannelConfig { ret } } - -pub trait HasSeenBeforeRangeCount { - fn seen_before_range_count(&self) -> usize; -} diff --git a/disk/src/merge.rs b/disk/src/merge.rs index fe99487..cebf7b6 100644 --- a/disk/src/merge.rs +++ b/disk/src/merge.rs @@ -1,4 +1,3 @@ -use crate::HasSeenBeforeRangeCount; use err::Error; use futures_core::Stream; use futures_util::StreamExt; @@ -272,17 +271,6 @@ where } } -impl HasSeenBeforeRangeCount for MergedStream -where - S: Stream> + Unpin, - ITY: Unpin, -{ - fn seen_before_range_count(&self) -> usize { - // TODO (only for debug) - 0 - } -} - #[cfg(test)] mod test { use crate::dataopen::position_file_for_test; diff --git a/disk/src/mergeblobs.rs b/disk/src/mergeblobs.rs index c21e0a5..22b8b93 100644 --- a/disk/src/mergeblobs.rs +++ b/disk/src/mergeblobs.rs @@ -1,4 +1,3 @@ -use crate::HasSeenBeforeRangeCount; use err::Error; use futures_core::Stream; use futures_util::StreamExt; @@ -277,14 +276,3 @@ where } } } - -impl HasSeenBeforeRangeCount for MergedBlobsStream -where - S: Stream> + Unpin, - I: Unpin + Appendable + WithTimestamps + PushableIndex + WithLen + ByteEstimate, -{ - fn seen_before_range_count(&self) -> usize { - // TODO (only for debug) - 0 - } -} diff --git a/parse/src/channelconfig.rs b/parse/src/channelconfig.rs index 23dd4da..6c349d4 100644 --- a/parse/src/channelconfig.rs +++ b/parse/src/channelconfig.rs @@ -339,6 +339,7 @@ mod test { let cwd = std::env::current_dir(); netpod::log::info!("CWD: {:?}", cwd); let path = "../resources/sf-daqbuf-33-S10CB01-RLOD100-PUP10:SIG-AMPLT-latest-00000_Config"; + //let path = "../resources/sf-daqbuf-21-S10CB01-RLOD100-PUP10:SIG-AMPLT-latest-00000_Config"; let mut f1 = std::fs::File::open(path).unwrap(); let mut buf = vec![]; f1.read_to_end(&mut buf).unwrap(); @@ -355,11 +356,11 @@ mod test { #[test] fn open_file() { let config = parse_config(&read_data()).unwrap().1; - assert_eq!(0, config.format_version); - assert_eq!(9, config.entries.len()); + assert_eq!(config.format_version, 0); + assert_eq!(config.entries.len(), 18); for e in &config.entries { assert!(e.ts >= 631152000000000000); - assert!(e.ts <= 1591106812800073974); + assert!(e.ts <= 1613640673424172164); assert!(e.shape.is_some()); } }