From 3ac93d043b18041d175e2a78a11694d99542ab9a Mon Sep 17 00:00:00 2001
From: time-and-fate <25057648+time-and-fate@users.noreply.github.com>
Date: Wed, 8 Jan 2025 20:13:53 +0800
Subject: [PATCH 1/7] add tests

---
 .../casetest/predicate_simplification.result  | 69 +++++++++++++++++++
 .../casetest/predicate_simplification.test    | 23 +++++++
 2 files changed, 92 insertions(+)

diff --git a/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result b/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
index de6d5b7b4a60e..99a9834716438 100644
--- a/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
+++ b/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
@@ -571,3 +571,72 @@ count(*)
 SELECT count(*) FROM t1 WHERE (1 = 0 AND a1 = 1) OR (b1 = 2);
 count(*)
 1
+drop table if exists t1;
+create table t1 (a int, b decimal(65,30));
+explain format=brief select * from t1 where a = 1 or a = 2 or a = 5 or a = 5 or a = 5;
+id	estRows	task	access object	operator info
+TableReader	30.00	root		data:Selection
+└─Selection	30.00	cop[tikv]		or(or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), eq(planner__core__casetest__predicate_simplification.t1.a, 2)), or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), eq(planner__core__casetest__predicate_simplification.t1.a, 5))))
+  └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
+explain format=brief select * from t1 where a = 1 or a = 2 or a = 5 or a = 5 or a = 5 or b = 1.1 or b = 2.2 or b = 3.3 or b = 3.3;
+id	estRows	task	access object	operator info
+TableReader	59.91	root		data:Selection
+└─Selection	59.91	cop[tikv]		or(or(or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), eq(planner__core__casetest__predicate_simplification.t1.a, 2)), or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), eq(planner__core__casetest__predicate_simplification.t1.a, 5))), or(or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), eq(planner__core__casetest__predicate_simplification.t1.b, 1.1)), or(eq(planner__core__casetest__predicate_simplification.t1.b, 2.2), or(eq(planner__core__casetest__predicate_simplification.t1.b, 3.3), eq(planner__core__casetest__predicate_simplification.t1.b, 3.3)))))
+  └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
+explain format=brief select * from t1 where a = 1 and (b = 1.1 or b = 2.2 or b = 3.3 or b = 3.3);
+id	estRows	task	access object	operator info
+TableReader	0.03	root		data:Selection
+└─Selection	0.03	cop[tikv]		eq(planner__core__casetest__predicate_simplification.t1.a, 1), or(or(eq(planner__core__casetest__predicate_simplification.t1.b, 1.1), eq(planner__core__casetest__predicate_simplification.t1.b, 2.2)), or(eq(planner__core__casetest__predicate_simplification.t1.b, 3.3), eq(planner__core__casetest__predicate_simplification.t1.b, 3.3)))
+  └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
+explain format=brief select * from t1 where a = 1 or (b = 1.1 and (a = 1 or a = 2 or a = 5 or a = 5 or a = 5));
+id	estRows	task	access object	operator info
+TableReader	10.03	root		data:Selection
+└─Selection	10.03	cop[tikv]		or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), and(eq(planner__core__casetest__predicate_simplification.t1.b, 1.1), or(or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), eq(planner__core__casetest__predicate_simplification.t1.a, 2)), or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), eq(planner__core__casetest__predicate_simplification.t1.a, 5))))))
+  └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
+drop table if exists t2;
+create table t2 (a datetime(6), b timestamp(6), index ia(a), index iab(a,b));
+explain format=brief select * from t2 where a = '2025-01-01 00:00:00' or a = '2025-01-01 00:00:00' or a = '2025-01-01 00:00:00';
+id	estRows	task	access object	operator info
+IndexReader	10.00	root		index:IndexRangeScan
+└─IndexRangeScan	10.00	cop[tikv]	table:t2, index:iab(a, b)	range:[2025-01-01 00:00:00.000000,2025-01-01 00:00:00.000000], keep order:false, stats:pseudo
+explain format=brief select * from t2 where (a = '2025-01-01 00:00:00' or a = '2025-01-01 00:00:00' or a = '2025-01-01 00:00:00') and (b = '2025-01-01 00:00:00' or b = '2025-01-01 00:00:00' or b = '2025-01-01 00:00:00');
+id	estRows	task	access object	operator info
+IndexReader	0.10	root		index:IndexRangeScan
+└─IndexRangeScan	0.10	cop[tikv]	table:t2, index:iab(a, b)	range:[2025-01-01 00:00:00.000000 2025-01-01 00:00:00.000000,2025-01-01 00:00:00.000000 2025-01-01 00:00:00.000000], keep order:false, stats:pseudo
+drop table if exists t3;
+create table t3 (a varchar(10) collate utf8mb4_general_ci, b varchar(10) collate utf8mb4_bin, index ia(a), index ib(b));
+explain format=brief select * from t3 where a = 'a' or a = 'a' or a = 'A';
+id	estRows	task	access object	operator info
+IndexLookUp	10.00	root		
+├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ia(a)	range:["\x00A","\x00A"], keep order:false, stats:pseudo
+└─TableRowIDScan(Probe)	10.00	cop[tikv]	table:t3	keep order:false, stats:pseudo
+explain format=brief select * from t3 where a = 'a' or a = 'a' or a = 'A' or b = _utf8mb4'b' or b = _latin1'b' or b = 'B';
+id	estRows	task	access object	operator info
+IndexMerge	29.98	root		type: union
+├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ia(a)	range:["\x00A","\x00A"], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ia(a)	range:["\x00A","\x00A"], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ia(a)	range:["\x00A","\x00A"], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ib(b)	range:["b","b"], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ib(b)	range:["b","b"], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ib(b)	range:["B","B"], keep order:false, stats:pseudo
+└─TableRowIDScan(Probe)	29.98	cop[tikv]	table:t3	keep order:false, stats:pseudo
+explain format=brief select * from t3 where a = _utf8mb4'a' collate utf8mb4_unicode_ci or a = _utf8mb4'a' collate utf8mb4_0900_ai_ci or a = 'A' or b = 'b' or b = 'b' or b = 'B';
+id	estRows	task	access object	operator info
+TableReader	9601.20	root		data:Selection
+└─Selection	9601.20	cop[tikv]		or(or(eq(planner__core__casetest__predicate_simplification.t3.a, "a"), or(eq(planner__core__casetest__predicate_simplification.t3.a, "a"), eq(planner__core__casetest__predicate_simplification.t3.a, "A"))), or(eq(planner__core__casetest__predicate_simplification.t3.b, "b"), or(eq(planner__core__casetest__predicate_simplification.t3.b, "b"), eq(planner__core__casetest__predicate_simplification.t3.b, "B"))))
+  └─TableFullScan	10000.00	cop[tikv]	table:t3	keep order:false, stats:pseudo
+drop table if exists t4;
+create table t4(a int, b int, c int, d int, index iab(a,b), index iac(a,c), index iad(a,d));
+explain format=brief select /*+ use_index_merge(t4) */ * from t4 where a = 1 and (b = 2 or c = 4 or b = 12 or c = 5 or d = 6 or c = 4 or c = 5 or d = 6);
+id	estRows	task	access object	operator info
+IndexMerge	0.00	root		type: union
+├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iab(a, b)	range:[1 2,1 2], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iac(a, c)	range:[1 4,1 4], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iab(a, b)	range:[1 12,1 12], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iac(a, c)	range:[1 5,1 5], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iad(a, d)	range:[1 6,1 6], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iac(a, c)	range:[1 4,1 4], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iac(a, c)	range:[1 5,1 5], keep order:false, stats:pseudo
+├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iad(a, d)	range:[1 6,1 6], keep order:false, stats:pseudo
+└─Selection(Probe)	0.00	cop[tikv]		eq(planner__core__casetest__predicate_simplification.t4.a, 1), or(or(or(eq(planner__core__casetest__predicate_simplification.t4.b, 2), eq(planner__core__casetest__predicate_simplification.t4.c, 4)), or(eq(planner__core__casetest__predicate_simplification.t4.b, 12), eq(planner__core__casetest__predicate_simplification.t4.c, 5))), or(or(eq(planner__core__casetest__predicate_simplification.t4.d, 6), eq(planner__core__casetest__predicate_simplification.t4.c, 4)), or(eq(planner__core__casetest__predicate_simplification.t4.c, 5), eq(planner__core__casetest__predicate_simplification.t4.d, 6))))
+  └─TableRowIDScan	8.00	cop[tikv]	table:t4	keep order:false, stats:pseudo
diff --git a/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test b/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test
index 40174ac801e88..5f63ad9b1b650 100644
--- a/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test
+++ b/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test
@@ -282,3 +282,26 @@ SELECT count(*) FROM t1 WHERE (1 = 0 AND a1 = 1) AND (b1 = 2);
 SELECT count(*) FROM t1 WHERE (1 = 0 AND a1 = 1) OR (b1 = 2);
 
 # end of test for https://github.com/pingcap/tidb/issues/58171
