Merge branch 'main' of https://github.com/datafuselabs/databend into add_runtime_bloom_filter_for_merge_into

Author: JackTan25

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

@@ -153,9 +153,7 @@ impl HashJoinBuildState {
         let mut enable_bloom_runtime_filter = false;
         let mut enable_inlist_runtime_filter = false;
         let mut enable_min_max_runtime_filter = false;
-        if supported_join_type_for_runtime_filter(&hash_join_state.hash_join_desc.join_type)
-            && ctx.get_settings().get_join_spilling_memory_ratio()? == 0
-        {
+        if supported_join_type_for_runtime_filter(&hash_join_state.hash_join_desc.join_type) {
             let is_cluster = !ctx.get_cluster().is_empty();
             // For cluster, only support runtime filter for broadcast join.
             let is_broadcast_join = hash_join_state.hash_join_desc.broadcast;
@@ -327,7 +325,10 @@ impl HashJoinBuildState {
                     .clone()
             };
 
-            self.add_runtime_filter(&build_chunks, build_num_rows)?;
+            // If spilling happened, skip adding runtime filter, because probe data is ready and spilled.
+            if self.spilled_partition_set.read().is_empty() {
+                self.add_runtime_filter(&build_chunks, build_num_rows)?;
+            }
 
             if self.hash_join_state.hash_join_desc.join_type == JoinType::Cross {
                 return Ok(());

tests/sqllogictests/suites/tpch/queries.test

@@ -802,6 +802,7 @@ Brand#13 LARGE BURNISHED COPPER 45 8
 Brand#13 MEDIUM ANODIZED STEEL 23 8
 
 #Q17
+
 query I
 select
         truncate(sum(l_extendedprice) / 7.0,8) as avg_yearly