Refactor

Author: adriangb

datafusion/expr/src/logical_plan/plan.rs

@@ -2683,18 +2683,9 @@ impl TableScan {
         })
     }
 
-    pub fn try_new_with_preferred_ordering(
-        table_name: impl Into<TableReference>,
-        table_source: Arc<dyn TableSource>,
-        projection: Option<Vec<usize>>,
-        filters: Vec<Expr>,
-        fetch: Option<usize>,
-        preferred_ordering: Option<Vec<SortExpr>>,
-    ) -> Result<Self> {
-        let mut table_scan =
-            Self::try_new(table_name, table_source, projection, filters, fetch)?;
-        table_scan.preferred_ordering = preferred_ordering;
-        Ok(table_scan)
+    pub fn with_preferred_ordering(mut self, preferred_ordering: Option<Vec<SortExpr>>) -> Self {
+        self.preferred_ordering = preferred_ordering;
+        self
     }
 }
 

datafusion/optimizer/src/optimize_projections/mod.rs

@@ -251,14 +251,14 @@ fn optimize_projections(
                 Some(projection) => indices.into_mapped_indices(|idx| projection[idx]),
                 None => indices.into_inner(),
             };
-            return TableScan::try_new_with_preferred_ordering(
+            return TableScan::try_new(
                 table_name,
                 source,
                 Some(projection),
                 filters,
                 fetch,
-                preferred_ordering,
             )
+            .map(|s| s.with_preferred_ordering(preferred_ordering))
             .map(LogicalPlan::TableScan)
             .map(Transformed::yes);
         }