+
+# Test removing redundant values in OR list
+drop table if exists t1;
+create table t1 (a int, b decimal(65,30));
+explain format=brief select * from t1 where a = 1 or a = 2 or a = 5 or a = 5 or a = 5;
+explain format=brief select * from t1 where a = 1 or a = 2 or a = 5 or a = 5 or a = 5 or b = 1.1 or b = 2.2 or b = 3.3 or b = 3.3;
+explain format=brief select * from t1 where a = 1 and (b = 1.1 or b = 2.2 or b = 3.3 or b = 3.3);
+explain format=brief select * from t1 where a = 1 or (b = 1.1 and (a = 1 or a = 2 or a = 5 or a = 5 or a = 5));
+
+drop table if exists t2;
+create table t2 (a datetime(6), b timestamp(6), index ia(a), index iab(a,b));
+explain format=brief select * from t2 where a = '2025-01-01 00:00:00' or a = '2025-01-01 00:00:00' or a = '2025-01-01 00:00:00';
+explain format=brief select * from t2 where (a = '2025-01-01 00:00:00' or a = '2025-01-01 00:00:00' or a = '2025-01-01 00:00:00') and (b = '2025-01-01 00:00:00' or b = '2025-01-01 00:00:00' or b = '2025-01-01 00:00:00');
+
+drop table if exists t3;
+create table t3 (a varchar(10) collate utf8mb4_general_ci, b varchar(10) collate utf8mb4_bin, index ia(a), index ib(b));
+explain format=brief select * from t3 where a = 'a' or a = 'a' or a = 'A';
+explain format=brief select * from t3 where a = 'a' or a = 'a' or a = 'A' or b = _utf8mb4'b' or b = _latin1'b' or b = 'B';
+explain format=brief select * from t3 where a = _utf8mb4'a' collate utf8mb4_unicode_ci or a = _utf8mb4'a' collate utf8mb4_0900_ai_ci or a = 'A' or b = 'b' or b = 'b' or b = 'B';
+
+drop table if exists t4;
+create table t4(a int, b int, c int, d int, index iab(a,b), index iac(a,c), index iad(a,d));
+explain format=brief select /*+ use_index_merge(t4) */ * from t4 where a = 1 and (b = 2 or c = 4 or b = 12 or c = 5 or d = 6 or c = 4 or c = 5 or d = 6);

From 1917ed012a855bc04d159edbe764167e57a737d6 Mon Sep 17 00:00:00 2001
From: time-and-fate <25057648+time-and-fate@users.noreply.github.com>
Date: Thu, 16 Jan 2025 02:12:36 +0800
Subject: [PATCH 2/7] add

