Skip to content

Commit fb634ab

Browse files
committed
chore: remove unused code
1 parent e66061f commit fb634ab

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

src/query/storages/fuse/src/operations/read/parquet_data_source_reader.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ use crate::io::ReadSettings;
4040
use crate::io::TableMetaLocationGenerator;
4141
use crate::io::VirtualColumnReader;
4242
use crate::operations::read::data_source_with_meta::DataSourceWithMeta;
43+
use crate::operations::read::runtime_filter_prunner::runtime_bloom_filter_pruner;
4344
use crate::operations::read::runtime_filter_prunner::runtime_filter_pruner;
4445

4546
pub struct ReadParquetDataSource<const BLOCKING_IO: bool> {
@@ -252,6 +253,18 @@ impl Processor for ReadParquetDataSource<false> {
252253
continue;
253254
}
254255

256+
if runtime_bloom_filter_pruner(
257+
self.table_schema.clone(),
258+
&part,
259+
&filters,
260+
&self.func_ctx,
261+
&self.block_reader.operator,
262+
)
263+
.await?
264+
{
265+
continue;
266+
}
267+
255268
fuse_part_infos.push(part.clone());
256269
let block_reader = self.block_reader.clone();
257270
let settings = ReadSettings::from_ctx(&self.partitions.ctx)?;

src/query/storages/fuse/src/operations/read/runtime_filter_prunner.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ use databend_common_expression::Scalar;
3535
use databend_common_expression::TableSchema;
3636
use databend_common_functions::BUILTIN_FUNCTIONS;
3737
use databend_common_hashtable::FastHash;
38-
use databend_common_sql::BloomIndexColumns;
3938
use databend_storages_common_index::statistics_to_domain;
40-
use databend_storages_common_table_meta::meta::BlockMeta;
4139
use log::info;
4240
use opendal::Operator;
4341
use xorf::BinaryFuse16;
@@ -56,7 +54,6 @@ pub fn runtime_filter_pruner(
5654
return Ok(false);
5755
}
5856
let part = FuseBlockPartInfo::from_part(part)?;
59-
eprintln!("filters {:#?}", filters);
6057
let pruned = filters.iter().any(|filter| {
6158
let column_refs = filter.column_refs();
6259
// Currently only support filter with one column(probe key).
@@ -113,16 +110,15 @@ pub async fn runtime_bloom_filter_pruner(
113110
part: &PartInfoPtr,
114111
filters: &[Expr<String>],
115112
func_ctx: &FunctionContext,
116-
dal: Operator,
117-
bloom_index_cols: BloomIndexColumns,
113+
dal: &Operator,
118114
) -> Result<bool> {
119115
let part = FuseBlockPartInfo::from_part(part)?;
120116

121-
let block_meta: BlockMeta;
122117
if let Some(bloom_desc) = &part.bloom_index_descriptor {
123118
let index_location = bloom_desc.bloom_index_location.clone();
124119
let index_size = bloom_desc.bloom_index_size;
125120
let column_ids = part.columns_meta.keys().cloned().collect::<Vec<_>>();
121+
let bloom_index_cols = bloom_desc.bloom_index_cols.clone();
126122

127123
for filter_expr in filters {
128124
if let Some(bloom_pruner) = BloomPrunerCreator::create(

src/query/storages/fuse/src/operations/read_partitions.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,22 @@ use databend_common_catalog::plan::TopK;
2727
use databend_common_catalog::table::Table;
2828
use databend_common_catalog::table_context::TableContext;
2929
use databend_common_exception::Result;
30-
use databend_common_expression::ColumnId;
3130
use databend_common_expression::Scalar;
3231
use databend_common_expression::TableSchemaRef;
3332
use databend_common_sql::field_default_value;
34-
use databend_common_sql::BloomIndexColumns;
3533
use databend_common_storage::ColumnNodes;
3634
use databend_storages_common_cache::CacheAccessor;
3735
use databend_storages_common_cache_manager::CachedObject;
3836
use databend_storages_common_pruner::BlockMetaIndex;
3937
use databend_storages_common_table_meta::meta::BlockMeta;
4038
use databend_storages_common_table_meta::meta::ColumnStatistics;
41-
use databend_storages_common_table_meta::meta::Location;
4239
use databend_storages_common_table_meta::table::ChangeType;
4340
use log::debug;
4441
use log::info;
4542
use opendal::Operator;
4643
use sha2::Digest;
4744
use sha2::Sha256;
4845

49-
use crate::fuse_part::BloomIndexDescriptor;
5046
use crate::fuse_part::FuseBlockPartInfo;
5147
use crate::pruning::create_segment_location_vector;
5248
use crate::pruning::FusePruner;

0 commit comments

Comments
 (0)