Apache DataFusion SQL Query Engine
Simplify wait_complete function (#19937)
Lía Adrianabef1368c3307
diff --git a/datafusion/physical-expr/src/expressions/dynamic_filters.rs b/datafusion/physical-expr/src/expressions/dynamic_filters.rsindex 6c961e3bb0..d285f8b377 100644--- a/datafusion/physical-expr/src/expressions/dynamic_filters.rs+++ b/datafusion/physical-expr/src/expressions/dynamic_filters.rs@@ -276,6 +276,10 @@ impl DynamicFilterPhysicalExpr {////// This method will return when [`Self::update`] is called and the generation increases./// It does not guarantee that the filter is complete.+ ///+ /// Producers (e.g.) HashJoinExec may never update the expression or mark it as completed if there are no consumers.+ /// If you call this method on a dynamic filter created by such a producer and there are no consumers registered this method would wait indefinitely.+ /// This should not happen under normal operation and would indicate a programming error either in your producer or in DataFusion if the producer is a built in node.pub async fn wait_update(&self) {let mut rx = self.state_watch.subscribe();// Get the current generation@@ -287,17 +291,16 @@ impl DynamicFilterPhysicalExpr {/// Wait asynchronously until this dynamic filter is marked as complete.///- /// This method returns immediately if the filter is already complete or if the filter- /// is not being used by any consumers.+ /// This method returns immediately if the filter is already complete./// Otherwise, it waits until [`Self::mark_complete`] is called.////// Unlike [`Self::wait_update`], this method guarantees that when it returns,/// the filter is fully complete with no more updates expected.- pub async fn wait_complete(self: &Arc<Self>) {- if !self.is_used() {- return;- }-+ ///+ /// Producers (e.g.) HashJoinExec may never update the expression or mark it as completed if there are no consumers.+ /// If you call this method on a dynamic filter created by such a producer and there are no consumers registered this method would wait indefinitely.+ /// This should not happen under normal operation and would indicate a programming error either in your producer or in DataFusion if the producer is a built in node.+ pub async fn wait_complete(&self) {if self.inner.read().is_complete {return;}diff --git a/datafusion/physical-plan/src/joins/hash_join/exec.rs b/datafusion/physical-plan/src/joins/hash_join/exec.rsindex 131b07461e..c249dfb10a 100644--- a/datafusion/physical-plan/src/joins/hash_join/exec.rs+++ b/datafusion/physical-plan/src/joins/hash_join/exec.rs@@ -5078,11 +5078,6 @@ mod tests {let dynamic_filter = HashJoinExec::create_dynamic_filter(&on);let dynamic_filter_clone = Arc::clone(&dynamic_filter);- // Simulate a consumer by creating a transformed copy (what happens during filter pushdown)- let _consumer = Arc::clone(&dynamic_filter)- .with_new_children(vec![])- .unwrap();-// Create HashJoinExec with the dynamic filterlet mut join = HashJoinExec::try_new(left,@@ -5132,11 +5127,6 @@ mod tests {let dynamic_filter = HashJoinExec::create_dynamic_filter(&on);let dynamic_filter_clone = Arc::clone(&dynamic_filter);- // Simulate a consumer by creating a transformed copy (what happens during filter pushdown)- let _consumer = Arc::clone(&dynamic_filter)- .with_new_children(vec![])- .unwrap();-// Create HashJoinExec with the dynamic filterlet mut join = HashJoinExec::try_new(left,