fix

Author: zhuqi-lucas

datafusion/expr/src/expr_rewriter/mod.rs

@@ -174,9 +174,9 @@ pub fn create_col_from_scalar_expr(
     subqry_alias: String,
 ) -> Result<Column> {
     match scalar_expr {
-        Expr::Alias(alias_box) => {
-            // alias_box: &Box<Alias> (if you’re matching on &expr) or Box<Alias>
-            let name = &alias_box.name;
+        Expr::Alias(boxed_alias) => {
+            // boxed_alias: &Box<Alias> (if you’re matching on &expr) or Box<Alias>
+            let name = &boxed_alias.name;
             Ok(Column::new(
                 Some::<TableReference>(subqry_alias.into()),
                 name,
@@ -256,9 +256,9 @@ fn coerce_exprs_for_schema(
             let new_type = dst_schema.field(idx).data_type();
             if new_type != &expr.get_type(src_schema)? {
                 match expr {
-                    Expr::Alias(alias_box) => {
-                        // alias_box: Box<Alias>
-                        let Alias { expr, name, .. } = *alias_box;
+                    Expr::Alias(boxed_alias) => {
+                        // boxed_alias: Box<Alias>
+                        let Alias { expr, name, .. } = *boxed_alias;
                         Ok(expr.cast_to(new_type, src_schema)?.alias(name))
                     }
                     #[expect(deprecated)]

datafusion/expr/src/expr_rewriter/order_by.rs

@@ -137,9 +137,9 @@ fn rewrite_in_terms_of_projection(
 /// so avg(c) as average will match avgc
 fn expr_match(needle: &Expr, expr: &Expr) -> bool {
     // check inside aliases
-    if let Expr::Alias(alias_box) = expr {
-        // alias_box: &Box<Alias>, so alias_box.as_ref() is &Alias
-        let alias: &Alias = alias_box.as_ref();
+    if let Expr::Alias(boxed_alias) = expr {
+        // boxed_alias: &Box<Alias>, so boxed_alias.as_ref() is &Alias
+        let alias: &Alias = boxed_alias.as_ref();
         // alias.expr: Box<Expr>, so alias.expr.as_ref() is &Expr
         alias.expr.as_ref() == needle
     } else {

datafusion/expr/src/expr_schema.rs

@@ -244,8 +244,8 @@ impl ExprSchemable for Expr {
     /// column that does not exist in the schema.
     fn nullable(&self, input_schema: &dyn ExprSchema) -> Result<bool> {
         match self {
-            Expr::Alias(alias_box) => {
-                let Alias { expr, .. } = alias_box.as_ref();
+            Expr::Alias(boxed_alias) => {
+                let Alias { expr, .. } = boxed_alias.as_ref();
                 expr.nullable(input_schema)
             }
             Expr::Not(expr) | Expr::Negative(expr) => expr.nullable(input_schema),

datafusion/expr/src/utils.rs

@@ -971,8 +971,8 @@ pub fn iter_conjunction(expr: &Expr) -> impl Iterator<Item = &Expr> {
                     stack.push(right);
                     stack.push(left);
                 }
-                Expr::Alias(alias_box) => {
-                    stack.push(&*alias_box.expr);
+                Expr::Alias(boxed_alias) => {
+                    stack.push(&*boxed_alias.expr);
                 }
                 other => return Some(other),
             }
@@ -997,7 +997,7 @@ pub fn iter_conjunction_owned(expr: Expr) -> impl Iterator<Item = Expr> {
                     stack.push(*right);
                     stack.push(*left);
                 }
-                Expr::Alias(alias_box) => stack.push(*alias_box.expr),
+                Expr::Alias(boxed_alias) => stack.push(*boxed_alias.expr),
                 other => return Some(other),
             }
         }