---
 .../core/rule_predicate_simplification.go     | 36 +++++++++++++++++++
 .../casetest/predicate_simplification.result  | 19 ++++------
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/pkg/planner/core/rule_predicate_simplification.go b/pkg/planner/core/rule_predicate_simplification.go
index a418b178cb699..bbd99685fdf26 100644
--- a/pkg/planner/core/rule_predicate_simplification.go
+++ b/pkg/planner/core/rule_predicate_simplification.go
@@ -186,6 +186,7 @@ func splitCNF(conditions []expression.Expression) []expression.Expression {
 func applyPredicateSimplification(sctx base.PlanContext, predicates []expression.Expression) []expression.Expression {
 	simplifiedPredicate := shortCircuitLogicalConstants(sctx, predicates)
 	simplifiedPredicate = mergeInAndNotEQLists(sctx, simplifiedPredicate)
+	recursiveRemoveRedundantORBranch(sctx, simplifiedPredicate)
 	pruneEmptyORBranches(sctx, simplifiedPredicate)
 	simplifiedPredicate = splitCNF(simplifiedPredicate)
 	return simplifiedPredicate
@@ -424,6 +425,41 @@ func shortCircuitLogicalConstants(sctx base.PlanContext, predicates []expression
 	return finalResult
 }
 
+func recursiveRemoveRedundantORBranch(sctx base.PlanContext, predicates []expression.Expression) {
+	for i, predicate := range predicates {
+		predicates[i] = removeRedundantORBranch(sctx, predicate)
+	}
+}
+
+func removeRedundantORBranch(sctx base.PlanContext, predicate expression.Expression) expression.Expression {
+	_, tp := FindPredicateType(sctx, predicate)
+	if tp != orPredicate {
+		return predicate
+	}
+	orFunc := predicate.(*expression.ScalarFunction)
+	ORList := expression.SplitDNFItems(orFunc)
+
+	dedupMap := make(map[string]struct{}, len(ORList))
+	newORList := make([]expression.Expression, 0, len(ORList))
+
+	for _, orItem := range ORList {
+		_, tp := FindPredicateType(sctx, orItem)
+		if tp == andPredicate {
+			andFunc := orItem.(*expression.ScalarFunction)
+			ANDList := expression.SplitCNFItems(andFunc)
+			recursiveRemoveRedundantORBranch(sctx, ANDList)
+			newORList = append(newORList, expression.ComposeCNFCondition(sctx.GetExprCtx(), ANDList...))
+		} else {
+			hashCode := string(orItem.HashCode())
+			if _, ok := dedupMap[hashCode]; !ok {
+				dedupMap[hashCode] = struct{}{}
+				newORList = append(newORList, orItem)
+			}
+		}
+	}
+	return expression.ComposeDNFCondition(sctx.GetExprCtx(), newORList...)
+}
+
 // Name implements base.LogicalOptRule.<1st> interface.
 func (*PredicateSimplification) Name() string {
 	return "predicate_simplification"
diff --git a/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result b/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
index 99a9834716438..38c058c87d3ad 100644
--- a/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
+++ b/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
@@ -576,22 +576,22 @@ create table t1 (a int, b decimal(65,30));
 explain format=brief select * from t1 where a = 1 or a = 2 or a = 5 or a = 5 or a = 5;
 id	estRows	task	access object	operator info
 TableReader	30.00	root		data:Selection
-└─Selection	30.00	cop[tikv]		or(or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), eq(planner__core__casetest__predicate_simplification.t1.a, 2)), or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), eq(planner__core__casetest__predicate_simplification.t1.a, 5))))
+└─Selection	30.00	cop[tikv]		or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), or(eq(planner__core__casetest__predicate_simplification.t1.a, 2), eq(planner__core__casetest__predicate_simplification.t1.a, 5)))
   └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
 explain format=brief select * from t1 where a = 1 or a = 2 or a = 5 or a = 5 or a = 5 or b = 1.1 or b = 2.2 or b = 3.3 or b = 3.3;
 id	estRows	task	access object	operator info
 TableReader	59.91	root		data:Selection
-└─Selection	59.91	cop[tikv]		or(or(or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), eq(planner__core__casetest__predicate_simplification.t1.a, 2)), or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), eq(planner__core__casetest__predicate_simplification.t1.a, 5))), or(or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), eq(planner__core__casetest__predicate_simplification.t1.b, 1.1)), or(eq(planner__core__casetest__predicate_simplification.t1.b, 2.2), or(eq(planner__core__casetest__predicate_simplification.t1.b, 3.3), eq(planner__core__casetest__predicate_simplification.t1.b, 3.3)))))
+└─Selection	59.91	cop[tikv]		or(or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), or(eq(planner__core__casetest__predicate_simplification.t1.a, 2), eq(planner__core__casetest__predicate_simplification.t1.a, 5))), or(eq(planner__core__casetest__predicate_simplification.t1.b, 1.1), or(eq(planner__core__casetest__predicate_simplification.t1.b, 2.2), eq(planner__core__casetest__predicate_simplification.t1.b, 3.3))))
   └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
 explain format=brief select * from t1 where a = 1 and (b = 1.1 or b = 2.2 or b = 3.3 or b = 3.3);
 id	estRows	task	access object	operator info
 TableReader	0.03	root		data:Selection
-└─Selection	0.03	cop[tikv]		eq(planner__core__casetest__predicate_simplification.t1.a, 1), or(or(eq(planner__core__casetest__predicate_simplification.t1.b, 1.1), eq(planner__core__casetest__predicate_simplification.t1.b, 2.2)), or(eq(planner__core__casetest__predicate_simplification.t1.b, 3.3), eq(planner__core__casetest__predicate_simplification.t1.b, 3.3)))
+└─Selection	0.03	cop[tikv]		eq(planner__core__casetest__predicate_simplification.t1.a, 1), or(eq(planner__core__casetest__predicate_simplification.t1.b, 1.1), or(eq(planner__core__casetest__predicate_simplification.t1.b, 2.2), eq(planner__core__casetest__predicate_simplification.t1.b, 3.3)))
   └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
 explain format=brief select * from t1 where a = 1 or (b = 1.1 and (a = 1 or a = 2 or a = 5 or a = 5 or a = 5));
 id	estRows	task	access object	operator info
 TableReader	10.03	root		data:Selection
-└─Selection	10.03	cop[tikv]		or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), and(eq(planner__core__casetest__predicate_simplification.t1.b, 1.1), or(or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), eq(planner__core__casetest__predicate_simplification.t1.a, 2)), or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), eq(planner__core__casetest__predicate_simplification.t1.a, 5))))))
+└─Selection	10.03	cop[tikv]		or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), and(eq(planner__core__casetest__predicate_simplification.t1.b, 1.1), or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), or(eq(planner__core__casetest__predicate_simplification.t1.a, 2), eq(planner__core__casetest__predicate_simplification.t1.a, 5)))))
   └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
 drop table if exists t2;
 create table t2 (a datetime(6), b timestamp(6), index ia(a), index iab(a,b));
