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
commit 7c45b214fa48aaffc44351726284513ed9fe627b Author: Dongyang Li <[email protected]> AuthorDate: Tue Sep 19 21:26:12 2023 +0800 [fix](case) ensure jar downloaded (#24475) ensure jar downloaded --- .../suites/ccr_mow_syncer_p0/test_get_binlog.groovy | 2 +- .../suites/ccr_mow_syncer_p0/test_txn_case.groovy | 6 +++--- regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy | 2 +- regression-test/suites/ccr_syncer_p0/test_txn_case.groovy | 6 +++--- .../suites/flink_connector_p0/flink_connector.groovy | 13 +++++++++++-- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/regression-test/suites/ccr_mow_syncer_p0/test_get_binlog.groovy b/regression-test/suites/ccr_mow_syncer_p0/test_get_binlog.groovy index ae679c5ab1..cd93bd7dc0 100644 --- a/regression-test/suites/ccr_mow_syncer_p0/test_get_binlog.groovy +++ b/regression-test/suites/ccr_mow_syncer_p0/test_get_binlog.groovy @@ -113,7 +113,7 @@ suite("test_mow_get_binlog_case") { logger.info("=== Test 3.2: no priv user get binlog case ===") syncer.context.seq = -1 - noPrivUser = "no_priv_user" + noPrivUser = "no_priv_user0" emptyTable = "tbl_empty_test" sql "DROP TABLE IF EXISTS ${emptyTable}" sql """ diff --git a/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy b/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy index a447b24a83..0e10e2c286 100644 --- a/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy +++ b/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy @@ -131,7 +131,7 @@ suite("test_mow_txn_case") { logger.info("=== Test 3.2: Begin a txn with no priv user case ===") - def noPrivUser = "no_priv_user" + def noPrivUser = "no_priv_user1" def emptyTable = "tbl_empty_test" target_sql "DROP TABLE IF EXISTS ${emptyTable}" target_sql """ @@ -160,7 +160,7 @@ suite("test_mow_txn_case") { // Recursively selecting privileges, // if not all privileges are obtained, txn should not be began logger.info("=== Test 3.3: Begin a txn with low priv user case ===") - def lowPrivUser = "low_priv_user" + def lowPrivUser = "low_priv_user0" target_sql """DROP USER IF EXISTS ${lowPrivUser}""" target_sql """CREATE USER ${lowPrivUser} IDENTIFIED BY '123456'""" target_sql """GRANT ALL ON ${context.config.defaultDb}.* TO ${lowPrivUser}""" @@ -178,7 +178,7 @@ suite("test_mow_txn_case") { } logger.info("=== Test 3.4: Complete the txn with SHOW_PRIV user case ===") - def showPrivUser = "show_priv_user" + def showPrivUser = "show_priv_user0" target_sql """DROP USER IF EXISTS ${showPrivUser}""" target_sql """CREATE USER ${showPrivUser} IDENTIFIED BY '123456'""" target_sql """GRANT ALL ON ${context.config.defaultDb}.* TO ${showPrivUser}""" diff --git a/regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy b/regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy index 8720d8106a..2750e9f87d 100644 --- a/regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy +++ b/regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy @@ -112,7 +112,7 @@ suite("test_get_binlog_case") { logger.info("=== Test 3.2: no priv user get binlog case ===") syncer.context.seq = -1 - noPrivUser = "no_priv_user" + noPrivUser = "no_priv_user2" emptyTable = "tbl_empty_test" sql "DROP TABLE IF EXISTS ${emptyTable}" sql """ diff --git a/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy b/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy index 72593c4a63..030376fb01 100644 --- a/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy +++ b/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy @@ -129,7 +129,7 @@ suite("test_txn_case") { logger.info("=== Test 3.2: Begin a txn with no priv user case ===") - def noPrivUser = "no_priv_user" + def noPrivUser = "no_priv_user3" def emptyTable = "tbl_empty_test" target_sql "DROP TABLE IF EXISTS ${emptyTable}" target_sql """ @@ -156,7 +156,7 @@ suite("test_txn_case") { // Recursively selecting privileges, // if not all privileges are obtained, txn should not be began logger.info("=== Test 3.3: Begin a txn with low priv user case ===") - def lowPrivUser = "low_priv_user" + def lowPrivUser = "low_priv_user1" target_sql """CREATE USER IF NOT EXISTS ${lowPrivUser} IDENTIFIED BY '123456'""" target_sql """GRANT ALL ON ${context.config.defaultDb}.* TO ${lowPrivUser}""" syncer.context.user = "${lowPrivUser}" @@ -173,7 +173,7 @@ suite("test_txn_case") { } logger.info("=== Test 3.4: Complete the txn with SHOW_PRIV user case ===") - def showPrivUser = "show_priv_user" + def showPrivUser = "show_priv_user1" target_sql """CREATE USER IF NOT EXISTS ${showPrivUser} IDENTIFIED BY '123456'""" target_sql """GRANT ALL ON ${context.config.defaultDb}.* TO ${showPrivUser}""" target_sql """ diff --git a/regression-test/suites/flink_connector_p0/flink_connector.groovy b/regression-test/suites/flink_connector_p0/flink_connector.groovy index e3e85ddff2..f71e34b57c 100644 --- a/regression-test/suites/flink_connector_p0/flink_connector.groovy +++ b/regression-test/suites/flink_connector_p0/flink_connector.groovy @@ -30,8 +30,17 @@ suite("flink_connector") { def delete_local_spark_jar = "rm -rf flink-doris-demo.jar".execute() logger.info("start download flink doris demo ...") logger.info("getS3Url ==== ${getS3Url()}") - def download_spark_jar = "curl ${getS3Url()}/regression/flink-doris-demo.jar --output flink-doris-demo.jar".execute().getText() - logger.info("finish download spark doris demo ...") + 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') + if (file.exists()) { + def fileSize = file.length() + assertEquals(fileSize, 167461032) + logger.info("finish download spark doris demo ...") + } else { + logger.info("flink-doris-demo.jar 文件不存在, 忽略") + return + } + def run_cmd = "java -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_flink_jar = run_cmd.execute().getText() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
