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

Remove remaining usages of Arc

Browse Source
This commit is contained in:
Dominik Werder
2021-04-28 15:04:39 +02:00
parent c1fc53c22e
commit e243f99bd7
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
disk/src/lib.rs
View File

@@ -9,7 +9,6 @@ use netpod::{ChannelConfig, NanoRange, Node, Shape};
use std::future::Future; use std::future::Future;
use std::path::PathBuf; use std::path::PathBuf;
use std::pin::Pin; use std::pin::Pin;
use std::sync::Arc;
use std::task::{Context, Poll}; use std::task::{Context, Poll};
use tokio::fs::{File, OpenOptions}; use tokio::fs::{File, OpenOptions};
use tokio::io::AsyncRead; use tokio::io::AsyncRead;
@@ -32,7 +31,7 @@ pub mod merge;
pub mod paths; pub mod paths;
pub mod raw; pub mod raw;
pub async fn read_test_1(query: &netpod::AggQuerySingleChannel, node: Arc<Node>) -> Result<netpod::BodyStream, Error> { pub async fn read_test_1(query: &netpod::AggQuerySingleChannel, node: Node) -> Result<netpod::BodyStream, Error> {
let path = paths::datapath(query.timebin as u64, &query.channel_config, &node); let path = paths::datapath(query.timebin as u64, &query.channel_config, &node);
debug!("try path: {:?}", path); debug!("try path: {:?}", path);
let fin = OpenOptions::new().read(true).open(path).await?; let fin = OpenOptions::new().read(true).open(path).await?;
@@ -142,7 +141,7 @@ unsafe impl Send for Fopen1 {}
pub fn raw_concat_channel_read_stream_try_open_in_background( pub fn raw_concat_channel_read_stream_try_open_in_background(
query: &netpod::AggQuerySingleChannel, query: &netpod::AggQuerySingleChannel,
node: Arc<Node>, node: Node,
) -> impl Stream<Item = Result<Bytes, Error>> + Send { ) -> impl Stream<Item = Result<Bytes, Error>> + Send {
let query = query.clone(); let query = query.clone();
let node = node.clone(); let node = node.clone();
@@ -432,7 +431,7 @@ impl Stream for NeedMinBuffer {
pub fn raw_concat_channel_read_stream( pub fn raw_concat_channel_read_stream(
query: &netpod::AggQuerySingleChannel, query: &netpod::AggQuerySingleChannel,
node: Arc<Node>, node: Node,
) -> impl Stream<Item = Result<Bytes, Error>> + Send { ) -> impl Stream<Item = Result<Bytes, Error>> + Send {
let mut query = query.clone(); let mut query = query.clone();
let node = node.clone(); let node = node.clone();
@@ -456,7 +455,7 @@ pub fn raw_concat_channel_read_stream(
pub fn raw_concat_channel_read_stream_timebin( pub fn raw_concat_channel_read_stream_timebin(
query: &netpod::AggQuerySingleChannel, query: &netpod::AggQuerySingleChannel,
node: Arc<Node>, node: Node,
) -> impl Stream<Item = Result<Bytes, Error>> { ) -> impl Stream<Item = Result<Bytes, Error>> {
let query = query.clone(); let query = query.clone();
let node = node.clone(); let node = node.clone();