planner: fix inner subq build process will ref-use outer's expand meta (

#56424) close #56218
pingcap · Oct 9, 2024 · 31d75bd · 31d75bd
1 parent 0ccba79
commit 31d75bd
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 0 deletions.
diff --git a/pkg/planner/core/expression_rewriter.go b/pkg/planner/core/expression_rewriter.go
@@ -472,6 +472,8 @@ func (er *expressionRewriter) buildSubquery(ctx context.Context, planCtx *exprRe
 		b.outerSchemas = append(b.outerSchemas, outerSchema)
 		b.outerNames = append(b.outerNames, er.names)
 		b.outerBlockExpand = append(b.outerBlockExpand, b.currentBlockExpand)
+		// set it to nil, otherwise, inner qb will use outer expand meta to rewrite expressions.
+		b.currentBlockExpand = nil
 		defer func() {
 			b.outerSchemas = b.outerSchemas[0 : len(b.outerSchemas)-1]
 			b.outerNames = b.outerNames[0 : len(b.outerNames)-1]

diff --git a/tests/integrationtest/r/executor/expand.result b/tests/integrationtest/r/executor/expand.result
@@ -515,3 +515,67 @@ NULL	NULL	NULL
 4	NULL	NULL
 4	1	NULL
 DROP TABLE t1;
+
+SELECT
+(SELECT 100.00
+FROM
+(SELECT '2024-09-15' AS DATE ) newTb
+WHERE T0.DATE = DATE_ADD(newTb.DATE, INTERVAL 1 MONTH)) AS 'PROFIT'
+FROM
+(SELECT '2024-09-15' AS DATE) T0
+GROUP BY T0.DATE WITH ROLLUP;
+PROFIT
+NULL
+NULL
+
+EXPLAIN SELECT
+(SELECT 100.00
+FROM
+(SELECT '2024-09-15' AS DATE ) newTb
+WHERE T0.DATE = DATE_ADD(newTb.DATE, INTERVAL 1 MONTH)) AS 'PROFIT'
+FROM
+(SELECT '2024-09-15' AS DATE) T0
+GROUP BY T0.DATE WITH ROLLUP;
+id	estRows	task	access object	operator info
+Projection_18	1.00	root		Column#6
+└─Apply_20	1.00	root		CARTESIAN left outer join
+  ├─HashAgg_21(Build)	1.00	root		group by:Column#3, gid, funcs:firstrow(Column#1)->Column#1
+  │ └─Expand_24	1.00	root		level-projection:[Column#1, <nil>->Column#3, 0->gid],[Column#1, Column#3, 1->gid]; schema: [Column#1,Column#3,gid]
+  │   └─Projection_26	1.00	root		2024-09-15->Column#1, 2024-09-15->Column#3
+  │     └─TableDual_27	1.00	root		rows:1
+  └─Projection_30(Probe)	0.80	root		100.00->Column#6
+    └─Selection_31	0.80	root		eq(Column#1, "2024-10-15")
+      └─TableDual_32	1.00	root		rows:1
+drop table if exists tr;
+create table tr(a date);
+insert into tr values('2024-09-15');
+
+SELECT
+(SELECT 100.00
+FROM  (SELECT '2024-09-15' AS DATE ) newTb
+WHERE T0.DATE = DATE_ADD(newTb.DATE, INTERVAL 0 MONTH)
+) AS 'PROFIT'
+FROM  (select tr.a as DATE from tr) T0
+GROUP BY T0.DATE WITH ROLLUP;
+PROFIT
+100.00
+100.00
+
+EXPLAIN SELECT
+(SELECT 100.00
+FROM  (SELECT '2024-09-15' AS DATE ) newTb
+WHERE T0.DATE = DATE_ADD(newTb.DATE, INTERVAL 0 MONTH)
+) AS 'PROFIT'
+FROM  (select tr.a as DATE from tr) T0
+GROUP BY T0.DATE WITH ROLLUP;
+id	estRows	task	access object	operator info
+Projection_18	8000.00	root		Column#7
+└─Apply_20	8000.00	root		CARTESIAN left outer join
+  ├─HashAgg_21(Build)	8000.00	root		group by:Column#4, gid, funcs:firstrow(executor__expand.tr.a)->executor__expand.tr.a
+  │ └─Expand_25	10000.00	root		level-projection:[executor__expand.tr.a, <nil>->Column#4, 0->gid],[executor__expand.tr.a, Column#4, 1->gid]; schema: [executor__expand.tr.a,Column#4,gid]
+  │   └─Projection_27	10000.00	root		executor__expand.tr.a, executor__expand.tr.a->Column#4
+  │     └─TableReader_29	10000.00	root		data:TableFullScan_28
+  │       └─TableFullScan_28	10000.00	cop[tikv]	table:tr	keep order:false, stats:pseudo
+  └─Projection_30(Probe)	6400.00	root		100.00->Column#7
+    └─Selection_31	6400.00	root		eq(executor__expand.tr.a, 2024-09-15 00:00:00.000000)
+      └─TableDual_32	8000.00	root		rows:1
diff --git a/tests/integrationtest/t/executor/expand.test b/tests/integrationtest/t/executor/expand.test
@@ -270,3 +270,49 @@ SELECT a,b,SUM(c) FROM t1 GROUP BY a,b,c WITH ROLLUP;
 SELECT distinct a,b,SUM(c) FROM t1 GROUP BY a,b,c WITH ROLLUP;
 
 DROP TABLE t1;
+
+# Test Issue 56218
+# Test with normal constant case
+
+--echo
+SELECT
+    (SELECT 100.00
+     FROM
+         (SELECT '2024-09-15' AS DATE ) newTb
+     WHERE T0.DATE = DATE_ADD(newTb.DATE, INTERVAL 1 MONTH)) AS 'PROFIT'
+FROM
+    (SELECT '2024-09-15' AS DATE) T0
+GROUP BY T0.DATE WITH ROLLUP;
+
+--echo
+EXPLAIN SELECT
+            (SELECT 100.00
+             FROM
+                 (SELECT '2024-09-15' AS DATE ) newTb
+             WHERE T0.DATE = DATE_ADD(newTb.DATE, INTERVAL 1 MONTH)) AS 'PROFIT'
+        FROM
+            (SELECT '2024-09-15' AS DATE) T0
+        GROUP BY T0.DATE WITH ROLLUP;
+
+# Test with real correlated column case
+drop table if exists tr;
+create table tr(a date);
+insert into tr values('2024-09-15');
+
+--echo
+SELECT
+    (SELECT 100.00
+     FROM  (SELECT '2024-09-15' AS DATE ) newTb
+     WHERE T0.DATE = DATE_ADD(newTb.DATE, INTERVAL 0 MONTH)
+     ) AS 'PROFIT'
+FROM  (select tr.a as DATE from tr) T0
+GROUP BY T0.DATE WITH ROLLUP;
+
+--echo
+EXPLAIN SELECT
+    (SELECT 100.00
+     FROM  (SELECT '2024-09-15' AS DATE ) newTb
+     WHERE T0.DATE = DATE_ADD(newTb.DATE, INTERVAL 0 MONTH)
+     ) AS 'PROFIT'
+FROM  (select tr.a as DATE from tr) T0
+GROUP BY T0.DATE WITH ROLLUP;