cherry pick #25063 to release-5.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
pingcap · Jun 4, 2021 · 4099df9 · 4099df9
1 parent 0ecd6bd
commit 4099df9
Show file tree

Hide file tree

Showing 6 changed files with 2,264 additions and 15 deletions.
diff --git a/cmd/explaintest/r/explain_easy.result b/cmd/explaintest/r/explain_easy.result
@@ -124,11 +124,12 @@ Projection	10000.00	root		eq(test.t1.c2, test.t2.c2)->Column#11
 └─Apply	10000.00	root		CARTESIAN left outer join
   ├─TableReader(Build)	10000.00	root		data:TableFullScan
   │ └─TableFullScan	10000.00	cop[tikv]	table:t1	keep order:false, stats:pseudo
-  └─Projection(Probe)	1.00	root		test.t2.c1, test.t2.c2
-    └─IndexLookUp	1.00	root		limit embedded(offset:0, count:1)
-      ├─Limit(Build)	1.00	cop[tikv]		offset:0, count:1
-      │ └─IndexRangeScan	1.00	cop[tikv]	table:t2, index:c1(c1)	range: decided by [eq(test.t1.c1, test.t2.c1)], keep order:true, stats:pseudo
-      └─TableRowIDScan(Probe)	1.00	cop[tikv]	table:t2	keep order:false, stats:pseudo
+  └─Limit(Probe)	1.00	root		offset:0, count:1
+    └─Projection	1.00	root		test.t2.c1, test.t2.c2
+      └─IndexLookUp	1.00	root		
+        ├─Limit(Build)	1.00	cop[tikv]		offset:0, count:1
+        │ └─IndexRangeScan	1.00	cop[tikv]	table:t2, index:c1(c1)	range: decided by [eq(test.t1.c1, test.t2.c1)], keep order:true, stats:pseudo
+        └─TableRowIDScan(Probe)	1.00	cop[tikv]	table:t2	keep order:false, stats:pseudo
 explain format = 'brief' select * from t1 order by c1 desc limit 1;
 id	estRows	task	access object	operator info
 Limit	1.00	root		offset:0, count:1

diff --git a/cmd/explaintest/r/explain_easy_stats.result b/cmd/explaintest/r/explain_easy_stats.result
@@ -106,11 +106,12 @@ Projection	1999.00	root		eq(test.t1.c2, test.t2.c2)->Column#11
 └─Apply	1999.00	root		CARTESIAN left outer join
   ├─TableReader(Build)	1999.00	root		data:TableFullScan
   │ └─TableFullScan	1999.00	cop[tikv]	table:t1	keep order:false
-  └─Projection(Probe)	1.00	root		test.t2.c1, test.t2.c2
-    └─IndexLookUp	1.00	root		limit embedded(offset:0, count:1)
-      ├─Limit(Build)	1.00	cop[tikv]		offset:0, count:1
-      │ └─IndexRangeScan	1.25	cop[tikv]	table:t2, index:c1(c1)	range: decided by [eq(test.t1.c1, test.t2.c1)], keep order:true
-      └─TableRowIDScan(Probe)	1.00	cop[tikv]	table:t2	keep order:false, stats:pseudo
+  └─Limit(Probe)	1.00	root		offset:0, count:1
+    └─Projection	1.00	root		test.t2.c1, test.t2.c2
+      └─IndexLookUp	1.00	root		
+        ├─Limit(Build)	1.00	cop[tikv]		offset:0, count:1
+        │ └─IndexRangeScan	1.25	cop[tikv]	table:t2, index:c1(c1)	range: decided by [eq(test.t1.c1, test.t2.c1)], keep order:true
+        └─TableRowIDScan(Probe)	1.00	cop[tikv]	table:t2	keep order:false, stats:pseudo
 explain format = 'brief' select * from t1 order by c1 desc limit 1;
 id	estRows	task	access object	operator info
 Limit	1.00	root		offset:0, count:1