fix merge

Author: SkyFan2002

src/query/service/src/physical_plans/physical_hash_join.rs

@@ -57,8 +57,6 @@ use crate::physical_plans::Exchange;
 use crate::physical_plans::PhysicalPlanBuilder;
 use crate::pipelines::processors::transforms::HashJoinFactory;
 use crate::pipelines::processors::transforms::HashJoinProbeState;
-use crate::pipelines::processors::transforms::InnerHashJoin;
-use crate::pipelines::processors::transforms::RuntimeFiltersDesc;
 use crate::pipelines::processors::transforms::TransformHashJoin;
 use crate::pipelines::processors::transforms::TransformHashJoinBuild;
 use crate::pipelines::processors::transforms::TransformHashJoinProbe;
@@ -410,7 +408,7 @@ impl HashJoin {
         builder: &mut PipelineBuilder,
         desc: Arc<HashJoinDesc>,
     ) -> Result<()> {
-        let factory = self.join_factory(builder, desc)?;
+        let factory = self.join_factory(builder, desc.clone())?;
 
         // After common subexpression elimination is completed, we can delete this type of code.
         {

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

@@ -37,7 +37,8 @@ pub use hash_join_spiller::HashJoinSpiller;
 pub use hash_join_state::*;
 pub use probe_state::ProbeState;
 pub use probe_state::ProcessState;
-pub use runtime_filter::*;
 pub use spill_common::get_hashes;
 pub use transform_hash_join_build::TransformHashJoinBuild;
 pub use transform_hash_join_probe::TransformHashJoinProbe;
+
+pub use super::runtime_filter::*;

src/query/service/src/pipelines/processors/transforms/mod.rs

@@ -44,7 +44,6 @@ pub use materialized_cte::MaterializedCteSink;
 pub use new_hash_join::Join;
 pub use new_hash_join::TransformHashJoin;
 pub use new_hash_join::*;
-pub use runtime_filter::*;
 pub use sort::*;
 pub use transform_async_function::SequenceCounters;
 pub use transform_async_function::TransformAsyncFunction;

src/query/service/src/pipelines/processors/transforms/new_hash_join/join.rs

@@ -27,7 +27,9 @@ pub trait Join: Send + Sync + 'static {
 
     /// Get build data for runtime filter
     /// Returns (build_chunks, build_num_rows)
-    fn get_build_data_for_runtime_filter(&self) -> (&[DataBlock], usize);
+    fn get_build_data_for_runtime_filter(&self) -> (&[DataBlock], usize) {
+        (&[], 0)
+    }
 
     fn probe_block(&mut self, data: DataBlock) -> Result<Box<dyn JoinStream + '_>>;