Merge pull request pingcap#24 from rebelice/fix_panic

fix count(distinct) panic
crazycs520 · Jan 7, 2022 · 7645e5b · 7645e5b
2 parents c8dbc74 + 833aeb0
commit 7645e5b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/planner/core/common_plans.go b/planner/core/common_plans.go
@@ -1738,7 +1738,7 @@ func BuildAWSQueryInfo(v *PhysicalTableReader, id int64) *RestoreData {
 				info.GroupBy = buffer.String()
 				if len(info.Col) == 0 {
 					info.Col = info.GroupBy
-				} else {
+				} else if len(info.Agg) != 0 {
 					info.Col = fmt.Sprintf("%v, %v", info.Col, info.GroupBy)
 				}
 			}
@@ -1773,7 +1773,7 @@ func BuildAWSQueryInfo(v *PhysicalTableReader, id int64) *RestoreData {
 				info.GroupBy = buffer.String()
 				if len(info.Col) == 0 {
 					info.Col = info.GroupBy
-				} else {
+				} else if len(info.Agg) != 0 {
 					info.Col = fmt.Sprintf("%v, %v", info.Col, info.GroupBy)
 				}
 			}