From 8a03766c583cac3bdfe4d75049ca654451ff2f47 Mon Sep 17 00:00:00 2001 From: Mingyu Chen Date: Thu, 27 Jul 2023 19:38:01 +0800 Subject: [PATCH] [fix](test) change some name in regression test to avoid conflict name running in parallel (#22273) --- .../mysql/test_external_resource_mysql.groovy | 4 ++-- .../mysql/test_external_resource_mysql_nereids.groovy | 10 +++++----- .../pg/test_external_pg_nereids.groovy | 10 +++++----- .../suites/jdbc_p0/test_jdbc_query_mysql.groovy | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql.groovy b/regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql.groovy index ed0ece15fb..4a31dab700 100644 --- a/regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql.groovy +++ b/regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql.groovy @@ -23,7 +23,7 @@ suite("test_external_resource_mysql", "p2") { String extMysqlPort = context.config.otherConfigs.get("extMysqlPort") String extMysqlUser = context.config.otherConfigs.get("extMysqlUser") String extMysqlPassword = context.config.otherConfigs.get("extMysqlPassword") - String mysqlResourceName = "jdbc_resource_mysql_57" + String mysqlResourceName = "jdbc_resource_mysql_57_y" String mysqlDatabaseName01 = "external_mysql_database_ssb" String mysqlTableNameLineOrder = "external_mysql_table_lineorder" String mysqlTableNameCustomer = "external_mysql_table_customer" @@ -38,7 +38,7 @@ suite("test_external_resource_mysql", "p2") { sql """drop resource if exists ${mysqlResourceName};""" sql """ - create external resource ${mysqlResourceName} + create external resource if not exists ${mysqlResourceName} properties ( "type"="jdbc", "user"="${extMysqlUser}", diff --git a/regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql_nereids.groovy b/regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql_nereids.groovy index c0e6eedafd..68e7e56b85 100644 --- a/regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql_nereids.groovy +++ b/regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql_nereids.groovy @@ -23,11 +23,11 @@ suite("test_external_resource_mysql_nereids", "p2") { String extMysqlPort = context.config.otherConfigs.get("extMysqlPort") String extMysqlUser = context.config.otherConfigs.get("extMysqlUser") String extMysqlPassword = context.config.otherConfigs.get("extMysqlPassword") - String mysqlResourceName = "jdbc_resource_mysql_57" - String mysqlDatabaseName01 = "external_mysql_database_ssb" - String mysqlTableNameLineOrder = "external_mysql_table_lineorder" - String mysqlTableNameCustomer = "external_mysql_table_customer" - String mysqlTableNameSupplier = "external_mysql_table_supplier" + String mysqlResourceName = "jdbc_resource_mysql_57_n" + String mysqlDatabaseName01 = "external_mysql_database_ssb_n" + String mysqlTableNameLineOrder = "external_mysql_table_lineorder_n" + String mysqlTableNameCustomer = "external_mysql_table_customer_n" + String mysqlTableNameSupplier = "external_mysql_table_supplier_n" diff --git a/regression-test/suites/external_table_emr_p2/pg/test_external_pg_nereids.groovy b/regression-test/suites/external_table_emr_p2/pg/test_external_pg_nereids.groovy index 0e59c2d3a6..02eb12851f 100644 --- a/regression-test/suites/external_table_emr_p2/pg/test_external_pg_nereids.groovy +++ b/regression-test/suites/external_table_emr_p2/pg/test_external_pg_nereids.groovy @@ -23,11 +23,11 @@ suite("test_external_pg_nereids", "p2") { String extPgPort = context.config.otherConfigs.get("extPgPort") String extPgUser = context.config.otherConfigs.get("extPgUser") String extPgPassword = context.config.otherConfigs.get("extPgPassword") - String jdbcResourcePg14 = "jdbc_resource_pg_14" - String jdbcPg14Database1 = "jdbc_pg_14_database1" - String pgTableNameLineOrder = "jdbc_pg_14_table1" - String pgTableNameCustomer = "jdbc_pg_14_customer" - String pgTableNameSupplier = "jdbc_pg_14_supplier" + String jdbcResourcePg14 = "jdbc_resource_pg_14_n" + String jdbcPg14Database1 = "jdbc_pg_14_database1_n" + String pgTableNameLineOrder = "jdbc_pg_14_table1_n" + String pgTableNameCustomer = "jdbc_pg_14_customer_n" + String pgTableNameSupplier = "jdbc_pg_14_supplier_n" sql """set enable_nereids_planner=true;""" sql """set enable_fallback_to_original_planner=false;""" diff --git a/regression-test/suites/jdbc_p0/test_jdbc_query_mysql.groovy b/regression-test/suites/jdbc_p0/test_jdbc_query_mysql.groovy index 6e10e2f28e..36fa0b0ced 100644 --- a/regression-test/suites/jdbc_p0/test_jdbc_query_mysql.groovy +++ b/regression-test/suites/jdbc_p0/test_jdbc_query_mysql.groovy @@ -20,7 +20,7 @@ suite("test_jdbc_query_mysql", "p0") { String enabled = context.config.otherConfigs.get("enableJdbcTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String mysql_57_port = context.config.otherConfigs.get("mysql_57_port") - String jdbcResourceMysql57 = "jdbc_resource_mysql_57" + String jdbcResourceMysql57 = "jdbc_resource_mysql_57_x" String jdbcMysql57Table1 = "jdbc_mysql_57_table1" String exMysqlTable = "doris_ex_tb"; String exMysqlTable1 = "doris_ex_tb1";