This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 8ffdfb62313 [Fix](regression)P0 case fail in inside pipeline on
branch-2.0 (#26197)
8ffdfb62313 is described below
commit 8ffdfb62313326819a36d549518228fd80cb24f7
Author: zhangguoqiang <[email protected]>
AuthorDate: Wed Nov 1 17:15:57 2023 +0800
[Fix](regression)P0 case fail in inside pipeline on branch-2.0 (#26197)
---
.../jdbc/test_jdbc_query_mysql.out | 12 +++----
.../external_table_p0/jdbc/test_jdbc_query_pg.out | 6 ++--
.../broker_load/test_broker_load_func.groovy | 34 +++++++++++++++-----
.../jdbc/test_jdbc_query_mysql.groovy | 37 ++++++++++++----------
.../jdbc/test_jdbc_query_pg.groovy | 11 +++++--
.../external_table_p0/tvf/test_hdfs_tvf.groovy | 4 ++-
6 files changed, 67 insertions(+), 37 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 de2b898688f..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 6,7,2,9 H,G,E,A 7601.25,3683.85,2449.00,5297.81,4785.38
4,5,6,9,A 9,7,C,5 a,b,e,d,c
-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 d,a,b,c,e
-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 C,B 8,7
e,d,b,c,a
-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,b,a,d
+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
@@ -1475,9 +1475,9 @@ true abc efg 2022-10-01 3.4 1
2 4 100000 1.2 2022-10-02T12:59:01 24.000 true abc
1.000
-- !sql95 --
+0
+1
1
-2
-3
-- !sql100 --
1025
diff --git a/regression-test/data/external_table_p0/jdbc/test_jdbc_query_pg.out
b/regression-test/data/external_table_p0/jdbc/test_jdbc_query_pg.out
index 14b59b54a53..06b0247814a 100644
--- a/regression-test/data/external_table_p0/jdbc/test_jdbc_query_pg.out
+++ b/regression-test/data/external_table_p0/jdbc/test_jdbc_query_pg.out
@@ -1384,9 +1384,9 @@ true abc def 2022-10-11 1.234 1
2 3 2022-10-22T10:59:59 34.123 true abc def 2022
1.000
-- !sql95 --
-123
-123
-234
+0
+1
+2
-- !sql100 --
1026
diff --git
a/regression-test/suites/external_table_p0/broker_load/test_broker_load_func.groovy
b/regression-test/suites/external_table_p0/broker_load/test_broker_load_func.groovy
index c3793c605a2..e15579a7ae9 100644
---
a/regression-test/suites/external_table_p0/broker_load/test_broker_load_func.groovy
+++
b/regression-test/suites/external_table_p0/broker_load/test_broker_load_func.groovy
@@ -25,13 +25,16 @@ suite("test_broker_load_func",
"p0,external,hive,external_docker,external_docker
String database_name = "test_broker_load_func"
String broker_name = "hdfs"
+ def uuid = UUID.randomUUID().toString().replaceAll("-", "")
+ def test_load_label="label_test_broker_load_func_${uuid}"
+ String table_name="simple"
sql """drop database if exists ${database_name}; """
sql """create database if not exists ${database_name};"""
sql """use ${database_name}; """
sql """
- create table simple (
+ create table ${table_name} (
`t_empty_string` varchar(255) NULL COMMENT '',
`t_string` varchar(255) NULL COMMENT ''
) engine=olap
@@ -42,10 +45,10 @@ suite("test_broker_load_func",
"p0,external,hive,external_docker,external_docker
"""
sql """
- LOAD LABEL ${database_name}.label_test_broker_load_func
+ LOAD LABEL ${database_name}.${test_load_label}
(
DATA
INFILE("hdfs://${externalEnvIp}:${hdfsPort}/user/doris/preinstalled_data/csv/csv_all_types/csv_all_types")
- INTO TABLE `simple`
+ INTO TABLE ${table_name}
COLUMNS TERMINATED BY ","
)
WITH BROKER ${broker_name}
@@ -55,11 +58,26 @@ suite("test_broker_load_func",
"p0,external,hive,external_docker,external_docker
);
"""
- sleep(10000)
-
- def res = sql """select count(*) from simple;"""
-
- assertEquals(10,res[0][0])
+ def check_load_result = {checklabel, testTablex ->
+ max_try_milli_secs = 60000
+ while(max_try_milli_secs) {
+ result = sql "show load where label = '${checklabel}'"
+ if(result[0][2] == "FINISHED") {
+ //sql "sync"
+ def res = sql "select count(*) from
${database_name}.${testTablex};"
+ assertEquals(10,res[0][0])
+ break
+ } else {
+ sleep(1000) // wait 1 second every time
+ max_try_milli_secs -= 1000
+ if(max_try_milli_secs <= 0) {
+ assertEquals(1, 2)
+ }
+ }
+ }
+ }
+
+ check_load_result.call(test_load_label, table_name)
} finally {
}
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 8b3f294b61e..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
@@ -18,6 +18,11 @@
suite("test_jdbc_query_mysql",
"p0,external,mysql,external_docker,external_docker_mysql") {
String enabled = context.config.otherConfigs.get("enableJdbcTest")
+ String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
+ String s3_endpoint = getS3Endpoint()
+ String bucket = getS3BucketName()
+ 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")
String jdbcResourceMysql57 = "jdbc_resource_mysql_57_x"
@@ -25,10 +30,10 @@ suite("test_jdbc_query_mysql",
"p0,external,mysql,external_docker,external_docke
String exMysqlTable = "doris_ex_tb";
String exMysqlTable1 = "doris_ex_tb1";
String exMysqlTable2 = "doris_ex_tb2";
- String exMysqlTypeTable = "doris_ex_type_tb";
- String inDorisTable = "doris_in_tb";
- String inDorisTable1 = "doris_in_tb1";
- String inDorisTable2 = "doris_in_tb2";
+ String exMysqlTypeTable = "doris_ex_type_tb";
+ String inDorisTable = "test_jdbc_mysql_doris_in_tb";
+ String inDorisTable1 = "test_jdbc_mysql_doris_in_tb1";
+ String inDorisTable2 = "test_jdbc_mysql_doris_in_tb2";
sql """drop resource if exists $jdbcResourceMysql57;"""
sql """
@@ -37,8 +42,8 @@ suite("test_jdbc_query_mysql",
"p0,external,mysql,external_docker,external_docke
"type"="jdbc",
"user"="root",
"password"="123456",
- "jdbc_url"="jdbc:mysql://127.0.0.1:$mysql_57_port/doris_test",
-
"driver_url"="https://doris-community-test-1308700295.cos.ap-hongkong.myqcloud.com/jdbc_driver/mysql-connector-java-8.0.25.jar";,
+
"jdbc_url"="jdbc:mysql://${externalEnvIp}:$mysql_57_port/doris_test",
+ "driver_url"="${driver_url}",
"driver_class"="com.mysql.cj.jdbc.Driver"
);
"""
@@ -669,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,
@@ -913,7 +918,7 @@ suite("test_jdbc_query_mysql",
"p0,external,mysql,external_docker,external_docke
order_qt_sql93 """ SELECT CASE k8 WHEN 1 THEN CAST(1 AS decimal(4,1))
WHEN 2 THEN CAST(1 AS decimal(4,2))
ELSE CAST(1 AS decimal(4,3)) END FROM
$jdbcMysql57Table1 limit 3"""
order_qt_sql95 """ SELECT * from (SELECT k8 FROM $jdbcMysql57Table1
UNION (SELECT id as k8 FROM ${exMysqlTable} UNION SELECT k7 as k8 FROM
$jdbcMysql57Table1)
- UNION ALL SELECT products_id as k8 FROM
$exMysqlTable1 ORDER BY k8 limit 3) as a limit 3"""
+ UNION ALL SELECT products_id as k8 FROM
$exMysqlTable1 ORDER BY k8 limit 3) as a order by k8 limit 3"""
order_qt_sql100 """ SELECT COUNT(*) FROM $jdbcMysql57Table1 WHERE
EXISTS(SELECT max(id) FROM ${exMysqlTable}) """
order_qt_sql103 """ SELECT count(*) FROM $jdbcMysql57Table1 n WHERE
(SELECT count(*) FROM ${exMysqlTable} r WHERE n.k8 = r.id) > 1 """
order_qt_sql105 """ SELECT count(*) AS numwait FROM $jdbcMysql57Table1
l1 WHERE
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_pg.groovy
b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_pg.groovy
index 7a41885d7cc..7eabc901f44 100644
--- a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_pg.groovy
+++ b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_pg.groovy
@@ -20,6 +20,11 @@ import java.nio.charset.Charset;
suite("test_jdbc_query_pg",
"p0,external,pg,external_docker,external_docker_pg") {
String enabled = context.config.otherConfigs.get("enableJdbcTest")
+ String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
+ String s3_endpoint = getS3Endpoint()
+ String bucket = getS3BucketName()
+ String driver_url =
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/postgresql-42.5.0.jar";
+
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String pg_14_port = context.config.otherConfigs.get("pg_14_port")
String jdbcResourcePg14 = "jdbc_resource_pg_14"
@@ -43,8 +48,8 @@ suite("test_jdbc_query_pg",
"p0,external,pg,external_docker,external_docker_pg")
"type"="jdbc",
"user"="postgres",
"password"="123456",
-
"jdbc_url"="jdbc:postgresql://127.0.0.1:$pg_14_port/postgres?currentSchema=doris_test",
-
"driver_url"="https://doris-community-test-1308700295.cos.ap-hongkong.myqcloud.com/jdbc_driver/postgresql-42.5.0.jar";,
+
"jdbc_url"="jdbc:postgresql://${externalEnvIp}:$pg_14_port/postgres?currentSchema=doris_test",
+ "driver_url"="${driver_url}",
"driver_class"="org.postgresql.Driver"
);
"""
@@ -616,7 +621,7 @@ suite("test_jdbc_query_pg",
"p0,external,pg,external_docker,external_docker_pg")
order_qt_sql93 """ SELECT CASE k8 WHEN 1 THEN CAST(1 AS decimal(4,1))
WHEN 2 THEN CAST(1 AS decimal(4,2))
ELSE CAST(1 AS decimal(4,3)) END FROM
$jdbcPg14Table1 limit 3"""
order_qt_sql95 """ SELECT * from (SELECT k8 FROM $jdbcPg14Table1 UNION
(SELECT id as k8 FROM ${dorisExTable1} UNION SELECT k7 as k8 FROM
$jdbcPg14Table1)
- UNION ALL SELECT id as k8 FROM $exMysqlTypeTable
ORDER BY id limit 3) as a limit 3"""
+ UNION ALL SELECT id as k8 FROM $exMysqlTypeTable
ORDER BY id limit 3) as a order by k8 limit 3"""
order_qt_sql100 """ SELECT COUNT(*) FROM $jdbcPg14Table1 WHERE
EXISTS(SELECT max(id) FROM ${dorisExTable1}) """
order_qt_sql103 """ SELECT count(*) FROM $jdbcPg14Table1 n WHERE
(SELECT count(*) FROM ${dorisExTable1} r WHERE n.k8 = r.id) > 1 """
order_qt_sql105 """ SELECT count(*) AS numwait FROM $jdbcPg14Table1 l1
WHERE
diff --git a/regression-test/suites/external_table_p0/tvf/test_hdfs_tvf.groovy
b/regression-test/suites/external_table_p0/tvf/test_hdfs_tvf.groovy
index 856646fff21..61c049a0a04 100644
--- a/regression-test/suites/external_table_p0/tvf/test_hdfs_tvf.groovy
+++ b/regression-test/suites/external_table_p0/tvf/test_hdfs_tvf.groovy
@@ -17,10 +17,12 @@
suite("test_hdfs_tvf","external,hive,tvf,external_docker") {
String hdfs_port = context.config.otherConfigs.get("hdfs_port")
+ String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
+
// It's okay to use random `hdfsUser`, but can not be empty.
def hdfsUserName = "doris"
def format = "csv"
- def defaultFS = "hdfs://127.0.0.1:${hdfs_port}"
+ def defaultFS = "hdfs://${externalEnvIp}:${hdfs_port}"
def uri = ""
String enabled = context.config.otherConfigs.get("enableHiveTest")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
