fix test

Signed-off-by: yisaer <[email protected]>
pingcap · Dec 31, 2021 · 7ddb75a · 7ddb75a
1 parent e65c1df
commit 7ddb75a
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/planner/core/rule_column_pruning.go b/planner/core/rule_column_pruning.go
@@ -578,9 +578,9 @@ func appendColumnPruneTraceStep(p LogicalPlan, prunedColumns []*expression.Colum
 	if len(prunedColumns) < 1 {
 		return
 	}
-	s := make([]string, 0)
+	s := make([]fmt.Stringer, 0, len(prunedColumns))
 	for _, item := range prunedColumns {
-		s = append(s, item.String())
+		s = append(s, item)
 	}
 	appendItemPruneTraceStep(p, "columns", s, opt)
 }
@@ -589,9 +589,9 @@ func appendFunctionPruneTraceStep(p LogicalPlan, prunedFunctions []*aggregation.
 	if len(prunedFunctions) < 1 {
 		return
 	}
-	s := make([]string, 0)
+	s := make([]fmt.Stringer, 0, len(prunedFunctions))
 	for _, item := range prunedFunctions {
-		s = append(s, item.String())
+		s = append(s, item)
 	}
 	appendItemPruneTraceStep(p, "aggregation functions", s, opt)
 }
@@ -600,14 +600,25 @@ func appendByItemsPruneTraceStep(p LogicalPlan, prunedByItems []*util.ByItems, o
 	if len(prunedByItems) < 1 {
 		return
 	}
-	s := make([]string, 0)
+	s := make([]fmt.Stringer, 0, len(prunedByItems))
 	for _, item := range prunedByItems {
-		s = append(s, item.String())
+		s = append(s, item)
 	}
 	appendItemPruneTraceStep(p, "byItems", s, opt)
 }
 
-func appendItemPruneTraceStep(p LogicalPlan, itemType string, prunedObjects []string, opt *logicalOptimizeOp) {
+func appendGroupByItemsPruneTraceStep(p LogicalPlan, prunedGroupByItems []expression.Expression, opt *logicalOptimizeOp) {
+	if len(prunedGroupByItems) < 1 {
+		return
+	}
+	s := make([]fmt.Stringer, 0, len(prunedGroupByItems))
+	for _, item := range prunedGroupByItems {
+		s = append(s, item)
+	}
+	appendItemPruneTraceStep(p, "groupByItems", s, opt)
+}
+
+func appendItemPruneTraceStep(p LogicalPlan, itemType string, prunedObjects []fmt.Stringer, opt *logicalOptimizeOp) {
 	if len(prunedObjects) < 1 {
 		return
 	}
@@ -617,7 +628,7 @@ func appendItemPruneTraceStep(p LogicalPlan, itemType string, prunedObjects []st
 			if i > 0 {
 				buffer.WriteString(",")
 			}
-			buffer.WriteString(item)
+			buffer.WriteString(item.String())
 		}
 		buffer.WriteString("] have been pruned")
 		return buffer.String()
@@ -627,14 +638,3 @@ func appendItemPruneTraceStep(p LogicalPlan, itemType string, prunedObjects []st
 	}
 	opt.appendStepToCurrent(p.ID(), p.TP(), reason, action)
 }
-
-func appendGroupByItemsPruneTraceStep(p LogicalPlan, prunedGroupByItems []expression.Expression, opt *logicalOptimizeOp) {
-	if len(prunedGroupByItems) < 1 {
-		return
-	}
-	s := make([]string, 0)
-	for _, item := range prunedGroupByItems {
-		s = append(s, item.String())
-	}
-	appendItemPruneTraceStep(p, "groupByItems", s, opt)
-}