From a8ea6cf7734a8071be0243bce3bb228ed310be0c Mon Sep 17 00:00:00 2001
From: Jia-Xuan Liu <liugs963@gmail.com>
Date: Sat, 21 Sep 2024 01:01:46 +0800
Subject: [PATCH] simplify the macro rules

---
 .../optimizer/src/analyzer/type_coercion.rs   | 81 +++++++------------
 1 file changed, 28 insertions(+), 53 deletions(-)

diff --git a/datafusion/optimizer/src/analyzer/type_coercion.rs b/datafusion/optimizer/src/analyzer/type_coercion.rs
index bac8c3db3adc..3e31ac1c6375 100644
--- a/datafusion/optimizer/src/analyzer/type_coercion.rs
+++ b/datafusion/optimizer/src/analyzer/type_coercion.rs
@@ -1811,6 +1811,22 @@ mod test {
         Ok(())
     }
 
+    macro_rules! test_case_expression {
+        ($expr:expr, $when_then:expr, $case_when_type:expr, $then_else_type:expr, $schema:expr) => {
+            let case = Case {
+                expr: $expr.map(|e| Box::new(col(e))),
+                when_then_expr: $when_then,
+                else_expr: None,
+            };
+
+            let expected =
+                cast_helper(case.clone(), &$case_when_type, &$then_else_type, &$schema);
+
+            let actual = coerce_case_expression(case, &$schema)?;
+            assert_eq!(expected, actual);
+        };
+    }
+
     #[test]
     fn tes_case_when_list() -> Result<()> {
         let inner_field = Arc::new(Field::new("item", DataType::Int64, true));
@@ -1832,30 +1848,8 @@ mod test {
             std::collections::HashMap::new(),
         )?);
 
-        macro_rules! test_case_expression {
-            ($expr:expr, $when_then:expr, $case_when_type:expr, $then_else_type:expr, $schema:expr) => {
-                let case = Case {
-                    expr: Some(Box::new(col($expr))),
-                    when_then_expr: $when_then,
-                    else_expr: None,
-                };
-
-                let case_when_common_type = $case_when_type;
-                let then_else_common_type = $then_else_type;
-                let expected = cast_helper(
-                    case.clone(),
-                    &case_when_common_type,
-                    &then_else_common_type,
-                    &$schema,
-                );
-
-                let actual = coerce_case_expression(case, &$schema)?;
-                assert_eq!(expected, actual);
-            };
-        }
-
         test_case_expression!(
-            "list",
+            Some("list"),
             vec![(Box::new(col("large_list")), Box::new(lit("1")))],
             DataType::LargeList(Arc::new(Field::new("item", DataType::Int64, true))),
             DataType::Utf8,
@@ -1863,7 +1857,7 @@ mod test {
         );
 
         test_case_expression!(
-            "large_list",
+            Some("large_list"),
             vec![(Box::new(col("list")), Box::new(lit("1")))],
             DataType::LargeList(Arc::new(Field::new("item", DataType::Int64, true))),
             DataType::Utf8,
@@ -1871,7 +1865,7 @@ mod test {
         );
 
         test_case_expression!(
-            "list",
+            Some("list"),
             vec![(Box::new(col("fixed_list")), Box::new(lit("1")))],
             DataType::List(Arc::new(Field::new("item", DataType::Int64, true))),
             DataType::Utf8,
@@ -1879,7 +1873,7 @@ mod test {
         );
 
         test_case_expression!(
-            "fixed_list",
+            Some("fixed_list"),
             vec![(Box::new(col("list")), Box::new(lit("1")))],
             DataType::List(Arc::new(Field::new("item", DataType::Int64, true))),
             DataType::Utf8,
@@ -1887,7 +1881,7 @@ mod test {
         );
 
         test_case_expression!(
-            "fixed_list",
+            Some("fixed_list"),
             vec![(Box::new(col("large_list")), Box::new(lit("1")))],
             DataType::LargeList(Arc::new(Field::new("item", DataType::Int64, true))),
             DataType::Utf8,
@@ -1895,7 +1889,7 @@ mod test {
         );
 
         test_case_expression!(
-            "large_list",
+            Some("large_list"),
             vec![(Box::new(col("fixed_list")), Box::new(lit("1")))],
             DataType::LargeList(Arc::new(Field::new("item", DataType::Int64, true))),
             DataType::Utf8,
@@ -1925,29 +1919,10 @@ mod test {
             .into(),
             std::collections::HashMap::new(),
         )?);
-        macro_rules! test_case_expression {
-            ($expr:expr, $when_then:expr, $case_when_type:expr, $then_else_type:expr, $schema:expr) => {
-                let case = Case {
-                    expr: None,
-                    when_then_expr: $when_then,
-                    else_expr: None,
-                };
-
-                let expected = cast_helper(
-                    case.clone(),
-                    &$case_when_type,
-                    &$then_else_type,
-                    &$schema,
-                );
-
-                let actual = coerce_case_expression(case, &$schema)?;
-                assert_eq!(expected, actual);
-            };
-        }
 
         // large list and list
         test_case_expression!(
-            "boolean",
+            None::<String>,
             vec![
                 (Box::new(col("boolean")), Box::new(col("large_list"))),
                 (Box::new(col("boolean")), Box::new(col("list")))
@@ -1958,7 +1933,7 @@ mod test {
         );
 
         test_case_expression!(
-            "boolean",
+            None::<String>,
             vec![
                 (Box::new(col("boolean")), Box::new(col("list"))),
                 (Box::new(col("boolean")), Box::new(col("large_list")))
@@ -1970,7 +1945,7 @@ mod test {
 
         // fixed list and list
         test_case_expression!(
-            "boolean",
+            None::<String>,
             vec![
                 (Box::new(col("boolean")), Box::new(col("fixed_list"))),
                 (Box::new(col("boolean")), Box::new(col("list")))
@@ -1981,7 +1956,7 @@ mod test {
         );
 
         test_case_expression!(
-            "boolean",
+            None::<String>,
             vec![
                 (Box::new(col("boolean")), Box::new(col("list"))),
                 (Box::new(col("boolean")), Box::new(col("fixed_list")))
@@ -1993,7 +1968,7 @@ mod test {
 
         // fixed list and large list
         test_case_expression!(
-            "boolean",
+            None::<String>,
             vec![
                 (Box::new(col("boolean")), Box::new(col("fixed_list"))),
                 (Box::new(col("boolean")), Box::new(col("large_list")))
@@ -2004,7 +1979,7 @@ mod test {
         );
 
         test_case_expression!(
-            "boolean",
+            None::<String>,
             vec![
                 (Box::new(col("boolean")), Box::new(col("large_list"))),
                 (Box::new(col("boolean")), Box::new(col("fixed_list")))