@@ -615,15 +615,13 @@ id	estRows	task	access object	operator info
 IndexMerge	29.98	root		type: union
 ├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ia(a)	range:["\x00A","\x00A"], keep order:false, stats:pseudo
 ├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ia(a)	range:["\x00A","\x00A"], keep order:false, stats:pseudo
-├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ia(a)	range:["\x00A","\x00A"], keep order:false, stats:pseudo
-├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ib(b)	range:["b","b"], keep order:false, stats:pseudo
 ├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ib(b)	range:["b","b"], keep order:false, stats:pseudo
 ├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t3, index:ib(b)	range:["B","B"], keep order:false, stats:pseudo
 └─TableRowIDScan(Probe)	29.98	cop[tikv]	table:t3	keep order:false, stats:pseudo
 explain format=brief select * from t3 where a = _utf8mb4'a' collate utf8mb4_unicode_ci or a = _utf8mb4'a' collate utf8mb4_0900_ai_ci or a = 'A' or b = 'b' or b = 'b' or b = 'B';
 id	estRows	task	access object	operator info
-TableReader	9601.20	root		data:Selection
-└─Selection	9601.20	cop[tikv]		or(or(eq(planner__core__casetest__predicate_simplification.t3.a, "a"), or(eq(planner__core__casetest__predicate_simplification.t3.a, "a"), eq(planner__core__casetest__predicate_simplification.t3.a, "A"))), or(eq(planner__core__casetest__predicate_simplification.t3.b, "b"), or(eq(planner__core__casetest__predicate_simplification.t3.b, "b"), eq(planner__core__casetest__predicate_simplification.t3.b, "B"))))
+TableReader	8006.00	root		data:Selection
+└─Selection	8006.00	cop[tikv]		or(or(eq(planner__core__casetest__predicate_simplification.t3.a, "a"), eq(planner__core__casetest__predicate_simplification.t3.a, "A")), or(eq(planner__core__casetest__predicate_simplification.t3.b, "b"), eq(planner__core__casetest__predicate_simplification.t3.b, "B")))
   └─TableFullScan	10000.00	cop[tikv]	table:t3	keep order:false, stats:pseudo
 drop table if exists t4;
 create table t4(a int, b int, c int, d int, index iab(a,b), index iac(a,c), index iad(a,d));
@@ -635,8 +633,5 @@ IndexMerge	0.00	root		type: union
 ├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iab(a, b)	range:[1 12,1 12], keep order:false, stats:pseudo
 ├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iac(a, c)	range:[1 5,1 5], keep order:false, stats:pseudo
 ├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iad(a, d)	range:[1 6,1 6], keep order:false, stats:pseudo
-├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iac(a, c)	range:[1 4,1 4], keep order:false, stats:pseudo
-├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iac(a, c)	range:[1 5,1 5], keep order:false, stats:pseudo
-├─IndexRangeScan(Build)	0.10	cop[tikv]	table:t4, index:iad(a, d)	range:[1 6,1 6], keep order:false, stats:pseudo
-└─Selection(Probe)	0.00	cop[tikv]		eq(planner__core__casetest__predicate_simplification.t4.a, 1), or(or(or(eq(planner__core__casetest__predicate_simplification.t4.b, 2), eq(planner__core__casetest__predicate_simplification.t4.c, 4)), or(eq(planner__core__casetest__predicate_simplification.t4.b, 12), eq(planner__core__casetest__predicate_simplification.t4.c, 5))), or(or(eq(planner__core__casetest__predicate_simplification.t4.d, 6), eq(planner__core__casetest__predicate_simplification.t4.c, 4)), or(eq(planner__core__casetest__predicate_simplification.t4.c, 5), eq(planner__core__casetest__predicate_simplification.t4.d, 6))))
+└─Selection(Probe)	0.00	cop[tikv]		eq(planner__core__casetest__predicate_simplification.t4.a, 1), or(or(eq(planner__core__casetest__predicate_simplification.t4.b, 2), eq(planner__core__casetest__predicate_simplification.t4.c, 4)), or(eq(planner__core__casetest__predicate_simplification.t4.b, 12), or(eq(planner__core__casetest__predicate_simplification.t4.c, 5), eq(planner__core__casetest__predicate_simplification.t4.d, 6))))
   └─TableRowIDScan	8.00	cop[tikv]	table:t4	keep order:false, stats:pseudo

From 100e9c77da6886a8bf1555762e7ae247ad8d7c72 Mon Sep 17 00:00:00 2001
From: time-and-fate <25057648+time-and-fate@users.noreply.github.com>
Date: Thu, 16 Jan 2025 02:19:00 +0800
Subject: [PATCH 3/7] fix lint

---
 pkg/planner/core/rule_predicate_simplification.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/planner/core/rule_predicate_simplification.go b/pkg/planner/core/rule_predicate_simplification.go
index bbd99685fdf26..13db026ecd1a8 100644
--- a/pkg/planner/core/rule_predicate_simplification.go
+++ b/pkg/planner/core/rule_predicate_simplification.go
@@ -437,18 +437,18 @@ func removeRedundantORBranch(sctx base.PlanContext, predicate expression.Express
 		return predicate
 	}
 	orFunc := predicate.(*expression.ScalarFunction)
-	ORList := expression.SplitDNFItems(orFunc)
+	orList := expression.SplitDNFItems(orFunc)
 
-	dedupMap := make(map[string]struct{}, len(ORList))
-	newORList := make([]expression.Expression, 0, len(ORList))
+	dedupMap := make(map[string]struct{}, len(orList))
+	newORList := make([]expression.Expression, 0, len(orList))
 
