fix

zml1206 · zml1206 · commit 13e6caa9d7a2 · 2024-12-24T20:27:48.000+08:00
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21.sf100/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21.sf100/explain.txt
@@ -134,16 +134,16 @@ Aggregate Attributes [2]: [sum(CASE WHEN (d_date#10 < 2000-03-11) THEN inv_quant
 Results [4]: [w_warehouse_name#12, i_item_id#7, sum(CASE WHEN (d_date#10 < 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#17 AS inv_before#19, sum(CASE WHEN (d_date#10 >= 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#18 AS inv_after#20]
 
 (23) Project [codegen id : 5]
-Output [5]: [w_warehouse_name#12, i_item_id#7, inv_before#19, inv_after#20, CASE WHEN (inv_before#19 > 0) THEN (cast(inv_after#20 as double) / cast(inv_before#19 as double)) END AS _common_expr_5#21]
+Output [5]: [w_warehouse_name#12, i_item_id#7, inv_before#19, inv_after#20, CASE WHEN (inv_before#19 > 0) THEN (cast(inv_after#20 as double) / cast(inv_before#19 as double)) END AS _common_expr_0#21]
 Input [4]: [w_warehouse_name#12, i_item_id#7, inv_before#19, inv_after#20]
 
 (24) Filter [codegen id : 5]
-Input [5]: [w_warehouse_name#12, i_item_id#7, inv_before#19, inv_after#20, _common_expr_5#21]
-Condition : ((isnotnull(_common_expr_5#21) AND (_common_expr_5#21 >= 0.666667)) AND (_common_expr_5#21 <= 1.5))
+Input [5]: [w_warehouse_name#12, i_item_id#7, inv_before#19, inv_after#20, _common_expr_0#21]
+Condition : ((isnotnull(_common_expr_0#21) AND (_common_expr_0#21 >= 0.666667)) AND (_common_expr_0#21 <= 1.5))
 
 (25) Project [codegen id : 5]
 Output [4]: [w_warehouse_name#12, i_item_id#7, inv_before#19, inv_after#20]
-Input [5]: [w_warehouse_name#12, i_item_id#7, inv_before#19, inv_after#20, _common_expr_5#21]
+Input [5]: [w_warehouse_name#12, i_item_id#7, inv_before#19, inv_after#20, _common_expr_0#21]
 
 (26) TakeOrderedAndProject
 Input [4]: [w_warehouse_name#12, i_item_id#7, inv_before#19, inv_after#20]
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21.sf100/simplified.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21.sf100/simplified.txt
@@ -1,7 +1,7 @@
 TakeOrderedAndProject [w_warehouse_name,i_item_id,inv_before,inv_after]
   WholeStageCodegen (5)
     Project [w_warehouse_name,i_item_id,inv_before,inv_after]
-      Filter [_common_expr_5]
+      Filter [_common_expr_0]
         Project [w_warehouse_name,i_item_id,inv_before,inv_after]
           HashAggregate [w_warehouse_name,i_item_id,sum,sum] [sum(CASE WHEN (d_date < 2000-03-11) THEN inv_quantity_on_hand ELSE 0 END),sum(CASE WHEN (d_date >= 2000-03-11) THEN inv_quantity_on_hand ELSE 0 END),inv_before,inv_after,sum,sum]
             InputAdapter
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/explain.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/explain.txt
@@ -134,16 +134,16 @@ Aggregate Attributes [2]: [sum(CASE WHEN (d_date#12 < 2000-03-11) THEN inv_quant
 Results [4]: [w_warehouse_name#7, i_item_id#9, sum(CASE WHEN (d_date#12 < 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#17 AS inv_before#19, sum(CASE WHEN (d_date#12 >= 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#18 AS inv_after#20]
 
 (23) Project [codegen id : 5]
-Output [5]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20, CASE WHEN (inv_before#19 > 0) THEN (cast(inv_after#20 as double) / cast(inv_before#19 as double)) END AS _common_expr_5#21]
+Output [5]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20, CASE WHEN (inv_before#19 > 0) THEN (cast(inv_after#20 as double) / cast(inv_before#19 as double)) END AS _common_expr_0#21]
 Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20]
 
 (24) Filter [codegen id : 5]
-Input [5]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20, _common_expr_5#21]
-Condition : ((isnotnull(_common_expr_5#21) AND (_common_expr_5#21 >= 0.666667)) AND (_common_expr_5#21 <= 1.5))
+Input [5]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20, _common_expr_0#21]
+Condition : ((isnotnull(_common_expr_0#21) AND (_common_expr_0#21 >= 0.666667)) AND (_common_expr_0#21 <= 1.5))
 
 (25) Project [codegen id : 5]
 Output [4]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20]
-Input [5]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20, _common_expr_5#21]
+Input [5]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20, _common_expr_0#21]
 
 (26) TakeOrderedAndProject
 Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20]
diff --git a/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/simplified.txt b/sql/core/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/simplified.txt
@@ -1,7 +1,7 @@
 TakeOrderedAndProject [w_warehouse_name,i_item_id,inv_before,inv_after]
   WholeStageCodegen (5)
     Project [w_warehouse_name,i_item_id,inv_before,inv_after]
-      Filter [_common_expr_5]
+      Filter [_common_expr_0]
         Project [w_warehouse_name,i_item_id,inv_before,inv_after]
           HashAggregate [w_warehouse_name,i_item_id,sum,sum] [sum(CASE WHEN (d_date < 2000-03-11) THEN inv_quantity_on_hand ELSE 0 END),sum(CASE WHEN (d_date >= 2000-03-11) THEN inv_quantity_on_hand ELSE 0 END),inv_before,inv_after,sum,sum]
             InputAdapter
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/TPCBase.scala b/sql/core/src/test/scala/org/apache/spark/sql/TPCBase.scala
@@ -32,6 +32,7 @@ trait TPCBase extends SharedSparkSession {
         .set(SQLConf.CBO_ENABLED, true)
         .set(SQLConf.PLAN_STATS_ENABLED, true)
         .set(SQLConf.JOIN_REORDER_ENABLED, true)
+        .set(SQLConf.USE_COMMON_EXPR_ID_FOR_ALIAS, false)
     } else {
       super.sparkConf.set(SQLConf.MAX_TO_STRING_FIELDS, Int.MaxValue)
     }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ trait TPCBase extends SharedSparkSession {`
`32`	`32`	`.set(SQLConf.CBO_ENABLED, true)`
`33`	`33`	`.set(SQLConf.PLAN_STATS_ENABLED, true)`
`34`	`34`	`.set(SQLConf.JOIN_REORDER_ENABLED, true)`
	`35`	`+ .set(SQLConf.USE_COMMON_EXPR_ID_FOR_ALIAS, false)`
`35`	`36`	`} else {`
`36`	`37`	`super.sparkConf.set(SQLConf.MAX_TO_STRING_FIELDS, Int.MaxValue)`
`37`	`38`	`}`