remove more allocations

apache · May 11, 2024 · 1ead25c · 1ead25c
1 parent 92ae104
commit 1ead25c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/datafusion/expr/src/expr.rs b/datafusion/expr/src/expr.rs
@@ -1700,17 +1700,15 @@ fn write_name<W: Write>(w: &mut W, e: &Expr) -> Result<()> {
         }) => {
             write!(
                 w,
-                "{} {}{} {} {}",
+                "{} {}{} {}",
                 expr,
                 if *negated { "NOT " } else { "" },
                 if *case_insensitive { "ILIKE" } else { "LIKE" },
                 pattern,
-                if let Some(char) = escape_char {
-                    format!("CHAR '{char}'")
-                } else {
-                    "".to_owned()
-                }
             )?;
+            if let Some(char) = escape_char {
+                write!(w, " CHAR '{char}'")?;
+            }
         }
         Expr::SimilarTo(Like {
             negated,
@@ -1721,20 +1719,18 @@ fn write_name<W: Write>(w: &mut W, e: &Expr) -> Result<()> {
         }) => {
             write!(
                 w,
-                "{} {} {} {}",
+                "{} {} {}",
                 expr,
                 if *negated {
                     "NOT SIMILAR TO"
                 } else {
                     "SIMILAR TO"
                 },
                 pattern,
-                if let Some(char) = escape_char {
-                    format!("CHAR '{char}'")
-                } else {
-                    "".to_owned()
-                }
             )?;
+            if let Some(char) = escape_char {
+                write!(w, " CHAR '{char}'")?;
+            }
         }
         Expr::Case(case) => {
             write!(w, "CASE ")?;

diff --git a/datafusion/optimizer/src/analyzer/type_coercion.rs b/datafusion/optimizer/src/analyzer/type_coercion.rs
@@ -1129,7 +1129,7 @@ mod test {
         let like_expr = Expr::Like(Like::new(false, expr, pattern, None, false));
         let empty = empty_with_type(DataType::Utf8);
         let plan = LogicalPlan::Projection(Projection::try_new(vec![like_expr], empty)?);
-        let expected = "Projection: a LIKE CAST(NULL AS Utf8) AS a LIKE NULL \
+        let expected = "Projection: a LIKE CAST(NULL AS Utf8) AS a LIKE NULL\
              \n  EmptyRelation";
         assert_analyzed_plan_eq(Arc::new(TypeCoercion::new()), plan, expected)?;
 
@@ -1158,7 +1158,7 @@ mod test {
         let ilike_expr = Expr::Like(Like::new(false, expr, pattern, None, true));
         let empty = empty_with_type(DataType::Utf8);
         let plan = LogicalPlan::Projection(Projection::try_new(vec![ilike_expr], empty)?);
-        let expected = "Projection: a ILIKE CAST(NULL AS Utf8) AS a ILIKE NULL \
+        let expected = "Projection: a ILIKE CAST(NULL AS Utf8) AS a ILIKE NULL\
              \n  EmptyRelation";
         assert_analyzed_plan_eq(Arc::new(TypeCoercion::new()), plan, expected)?;