-	for _, orItem := range ORList {
+	for _, orItem := range orList {
 		_, tp := FindPredicateType(sctx, orItem)
 		if tp == andPredicate {
 			andFunc := orItem.(*expression.ScalarFunction)
-			ANDList := expression.SplitCNFItems(andFunc)
-			recursiveRemoveRedundantORBranch(sctx, ANDList)
-			newORList = append(newORList, expression.ComposeCNFCondition(sctx.GetExprCtx(), ANDList...))
+			andList := expression.SplitCNFItems(andFunc)
+			recursiveRemoveRedundantORBranch(sctx, andList)
+			newORList = append(newORList, expression.ComposeCNFCondition(sctx.GetExprCtx(), andList...))
 		} else {
 			hashCode := string(orItem.HashCode())
 			if _, ok := dedupMap[hashCode]; !ok {

From f9c2a047f518b43760ba6eb8b3b19b2a98fe6fbc Mon Sep 17 00:00:00 2001
From: time-and-fate <25057648+time-and-fate@users.noreply.github.com>
Date: Thu, 16 Jan 2025 03:05:27 +0800
Subject: [PATCH 4/7] update test result

---
 .../r/executor/partition/partition_boundaries.result      | 8 ++++----
 .../integrationtest/r/planner/core/indexmerge_path.result | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/integrationtest/r/executor/partition/partition_boundaries.result b/tests/integrationtest/r/executor/partition/partition_boundaries.result
index bd9d9ef98ec04..f0e29436e5857 100644
--- a/tests/integrationtest/r/executor/partition/partition_boundaries.result
+++ b/tests/integrationtest/r/executor/partition/partition_boundaries.result
@@ -478,7 +478,7 @@ a	b
 explain format='brief' SELECT * FROM t WHERE 1 = 0 OR a = -1 OR a = 0 OR a = 1 OR a = 2;
 id	estRows	task	access object	operator info
 TableReader	3.00	root	partition:p0,p1,p2	data:Selection
-└─Selection	3.00	cop[tikv]		or(eq(executor__partition__partition_boundaries.t.a, -1), or(eq(executor__partition__partition_boundaries.t.a, 0), or(eq(executor__partition__partition_boundaries.t.a, 1), eq(executor__partition__partition_boundaries.t.a, 2))))
+└─Selection	3.00	cop[tikv]		or(or(eq(executor__partition__partition_boundaries.t.a, -1), eq(executor__partition__partition_boundaries.t.a, 0)), or(eq(executor__partition__partition_boundaries.t.a, 1), eq(executor__partition__partition_boundaries.t.a, 2)))
   └─TableFullScan	7.00	cop[tikv]	table:t	keep order:false
 SELECT * FROM t WHERE 1 = 0 OR a = -1 OR a = 0 OR a = 1 OR a = 2;
 a	b
@@ -563,7 +563,7 @@ a	b
 explain format='brief' SELECT * FROM t WHERE 1 = 0 OR a = -1 OR a = 0 OR a = 1 OR a = 2 OR a = 3 OR a = 4;
 id	estRows	task	access object	operator info
 TableReader	5.00	root	partition:p0,p1,p2,p3,p4	data:Selection
-└─Selection	5.00	cop[tikv]		or(or(eq(executor__partition__partition_boundaries.t.a, -1), eq(executor__partition__partition_boundaries.t.a, 0)), or(or(eq(executor__partition__partition_boundaries.t.a, 1), eq(executor__partition__partition_boundaries.t.a, 2)), or(eq(executor__partition__partition_boundaries.t.a, 3), eq(executor__partition__partition_boundaries.t.a, 4))))
+└─Selection	5.00	cop[tikv]		or(or(eq(executor__partition__partition_boundaries.t.a, -1), or(eq(executor__partition__partition_boundaries.t.a, 0), eq(executor__partition__partition_boundaries.t.a, 1))), or(eq(executor__partition__partition_boundaries.t.a, 2), or(eq(executor__partition__partition_boundaries.t.a, 3), eq(executor__partition__partition_boundaries.t.a, 4))))
   └─TableFullScan	7.00	cop[tikv]	table:t	keep order:false
 SELECT * FROM t WHERE 1 = 0 OR a = -1 OR a = 0 OR a = 1 OR a = 2 OR a = 3 OR a = 4;
 a	b
@@ -644,7 +644,7 @@ a	b
 explain format='brief' SELECT * FROM t WHERE 1 = 0 OR a = -1 OR a = 0 OR a = 1 OR a = 2 OR a = 3 OR a = 4 OR a = 5 OR a = 6;
 id	estRows	task	access object	operator info
 TableReader	7.00	root	partition:all	data:Selection
-└─Selection	7.00	cop[tikv]		or(or(eq(executor__partition__partition_boundaries.t.a, -1), or(eq(executor__partition__partition_boundaries.t.a, 0), eq(executor__partition__partition_boundaries.t.a, 1))), or(or(eq(executor__partition__partition_boundaries.t.a, 2), eq(executor__partition__partition_boundaries.t.a, 3)), or(eq(executor__partition__partition_boundaries.t.a, 4), or(eq(executor__partition__partition_boundaries.t.a, 5), eq(executor__partition__partition_boundaries.t.a, 6)))))
+└─Selection	7.00	cop[tikv]		or(or(or(eq(executor__partition__partition_boundaries.t.a, -1), eq(executor__partition__partition_boundaries.t.a, 0)), or(eq(executor__partition__partition_boundaries.t.a, 1), eq(executor__partition__partition_boundaries.t.a, 2))), or(or(eq(executor__partition__partition_boundaries.t.a, 3), eq(executor__partition__partition_boundaries.t.a, 4)), or(eq(executor__partition__partition_boundaries.t.a, 5), eq(executor__partition__partition_boundaries.t.a, 6))))
   └─TableFullScan	7.00	cop[tikv]	table:t	keep order:false
 SELECT * FROM t WHERE 1 = 0 OR a = -1 OR a = 0 OR a = 1 OR a = 2 OR a = 3 OR a = 4 OR a = 5 OR a = 6;
 a	b
@@ -686,7 +686,7 @@ a	b
 explain format='brief' SELECT * FROM t WHERE 1 = 0 OR a = -1 OR a = 0 OR a = 1 OR a = 2 OR a = 3 OR a = 4 OR a = 5 OR a = 6 OR a = 7;
 id	estRows	task	access object	operator info
 TableReader	7.00	root	partition:all	data:Selection
-└─Selection	7.00	cop[tikv]		or(or(eq(executor__partition__partition_boundaries.t.a, -1), or(eq(executor__partition__partition_boundaries.t.a, 0), or(eq(executor__partition__partition_boundaries.t.a, 1), eq(executor__partition__partition_boundaries.t.a, 2)))), or(or(eq(executor__partition__partition_boundaries.t.a, 3), eq(executor__partition__partition_boundaries.t.a, 4)), or(eq(executor__partition__partition_boundaries.t.a, 5), or(eq(executor__partition__partition_boundaries.t.a, 6), eq(executor__partition__partition_boundaries.t.a, 7)))))
+└─Selection	7.00	cop[tikv]		or(or(or(eq(executor__partition__partition_boundaries.t.a, -1), eq(executor__partition__partition_boundaries.t.a, 0)), or(eq(executor__partition__partition_boundaries.t.a, 1), eq(executor__partition__partition_boundaries.t.a, 2))), or(or(eq(executor__partition__partition_boundaries.t.a, 3), eq(executor__partition__partition_boundaries.t.a, 4)), or(eq(executor__partition__partition_boundaries.t.a, 5), or(eq(executor__partition__partition_boundaries.t.a, 6), eq(executor__partition__partition_boundaries.t.a, 7)))))
   └─TableFullScan	7.00	cop[tikv]	table:t	keep order:false
 SELECT * FROM t WHERE 1 = 0 OR a = -1 OR a = 0 OR a = 1 OR a = 2 OR a = 3 OR a = 4 OR a = 5 OR a = 6 OR a = 7;
 a	b
diff --git a/tests/integrationtest/r/planner/core/indexmerge_path.result b/tests/integrationtest/r/planner/core/indexmerge_path.result
index 7bdcb3bdeecb4..915bfb464d713 100644
--- a/tests/integrationtest/r/planner/core/indexmerge_path.result
+++ b/tests/integrationtest/r/planner/core/indexmerge_path.result
@@ -1012,7 +1012,7 @@ EXPLAIN format = brief SELECT * FROM t WHERE a = 1 AND (c = 13 OR c = 15 OR c =
 id	estRows	task	access object	operator info
 IndexLookUp	0.05	root		
 ├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t, index:ia(a)	range:[1,1], keep order:false, stats:pseudo
-└─Selection(Probe)	0.05	cop[tikv]		or(or(eq(planner__core__indexmerge_path.t.c, 13), or(eq(planner__core__indexmerge_path.t.c, 15), eq(planner__core__indexmerge_path.t.c, 5))), or(eq(planner__core__indexmerge_path.t.b, "12"), or(eq(planner__core__indexmerge_path.t.c, 13), eq(planner__core__indexmerge_path.t.b, "11"))))
+└─Selection(Probe)	0.05	cop[tikv]		or(or(eq(planner__core__indexmerge_path.t.c, 13), eq(planner__core__indexmerge_path.t.c, 15)), or(eq(planner__core__indexmerge_path.t.c, 5), or(eq(planner__core__indexmerge_path.t.b, "12"), eq(planner__core__indexmerge_path.t.b, "11"))))
   └─TableRowIDScan	10.00	cop[tikv]	table:t	keep order:false, stats:pseudo
 SET @@tidb_opt_fix_control = '52869:on';
 EXPLAIN format = brief SELECT * FROM t WHERE a = 1 AND (b = '2' OR c = 3 OR d = '4');
@@ -1058,7 +1058,6 @@ IndexMerge	0.05	root		type: union
 ├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t, index:ic(c)	range:[15,15], keep order:false, stats:pseudo
 ├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t, index:ic(c)	range:[5,5], keep order:false, stats:pseudo
 ├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t, index:ib(b)	range:["12","12"], keep order:false, stats:pseudo
-├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t, index:ic(c)	range:[13,13], keep order:false, stats:pseudo
 ├─IndexRangeScan(Build)	10.00	cop[tikv]	table:t, index:ib(b)	range:["11","11"], keep order:false, stats:pseudo
 └─Selection(Probe)	0.05	cop[tikv]		eq(planner__core__indexmerge_path.t.a, 1)
   └─TableRowIDScan	49.94	cop[tikv]	table:t	keep order:false, stats:pseudo

From 2e3d1b7defead33813f0ec2e7eae70d92680ac1f Mon Sep 17 00:00:00 2001
From: time-and-fate <25057648+time-and-fate@users.noreply.github.com>
Date: Thu, 16 Jan 2025 03:55:11 +0800
Subject: [PATCH 5/7] rename function and add comments

---
 pkg/planner/core/rule_predicate_simplification.go | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkg/planner/core/rule_predicate_simplification.go b/pkg/planner/core/rule_predicate_simplification.go
index 13db026ecd1a8..e9887580a3b51 100644
--- a/pkg/planner/core/rule_predicate_simplification.go
+++ b/pkg/planner/core/rule_predicate_simplification.go
@@ -186,7 +186,7 @@ func splitCNF(conditions []expression.Expression) []expression.Expression {
 func applyPredicateSimplification(sctx base.PlanContext, predicates []expression.Expression) []expression.Expression {
 	simplifiedPredicate := shortCircuitLogicalConstants(sctx, predicates)
 	simplifiedPredicate = mergeInAndNotEQLists(sctx, simplifiedPredicate)
-	recursiveRemoveRedundantORBranch(sctx, simplifiedPredicate)
+	removeRedundantORBranch(sctx, simplifiedPredicate)
 	pruneEmptyORBranches(sctx, simplifiedPredicate)
 	simplifiedPredicate = splitCNF(simplifiedPredicate)
 	return simplifiedPredicate
@@ -425,13 +425,16 @@ func shortCircuitLogicalConstants(sctx base.PlanContext, predicates []expression
 	return finalResult
 }
 
-func recursiveRemoveRedundantORBranch(sctx base.PlanContext, predicates []expression.Expression) {
+// removeRedundantORBranch recursively iterates over a list of predicates, try to find OR lists and remove redundant in
+// each OR list.
+// It modifies the input slice in place.
+func removeRedundantORBranch(sctx base.PlanContext, predicates []expression.Expression) {
 	for i, predicate := range predicates {
-		predicates[i] = removeRedundantORBranch(sctx, predicate)
+		predicates[i] = recursiveRemoveRedundantORBranch(sctx, predicate)
 	}
 }
 
-func removeRedundantORBranch(sctx base.PlanContext, predicate expression.Expression) expression.Expression {
+func recursiveRemoveRedundantORBranch(sctx base.PlanContext, predicate expression.Expression) expression.Expression {
 	_, tp := FindPredicateType(sctx, predicate)
 	if tp != orPredicate {
 		return predicate
@@ -447,7 +450,7 @@ func removeRedundantORBranch(sctx base.PlanContext, predicate expression.Express
 		if tp == andPredicate {
 			andFunc := orItem.(*expression.ScalarFunction)
 			andList := expression.SplitCNFItems(andFunc)
-			recursiveRemoveRedundantORBranch(sctx, andList)
+			removeRedundantORBranch(sctx, andList)
 			newORList = append(newORList, expression.ComposeCNFCondition(sctx.GetExprCtx(), andList...))
 		} else {
 			hashCode := string(orItem.HashCode())

From d3f6f324346cc2c93e8e724b00f1348c11e9946e Mon Sep 17 00:00:00 2001
From: time-and-fate <25057648+time-and-fate@users.noreply.github.com>
Date: Thu, 16 Jan 2025 19:40:34 +0800
Subject: [PATCH 6/7] handle nondeterministic and side effects exprs

---
 pkg/planner/core/rule_predicate_simplification.go      |  7 +++++++
 .../core/casetest/predicate_simplification.result      | 10 ++++++++++
 .../core/casetest/predicate_simplification.test        |  4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkg/planner/core/rule_predicate_simplification.go b/pkg/planner/core/rule_predicate_simplification.go
index e9887580a3b51..c83ca89fce0ad 100644
--- a/pkg/planner/core/rule_predicate_simplification.go
+++ b/pkg/planner/core/rule_predicate_simplification.go
@@ -447,17 +447,24 @@ func recursiveRemoveRedundantORBranch(sctx base.PlanContext, predicate expressio
 
 	for _, orItem := range orList {
 		_, tp := FindPredicateType(sctx, orItem)
+		// 1. If it's an AND predicate, we recursively call removeRedundantORBranch() on it.
 		if tp == andPredicate {
 			andFunc := orItem.(*expression.ScalarFunction)
 			andList := expression.SplitCNFItems(andFunc)
 			removeRedundantORBranch(sctx, andList)
 			newORList = append(newORList, expression.ComposeCNFCondition(sctx.GetExprCtx(), andList...))
 		} else {
+			// 2. Otherwise, we check if it's a duplicate predicate by checking HashCode().
 			hashCode := string(orItem.HashCode())
+			// 2-1. If it's not a duplicate, we need to keep this predicate.
 			if _, ok := dedupMap[hashCode]; !ok {
 				dedupMap[hashCode] = struct{}{}
 				newORList = append(newORList, orItem)
+			} else if expression.IsMutableEffectsExpr(orItem) {
+				// 2-2. If it's a duplicate, but it's nondeterministic or has side effects, we also need to keep it.
+				newORList = append(newORList, orItem)
 			}
+			// 2-3. Otherwise, we remove it.
 		}
 	}
 	return expression.ComposeDNFCondition(sctx.GetExprCtx(), newORList...)
diff --git a/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result b/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
index 38c058c87d3ad..c1a7db7807dd8 100644
--- a/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
+++ b/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
@@ -593,6 +593,16 @@ id	estRows	task	access object	operator info
 TableReader	10.03	root		data:Selection
 └─Selection	10.03	cop[tikv]		or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), and(eq(planner__core__casetest__predicate_simplification.t1.b, 1.1), or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), or(eq(planner__core__casetest__predicate_simplification.t1.a, 2), eq(planner__core__casetest__predicate_simplification.t1.a, 5)))))
   └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
+explain format=brief select * from t1 where (rand() * 10 = 1) or (rand() * 10 = 1);
+id	estRows	task	access object	operator info
+Selection	8000.00	root		or(eq(mul(rand(), 10), 1), eq(mul(rand(), 10), 1))
+└─TableReader	10000.00	root		data:TableFullScan
+  └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
+explain format=brief select * from t1 where (@a:=@a+1) or (@a:=@a+1);
+id	estRows	task	access object	operator info
+Selection	8000.00	root		or(istrue_with_null(setvar("a", plus(cast(getvar("a"), double BINARY), 1))), istrue_with_null(setvar("a", plus(getvar("a"), 1))))
+└─TableReader	10000.00	root		data:TableFullScan
+  └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
 drop table if exists t2;
 create table t2 (a datetime(6), b timestamp(6), index ia(a), index iab(a,b));
 explain format=brief select * from t2 where a = '2025-01-01 00:00:00' or a = '2025-01-01 00:00:00' or a = '2025-01-01 00:00:00';
diff --git a/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test b/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test
index 5f63ad9b1b650..bfbae25f60a25 100644
--- a/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test
+++ b/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test
@@ -283,13 +283,15 @@ SELECT count(*) FROM t1 WHERE (1 = 0 AND a1 = 1) OR (b1 = 2);
 
 # end of test for https://github.com/pingcap/tidb/issues/58171
 
-# Test removing redundant values in OR list
+# Test removing redundant branches from OR list
 drop table if exists t1;
 create table t1 (a int, b decimal(65,30));
 explain format=brief select * from t1 where a = 1 or a = 2 or a = 5 or a = 5 or a = 5;
 explain format=brief select * from t1 where a = 1 or a = 2 or a = 5 or a = 5 or a = 5 or b = 1.1 or b = 2.2 or b = 3.3 or b = 3.3;
 explain format=brief select * from t1 where a = 1 and (b = 1.1 or b = 2.2 or b = 3.3 or b = 3.3);
 explain format=brief select * from t1 where a = 1 or (b = 1.1 and (a = 1 or a = 2 or a = 5 or a = 5 or a = 5));
+explain format=brief select * from t1 where (rand() * 10 = 1) or (rand() * 10 = 1);
+explain format=brief select * from t1 where (@a:=@a+1) or (@a:=@a+1);
 
 drop table if exists t2;
 create table t2 (a datetime(6), b timestamp(6), index ia(a), index iab(a,b));

From 126458a11f917cb4a651b485a804169debccd367 Mon Sep 17 00:00:00 2001
From: time-and-fate <25057648+time-and-fate@users.noreply.github.com>
Date: Fri, 17 Jan 2025 21:08:40 +0800
Subject: [PATCH 7/7] add test cases

---
 .../core/casetest/predicate_simplification.result    | 12 +++++++++++-
 .../core/casetest/predicate_simplification.test      |  4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result b/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
index c1a7db7807dd8..9eb16a19950c4 100644
--- a/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
+++ b/tests/integrationtest/r/planner/core/casetest/predicate_simplification.result
@@ -572,7 +572,7 @@ SELECT count(*) FROM t1 WHERE (1 = 0 AND a1 = 1) OR (b1 = 2);
 count(*)
 1
 drop table if exists t1;
-create table t1 (a int, b decimal(65,30));
+create table t1 (a int, b decimal(65,30), c int);
 explain format=brief select * from t1 where a = 1 or a = 2 or a = 5 or a = 5 or a = 5;
 id	estRows	task	access object	operator info
 TableReader	30.00	root		data:Selection
@@ -593,6 +593,16 @@ id	estRows	task	access object	operator info
 TableReader	10.03	root		data:Selection
 └─Selection	10.03	cop[tikv]		or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), and(eq(planner__core__casetest__predicate_simplification.t1.b, 1.1), or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), or(eq(planner__core__casetest__predicate_simplification.t1.a, 2), eq(planner__core__casetest__predicate_simplification.t1.a, 5)))))
   └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
+explain format=brief select * from t1 where (a = 1 and (b = 2.2 or (c = 1 and (b = 1 or b = 1)))) or (b = 1.1 and b = 1.1 and (a = 1 or a = 2 or a = 5 or a = 5 or a = 5));
+id	estRows	task	access object	operator info
+TableReader	0.04	root		data:Selection
+└─Selection	0.04	cop[tikv]		or(and(eq(planner__core__casetest__predicate_simplification.t1.a, 1), or(eq(planner__core__casetest__predicate_simplification.t1.b, 2.2), and(eq(planner__core__casetest__predicate_simplification.t1.c, 1), eq(planner__core__casetest__predicate_simplification.t1.b, 1)))), and(eq(planner__core__casetest__predicate_simplification.t1.b, 1.1), or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), or(eq(planner__core__casetest__predicate_simplification.t1.a, 2), eq(planner__core__casetest__predicate_simplification.t1.a, 5)))))
+  └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
+explain format=brief select * from t1 where (c = 10 or (b + 1 > 10 and (a + 1 < 5 or a + 1 < 5 or a = 20))) and c + 1 < 10 and (a = 1 or a = 2 or a = 5 or a = 5 or b = 5 or b = 5);
+id	estRows	task	access object	operator info
+TableReader	20.48	root		data:Selection
+└─Selection	20.48	cop[tikv]		lt(plus(planner__core__casetest__predicate_simplification.t1.c, 1), 10), or(eq(planner__core__casetest__predicate_simplification.t1.c, 10), and(gt(plus(planner__core__casetest__predicate_simplification.t1.b, 1), 10), or(lt(plus(planner__core__casetest__predicate_simplification.t1.a, 1), 5), eq(planner__core__casetest__predicate_simplification.t1.a, 20)))), or(or(eq(planner__core__casetest__predicate_simplification.t1.a, 1), eq(planner__core__casetest__predicate_simplification.t1.a, 2)), or(eq(planner__core__casetest__predicate_simplification.t1.a, 5), eq(planner__core__casetest__predicate_simplification.t1.b, 5)))
+  └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
 explain format=brief select * from t1 where (rand() * 10 = 1) or (rand() * 10 = 1);
 id	estRows	task	access object	operator info
 Selection	8000.00	root		or(eq(mul(rand(), 10), 1), eq(mul(rand(), 10), 1))
diff --git a/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test b/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test
index bfbae25f60a25..6718f18cdfbfe 100644
--- a/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test
+++ b/tests/integrationtest/t/planner/core/casetest/predicate_simplification.test
@@ -285,11 +285,13 @@ SELECT count(*) FROM t1 WHERE (1 = 0 AND a1 = 1) OR (b1 = 2);
 
 # Test removing redundant branches from OR list
 drop table if exists t1;
-create table t1 (a int, b decimal(65,30));
+create table t1 (a int, b decimal(65,30), c int);
 explain format=brief select * from t1 where a = 1 or a = 2 or a = 5 or a = 5 or a = 5;
 explain format=brief select * from t1 where a = 1 or a = 2 or a = 5 or a = 5 or a = 5 or b = 1.1 or b = 2.2 or b = 3.3 or b = 3.3;
 explain format=brief select * from t1 where a = 1 and (b = 1.1 or b = 2.2 or b = 3.3 or b = 3.3);
 explain format=brief select * from t1 where a = 1 or (b = 1.1 and (a = 1 or a = 2 or a = 5 or a = 5 or a = 5));
+explain format=brief select * from t1 where (a = 1 and (b = 2.2 or (c = 1 and (b = 1 or b = 1)))) or (b = 1.1 and b = 1.1 and (a = 1 or a = 2 or a = 5 or a = 5 or a = 5));
+explain format=brief select * from t1 where (c = 10 or (b + 1 > 10 and (a + 1 < 5 or a + 1 < 5 or a = 20))) and c + 1 < 10 and (a = 1 or a = 2 or a = 5 or a = 5 or b = 5 or b = 5);
 explain format=brief select * from t1 where (rand() * 10 = 1) or (rand() * 10 = 1);
 explain format=brief select * from t1 where (@a:=@a+1) or (@a:=@a+1);