daqbuf/daqbuffer
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Dominik Werder
2024-11-05 14:27:41 +01:00
parent 35d15c4694
commit ef021ff971
31 changed files with 266 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/disk/src/eventchunker.rs
View File

@@ -140,7 +140,7 @@ impl EventChunker {
// TODO `expand` flag usage
pub fn from_start(
inp: Pin<Box<dyn Stream<Item = Result<FileChunkRead, Error>> + Send>>,
inp: Pin<Box<dyn Stream<Item = Result<FileChunkRead, items_0::streamitem::SitemErrTy>> + Send>>,
fetch_info: SfChFetchInfo,
range: NanoRange,
stats_conf: EventChunkerConf,

6
crates/disk/src/merge/mergedblobsfromremotes.rs
View File

@@ -1,7 +1,8 @@
use err::Error;
use futures_util::pin_mut;
use futures_util::Stream;
use futures_util::StreamExt;
use futures_util::TryFutureExt;
use items_0::streamitem::sitem_err2_from_string;
use items_0::streamitem::Sitemty;
use items_2::eventfull::EventFull;
use items_2::merger::Merger;
@@ -16,7 +17,7 @@ use std::task::Poll;
use streams::tcprawclient::x_processed_event_blobs_stream_from_node;
type T001<T> = Pin<Box<dyn Stream<Item = Sitemty<T>> + Send>>;
type T002<T> = Pin<Box<dyn Future<Output = Result<T001<T>, Error>> + Send>>;
type T002<T> = Pin<Box<dyn Future<Output = Result<T001<T>, items_0::streamitem::SitemErrTy>> + Send>>;
pub struct MergedBlobsFromRemotes {
tcp_establish_futs: Vec<T002<EventFull>>,
@@ -32,6 +33,7 @@ impl MergedBlobsFromRemotes {
let mut tcp_establish_futs = Vec::new();
for node in &cluster.nodes {
let f = x_processed_event_blobs_stream_from_node(subq.clone(), node.clone(), ctx.clone());
let f = f.map_err(sitem_err2_from_string);
let f: T002<EventFull> = Box::pin(f);
tcp_establish_futs.push(f);
}

4
crates/disk/src/raw/conn.rs
View File

@@ -73,7 +73,7 @@ pub async fn make_event_pipe(
128
};
let event_blobs = EventChunkerMultifile::new(
(&range).try_into()?,
(&range).try_into().map_err(Error::from_string)?,
fetch_info.clone(),
ncc.node.clone(),
ncc.ix,
@@ -129,7 +129,7 @@ pub fn make_event_blobs_pipe_real(
let range = subq.range();
let event_chunker_conf = EventChunkerConf::new(ByteSize::from_kb(1024));
let event_blobs = make_event_blobs_stream(
range.try_into()?,
range.try_into().map_err(Error::from_string)?,
fetch_info.clone(),
one_before,
event_chunker_conf,