diff --git a/crates/daqbuffer/Cargo.toml b/crates/daqbuffer/Cargo.toml index 2a3a111..c06d89f 100644 --- a/crates/daqbuffer/Cargo.toml +++ b/crates/daqbuffer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "daqbuffer" -version = "0.5.5-aa.3" +version = "0.5.5-aa.4" authors = ["Dominik Werder "] edition = "2021" diff --git a/crates/disk/src/decode.rs b/crates/disk/src/decode.rs index 24f68ef..691a0c1 100644 --- a/crates/disk/src/decode.rs +++ b/crates/disk/src/decode.rs @@ -207,6 +207,9 @@ where evs.push_back(TsNano::from_ns(ts), PulsedVal(pulse, v)); Ok(()) } else { + let self_name = std::any::type_name::(); + let events_name = events.type_name(); + error!("unexpected container Self {} events {}", self_name, events_name); Err(Error::with_msg_no_trace("unexpected container")) } } @@ -290,11 +293,11 @@ where }; let v = >::convert_dim1(buf, endian, n as _)?; evs.push_back(TsNano::from_ns(ts), PulsedVal(pulse, v)); - // evs.values.push_back(v); - // evs.tss.push_back(ts); - // evs.pulses.push_back(pulse); Ok(()) } else { + let self_name = std::any::type_name::(); + let events_name = events.type_name(); + error!("unexpected container Self {} events {}", self_name, events_name); Err(Error::with_msg_no_trace("unexpected container")) } } diff --git a/crates/scyllaconn/src/bincache.rs b/crates/scyllaconn/src/bincache.rs index a8a57ee..9e78a3f 100644 --- a/crates/scyllaconn/src/bincache.rs +++ b/crates/scyllaconn/src/bincache.rs @@ -4,7 +4,6 @@ use crate::log::*; use crate::worker::ScyllaQueue; use futures_util::TryStreamExt; use items_0::merge::MergeableTy; -use items_0::timebin::BinsBoxed; use items_2::binning::container_bins::ContainerBins; use netpod::ttl::RetentionTime; use netpod::DtMs; @@ -91,13 +90,6 @@ impl streams::timebin::CacheReadProvider for ScyllaPrebinnedReadProvider { let fut = scylla_read_prebinned_f32(series, bin_len, msp, offs, self.scyqueue.clone()); streams::timebin::cached::reader::CacheReading::new(Box::pin(fut)) } - - fn write(&self, _series: u64, _bins: BinsBoxed) -> streams::timebin::cached::reader::CacheWriting { - // let scyqueue = self.scyqueue.clone(); - // let fut = async move { scyqueue.write_cache_f32(series, bins).await }; - // streams::timebin::cached::reader::CacheWriting::new(Box::pin(fut)) - todo!("TODO impl scylla cache write") - } } pub async fn worker_write(