This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new 50c2d32567a branch-4.1: [test](regression) Support TLS connector
regression cases #66658 (#66718)
50c2d32567a is described below
commit 50c2d32567add10f1847e0cff49efc0ebd8cea9d
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Aug 13 18:44:37 2026 +0800
branch-4.1: [test](regression) Support TLS connector regression cases
#66658 (#66718)
Cherry-picked from #66658
Co-authored-by: wudi <[email protected]>
---
regression-test/conf/regression-conf.groovy | 2 ++
.../spark_connector/spark_connector_arrow.out | 28 +++++++++++-----------
.../org/apache/doris/regression/suite/Suite.groovy | 16 +++++++++++++
.../spark_connector/spark_connector_arrow.groovy | 17 ++++++++-----
.../spark_connector_read_type.groovy | 18 ++++++++++----
.../flink_connector_p0/flink_connector.groovy | 25 +++++++++++--------
.../flink_connector_syncdb.groovy | 27 +++++++++++++--------
.../flink_connector_p0/flink_connector_type.groovy | 27 +++++++++++++--------
8 files changed, 105 insertions(+), 55 deletions(-)
diff --git a/regression-test/conf/regression-conf.groovy
b/regression-test/conf/regression-conf.groovy
index 385a523d33c..934d5514331 100644
--- a/regression-test/conf/regression-conf.groovy
+++ b/regression-test/conf/regression-conf.groovy
@@ -301,6 +301,8 @@ icebergS3TablesCatalogGlueRest=""
// The path of the cert configuration file for the testing framework
// is consistent with the path of the cert file for the cluster
enableTLS=false
+// Comma-separated Doris connector protocols that remain plaintext when TLS is
enabled
+tlsExcludedProtocols=""
tlsVerifyMode="strict"
keyStorePath="/your/keystore.p12"
keyStorePassword="yourPwd"
diff --git
a/regression-test/data/connector_p0/spark_connector/spark_connector_arrow.out
b/regression-test/data/connector_p0/spark_connector/spark_connector_arrow.out
index e5c155d4ca7..7d83e89e9f3 100644
---
a/regression-test/data/connector_p0/spark_connector/spark_connector_arrow.out
+++
b/regression-test/data/connector_p0/spark_connector/spark_connector_arrow.out
@@ -9,22 +9,22 @@
1 true 1 2 3 4 123456789 6.6 7.7
3.12000 2023-09-08 2023-09-08T17:12:34.123456 char varchar string
-- !q02 --
-1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.7, 8.8,
8.899999618530273] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
-1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.7, 8.8,
8.899999618530273] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
-1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.7, 8.8,
8.899999618530273] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
-1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.7, 8.8,
8.899999618530273] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
-1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.7, 8.8,
8.899999618530273] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
-1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.7, 8.8,
8.899999618530273] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
-1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.7, 8.8,
8.899999618530273] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
+1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.5, 8.5,
9.25] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
+1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.5, 8.5,
9.25] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
+1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.5, 8.5,
9.25] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
+1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.5, 8.5,
9.25] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
+1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.5, 8.5,
9.25] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
+1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.5, 8.5,
9.25] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
+1 [1, 0, 0, 1, 1] [1, 2, 3] [2, 12, 32] [3, 4, 5, 6] [4, 5,
6] [123456789, 987654321, 123789456] [6.6, 6.7, 7.8] [7.5, 8.5,
9.25] [3.12000, 1.12345] ["2023-09-08", "2027-10-28"]
["2023-09-08 17:12:34.123456", "2024-09-08 18:12:34.123456"] ["char",
"char2"] ["varchar", "varchar2"] ["string", "string2"]
-- !q03 --
-1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "1023-09-08":"2023-09-08"} {"1023-09-08
17:06:51.123456":"2023-09-08 17:12:34.123456", "3023-09-08
17:12:34.123456":"4023-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
-1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "1023-09-08":"2023-09-08"} {"1023-09-08
17:06:51.123456":"2023-09-08 17:12:34.123456", "3023-09-08
17:12:34.123456":"4023-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
-1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "1023-09-08":"2023-09-08"} {"1023-09-08
17:06:51.123456":"2023-09-08 17:12:34.123456", "3023-09-08
17:12:34.123456":"4023-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
-1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "1023-09-08":"2023-09-08"} {"1023-09-08
17:06:51.123456":"2023-09-08 17:12:34.123456", "3023-09-08
17:12:34.123456":"4023-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
-1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "1023-09-08":"2023-09-08"} {"1023-09-08
17:06:51.123456":"2023-09-08 17:12:34.123456", "3023-09-08
17:12:34.123456":"4023-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
-1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "1023-09-08":"2023-09-08"} {"1023-09-08
17:06:51.123456":"2023-09-08 17:12:34.123456", "3023-09-08
17:12:34.123456":"4023-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
-1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "1023-09-08":"2023-09-08"} {"1023-09-08
17:06:51.123456":"2023-09-08 17:12:34.123456", "3023-09-08
17:12:34.123456":"4023-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
+1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "2022-09-08":"2023-09-08"} {"2022-09-08
17:12:34.123456":"2023-09-08 17:12:34.123456", "2024-09-08
17:12:34.123456":"2025-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
+1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "2022-09-08":"2023-09-08"} {"2022-09-08
17:12:34.123456":"2023-09-08 17:12:34.123456", "2024-09-08
17:12:34.123456":"2025-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
+1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "2022-09-08":"2023-09-08"} {"2022-09-08
17:12:34.123456":"2023-09-08 17:12:34.123456", "2024-09-08
17:12:34.123456":"2025-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
+1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "2022-09-08":"2023-09-08"} {"2022-09-08
17:12:34.123456":"2023-09-08 17:12:34.123456", "2024-09-08
17:12:34.123456":"2025-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
+1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "2022-09-08":"2023-09-08"} {"2022-09-08
17:12:34.123456":"2023-09-08 17:12:34.123456", "2024-09-08
17:12:34.123456":"2025-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
+1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "2022-09-08":"2023-09-08"} {"2022-09-08
17:12:34.123456":"2023-09-08 17:12:34.123456", "2024-09-08
17:12:34.123456":"2025-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
+1 {1:1, 0:1} {1:2, 3:4} {2:4, 5:6} {3:4, 7:8} {4:5,
1:2} {123456789:987654321, 789456123:456789123} {6.6:8.8, 9.9:10.1}
{7.7:1.1, 2.2:3.3} {3.12000:1.23000, 2.34000:5.67000}
{"2023-09-08":"2024-09-08", "2022-09-08":"2023-09-08"} {"2022-09-08
17:12:34.123456":"2023-09-08 17:12:34.123456", "2024-09-08
17:12:34.123456":"2025-09-08 17:12:34.123456"} {"char":"char2",
"char2":"char3"} {"varchar":"varchar2", "varchar3":"varchar4"}
{"string":"string2", "string3":"string4"}
-- !q04 --
1 {"c_bool":1, "c_tinyint":1, "c_smallint":2, "c_int":3, "c_bigint":4,
"c_largeint":123456789, "c_float":6.6, "c_double":7.7, "c_decimal":3.12000,
"c_date":"2023-09-08", "c_datetime":"2023-09-08 17:12:34.123456",
"c_char":"char", "c_varchar":"varchar", "c_string":"string"}
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
index 70e5c6e11a4..4f4130d94de 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
@@ -130,6 +130,22 @@ class Suite implements GroovyInterceptable {
return getConf("suites." + name + "." + key, defaultValue)
}
+ List<String> getDorisConnectorTlsArgs() {
+ if (!Boolean.parseBoolean(getConf("enableTLS", "false"))) {
+ return Collections.emptyList()
+ }
+
+ String tlsVerifyMode = getConf("tlsVerifyMode", "strict")
+ boolean skipHostnameVerification =
!tlsVerifyMode.equalsIgnoreCase("strict")
+ String excludedProtocols = getConf("tlsExcludedProtocols", "")
+ return [
+ "--doris-enable-tls", "true",
+ "--doris-tls-ca-certificate-path", getConf("trustCACert"),
+ "--doris-tls-skip-hostname-verification",
skipHostnameVerification.toString(),
+ "--doris-tls-excluded-protocols", excludedProtocols
+ ]
+ }
+
Properties getConfs(String prefix) {
Properties p = new Properties()
for (String name : context.config.otherConfigs.stringPropertyNames()) {
diff --git
a/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy
b/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy
index 08fcc1807c4..0bea2af702f 100644
---
a/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy
+++
b/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy
@@ -126,13 +126,11 @@ suite("spark_connector_for_arrow", "connector") {
sql """DELETE FROM spark_connector_map where id > 0"""
sql """DELETE FROM spark_connector_struct where id > 0"""
- def jar_name = "spark-doris-connector-3.4_2.12-1.3.0-SNAPSHOT.jar"
+ def jar_name = "spark-doris-regression-case-arrow.jar"
- logger.info("start delete local spark doris demo jar...")
- def delete_local_spark_jar = "rm -rf ${jar_name}".execute()
logger.info("start download spark doris demo ...")
logger.info("getS3Url ==== ${getS3Url()}")
- def download_spark_jar = "/usr/bin/curl
${getS3Url()}/regression/${jar_name} --output ${jar_name}".execute().getText()
+ def download_spark_jar = "/usr/bin/curl
${getS3Url()}/regression/spark-doris-regression-case.jar --output
${jar_name}".execute().getText()
logger.info("finish download spark doris demo ...")
def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
@@ -150,8 +148,15 @@ suite("spark_connector_for_arrow", "connector") {
addOpens = "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED"
}
- def run_cmd = "${javaPath} ${addOpens} -cp ${jar_name}
org.apache.doris.spark.testcase.TestStreamLoadForArrowType
$context.config.feHttpAddress $context.config.feHttpUser
regression_test_connector_p0_spark_connector"
- logger.info("run_cmd : $run_cmd")
+ def run_cmd = [javaPath]
+ run_cmd.addAll(addOpens.tokenize())
+ run_cmd.addAll(["-cp", jar_name,
"org.apache.doris.spark.testcase.TestStreamLoadForArrowType",
+ "--doris-fe-address", context.config.feHttpAddress,
+ "--doris-database", "regression_test_connector_p0_spark_connector",
+ "--doris-user", context.config.feHttpUser,
+ "--doris-password", context.config.feHttpPassword])
+ run_cmd.addAll(getDorisConnectorTlsArgs())
+ logger.info("run_cmd : ${run_cmd.join(' ')}")
def proc = run_cmd.execute()
def sout = new StringBuilder()
def serr = new StringBuilder()
diff --git
a/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy
b/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy
index 78a157256f7..707cd4a047a 100644
---
a/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy
+++
b/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy
@@ -91,11 +91,11 @@ suite("spark_connector_read_type", "connector") {
);
"""
- logger.info("start delete local spark doris demo jar...")
- def delete_local_spark_jar = "rm -rf spark-doris-read.jar".execute()
+ def jar_name = "spark-doris-regression-case-read-type.jar"
+
logger.info("start download spark doris demo ...")
logger.info("getS3Url ==== ${getS3Url()}")
- def download_spark_jar = "/usr/bin/curl
${getS3Url()}/regression/spark-doris-read-jar-with-dependencies.jar --output
spark-doris-read.jar".execute().getText()
+ def download_spark_jar = "/usr/bin/curl
${getS3Url()}/regression/spark-doris-regression-case.jar --output
${jar_name}".execute().getText()
logger.info("finish download spark doris demo ...")
def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
@@ -113,8 +113,16 @@ suite("spark_connector_read_type", "connector") {
addOpens = "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED"
}
- def run_cmd = "${javaPath} ${addOpens} -jar spark-doris-read.jar
$context.config.feHttpAddress $context.config.feHttpUser
regression_test_connector_p0_spark_connector.$tableReadName
regression_test_connector_p0_spark_connector.$tableWriterName"
- logger.info("run_cmd : $run_cmd")
+ def run_cmd = [javaPath]
+ run_cmd.addAll(addOpens.tokenize())
+ run_cmd.addAll(["-jar", jar_name,
+ "--doris-fe-address", context.config.feHttpAddress,
+ "--doris-read-table-identifier",
"regression_test_connector_p0_spark_connector.${tableReadName}",
+ "--doris-write-table-identifier",
"regression_test_connector_p0_spark_connector.${tableWriterName}",
+ "--doris-user", context.config.feHttpUser,
+ "--doris-password", context.config.feHttpPassword])
+ run_cmd.addAll(getDorisConnectorTlsArgs())
+ logger.info("run_cmd : ${run_cmd.join(' ')}")
def proc = run_cmd.execute()
def sout = new StringBuilder()
def serr = new StringBuilder()
diff --git a/regression-test/suites/flink_connector_p0/flink_connector.groovy
b/regression-test/suites/flink_connector_p0/flink_connector.groovy
index 114e28fd65f..80ea52b451a 100644
--- a/regression-test/suites/flink_connector_p0/flink_connector.groovy
+++ b/regression-test/suites/flink_connector_p0/flink_connector.groovy
@@ -27,18 +27,18 @@ suite("flink_connector") {
def tableName = "flink_connector"
sql """DROP TABLE IF EXISTS ${tableName}"""
sql new File("""${context.file.parent}/ddl/create.sql""").text
- logger.info("start delete local flink doris demo jar...")
- def delete_local_spark_jar = "rm -rf flink-doris-demo.jar".execute()
- logger.info("start download flink doris demo ...")
+ def jarName = "flink-doris-regression-case-flink-connector.jar"
+
+ logger.info("start download flink doris case ...")
logger.info("getS3Url ==== ${getS3Url()}")
- def download_spark_jar = "wget --quiet --continue --tries=3
${getS3Url()}/regression/flink-doris-demo.jar".execute().getText()
- def file = new File('flink-doris-demo.jar')
+ def download_flink_jar = "wget --quiet --tries=3
--output-document=${jarName}
${getS3Url()}/regression/flink-doris-regression-case.jar".execute().getText()
+ def file = new File(jarName)
if (file.exists()) {
def fileSize = file.length()
- assertEquals(fileSize, 167461032)
- logger.info("finish download spark doris demo ...")
+ assertTrue(fileSize > 0)
+ logger.info("finish download flink doris case ...")
} else {
- logger.info("flink-doris-demo.jar 文件不存在, 忽略")
+ logger.info("flink-doris-regression-case.jar does not exist, skip this
case")
return
}
@@ -52,8 +52,13 @@ suite("flink_connector") {
def javaVersion = System.getProperty("java.version")
logger.info("Runtime java version: ${javaVersion}")
- def run_cmd = "${javaPath} -cp flink-doris-demo.jar
com.doris.DorisFlinkDfSinkDemo $context.config.feHttpAddress
regression_test_flink_connector_p0.$tableName $context.config.feHttpUser"
- logger.info("run_cmd : $run_cmd")
+ def run_cmd = [javaPath, "-cp", jarName,
"org.apache.doris.DorisFlinkDfSinkDemo",
+ "--doris-fe-address", context.config.feHttpAddress,
+ "--doris-table-identifier",
"regression_test_flink_connector_p0.${tableName}",
+ "--doris-user", context.config.feHttpUser,
+ "--doris-password", context.config.feHttpPassword]
+ run_cmd.addAll(getDorisConnectorTlsArgs())
+ logger.info("run_cmd : ${run_cmd.join(' ')}")
def run_flink_jar = run_cmd.execute().getText()
logger.info("result: $run_flink_jar")
// The publish in the commit phase is asynchronous
diff --git
a/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy
b/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy
index 5efa5789470..46f504aa37f 100644
--- a/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy
+++ b/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy
@@ -59,19 +59,19 @@ PROPERTIES (
"enable_unique_key_merge_on_write" = "false"
);"""
- logger.info("start delete local flink-doris-syncdb.jar....")
- def delete_local_flink_jar = "rm -rf flink-doris-syncdb.jar".execute()
- logger.info("start download regression/flink-doris-syncdb.jar ....")
+ def jarName = "flink-doris-regression-case-flink-connector-syncdb.jar"
+
+ logger.info("start download regression/flink-doris-regression-case.jar
....")
logger.info("getS3Url: ${getS3Url()}")
- def download_flink_jar = "wget --quiet --continue --tries=5
${getS3Url()}/regression/flink-doris-syncdb.jar".execute().getText()
+ def download_flink_jar = "wget --quiet --tries=5
--output-document=${jarName}
${getS3Url()}/regression/flink-doris-regression-case.jar".execute().getText()
- def file = new File('flink-doris-syncdb.jar')
+ def file = new File(jarName)
if (file.exists()) {
def fileSize = file.length()
- logger.info("finish download flink-doris-syncdb.jar, size " + fileSize)
+ logger.info("finish download flink-doris-regression-case.jar, size " +
fileSize)
} else {
- logger.info("flink-doris-syncdb.jar download failed")
- throw new Exception("File flink-doris-syncdb.jar download failed.")
+ logger.info("flink-doris-regression-case.jar download failed")
+ throw new Exception("File flink-doris-regression-case.jar download
failed.")
}
def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
@@ -89,8 +89,15 @@ PROPERTIES (
addOpens = "--add-opens=java.base/java.nio=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED"
}
- def run_cmd = "${javaPath} ${addOpens} -cp flink-doris-syncdb.jar
org.apache.doris.DatabaseFullSync $context.config.feHttpAddress
regression_test_flink_connector_p0 $context.config.feHttpUser"
- logger.info("run_cmd : $run_cmd")
+ def run_cmd = [javaPath]
+ run_cmd.addAll(addOpens.tokenize())
+ run_cmd.addAll(["-cp", jarName, "org.apache.doris.DatabaseFullSync",
+ "--doris-fe-address", context.config.feHttpAddress,
+ "--doris-database", "regression_test_flink_connector_p0",
+ "--doris-user", context.config.feHttpUser,
+ "--doris-password", context.config.feHttpPassword])
+ run_cmd.addAll(getDorisConnectorTlsArgs())
+ logger.info("run_cmd : ${run_cmd.join(' ')}")
def run_flink_jar = run_cmd.execute().getText()
logger.info("result: $run_flink_jar")
// The publish in the commit phase is asynchronous
diff --git
a/regression-test/suites/flink_connector_p0/flink_connector_type.groovy
b/regression-test/suites/flink_connector_p0/flink_connector_type.groovy
index d8b49715a71..26d4b33b1b8 100644
--- a/regression-test/suites/flink_connector_p0/flink_connector_type.groovy
+++ b/regression-test/suites/flink_connector_p0/flink_connector_type.groovy
@@ -110,19 +110,19 @@ VALUES
thisDb = thisDb[0][0];
logger.info("current database is ${thisDb}");
- logger.info("start delete local flink-doris-case.jar....")
- def delete_local_flink_jar = "rm -rf flink-doris-case.jar".execute()
- logger.info("start download regression/flink-doris-case.jar ....")
+ def jarName = "flink-doris-regression-case-flink-connector-type.jar"
+
+ logger.info("start download regression/flink-doris-regression-case.jar
....")
logger.info("getS3Url: ${getS3Url()}")
- def download_flink_jar = "wget --quiet --continue --tries=5
${getS3Url()}/regression/flink-doris-case.jar".execute().getText()
+ def download_flink_jar = "wget --quiet --tries=5
--output-document=${jarName}
${getS3Url()}/regression/flink-doris-regression-case.jar".execute().getText()
- def file = new File('flink-doris-case.jar')
+ def file = new File(jarName)
if (file.exists()) {
def fileSize = file.length()
- logger.info("finish download flink-doris-case.jar, size " + fileSize)
+ logger.info("finish download flink-doris-regression-case.jar, size " +
fileSize)
} else {
- logger.info("flink-doris-case.jar download failed")
- throw new Exception("File flink-doris-case.jar download failed.")
+ logger.info("flink-doris-regression-case.jar download failed")
+ throw new Exception("File flink-doris-regression-case.jar download
failed.")
}
def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
logger.info("System java path: ${systemJavaPath}")
@@ -139,8 +139,15 @@ VALUES
addOpens = "--add-opens=java.base/java.nio=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED"
}
- def run_cmd = "${javaPath} ${addOpens} -cp flink-doris-case.jar
org.apache.doris.FlinkConnectorTypeCase $context.config.feHttpAddress
regression_test_flink_connector_p0 $context.config.feHttpUser"
- logger.info("run_cmd : $run_cmd")
+ def run_cmd = [javaPath]
+ run_cmd.addAll(addOpens.tokenize())
+ run_cmd.addAll(["-cp", jarName, "org.apache.doris.FlinkConnectorTypeCase",
+ "--doris-fe-address", context.config.feHttpAddress,
+ "--doris-database", "regression_test_flink_connector_p0",
+ "--doris-user", context.config.feHttpUser,
+ "--doris-password", context.config.feHttpPassword])
+ run_cmd.addAll(getDorisConnectorTlsArgs())
+ logger.info("run_cmd : ${run_cmd.join(' ')}")
def run_flink_jar = run_cmd.execute().getText()
logger.info("result: $run_flink_jar")
// The publish in the commit phase is asynchronous
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
