You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2023/06/13 09:20:37 UTC
[doris] branch master updated: [fix](group_concat) use default seperator ',' instead of ', ' for group_concat, to be consistant with mysql (#20741)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new feb21fc9e9 [fix](group_concat) use default seperator ',' instead of ', ' for group_concat, to be consistant with mysql (#20741)
feb21fc9e9 is described below
commit feb21fc9e992e7de3dc36c1ae3f60be3131cd4b4
Author: TengJianPing <18...@users.noreply.github.com>
AuthorDate: Tue Jun 13 17:20:29 2023 +0800
[fix](group_concat) use default seperator ',' instead of ', ' for group_concat, to be consistant with mysql (#20741)
---
.../aggregate_function_group_concat.cpp | 2 +-
.../nereids_p0/group_concat/test_group_concat.out | 26 +++++++++++-----------
.../test_aggregate_all_functions.out | 8 +++----
.../query_p0/group_concat/test_group_concat.out | 26 +++++++++++-----------
.../test_aggregate_all_functions.out | 9 ++++----
.../suites/nereids_syntax_p0/group_concat.groovy | 2 +-
6 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/be/src/vec/aggregate_functions/aggregate_function_group_concat.cpp b/be/src/vec/aggregate_functions/aggregate_function_group_concat.cpp
index c43fb44333..9661b9c89d 100644
--- a/be/src/vec/aggregate_functions/aggregate_function_group_concat.cpp
+++ b/be/src/vec/aggregate_functions/aggregate_function_group_concat.cpp
@@ -24,7 +24,7 @@
namespace doris::vectorized {
-const std::string AggregateFunctionGroupConcatImplStr::separator = ", ";
+const std::string AggregateFunctionGroupConcatImplStr::separator = ",";
AggregateFunctionPtr create_aggregate_function_group_concat(const std::string& name,
const DataTypes& argument_types,
diff --git a/regression-test/data/nereids_p0/group_concat/test_group_concat.out b/regression-test/data/nereids_p0/group_concat/test_group_concat.out
index 157046ae1e..16467f6be7 100644
--- a/regression-test/data/nereids_p0/group_concat/test_group_concat.out
+++ b/regression-test/data/nereids_p0/group_concat/test_group_concat.out
@@ -1,6 +1,6 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !select --
-false, false
+false,false
-- !select --
false
@@ -8,12 +8,12 @@ false
-- !select --
\N \N
103 255
-1001 1986, 1989
-1002 1989, 32767
-3021 1991, 1992, 32767
-5014 1985, 1991
+1001 1986,1989
+1002 1989,32767
+3021 1991,1992,32767
+5014 1985,1991
25699 1989
-2147483647 255, 1991, 32767, 32767
+2147483647 255,1991,32767,32767
-- !select --
\N \N
@@ -26,7 +26,7 @@ false
2147483647 255:1991:32767:32767
-- !select --
-12 false, false, false, false, false, false, false, false, true, true, true, true, true, true, true
+12 false,false,false,false,false,false,false,false,true,true,true,true,true,true,true
-- !select_10 --
1 2
@@ -48,14 +48,14 @@ false
2 23 23
-- !select_group_concat_order_by_desc1 --
-1 3, 2, 2, 1, 1
-2 23, 22, 22, 21, 21
+1 3,2,2,1,1
+2 23,22,22,21,21
-- !select_group_concat_order_by_desc2 --
-1 3, 2, 21, 1, 11
-2 23, 22, 222, 21, 211
+1 3,2,21,1,11
+2 23,22,222,21,211
-- !select_group_concat_order_by_desc3 --
-1 3, 21, 2, 11, 1
-2 23, 222, 22, 211, 21
+1 3,21,2,11,1
+2 23,222,22,211,21
diff --git a/regression-test/data/nereids_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.out b/regression-test/data/nereids_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.out
index 78282bd470..316252a3cd 100644
--- a/regression-test/data/nereids_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.out
+++ b/regression-test/data/nereids_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.out
@@ -40,7 +40,7 @@ beijing 3
xian 2
-- !select9 --
-beijing, xian, beijing, chengdu, shanghai
+beijing,xian,beijing,chengdu,shanghai
-- !select10 --
beijing xian beijing chengdu shanghai
@@ -49,8 +49,8 @@ beijing xian beijing chengdu shanghai
\N
-- !select12 --
-beijing, xian
-beijing, chengdu, shanghai
+beijing,xian
+beijing,chengdu,shanghai
-- !select13 --
beijing xian
@@ -226,7 +226,7 @@ beijing chengdu shanghai
2
-- !select44 --
-6 3975 2003 33035710 25819.948000000 78965.368 4449.5830001831055
+6 3975 2003 33035710 25819.948 78965.368 4449.5830001831055
-- !select45 --
1 10
diff --git a/regression-test/data/query_p0/group_concat/test_group_concat.out b/regression-test/data/query_p0/group_concat/test_group_concat.out
index 8fdcde8db4..2895251f01 100644
--- a/regression-test/data/query_p0/group_concat/test_group_concat.out
+++ b/regression-test/data/query_p0/group_concat/test_group_concat.out
@@ -1,6 +1,6 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !select --
-false, false
+false,false
-- !select --
false
@@ -8,12 +8,12 @@ false
-- !select --
\N \N
103 255
-1001 1986, 1989
-1002 1989, 32767
-3021 1991, 1992, 32767
-5014 1985, 1991
+1001 1986,1989
+1002 1989,32767
+3021 1991,1992,32767
+5014 1985,1991
25699 1989
-2147483647 255, 1991, 32767, 32767
+2147483647 255,1991,32767,32767
-- !select --
\N \N
@@ -26,7 +26,7 @@ false
2147483647 255:1991:32767:32767
-- !select --
-12 false, false, false, false, false, false, false, false, true, true, true, true, true, true, true
+12 false,false,false,false,false,false,false,false,true,true,true,true,true,true,true
-- !select_10 --
1 2
@@ -48,16 +48,16 @@ false
2 23 23
-- !select_group_concat_order_by_desc1 --
-1 3, 2, 2, 1, 1
-2 23, 22, 22, 21, 21
+1 3,2,2,1,1
+2 23,22,22,21,21
-- !select_group_concat_order_by_desc2 --
-1 3, 2, 21, 1, 11
-2 23, 22, 222, 21, 211
+1 3,2,21,1,11
+2 23,22,222,21,211
-- !select_group_concat_order_by_desc3 --
-1 3, 21, 2, 11, 1
-2 23, 222, 22, 211, 21
+1 3,21,2,11,1
+2 23,222,22,211,21
-- !select_group_concat_order_by --
1,11,2,21,21,211,22,222,23,3 3,23,222,22,211,21,21,2,11,1
diff --git a/regression-test/data/query_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.out b/regression-test/data/query_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.out
index 6e76e30c55..5713247a09 100644
--- a/regression-test/data/query_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.out
+++ b/regression-test/data/query_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.out
@@ -40,7 +40,7 @@ beijing 3
xian 2
-- !select9 --
-beijing, xian, beijing, chengdu, shanghai
+beijing,xian,beijing,chengdu,shanghai
-- !select10 --
beijing xian beijing chengdu shanghai
@@ -49,8 +49,8 @@ beijing xian beijing chengdu shanghai
\N
-- !select12 --
-beijing, xian
-beijing, chengdu, shanghai
+beijing,xian
+beijing,chengdu,shanghai
-- !select13 --
beijing xian
@@ -239,7 +239,7 @@ beijing chengdu shanghai
2
-- !select44 --
-6 3975 2003 33035710 25819.948000000 78965.368 4449.5830001831055
+6 3975 2003 33035710 25819.948 78965.368 4449.5830001831055
-- !select45 --
1 10
@@ -269,3 +269,4 @@ beijing chengdu shanghai
20220201 0 1.0
20220201 1 3.0
20220202 2 4999.0
+
diff --git a/regression-test/suites/nereids_syntax_p0/group_concat.groovy b/regression-test/suites/nereids_syntax_p0/group_concat.groovy
index 551fe37384..fe2062d66d 100644
--- a/regression-test/suites/nereids_syntax_p0/group_concat.groovy
+++ b/regression-test/suites/nereids_syntax_p0/group_concat.groovy
@@ -36,7 +36,7 @@ suite("group_concat") {
test {
sql "select group_concat(cast(number as string)) from numbers('number'='10')"
- result([["0, 1, 2, 3, 4, 5, 6, 7, 8, 9"]])
+ result([["0,1,2,3,4,5,6,7,8,9"]])
}
test {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org