Skip to content

Commit efe12ae

Browse files
wangyumwangyum
committed
Revert "[SPARK-33861][SQL] Simplify conditional in predicate"
This reverts commit 32d4a2b and 3aa4e11. Closes apache#37729 from wangyum/SPARK-33861. Authored-by: Yuming Wang <[email protected]> Signed-off-by: Yuming Wang <[email protected]> (cherry picked from commit 43cbdc6) Signed-off-by: Yuming Wang <[email protected]>
1 parent 58375a8 commit efe12ae

File tree

54 files changed

+343
-665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+343
-665
lines changed

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ abstract class Optimizer(catalogManager: CatalogManager)
113113
RemoveDispensableExpressions,
114114
SimplifyBinaryComparison,
115115
ReplaceNullWithFalseInPredicate,
116-
SimplifyConditionalsInPredicate,
117116
PruneFilters,
118117
SimplifyCasts,
119118
SimplifyCaseConversionExpressions,

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalsInPredicate.scala‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/rules/RuleIdCollection.scala‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ object RuleIdCollection {
148148
"org.apache.spark.sql.catalyst.optimizer.SimplifyCaseConversionExpressions" ::
149149
"org.apache.spark.sql.catalyst.optimizer.SimplifyCasts" ::
150150
"org.apache.spark.sql.catalyst.optimizer.SimplifyConditionals" ::
151-
"org.apache.spark.sql.catalyst.optimizer.SimplifyConditionalsInPredicate" ::
152151
"org.apache.spark.sql.catalyst.optimizer.SimplifyExtractValueOps" ::
153152
"org.apache.spark.sql.catalyst.optimizer.TransposeWindow" ::
154153
"org.apache.spark.sql.catalyst.optimizer.UnwrapCastInBinaryComparison" :: Nil

‎sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalsInPredicateSuite.scala‎

Lines changed: 0 additions & 249 deletions
This file was deleted.

‎sql/core/src/test/resources/tpcds-plan-stability/approved-plans-modified/q34.sf100/explain.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ Input [5]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_store_sk#3, ss_ticket_number#4,
9898
Output [4]: [hd_demo_sk#10, hd_buy_potential#11, hd_dep_count#12, hd_vehicle_count#13]
9999
Batched: true
100100
Location [not included in comparison]/{warehouse_dir}/household_demographics]
101-
PushedFilters: [IsNotNull(hd_vehicle_count), IsNotNull(hd_dep_count), Or(EqualTo(hd_buy_potential,>10000 ),EqualTo(hd_buy_potential,Unknown )), GreaterThan(hd_vehicle_count,0), IsNotNull(hd_demo_sk)]
101+
PushedFilters: [IsNotNull(hd_vehicle_count), Or(EqualTo(hd_buy_potential,>10000 ),EqualTo(hd_buy_potential,Unknown )), GreaterThan(hd_vehicle_count,0), IsNotNull(hd_demo_sk)]
102102
ReadSchema: struct<hd_demo_sk:int,hd_buy_potential:string,hd_dep_count:int,hd_vehicle_count:int>
103103

104104
(15) ColumnarToRow [codegen id : 3]
105105
Input [4]: [hd_demo_sk#10, hd_buy_potential#11, hd_dep_count#12, hd_vehicle_count#13]
106106

107107
(16) Filter [codegen id : 3]
108108
Input [4]: [hd_demo_sk#10, hd_buy_potential#11, hd_dep_count#12, hd_vehicle_count#13]
109-
Condition : (((((isnotnull(hd_vehicle_count#13) AND isnotnull(hd_dep_count#12)) AND ((hd_buy_potential#11 = >10000 ) OR (hd_buy_potential#11 = Unknown ))) AND (hd_vehicle_count#13 > 0)) AND ((cast(hd_dep_count#12 as double) / cast(hd_vehicle_count#13 as double)) > 1.2)) AND isnotnull(hd_demo_sk#10))
109+
Condition : ((((isnotnull(hd_vehicle_count#13) AND ((hd_buy_potential#11 = >10000 ) OR (hd_buy_potential#11 = Unknown ))) AND (hd_vehicle_count#13 > 0)) AND CASE WHEN (hd_vehicle_count#13 > 0) THEN ((cast(hd_dep_count#12 as double) / cast(hd_vehicle_count#13 as double)) > 1.2) END) AND isnotnull(hd_demo_sk#10))
110110

111111
(17) Project [codegen id : 3]
112112
Output [1]: [hd_demo_sk#10]

‎sql/core/src/test/resources/tpcds-plan-stability/approved-plans-modified/q34.sf100/simplified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ WholeStageCodegen (10)
4949
BroadcastExchange #6
5050
WholeStageCodegen (3)
5151
Project [hd_demo_sk]
52-
Filter [hd_vehicle_count,hd_dep_count,hd_buy_potential,hd_demo_sk]
52+
Filter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
5353
ColumnarToRow
5454
InputAdapter
5555
Scan parquet default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]

0 commit comments

Comments
 (0)