Skip to content

Commit feef21c

Browse files
committed
rm unused modify
1 parent 6a8a352 commit feef21c

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

src/query/service/src/pipelines/builders/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ mod builder_recluster;
4040
mod builder_recursive_cte;
4141
mod builder_replace_into;
4242
mod builder_row_fetch;
43-
mod builder_runtime_filter;
43+
mod builder_broadcast;
4444
mod builder_scalar;
4545
mod builder_scan;
4646
mod builder_sort;

src/query/service/src/pipelines/processors/transforms/hash_join/desc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ impl HashJoinDesc {
117117
from_correlated_subquery: join.from_correlated_subquery,
118118
broadcast: join.broadcast,
119119
single_to_inner: join.single_to_inner.clone(),
120-
runtime_filter: (&join.runtime_filter_plan).into(),
120+
runtime_filter: (&join.runtime_filter).into(),
121121
})
122122
}
123123

src/query/service/src/schedulers/fragments/fragmenter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ impl PhysicalPlanReplacer for Fragmenter {
246246
broadcast: plan.broadcast,
247247
single_to_inner: plan.single_to_inner.clone(),
248248
build_side_cache_info: plan.build_side_cache_info.clone(),
249-
runtime_filter_plan: plan.runtime_filter_plan.clone(),
249+
runtime_filter: plan.runtime_filter.clone(),
250250
}))
251251
}
252252

src/query/service/tests/it/sql/exec/get_table_bind_test.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ use databend_common_catalog::plan::DataSourcePlan;
3131
use databend_common_catalog::plan::PartInfoPtr;
3232
use databend_common_catalog::plan::Partitions;
3333
use databend_common_catalog::query_kind::QueryKind;
34+
use databend_common_catalog::runtime_filter_info::RuntimeFilterInfo;
3435
use databend_common_catalog::runtime_filter_info::RuntimeFilterReady;
35-
use databend_common_catalog::runtime_filter_info::RuntimeFiltersForScan;
3636
use databend_common_catalog::statistics::data_cache_statistics::DataCacheMetrics;
3737
use databend_common_catalog::table::Table;
3838
use databend_common_catalog::table_context::ContextError;
@@ -924,7 +924,7 @@ impl TableContext for CtxDelegation {
924924
todo!()
925925
}
926926

927-
fn set_runtime_filter(&self, _filters: (IndexType, RuntimeFiltersForScan)) {
927+
fn set_runtime_filter(&self, _filters: (IndexType, RuntimeFilterInfo)) {
928928
todo!()
929929
}
930930

src/query/service/tests/it/storages/fuse/operations/commit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ use databend_common_catalog::plan::DataSourcePlan;
3030
use databend_common_catalog::plan::PartInfoPtr;
3131
use databend_common_catalog::plan::Partitions;
3232
use databend_common_catalog::query_kind::QueryKind;
33+
use databend_common_catalog::runtime_filter_info::RuntimeFilterInfo;
3334
use databend_common_catalog::runtime_filter_info::RuntimeFilterReady;
34-
use databend_common_catalog::runtime_filter_info::RuntimeFiltersForScan;
3535
use databend_common_catalog::statistics::data_cache_statistics::DataCacheMetrics;
3636
use databend_common_catalog::table::Table;
3737
use databend_common_catalog::table_context::ContextError;
@@ -789,7 +789,7 @@ impl TableContext for CtxDelegation {
789789
todo!()
790790
}
791791

792-
fn set_runtime_filter(&self, _filters: (IndexType, RuntimeFiltersForScan)) {
792+
fn set_runtime_filter(&self, _filters: (IndexType, RuntimeFilterInfo)) {
793793
todo!()
794794
}
795795

src/query/sql/src/executor/format.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1523,7 +1523,7 @@ fn hash_join_to_format_tree(
15231523
profs: &HashMap<u32, PlanProfile>,
15241524
context: &mut FormatContext,
15251525
) -> Result<FormatTreeNode<String>> {
1526-
for rf in plan.runtime_filter_plan.filters.iter() {
1526+
for rf in plan.runtime_filter.filters.iter() {
15271527
context
15281528
.scan_id_to_runtime_filters
15291529
.entry(rf.scan_id)
@@ -1557,7 +1557,7 @@ fn hash_join_to_format_tree(
15571557
probe_child.payload = format!("{}(Probe)", probe_child.payload);
15581558

15591559
let mut build_runtime_filters = vec![];
1560-
for rf in plan.runtime_filter_plan.filters.iter() {
1560+
for rf in plan.runtime_filter.filters.iter() {
15611561
let mut s = format!(
15621562
"filter id:{}, build key:{}, probe key:{}, filter type:",
15631563
rf.id,

src/query/sql/src/executor/physical_plan_visitor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ pub trait PhysicalPlanReplacer {
288288
output_schema: plan.output_schema.clone(),
289289
need_hold_hash_table: plan.need_hold_hash_table,
290290
stat_info: plan.stat_info.clone(),
291-
runtime_filter_plan: plan.runtime_filter_plan.clone(),
291+
runtime_filter: plan.runtime_filter.clone(),
292292
broadcast: plan.broadcast,
293293
single_to_inner: plan.single_to_inner.clone(),
294294
build_side_cache_info: plan.build_side_cache_info.clone(),

src/query/sql/src/executor/physical_plans/physical_hash_join.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ pub struct HashJoin {
107107
// a HashMap for mapping the column indexes to the BlockEntry indexes in DataBlock.
108108
pub build_side_cache_info: Option<(usize, HashMap<IndexType, usize>)>,
109109

110-
pub runtime_filter_plan: PhysicalRuntimeFilters,
110+
pub runtime_filter: PhysicalRuntimeFilters,
111111
}
112112

113113
impl HashJoin {
@@ -815,7 +815,7 @@ impl PhysicalPlanBuilder {
815815
probe_to_build: Vec<(usize, (bool, bool))>,
816816
output_schema: DataSchemaRef,
817817
build_side_cache_info: Option<(usize, HashMap<IndexType, usize>)>,
818-
runtime_filter_plan: PhysicalRuntimeFilters,
818+
runtime_filter: PhysicalRuntimeFilters,
819819
stat_info: PlanStatsInfo,
820820
) -> Result<PhysicalPlan> {
821821
Ok(PhysicalPlan::HashJoin(HashJoin {
@@ -839,7 +839,7 @@ impl PhysicalPlanBuilder {
839839
broadcast: is_broadcast,
840840
single_to_inner: join.single_to_inner.clone(),
841841
build_side_cache_info,
842-
runtime_filter_plan,
842+
runtime_filter,
843843
}))
844844
}
845845

@@ -915,7 +915,7 @@ impl PhysicalPlanBuilder {
915915
let non_equi_conditions = self.process_non_equi_conditions(join, &merged_schema)?;
916916

917917
// Step 11: Build runtime filter
918-
let runtime_filter_desc = self
918+
let runtime_filter = self
919919
.build_runtime_filter(
920920
join,
921921
s_expr,
@@ -941,7 +941,7 @@ impl PhysicalPlanBuilder {
941941
probe_to_build,
942942
output_schema,
943943
build_side_cache_info,
944-
runtime_filter_desc,
944+
runtime_filter,
945945
stat_info,
946946
)
947947
}

0 commit comments

Comments
 (0)