minor reverts, backwards compat export

Author: adriangb

datafusion/optimizer/src/push_down_filter.rs

@@ -41,11 +41,13 @@ use datafusion_expr::{
 use crate::optimizer::ApplyOrder;
 use crate::simplify_expressions::simplify_predicates;
 use crate::utils::{
-    build_schema_remapping, has_all_column_refs, is_restrict_null_predicate,
-    replace_cols_by_name,
+    build_schema_remapping, has_all_column_refs, is_restrict_null_predicate
 };
 use crate::{OptimizerConfig, OptimizerRule};
 
+// Re-export from here for backwards compatibility; it was moved from this module into `utils`.
+pub use crate::utils::replace_cols_by_name;
+
 /// Optimizer rule for pushing (moving) filter expressions down in a plan so
 /// they are applied as early as possible.
 ///

datafusion/optimizer/src/utils.rs

@@ -167,7 +167,7 @@ fn coerce(expr: Expr, schema: &DFSchema) -> Result<Expr> {
 /// # Returns
 ///
 /// The transformed expression with columns replaced according to the map
-pub(crate) fn replace_cols_by_name(
+pub fn replace_cols_by_name(
     e: Expr,
     replace_map: &HashMap<String, Expr>,
 ) -> Result<Expr> {

datafusion/sqllogictest/test_files/spark/aggregate/avg.slt

@@ -53,4 +53,4 @@ FROM (VALUES (0::INT), (0::INT)) AS t(a)
 GROUP BY a
 ORDER BY a;
 ----
-0 0
+0 0

datafusion/sqllogictest/test_files/spark/string/format_string.slt

@@ -70,7 +70,7 @@ SELECT format_string('Value: %d', 42);
 Value: 42
 
 ## Hexadecimal integer formatting (lowercase)
-query T
+query T  
 SELECT format_string('Hex: %x', 255);
 ----
 Hex: ff
@@ -118,7 +118,7 @@ SELECT format_string('Negative: %d', -42);
 Negative: -42
 
 # ================================
-# Float formatting tests
+# Float formatting tests  
 # ================================
 
 ## Basic float formatting
@@ -254,7 +254,7 @@ SELECT format_string('Bool: %b', true);
 ----
 Bool: true
 
-## Boolean uppercase
+## Boolean uppercase  
 query T
 SELECT format_string('Bool: %B', false);
 ----
@@ -370,7 +370,7 @@ SELECT format_string('Minute: %tM', TIMESTAMP '2023-12-25 14:30:45');
 ----
 Minute: 30
 
-## Second formatting
+## Second formatting  
 query T
 SELECT format_string('Second: %tS', TIMESTAMP '2023-12-25 14:30:45');
 ----