Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove buffer in block_reader of fuse store #4230

Merged
merged 2 commits into from
Feb 24, 2022
Merged

remove buffer in block_reader of fuse store #4230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
145b9ba
cleanup.
youngsofun Feb 23, 2022
7373fc5
rm buffer in block_reader
youngsofun Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion common/streams/src/stream_limit_by.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ impl LimitByStream {
let array = BooleanArray::from_data(ArrowType::Boolean, filter.into(), None);
let chunk = block.clone().try_into()?;
let chunk = arrow::compute::filter::filter_chunk(&chunk, &array)?;
//let chunk = chunk.into();
Some(DataBlock::from_chunk(block.schema(), &chunk)).transpose()
}
}
Expand Down
11 changes: 2 additions & 9 deletions query/src/storages/fuse/io/block_reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ use common_tracing::tracing;
use common_tracing::tracing::debug_span;
use common_tracing::tracing::Instrument;
use futures::future::BoxFuture;
use futures::io::BufReader;
use opendal::Operator;

use crate::storages::fuse::io::meta_readers::BlockMetaReader;
Expand All @@ -38,7 +37,6 @@ pub struct BlockReader {
arrow_table_schema: ArrowSchema,
projection: Vec<usize>,
file_len: u64,
read_buffer_size: u64,
metadata_reader: BlockMetaReader,
}

Expand All @@ -49,7 +47,6 @@ impl BlockReader {
table_schema: DataSchemaRef,
projection: Vec<usize>,
file_len: u64,
read_buffer_size: u64,
reader: BlockMetaReader,
) -> Self {
let block_schema = Arc::new(table_schema.project(projection.clone()));
Expand All @@ -61,7 +58,6 @@ impl BlockReader {
arrow_table_schema,
projection,
file_len,
read_buffer_size,
metadata_reader: reader,
}
}
Expand All @@ -84,7 +80,6 @@ impl BlockReader {

let arrow_fields = &self.arrow_table_schema.fields;
let stream_len = self.file_len;
let read_buffer_size = self.read_buffer_size;
let parquet_fields = metadata.schema().fields();

// read_columns_many_async use field name to filter columns
Expand All @@ -105,12 +100,10 @@ impl BlockReader {
let data_accessor = self.data_accessor.clone();
let path = self.path.clone();
Box::pin(async move {
let reader = data_accessor
Ok(data_accessor
.object(path.as_str())
.reader()
.total_size(stream_len);
let reader = BufReader::with_capacity(read_buffer_size as usize, reader);
Ok(reader)
.total_size(stream_len))
}) as BoxFuture<_>
};

Expand Down
2 changes: 0 additions & 2 deletions query/src/storages/fuse/operations/read.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ impl FuseTable {

let part_stream = futures::stream::iter(iter);

let read_buffer_size = ctx.get_settings().get_storage_read_buffer_size()?;
Copy link
Member

@BohuTANG BohuTANG Feb 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does ctx.get_storage_read_buffer_size not used anymore?

Copy link
Member Author

@youngsofun youngsofun Feb 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still in use

let stream = part_stream
.map(move |part| {
let da = operator.clone();
Expand All @@ -81,7 +80,6 @@ impl FuseTable {
table_schema,
projection,
part_len,
read_buffer_size,
reader,
);
block_reader.read().await.map_err(|e| {
Expand Down