This is an automated email from the ASF dual-hosted git repository.
englefly pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new af7eb1573f3 [fix](nereids)OrToIn and SimplifyRange rules dead loop
(#41689)
af7eb1573f3 is described below
commit af7eb1573f36a4849f41ae9517fc93480ae75a6d
Author: minghong <engle...@gmail.com>
AuthorDate: Tue Oct 15 14:48:30 2024 +0800
[fix](nereids)OrToIn and SimplifyRange rules dead loop (#41689)
intro by #41222
[bug]
OrToIn Rule set state flag in Or expression to avoid repeatedly process
the same expression. But SimplifyRange Rule may remove this flag, and
hence OrToIn and SimplifyRange Rules go into dead loop.
[fix]
if the input expression and output expression of SimplifyRange Rule are
the same, SimplifyRange will return input expression to keep expression
state.
---
.../rules/expression/ExpressionOptimization.java | 1 -
.../rules/expression/rules/SimplifyRange.java | 3 ++
.../doris/nereids/rules/rewrite/OrToInTest.java | 8 +++
.../data/nereids_hint_tpcds_p0/shape/query13.out | 2 +-
.../bs_downgrade_shape/query13.out | 2 +-
.../shape/query13.out | 2 +-
.../noStatsRfPrune/query13.out | 2 +-
.../no_stats_shape/query13.out | 2 +-
.../rf_prune/query13.out | 2 +-
.../nereids_tpcds_shape_sf100_p0/shape/query13.out | 2 +-
.../shape/query13.out | 2 +-
.../tpcds_sf100/noStatsRfPrune/query13.out | 2 +-
.../tpcds_sf100/no_stats_shape/query13.out | 2 +-
.../new_shapes_p0/tpcds_sf100/rf_prune/query13.out | 2 +-
.../new_shapes_p0/tpcds_sf100/shape/query13.out | 2 +-
.../tpcds_sf1000/bs_downgrade_shape/query13.out | 2 +-
.../new_shapes_p0/tpcds_sf1000/shape/query13.out | 2 +-
.../suites/nereids_rules_p0/or_to_in/ortoin.groovy | 62 ++++++++++++++++++++++
18 files changed, 87 insertions(+), 15 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/ExpressionOptimization.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/ExpressionOptimization.java
index 1852994b7af..0ae179489ac 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/ExpressionOptimization.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/ExpressionOptimization.java
@@ -48,7 +48,6 @@ public class ExpressionOptimization extends ExpressionRewrite
{
SimplifyDecimalV3Comparison.INSTANCE,
SimplifyRange.INSTANCE,
OrToIn.INSTANCE,
- SimplifyRange.INSTANCE,
DateFunctionRewrite.INSTANCE,
ArrayContainToArrayOverlap.INSTANCE,
CaseWhenToIf.INSTANCE,
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/SimplifyRange.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/SimplifyRange.java
index 98d752facb4..c03b88f8816 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/SimplifyRange.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/SimplifyRange.java
@@ -494,6 +494,9 @@ public class SimplifyRange implements
ExpressionPatternRuleFactory {
for (int i = 1; i < sourceValues.size(); i++) {
result = mergeExprOp.apply(result,
sourceValues.get(i).toExpression());
}
+ if (result.equals(expr)) {
+ return expr;
+ }
return result;
}
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/OrToInTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/OrToInTest.java
index f5615d59fe8..aaca3edf101 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/OrToInTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/OrToInTest.java
@@ -205,4 +205,12 @@ class OrToInTest extends ExpressionRewriteTestHelper {
Assertions.assertEquals("(a = 1)",
rewritten.toSql());
}
+
+ @Test
+ void test17() {
+ String expr = "(a=1 and b=2) or (a in (2, 3) and ((a=2 and c=3) or
(a=3 and d=4)))";
+ Expression expression = PARSER.parseExpression(expr);
+ Expression rewritten = OrToIn.INSTANCE.rewriteTree(expression,
context);
+ System.out.println(rewritten);
+ }
}
diff --git a/regression-test/data/nereids_hint_tpcds_p0/shape/query13.out
b/regression-test/data/nereids_hint_tpcds_p0/shape/query13.out
index ef354dbaff4..1c8d917a861 100644
--- a/regression-test/data/nereids_hint_tpcds_p0/shape/query13.out
+++ b/regression-test/data/nereids_hint_tpcds_p0/shape/query13.out
@@ -7,7 +7,7 @@ PhysicalResultSink
--------PhysicalProject
----------hashJoin[INNER_JOIN broadcast] hashCondition=((store.s_store_sk =
store_sales.ss_store_sk)) otherCondition=() build RFs:RF4
s_store_sk->[ss_store_sk]
------------PhysicalProject
---------------hashJoin[INNER_JOIN shuffle]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('2 yr Degree',
'Primary')) AND ((cd_marital_status IN ('D', 'W') AND cd_education_status IN
('2 yr Degree', 'Primary')) AND ((((customer_demographics.cd_marital_status =
'D') AND (customer_demographics.cd_education_status = 'Primary')) AND ((sto
[...]
+--------------hashJoin[INNER_JOIN shuffle]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('2 yr Degree',
'Primary')) AND ((((customer_demographics.cd_marital_status = 'D') AND
(customer_demographics.cd_education_status = 'Primary')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR (((customer [...]
----------------PhysicalProject
------------------filter(((((customer_demographics.cd_marital_status = 'M')
AND (customer_demographics.cd_education_status = 'College')) OR
((customer_demographics.cd_marital_status = 'D') AND
(customer_demographics.cd_education_status = 'Primary'))) OR
((customer_demographics.cd_marital_status = 'W') AND
(customer_demographics.cd_education_status = '2 yr Degree'))) and
cd_education_status IN ('2 yr Degree', 'College', 'Primary') and
cd_marital_status IN ('D', 'M', 'W'))
--------------------PhysicalOlapScan[customer_demographics] apply RFs: RF3
diff --git
a/regression-test/data/nereids_tpcds_shape_sf1000_p0/bs_downgrade_shape/query13.out
b/regression-test/data/nereids_tpcds_shape_sf1000_p0/bs_downgrade_shape/query13.out
index 30208c887ca..461f54e0e17 100644
---
a/regression-test/data/nereids_tpcds_shape_sf1000_p0/bs_downgrade_shape/query13.out
+++
b/regression-test/data/nereids_tpcds_shape_sf1000_p0/bs_downgrade_shape/query13.out
@@ -14,7 +14,7 @@ PhysicalResultSink
----------------PhysicalProject
------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_sold_date_sk = date_dim.d_date_sk))
otherCondition=() build RFs:RF2 d_date_sk->[ss_sold_date_sk]
--------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('2 yr Degree',
'Primary')) AND ((cd_marital_status IN ('D', 'W') AND cd_education_status IN
('2 yr Degree', 'Primary')) AND ((((customer_demographics.cd_marital_status =
'D') AND (customer_demographics.cd_education_status = 'Primary') [...]
+----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('2 yr Degree',
'Primary')) AND ((((customer_demographics.cd_marital_status = 'D') AND
(customer_demographics.cd_education_status = 'Primary')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR [...]
------------------------PhysicalProject
--------------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=() build RFs:RF0 cd_demo_sk->[ss_cdemo_sk]
----------------------------PhysicalProject
diff --git
a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query13.out
b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query13.out
index 30208c887ca..461f54e0e17 100644
--- a/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query13.out
+++ b/regression-test/data/nereids_tpcds_shape_sf1000_p0/shape/query13.out
@@ -14,7 +14,7 @@ PhysicalResultSink
----------------PhysicalProject
------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_sold_date_sk = date_dim.d_date_sk))
otherCondition=() build RFs:RF2 d_date_sk->[ss_sold_date_sk]
--------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('2 yr Degree',
'Primary')) AND ((cd_marital_status IN ('D', 'W') AND cd_education_status IN
('2 yr Degree', 'Primary')) AND ((((customer_demographics.cd_marital_status =
'D') AND (customer_demographics.cd_education_status = 'Primary') [...]
+----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('2 yr Degree',
'Primary')) AND ((((customer_demographics.cd_marital_status = 'D') AND
(customer_demographics.cd_education_status = 'Primary')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR [...]
------------------------PhysicalProject
--------------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=() build RFs:RF0 cd_demo_sk->[ss_cdemo_sk]
----------------------------PhysicalProject
diff --git
a/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query13.out
b/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query13.out
index b62a45f1fe2..6df93fe3046 100644
---
a/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query13.out
+++
b/regression-test/data/nereids_tpcds_shape_sf100_p0/noStatsRfPrune/query13.out
@@ -9,7 +9,7 @@ PhysicalResultSink
------------PhysicalProject
--------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_addr_sk = customer_address.ca_address_sk))
otherCondition=((((ca_state IN ('KS', 'MI', 'SD') AND
((store_sales.ss_net_profit >= 100.00) AND (store_sales.ss_net_profit <=
200.00))) OR (ca_state IN ('CO', 'MO', 'ND') AND ((store_sales.ss_net_profit >=
150.00) AND (store_sales.ss_net_profit <= 300.00)))) OR (ca_state IN ('NH',
'OH', 'TX') AND ((store_sales.ss_net_profit >= 50.00) AND
(store_sales.ss_net_profit <= 25 [...]
----------------PhysicalProject
-------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((cd_marital_status IN ('M', 'S') AND cd_education_status IN
('4 yr Degree', 'College')) AND ((((customer_demographics.cd_marital_status =
'S') AND (customer_demographics.cd_education_status = 'College')) AN [...]
+------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR (((c [...]
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=() build RFs:RF1 cd_demo_sk->[ss_cdemo_sk]
------------------------PhysicalProject
diff --git
a/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query13.out
b/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query13.out
index 61f8590deca..7f109c5dece 100644
---
a/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query13.out
+++
b/regression-test/data/nereids_tpcds_shape_sf100_p0/no_stats_shape/query13.out
@@ -9,7 +9,7 @@ PhysicalResultSink
------------PhysicalProject
--------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_addr_sk = customer_address.ca_address_sk))
otherCondition=((((ca_state IN ('KS', 'MI', 'SD') AND
((store_sales.ss_net_profit >= 100.00) AND (store_sales.ss_net_profit <=
200.00))) OR (ca_state IN ('CO', 'MO', 'ND') AND ((store_sales.ss_net_profit >=
150.00) AND (store_sales.ss_net_profit <= 300.00)))) OR (ca_state IN ('NH',
'OH', 'TX') AND ((store_sales.ss_net_profit >= 50.00) AND
(store_sales.ss_net_profit <= 25 [...]
----------------PhysicalProject
-------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((cd_marital_status IN ('M', 'S') AND cd_education_status IN
('4 yr Degree', 'College')) AND ((((customer_demographics.cd_marital_status =
'S') AND (customer_demographics.cd_education_status = 'College')) AN [...]
+------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR (((c [...]
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=() build RFs:RF1 cd_demo_sk->[ss_cdemo_sk]
------------------------PhysicalProject
diff --git
a/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query13.out
b/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query13.out
index f3c8db3bfc4..e92ddac6d97 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query13.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/rf_prune/query13.out
@@ -7,7 +7,7 @@ PhysicalResultSink
--------PhysicalProject
----------hashJoin[INNER_JOIN broadcast] hashCondition=((store.s_store_sk =
store_sales.ss_store_sk)) otherCondition=()
------------PhysicalProject
---------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((cd_marital_status IN ('M', 'S') AND cd_education_status IN
('4 yr Degree', 'College')) AND ((((customer_demographics.cd_marital_status =
'S') AND (customer_demographics.cd_education_status = 'College')) AND ((s [...]
+--------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR (((custom [...]
----------------PhysicalProject
------------------filter(((((customer_demographics.cd_marital_status = 'D')
AND (customer_demographics.cd_education_status = 'Unknown')) OR
((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College'))) OR
((customer_demographics.cd_marital_status = 'M') AND
(customer_demographics.cd_education_status = '4 yr Degree'))) and
cd_education_status IN ('4 yr Degree', 'College', 'Unknown') and
cd_marital_status IN ('D', 'M', 'S'))
--------------------PhysicalOlapScan[customer_demographics] apply RFs: RF3
diff --git
a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query13.out
b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query13.out
index 17cd82b3e1c..7528312c6da 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query13.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query13.out
@@ -7,7 +7,7 @@ PhysicalResultSink
--------PhysicalProject
----------hashJoin[INNER_JOIN broadcast] hashCondition=((store.s_store_sk =
store_sales.ss_store_sk)) otherCondition=() build RFs:RF4
s_store_sk->[ss_store_sk]
------------PhysicalProject
---------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((cd_marital_status IN ('M', 'S') AND cd_education_status IN
('4 yr Degree', 'College')) AND ((((customer_demographics.cd_marital_status =
'S') AND (customer_demographics.cd_education_status = 'College')) AND ((s [...]
+--------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR (((custom [...]
----------------PhysicalProject
------------------filter(((((customer_demographics.cd_marital_status = 'D')
AND (customer_demographics.cd_education_status = 'Unknown')) OR
((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College'))) OR
((customer_demographics.cd_marital_status = 'M') AND
(customer_demographics.cd_education_status = '4 yr Degree'))) and
cd_education_status IN ('4 yr Degree', 'College', 'Unknown') and
cd_marital_status IN ('D', 'M', 'S'))
--------------------PhysicalOlapScan[customer_demographics] apply RFs: RF3
diff --git
a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query13.out
b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query13.out
index 2487ceb9b58..169daff229f 100644
--- a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query13.out
+++ b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query13.out
@@ -9,7 +9,7 @@ PhysicalResultSink
------------PhysicalProject
--------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_addr_sk = customer_address.ca_address_sk))
otherCondition=((((ca_state IN ('MI', 'OK', 'TX') AND
((store_sales.ss_net_profit >= 100.00) AND (store_sales.ss_net_profit <=
200.00))) OR (ca_state IN ('NC', 'OH', 'WA') AND ((store_sales.ss_net_profit >=
150.00) AND (store_sales.ss_net_profit <= 300.00)))) OR (ca_state IN ('FL',
'GA', 'MT') AND ((store_sales.ss_net_profit >= 50.00) AND
(store_sales.ss_net_profit <= 25 [...]
----------------PhysicalProject
-------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('College',
'Primary')) AND ((cd_marital_status IN ('D', 'W') AND cd_education_status IN
('College', 'Primary')) AND ((((customer_demographics.cd_marital_status = 'W')
AND (customer_demographics.cd_education_status = 'College')) AND ((stor [...]
+------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('College',
'Primary')) AND ((((customer_demographics.cd_marital_status = 'W') AND
(customer_demographics.cd_education_status = 'College')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR (((custo [...]
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=() build RFs:RF1 cd_demo_sk->[ss_cdemo_sk]
------------------------PhysicalProject
diff --git
a/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query13.out
b/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query13.out
index b62a45f1fe2..6df93fe3046 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query13.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/noStatsRfPrune/query13.out
@@ -9,7 +9,7 @@ PhysicalResultSink
------------PhysicalProject
--------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_addr_sk = customer_address.ca_address_sk))
otherCondition=((((ca_state IN ('KS', 'MI', 'SD') AND
((store_sales.ss_net_profit >= 100.00) AND (store_sales.ss_net_profit <=
200.00))) OR (ca_state IN ('CO', 'MO', 'ND') AND ((store_sales.ss_net_profit >=
150.00) AND (store_sales.ss_net_profit <= 300.00)))) OR (ca_state IN ('NH',
'OH', 'TX') AND ((store_sales.ss_net_profit >= 50.00) AND
(store_sales.ss_net_profit <= 25 [...]
----------------PhysicalProject
-------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((cd_marital_status IN ('M', 'S') AND cd_education_status IN
('4 yr Degree', 'College')) AND ((((customer_demographics.cd_marital_status =
'S') AND (customer_demographics.cd_education_status = 'College')) AN [...]
+------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR (((c [...]
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=() build RFs:RF1 cd_demo_sk->[ss_cdemo_sk]
------------------------PhysicalProject
diff --git
a/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query13.out
b/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query13.out
index 61f8590deca..7f109c5dece 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query13.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/no_stats_shape/query13.out
@@ -9,7 +9,7 @@ PhysicalResultSink
------------PhysicalProject
--------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_addr_sk = customer_address.ca_address_sk))
otherCondition=((((ca_state IN ('KS', 'MI', 'SD') AND
((store_sales.ss_net_profit >= 100.00) AND (store_sales.ss_net_profit <=
200.00))) OR (ca_state IN ('CO', 'MO', 'ND') AND ((store_sales.ss_net_profit >=
150.00) AND (store_sales.ss_net_profit <= 300.00)))) OR (ca_state IN ('NH',
'OH', 'TX') AND ((store_sales.ss_net_profit >= 50.00) AND
(store_sales.ss_net_profit <= 25 [...]
----------------PhysicalProject
-------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((cd_marital_status IN ('M', 'S') AND cd_education_status IN
('4 yr Degree', 'College')) AND ((((customer_demographics.cd_marital_status =
'S') AND (customer_demographics.cd_education_status = 'College')) AN [...]
+------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR (((c [...]
--------------------PhysicalProject
----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=() build RFs:RF1 cd_demo_sk->[ss_cdemo_sk]
------------------------PhysicalProject
diff --git
a/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query13.out
b/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query13.out
index f3c8db3bfc4..e92ddac6d97 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query13.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/rf_prune/query13.out
@@ -7,7 +7,7 @@ PhysicalResultSink
--------PhysicalProject
----------hashJoin[INNER_JOIN broadcast] hashCondition=((store.s_store_sk =
store_sales.ss_store_sk)) otherCondition=()
------------PhysicalProject
---------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((cd_marital_status IN ('M', 'S') AND cd_education_status IN
('4 yr Degree', 'College')) AND ((((customer_demographics.cd_marital_status =
'S') AND (customer_demographics.cd_education_status = 'College')) AND ((s [...]
+--------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR (((custom [...]
----------------PhysicalProject
------------------filter(((((customer_demographics.cd_marital_status = 'D')
AND (customer_demographics.cd_education_status = 'Unknown')) OR
((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College'))) OR
((customer_demographics.cd_marital_status = 'M') AND
(customer_demographics.cd_education_status = '4 yr Degree'))) and
cd_education_status IN ('4 yr Degree', 'College', 'Unknown') and
cd_marital_status IN ('D', 'M', 'S'))
--------------------PhysicalOlapScan[customer_demographics] apply RFs: RF3
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query13.out
b/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query13.out
index 17cd82b3e1c..7528312c6da 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query13.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf100/shape/query13.out
@@ -7,7 +7,7 @@ PhysicalResultSink
--------PhysicalProject
----------hashJoin[INNER_JOIN broadcast] hashCondition=((store.s_store_sk =
store_sales.ss_store_sk)) otherCondition=() build RFs:RF4
s_store_sk->[ss_store_sk]
------------PhysicalProject
---------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((cd_marital_status IN ('M', 'S') AND cd_education_status IN
('4 yr Degree', 'College')) AND ((((customer_demographics.cd_marital_status =
'S') AND (customer_demographics.cd_education_status = 'College')) AND ((s [...]
+--------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('M', 'S')) AND cd_education_status IN ('4 yr Degree',
'College')) AND ((((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR (((custom [...]
----------------PhysicalProject
------------------filter(((((customer_demographics.cd_marital_status = 'D')
AND (customer_demographics.cd_education_status = 'Unknown')) OR
((customer_demographics.cd_marital_status = 'S') AND
(customer_demographics.cd_education_status = 'College'))) OR
((customer_demographics.cd_marital_status = 'M') AND
(customer_demographics.cd_education_status = '4 yr Degree'))) and
cd_education_status IN ('4 yr Degree', 'College', 'Unknown') and
cd_marital_status IN ('D', 'M', 'S'))
--------------------PhysicalOlapScan[customer_demographics] apply RFs: RF3
diff --git
a/regression-test/data/new_shapes_p0/tpcds_sf1000/bs_downgrade_shape/query13.out
b/regression-test/data/new_shapes_p0/tpcds_sf1000/bs_downgrade_shape/query13.out
index 30208c887ca..461f54e0e17 100644
---
a/regression-test/data/new_shapes_p0/tpcds_sf1000/bs_downgrade_shape/query13.out
+++
b/regression-test/data/new_shapes_p0/tpcds_sf1000/bs_downgrade_shape/query13.out
@@ -14,7 +14,7 @@ PhysicalResultSink
----------------PhysicalProject
------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_sold_date_sk = date_dim.d_date_sk))
otherCondition=() build RFs:RF2 d_date_sk->[ss_sold_date_sk]
--------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('2 yr Degree',
'Primary')) AND ((cd_marital_status IN ('D', 'W') AND cd_education_status IN
('2 yr Degree', 'Primary')) AND ((((customer_demographics.cd_marital_status =
'D') AND (customer_demographics.cd_education_status = 'Primary') [...]
+----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('2 yr Degree',
'Primary')) AND ((((customer_demographics.cd_marital_status = 'D') AND
(customer_demographics.cd_education_status = 'Primary')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR [...]
------------------------PhysicalProject
--------------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=() build RFs:RF0 cd_demo_sk->[ss_cdemo_sk]
----------------------------PhysicalProject
diff --git a/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query13.out
b/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query13.out
index 30208c887ca..461f54e0e17 100644
--- a/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query13.out
+++ b/regression-test/data/new_shapes_p0/tpcds_sf1000/shape/query13.out
@@ -14,7 +14,7 @@ PhysicalResultSink
----------------PhysicalProject
------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_sold_date_sk = date_dim.d_date_sk))
otherCondition=() build RFs:RF2 d_date_sk->[ss_sold_date_sk]
--------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('2 yr Degree',
'Primary')) AND ((cd_marital_status IN ('D', 'W') AND cd_education_status IN
('2 yr Degree', 'Primary')) AND ((((customer_demographics.cd_marital_status =
'D') AND (customer_demographics.cd_education_status = 'Primary') [...]
+----------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk))
otherCondition=((((((household_demographics.hd_dep_count = 1) AND
cd_marital_status IN ('D', 'W')) AND cd_education_status IN ('2 yr Degree',
'Primary')) AND ((((customer_demographics.cd_marital_status = 'D') AND
(customer_demographics.cd_education_status = 'Primary')) AND
((store_sales.ss_sales_price >= 50.00) AND (store_sales.ss_sales_price <=
100.00))) OR [...]
------------------------PhysicalProject
--------------------------hashJoin[INNER_JOIN broadcast]
hashCondition=((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk))
otherCondition=() build RFs:RF0 cd_demo_sk->[ss_cdemo_sk]
----------------------------PhysicalProject
diff --git a/regression-test/suites/nereids_rules_p0/or_to_in/ortoin.groovy
b/regression-test/suites/nereids_rules_p0/or_to_in/ortoin.groovy
new file mode 100644
index 00000000000..6633651b030
--- /dev/null
+++ b/regression-test/suites/nereids_rules_p0/or_to_in/ortoin.groovy
@@ -0,0 +1,62 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+
+suite("ortoin") {
+ sql """
+ drop table if exists
table_10_undef_partitions2_keys3_properties4_distributed_by53;
+ CREATE TABLE
`table_10_undef_partitions2_keys3_properties4_distributed_by53` (
+ `pk` int NULL,
+ `col_varchar_10__undef_signed` varchar(10) NULL,
+ `col_bigint_undef_signed` bigint NULL,
+ `col_varchar_64__undef_signed` varchar(64) NULL
+ ) ENGINE=OLAP
+ DUPLICATE KEY(`pk`, `col_varchar_10__undef_signed`)
+ DISTRIBUTED BY HASH(`pk`) BUCKETS 10
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1");
+ """
+
+ // OrToIn Rule set state flag in Or expression. SimplifyRange Rule may
remove this flag, and hence
+ // OrToIn and SimplifyRange Rules go into dead loop.
+ // to fix this bug, if the input expression and output expression of
SimplifyRange Rule are the same,
+ // SimplifyRange will return input expression to keep expression state.
+ //
+ sql """
+ explain
+ SELECT
+ *
+ FROM
+ table_10_undef_partitions2_keys3_properties4_distributed_by53
+ WHERE
+ (
+ `pk` IN (2, -114)
+ AND `pk` IS NOT NULL
+ )
+ OR
+ (
+ col_varchar_64__undef_signed IS NULL
+ AND `pk` IN (7, 1)
+ AND `pk` IS NOT NULL
+ )
+ OR
+ (
+ (`pk` <> -89)
+ )
+ ;
+ """
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
