rename

Author: adriangb

datafusion/catalog/src/table.rs

@@ -164,7 +164,7 @@ pub trait TableProvider: Debug + Sync + Send {
     /// because inexact filters do not guarantee that every filtered row is
     /// removed, so applying the limit could lead to too few rows being available
     /// to return as a final result.
-    #[deprecated(since = "50.0.0", note = "Use `scan_with_options` instead")]
+    #[deprecated(since = "50.0.0", note = "Use `scan_with_args` instead")]
     async fn scan(
         &self,
         state: &dyn Session,
@@ -173,10 +173,10 @@ pub trait TableProvider: Debug + Sync + Send {
         limit: Option<usize>,
     ) -> Result<Arc<dyn ExecutionPlan>>;
 
-    async fn scan_with_options(
+    async fn scan_with_args(
         &self,
         state: &dyn Session,
-        options: ScanArgs,
+        args: ScanArgs,
     ) -> Result<ScanResult> {
         let ScanArgs {
             preferred_ordering: _,
@@ -272,7 +272,7 @@ pub trait TableProvider: Debug + Sync + Send {
     ///     }
     /// }
     /// ```
-    #[deprecated(since = "50.0.0", note = "Use `scan_with_options` instead")]
+    #[deprecated(since = "50.0.0", note = "Use `scan_with_args` instead")]
     fn supports_filters_pushdown(
         &self,
         filters: &[&Expr],
@@ -371,7 +371,7 @@ impl ScanArgs {
 pub struct ScanResult {
     /// The ExecutionPlan to run.
     plan: Arc<dyn ExecutionPlan>,
-    // Remaining filters that were not completely evaluated during `scan_with_options()`.
+    // Remaining filters that were not completely evaluated during `scan_with_args()`.
     filters: Vec<Expr>,
 }
 

datafusion/core/src/datasource/listing/table.rs

@@ -1170,13 +1170,13 @@ impl TableProvider for ListingTable {
             .with_projection(projection.cloned())
             .with_filters(Some(filters.to_vec()))
             .with_limit(limit);
-        Ok(self.scan_with_options(state, options).await?.plan())
+        Ok(self.scan_with_args(state, options).await?.plan())
     }
 
-    async fn scan_with_options(
+    async fn scan_with_args(
         &self,
         state: &dyn Session,
-        options: ScanArgs,
+        args: ScanArgs,
     ) -> Result<ScanResult> {
         let projection = options.projection();
         let filters = options.filters().map(|f| f.to_vec()).unwrap_or_default();

datafusion/core/src/physical_planner.rs

@@ -466,7 +466,7 @@ impl DefaultPhysicalPlanner {
                     .with_filters(Some(filters).clone())
                     .with_preferred_ordering(preferred_ordering.clone())
                     .with_limit(*fetch);
-                let res = source.scan_with_options(session_state, opts).await?;
+                let res = source.scan_with_args(session_state, opts).await?;
                 // TODO: move FilterExec wrapping logic from filter pushdown rule to here?
                 res.plan()
             }