Clena up

Signed-off-by: Austin Liu <[email protected]>

Clean up

Signed-off-by: Austin Liu <[email protected]>

datafusion/core/src/physical_planner.rs

@@ -2558,7 +2558,7 @@ mod tests {
             unimplemented!("NoOp");
         }
 
-        fn allows_limit_to_inputs(&self) -> bool {
+        fn supports_limit_pushdown(&self) -> bool {
             false // Disallow limit push-down by default
         }
     }

datafusion/core/tests/user_defined/user_defined_plan.rs

@@ -444,7 +444,7 @@ impl UserDefinedLogicalNodeCore for TopKPlanNode {
         })
     }
 
-    fn allows_limit_to_inputs(&self) -> bool {
+    fn supports_limit_pushdown(&self) -> bool {
         false // Disallow limit push-down by default
     }
 }

datafusion/expr/src/logical_plan/extension.rs

@@ -196,9 +196,15 @@ pub trait UserDefinedLogicalNode: fmt::Debug + Send + Sync {
     fn dyn_eq(&self, other: &dyn UserDefinedLogicalNode) -> bool;
     fn dyn_ord(&self, other: &dyn UserDefinedLogicalNode) -> Option<Ordering>;
 
-    /// Indicates to the optimizer if its safe to push a limit down past
-    /// this extension node
-    fn allows_limit_to_inputs(&self) -> bool;
+    /// Returns `true` if a limit can be safely pushed down through this
+    /// `UserDefinedLogicalNode` node.
+    ///
+    /// If this method returns `true`, and the query plan contains a limit at
+    /// the output of this node, DataFusion will push the limit to the input
+    /// of this node.
+    fn supports_limit_pushdown(&self) -> bool {
+        false
+    }
 }
 
 impl Hash for dyn UserDefinedLogicalNode {
@@ -300,9 +306,15 @@ pub trait UserDefinedLogicalNodeCore:
         None
     }
 
-    /// Indicates to the optimizer if its safe to push a limit down past
-    /// this extension node
-    fn allows_limit_to_inputs(&self) -> bool;
+    /// Returns `true` if a limit can be safely pushed down through this
+    /// `UserDefinedLogicalNode` node.
+    ///
+    /// If this method returns `true`, and the query plan contains a limit at
+    /// the output of this node, DataFusion will push the limit to the input
+    /// of this node.
+    fn supports_limit_pushdown(&self) -> bool {
+        false // Disallow limit push-down by default
+    }
 }
 
 /// Automatically derive UserDefinedLogicalNode to `UserDefinedLogicalNode`
@@ -370,8 +382,8 @@ impl<T: UserDefinedLogicalNodeCore> UserDefinedLogicalNode for T {
             .and_then(|other| self.partial_cmp(other))
     }
 
-    fn allows_limit_to_inputs(&self) -> bool {
-        self.allows_limit_to_inputs()
+    fn supports_limit_pushdown(&self) -> bool {
+        self.supports_limit_pushdown()
     }
 }
 

datafusion/optimizer/src/analyzer/subquery.rs

@@ -386,7 +386,7 @@ mod test {
             })
         }
 
-        fn allows_limit_to_inputs(&self) -> bool {
+        fn supports_limit_pushdown(&self) -> bool {
             false // Disallow limit push-down by default
         }
     }

datafusion/optimizer/src/optimize_projections/mod.rs

@@ -896,7 +896,7 @@ mod tests {
             Some(vec![output_columns.to_vec()])
         }
 
-        fn allows_limit_to_inputs(&self) -> bool {
+        fn supports_limit_pushdown(&self) -> bool {
             false // Disallow limit push-down by default
         }
     }
@@ -996,7 +996,7 @@ mod tests {
             Some(vec![left_reqs, right_reqs])
         }
 
-        fn allows_limit_to_inputs(&self) -> bool {
+        fn supports_limit_pushdown(&self) -> bool {
             false // Disallow limit push-down by default
         }
     }

datafusion/optimizer/src/push_down_filter.rs

@@ -1500,7 +1500,7 @@ mod tests {
             })
         }
 
-        fn allows_limit_to_inputs(&self) -> bool {
+        fn supports_limit_pushdown(&self) -> bool {
             false // Disallow limit push-down by default
         }
     }

datafusion/optimizer/src/push_down_limit.rs

@@ -154,13 +154,7 @@ impl OptimizerRule for PushDownLimit {
                 Ok(Transformed::yes(LogicalPlan::SubqueryAlias(subquery_alias)))
             }
             LogicalPlan::Extension(extension_plan)
-                if !extension_plan.node.allows_limit_to_inputs() =>
-            {
-                // If push down is not allowed, keep the original limit
-                original_limit(skip, fetch, LogicalPlan::Extension(extension_plan))
-            }
-            LogicalPlan::Extension(extension_plan)
-                if extension_plan.node.allows_limit_to_inputs() =>
+                if extension_plan.node.supports_limit_pushdown() =>
             {
                 let new_children = extension_plan
                     .node
@@ -353,7 +347,7 @@ mod test {
             })
         }
 
-        fn allows_limit_to_inputs(&self) -> bool {
+        fn supports_limit_pushdown(&self) -> bool {
             true // Allow limit push-down
         }
     }
@@ -406,7 +400,7 @@ mod test {
             })
         }
 
-        fn allows_limit_to_inputs(&self) -> bool {
+        fn supports_limit_pushdown(&self) -> bool {
             false // Disallow limit push-down by default
         }
     }

datafusion/optimizer/src/test/user_defined.rs

@@ -77,7 +77,7 @@ impl UserDefinedLogicalNodeCore for TestUserDefinedPlanNode {
         })
     }
 
-    fn allows_limit_to_inputs(&self) -> bool {
+    fn supports_limit_pushdown(&self) -> bool {
         false // Disallow limit push-down by default
     }
 }

datafusion/proto/tests/cases/roundtrip_logical_plan.rs

@@ -1061,7 +1061,7 @@ impl UserDefinedLogicalNodeCore for TopKPlanNode {
         })
     }
 
-    fn allows_limit_to_inputs(&self) -> bool {
+    fn supports_limit_pushdown(&self) -> bool {
         false // Disallow limit push-down by default
     }
 }

datafusion/substrait/tests/cases/roundtrip_logical_plan.rs

@@ -150,7 +150,7 @@ impl UserDefinedLogicalNode for MockUserDefinedLogicalPlan {
         unimplemented!()
     }
 
-    fn allows_limit_to_inputs(&self) -> bool {
+    fn supports_limit_pushdown(&self) -> bool {
         false // Disallow limit push-down by default
     }
 }