cherry pick pingcap#12225 to release-3.1

Signed-off-by: sre-bot <sre-bot@pingcap.com>

cmd/explaintest/r/explain_easy.result

@@ -722,3 +722,48 @@ TableReader_7	1.00	root	data:Selection_6
 └─Selection_6	1.00	cop[tikv]	eq(test.t.b, 1000-01-01 00:00:00.000000)
   └─TableScan_5	3.00	cop[tikv]	table:t, range:[-inf,+inf], keep order:false
 drop table t;
+<<<<<<< HEAD
+=======
+create table t(a int, b int, index idx_ab(a, b));
+explain select a, b from t where a in (1) order by b;
+id	count	task	operator info
+IndexReader_12	10.00	root	index:IndexScan_11
+└─IndexScan_11	10.00	cop	table:t, index:a, b, range:[1,1], keep order:true, stats:pseudo
+explain select a, b from t where a = 1 order by b;
+id	count	task	operator info
+IndexReader_12	10.00	root	index:IndexScan_11
+└─IndexScan_11	10.00	cop	table:t, index:a, b, range:[1,1], keep order:true, stats:pseudo
+drop table if exists t;
+create table t(a int, b int);
+explain select a, b from (select a, b, avg(b) over (partition by a)as avg_b from t) as tt where a > 10 and b < 10 and a > avg_b;
+id	count	task	operator info
+Projection_8	2666.67	root	Column#1, Column#2
+└─Selection_9	2666.67	root	gt(cast(Column#1), Column#7), lt(Column#2, 10)
+  └─Window_10	3333.33	root	avg(cast(Column#2)) over(partition by Column#1)
+    └─Sort_14	3333.33	root	Column#1:asc
+      └─TableReader_13	3333.33	root	data:Selection_12
+        └─Selection_12	3333.33	cop	gt(Column#1, 10)
+          └─TableScan_11	10000.00	cop	table:t, range:[-inf,+inf], keep order:false, stats:pseudo
+drop table if exists t;
+create table t(a int, b int);
+explain format="dot" select * from t where a < 2;
+dot contents
+
+digraph TableReader_7 {
+subgraph cluster7{
+node [style=filled, color=lightgrey]
+color=black
+label = "root"
+"TableReader_7"
+}
+subgraph cluster6{
+node [style=filled, color=lightgrey]
+color=black
+label = "cop"
+"Selection_6" -> "TableScan_5"
+}
+"TableReader_7" -> "Selection_6"
+}
+
+drop table if exists t;
+>>>>>>> 96d4b1f... planner: display cop tasks when explain format is "dot" (#12225)

cmd/explaintest/t/explain_easy.test

@@ -179,3 +179,27 @@ analyze table t;
 explain select * from t where a = 1;
 explain select * from t where b = "1000-01-01";
 drop table t;
+<<<<<<< HEAD
+=======
+
+create table t(a int);
+insert into t values (1),(2),(2),(2),(9),(9),(9),(10);
+analyze table t with 1 buckets;
+explain select * from t where a >= 3 and a <= 8;
+drop table t;
+
+# https://github.com/pingcap/tidb/issues/10626
+create table t(a int, b int, index idx_ab(a, b));
+explain select a, b from t where a in (1) order by b;
+explain select a, b from t where a = 1 order by b;
+drop table if exists t;
+
+# https://github.com/pingcap/tidb/issues/11903
+create table t(a int, b int);
+explain select a, b from (select a, b, avg(b) over (partition by a)as avg_b from t) as tt where a > 10 and b < 10 and a > avg_b;
+drop table if exists t;
+
+create table t(a int, b int);
+explain format="dot" select * from t where a < 2;
+drop table if exists t;
+>>>>>>> 96d4b1f... planner: display cop tasks when explain format is "dot" (#12225)

planner/core/common_plans.go

@@ -680,22 +680,25 @@ func (e *Explain) prepareOperatorInfo(p PhysicalPlan, taskType string, indent st
 
 func (e *Explain) prepareDotInfo(p PhysicalPlan) {
 	buffer := bytes.NewBufferString("")
-	buffer.WriteString(fmt.Sprintf("\ndigraph %s {\n", p.ExplainID()))
+	fmt.Fprintf(buffer, "\ndigraph %s {\n", p.ExplainID())
 	e.prepareTaskDot(p, "root", buffer)
-	buffer.WriteString(fmt.Sprintln("}"))
+	buffer.WriteString("}\n")
 
 	e.Rows = append(e.Rows, []string{buffer.String()})
 }
 
 func (e *Explain) prepareTaskDot(p PhysicalPlan, taskTp string, buffer *bytes.Buffer) {
-	buffer.WriteString(fmt.Sprintf("subgraph cluster%v{\n", p.ID()))
+	fmt.Fprintf(buffer, "subgraph cluster%v{\n", p.ID())
 	buffer.WriteString("node [style=filled, color=lightgrey]\n")
 	buffer.WriteString("color=black\n")
-	buffer.WriteString(fmt.Sprintf("label = \"%s\"\n", taskTp))
+	fmt.Fprintf(buffer, "label = \"%s\"\n", taskTp)
 
 	if len(p.Children()) == 0 {
-		buffer.WriteString(fmt.Sprintf("\"%s\"\n}\n", p.ExplainID()))
-		return
+		if taskTp == "cop" {
+			fmt.Fprintf(buffer, "\"%s\"\n}\n", p.ExplainID())
+			return
+		}
+		fmt.Fprintf(buffer, "\"%s\"\n", p.ExplainID())
 	}
 
 	var copTasks []PhysicalPlan
@@ -717,7 +720,7 @@ func (e *Explain) prepareTaskDot(p PhysicalPlan, taskTp string, buffer *bytes.Bu
 			copTasks = append(copTasks, copPlan.indexPlan)
 		}
 		for _, child := range curPlan.Children() {
-			buffer.WriteString(fmt.Sprintf("\"%s\" -> \"%s\"\n", curPlan.ExplainID(), child.ExplainID()))
+			fmt.Fprintf(buffer, "\"%s\" -> \"%s\"\n", curPlan.ExplainID(), child.ExplainID())
 			planQueue = append(planQueue, child)
 		}
 	}