This is an automated email from the ASF dual-hosted git repository.
morningman 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 bddb6b6ddc1 [test](jdbc) fix unstable group_concat distinct case
(#26076)
bddb6b6ddc1 is described below
commit bddb6b6ddc1f9adfb2d958ef74915f96f905b437
Author: Mingyu Chen <morning...@163.com>
AuthorDate: Mon Oct 30 12:46:11 2023 +0800
[test](jdbc) fix unstable group_concat distinct case (#26076)
The `group_concat` with `distinct` may return unstable result,
so I remove the distinct and add `order by` to make test case stable
---
.../external_table_p0/jdbc/test_jdbc_query_mysql.out | 8 ++++----
.../jdbc/test_jdbc_query_mysql.groovy | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/regression-test/data/external_table_p0/jdbc/test_jdbc_query_mysql.out
b/regression-test/data/external_table_p0/jdbc/test_jdbc_query_mysql.out
index 76a8b0771b7..f92290ff60c 100644
--- a/regression-test/data/external_table_p0/jdbc/test_jdbc_query_mysql.out
+++ b/regression-test/data/external_table_p0/jdbc/test_jdbc_query_mysql.out
@@ -1104,10 +1104,10 @@ false
\N
-- !sql --
-3 1970-01-01 1970-01-01 1427427954.90 0.00 0.00 0.00
0.00 0.00 7,2,9,6 G,H,A,E 5297.81,3683.85,7601.25,2449.00,4785.38
5,9,A,6,4 7,5,9,C c,e,d,a,b
-5 1970-01-01 1970-01-01 163793651.90 0.00 0.00 0.00
0.00 0.00 7 C 6276.86 8 9 c,e,d,a,b
-6 1970-01-01 1970-01-01 113878186.90 106106702.80 0.00
0.00 0.00 343909702.45 1,4 A,E 2099.18,9137.82 B,C 7,8
c,e,d,a,b
-8 1970-01-01 1970-01-01 487433108.65 0.00 0.00 0.00
0.00 0.00 9 H 2900.42 A 6 c,e,d,a,b
+3 1970-01-01 1970-01-01 1427427954.90 0.00 0.00 0.00
0.00 0.00 2,2,2,2,2,6,6,6,6,6,6,6,6,6,6,7,7,7,7,7,9,9,9,9,9
A,A,A,A,A,E,E,E,E,E,G,G,G,G,G,H,H,H,H,H,H,H,H,H,H
2449.00,2449.00,2449.00,2449.00,2449.00,3683.85,3683.85,3683.85,3683.85,3683.85,4785.38,4785.38,4785.38,4785.38,4785.38,5297.81,5297.81,5297.81,5297.81,5297.81,7601.25,7601.25,7601.25,7601.25,7601.25
A,A,A,A,A,4,4,4,4,4,5,5,5,5,5,6,6,6,6,6,9,9,9,9,9
C,C,C,C,C,C,C,C,C,C,5,5,5,5,5,7,7,7,7,7,9,9,9,9,9
a,a,a,a,a,b,b,b,b,b,c,c,c,c,c [...]
+5 1970-01-01 1970-01-01 163793651.90 0.00 0.00 0.00
0.00 0.00 7,7,7,7,7 C,C,C,C,C
6276.86,6276.86,6276.86,6276.86,6276.86 8,8,8,8,8 9,9,9,9,9
a,b,c,d,e
+6 1970-01-01 1970-01-01 113878186.90 106106702.80 0.00
0.00 0.00 343909702.45 1,1,1,1,1,4,4,4,4 A,A,A,A,A,E,E,E,E
2099.18,2099.18,2099.18,2099.18,2099.18,9137.82,9137.82,9137.82,9137.82
B,B,B,B,C,C,C,C,C 7,7,7,7,8,8,8,8,8 a,a,b,b,c,c,d,d,e
+8 1970-01-01 1970-01-01 487433108.65 0.00 0.00 0.00
0.00 0.00 9,9,9,9,9 H,H,H,H,H
2900.42,2900.42,2900.42,2900.42,2900.42 A,A,A,A,A 6,6,6,6,6
a,b,c,d,e
-- !sql1 --
1025
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_mysql.groovy
b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_mysql.groovy
index b723b3f1f02..7964b7e9370 100644
--- a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_mysql.groovy
+++ b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_mysql.groovy
@@ -21,7 +21,7 @@ suite("test_jdbc_query_mysql",
"p0,external,mysql,external_docker,external_docke
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
String s3_endpoint = getS3Endpoint()
String bucket = getS3BucketName()
- String driver_url =
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mysql-connector-java-8.0.25.jar";
+ String driver_url =
"http://${bucket}.${s3_endpoint}/regression/jdbc_driver/mysql-connector-java-8.0.25.jar";
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String mysql_57_port = context.config.otherConfigs.get("mysql_57_port")
@@ -674,22 +674,22 @@ suite("test_jdbc_query_mysql",
"p0,external,mysql,external_docker,external_docke
sum(case when capital_type = '2' and petty_cash_type = '2' then
IFNULL(recharge_amount, 0.00) else 0.00 end) as petty_recharge_amount,
sum(case when capital_type = '2' and petty_cash_type = '3' then
IFNULL(recharge_amount, 0.00) else 0.00 end) as petty_return_amount,
sum(case when capital_type = '3' then IFNULL(need_actual_amount,
0.00) else 0.00 end) as return_goods_amount,
- GROUP_CONCAT(distinct cast(supplier_id as varchar (12)))
supplier_id_list
+ GROUP_CONCAT(cast(supplier_id as varchar (12)) order by
supplier_id) supplier_id_list
from tmp_media_purchase group by media_order_id),
- t2 as (select media_order_id, GROUP_CONCAT(distinct (case
agent_policy_type
+ t2 as (select media_order_id, GROUP_CONCAT((case agent_policy_type
when '1' then 'A' when '2' then 'B' when '3' then 'C' when '4' then
'D' when '5' then 'E' when '6' then 'F'
when '7' then 'G' when '8' then 'H' when '9' then 'I' when '10' then
'J' when '11' then 'K' when '12' then 'L'
- when '13' then 'M' else agent_policy_type end)) agent_policy_type_list
+ when '13' then 'M' else agent_policy_type end) order by
agent_policy_type) agent_policy_type_list
from tmp_media_purchase group by media_order_id),
- t3 as (select media_order_id, GROUP_CONCAT(distinct cast(agent_policy
as varchar (12))) agent_policy_list
+ t3 as (select media_order_id, GROUP_CONCAT(cast(agent_policy as varchar
(12)) order by agent_policy) agent_policy_list
from tmp_media_purchase group by media_order_id),
- t4 as (select media_order_id, GROUP_CONCAT(distinct (case capital_type
- when '1' then 'A' when '2' then 'B' when '3' then 'C' else
capital_type end)) capital_type_list
+ t4 as (select media_order_id, GROUP_CONCAT((case capital_type
+ when '1' then 'A' when '2' then 'B' when '3' then 'C' else
capital_type end) order by capital_type) capital_type_list
from tmp_media_purchase group by media_order_id),
- t5 as (select media_order_id, GROUP_CONCAT(distinct (case
petty_cash_type
- when '1' then 'A' when '2' then 'B' when '3' then 'C' else
petty_cash_type end)) petty_cash_type_list
+ t5 as (select media_order_id, GROUP_CONCAT((case petty_cash_type
+ when '1' then 'A' when '2' then 'B' when '3' then 'C' else
petty_cash_type end) order by petty_cash_type) petty_cash_type_list
from tmp_media_purchase group by media_order_id),
- t6 as (select media_order_id, GROUP_CONCAT(distinct `name`)
company_name_list
+ t6 as (select media_order_id, GROUP_CONCAT(`name` order by `name`)
company_name_list
from tmp_media_purchase group by media_order_id)
select distinct tmp_media_purchase.`media_order_id`,
first_payment_date,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
