diff --git a/regression-test/suites/account_p0/test_alter_user.groovy b/regression-test/suites/account_p0/test_alter_user.groovy index 2cfa5b082b3994..7a2c4649a0667e 100644 --- a/regression-test/suites/account_p0/test_alter_user.groovy +++ b/regression-test/suites/account_p0/test_alter_user.groovy @@ -37,7 +37,7 @@ suite("test_alter_user", "account,nonConcurrent") { sql """alter user test_auth_user2 password_history 0""" sql """set password for 'test_auth_user2' = password('12345')""" - def result1 = connect(user = 'test_auth_user2', password = '12345', url = context.config.jdbcUrl) { + def result1 = connect('test_auth_user2', '12345', context.config.jdbcUrl) { sql 'select 1' } @@ -48,7 +48,7 @@ suite("test_alter_user", "account,nonConcurrent") { sql """alter user test_auth_user2 identified by 'abc12345'""" exception "Cannot use these credentials for 'test_auth_user2'@'%' because they contradict the password history policy" } - result1 = connect(user = 'test_auth_user2', password = 'abc123456', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user2', 'abc123456', context.config.jdbcUrl) { sql 'select 1' } sql """set global password_history=0""" // set to disabled @@ -58,31 +58,31 @@ suite("test_alter_user", "account,nonConcurrent") { sql """grant all on *.* to test_auth_user3""" // login success in multi times - result1 = connect(user = 'test_auth_user3', password = '12345', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user3', '12345', context.config.jdbcUrl) { sql 'select 1' } - result1 = connect(user = 'test_auth_user3', password = '12345', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user3', '12345', context.config.jdbcUrl) { sql 'select 1' } - result1 = connect(user = 'test_auth_user3', password = '12345', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user3', '12345', context.config.jdbcUrl) { sql 'select 1' } // login failed in 2 times try { - connect(user = 'test_auth_user3', password = 'wrong', url = context.config.jdbcUrl) {} + connect('test_auth_user3', 'wrong',context.config.jdbcUrl) {} assertTrue(false. "should not be able to login") } catch (Exception e) { assertTrue(e.getMessage().contains("Access denied for user 'test_auth_user3"), e.getMessage()) } try { - connect(user = 'test_auth_user3', password = 'wrong', url = context.config.jdbcUrl) {} + connect('test_auth_user3', 'wrong', context.config.jdbcUrl) {} assertTrue(false. "should not be able to login") } catch (Exception e) { assertTrue(e.getMessage().contains("Access denied for user 'test_auth_user3"), e.getMessage()) } // login with correct password but also failed try { - connect(user = 'test_auth_user3', password = '12345', url = context.config.jdbcUrl) {} + connect('test_auth_user3', '12345', context.config.jdbcUrl) {} assertTrue(false. "should not be able to login") } catch (Exception e) { assertTrue(e.getMessage().contains("Access denied for user 'test_auth_user3'@'%'. Account is blocked for 86400 second(s) (86400 second(s) remaining) due to 2 consecutive failed logins."), e.getMessage()) @@ -90,7 +90,7 @@ suite("test_alter_user", "account,nonConcurrent") { // unlock user and login again sql """alter user test_auth_user3 account_unlock""" - result1 = connect(user = 'test_auth_user3', password = '12345', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user3', '12345', context.config.jdbcUrl) { sql 'select 1' } @@ -98,27 +98,27 @@ suite("test_alter_user", "account,nonConcurrent") { sql """alter user test_auth_user3 PASSWORD_LOCK_TIME 5 SECOND""" // login failed in 2 times to lock the accout again try { - connect(user = 'test_auth_user3', password = 'wrong', url = context.config.jdbcUrl) {} + connect('test_auth_user3', 'wrong', context.config.jdbcUrl) {} assertTrue(false. "should not be able to login") } catch (Exception e) { assertTrue(e.getMessage().contains("Access denied for user 'test_auth_user3"), e.getMessage()) } try { - connect(user = 'test_auth_user3', password = 'wrong', url = context.config.jdbcUrl) {} + connect('test_auth_user3', 'wrong', context.config.jdbcUrl) {} assertTrue(false. "should not be able to login") } catch (Exception e) { assertTrue(e.getMessage().contains("Access denied for user 'test_auth_user3"), e.getMessage()) } // login with correct password but also failed try { - connect(user = 'test_auth_user3', password = '12345', url = context.config.jdbcUrl) {} + connect('test_auth_user3', '12345', context.config.jdbcUrl) {} assertTrue(false. "should not be able to login") } catch (Exception e) { assertTrue(e.getMessage().contains("Access denied for user 'test_auth_user3'@'%'. Account is blocked for 5 second(s) (5 second(s) remaining) due to 2 consecutive failed logins."), e.getMessage()) } // sleep 5 second to unlock account sleep(5000) - result1 = connect(user = 'test_auth_user3', password = '12345', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user3', '12345', context.config.jdbcUrl) { sql 'select 1' } @@ -134,7 +134,7 @@ suite("test_alter_user", "account,nonConcurrent") { } sql """set password for 'test_auth_user3' = password('Ab1234567^')""" - result1 = connect(user = 'test_auth_user3', password = 'Ab1234567^', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user3', 'Ab1234567^', context.config.jdbcUrl) { sql 'select 1' } sql """set global validate_password_policy=NONE""" @@ -142,12 +142,12 @@ suite("test_alter_user", "account,nonConcurrent") { // 5. test expire sql """create user test_auth_user4 identified by '12345' PASSWORD_EXPIRE INTERVAL 5 SECOND""" sql """grant all on *.* to test_auth_user4""" - result1 = connect(user = 'test_auth_user4', password = '12345', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user4', '12345', context.config.jdbcUrl) { sql 'select 1' } sleep(6000) try { - connect(user = 'test_auth_user4', password = '12345', url = context.config.jdbcUrl) {} + connect('test_auth_user4', '12345', context.config.jdbcUrl) {} assertTrue(false. "should not be able to login") } catch (Exception e) { assertTrue(e.getMessage().contains("Your password has expired. To log in you must change it using a client that supports expired passwords."), e.getMessage()) @@ -157,7 +157,7 @@ suite("test_alter_user", "account,nonConcurrent") { sql """drop user test_auth_user4""" sql """create user test_auth_user4 identified by '12345'""" sql """grant all on *.* to test_auth_user4""" - result1 = connect(user = 'test_auth_user4', password = '12345', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user4', '12345', context.config.jdbcUrl) { sql 'select 1' } @@ -165,17 +165,17 @@ suite("test_alter_user", "account,nonConcurrent") { sql """drop user test_auth_user4""" sql """create user test_auth_user4 identified by '12345' PASSWORD_EXPIRE INTERVAL 5 SECOND""" sql """grant all on *.* to test_auth_user4""" - result1 = connect(user = 'test_auth_user4', password = '12345', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user4', '12345', context.config.jdbcUrl) { sql 'select 1' } sleep(6000) sql """set password for 'test_auth_user4' = password('123')""" - result2 = connect(user = 'test_auth_user4', password = '123', url = context.config.jdbcUrl) { + result2 = connect('test_auth_user4', '123', context.config.jdbcUrl) { sql 'select 1' } sleep(6000) try { - connect(user = 'test_auth_user4', password = '123', url = context.config.jdbcUrl) {} + connect('test_auth_user4', '123', context.config.jdbcUrl) {} assertTrue(false. "should not be able to login") } catch (Exception e) { assertTrue(e.getMessage().contains("Your password has expired. To log in you must change it using a client that supports expired passwords."), e.getMessage()) @@ -185,11 +185,11 @@ suite("test_alter_user", "account,nonConcurrent") { sql """drop user test_auth_user4""" sql """create user test_auth_user4 identified by '12345'""" sql """grant all on *.* to test_auth_user4""" - result1 = connect(user = 'test_auth_user4', password = '12345', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user4', '12345', context.config.jdbcUrl) { sql 'select 1' } sleep(1000) - result2 = connect(user = 'test_auth_user4', password = '12345', url = context.config.jdbcUrl) { + result2 = connect('test_auth_user4', '12345', context.config.jdbcUrl) { sql 'select 1' } @@ -197,7 +197,7 @@ suite("test_alter_user", "account,nonConcurrent") { sql """drop user if exists test_auth_user4""" sql """create user test_auth_user4 identified by '12345'""" sql """grant SELECT_PRIV on regression_test.* to test_auth_user4""" - result1 = connect(user = 'test_auth_user4', password = '12345', url = context.config.jdbcUrl) { + result1 = connect('test_auth_user4', '12345', context.config.jdbcUrl) { sql 'select 1' sql 'use information_schema' sql 'use mysql' diff --git a/regression-test/suites/account_p0/test_auth_compatibility.groovy b/regression-test/suites/account_p0/test_auth_compatibility.groovy index c4f780b01751c1..f3118680e50433 100644 --- a/regression-test/suites/account_p0/test_auth_compatibility.groovy +++ b/regression-test/suites/account_p0/test_auth_compatibility.groovy @@ -66,7 +66,7 @@ suite("test_auth_compatibility", "account") { GRANT SHOW_VIEW_PRIV on ${dbName}.${viewName} TO ${user} """ - connect(user = user, password = pwd, url = context.config.jdbcUrl) { + connect(user, pwd, context.config.jdbcUrl) { sql """USE ${dbName}""" // auth ok, no exception sql """SHOW CREATE TABLE ${viewName}""" diff --git a/regression-test/suites/account_p0/test_auth_show.groovy b/regression-test/suites/account_p0/test_auth_show.groovy index c847fd1715aaeb..d9d4f3fa7f16ec 100644 --- a/regression-test/suites/account_p0/test_auth_show.groovy +++ b/regression-test/suites/account_p0/test_auth_show.groovy @@ -45,7 +45,7 @@ suite("test_auth_show", "account") { // With select priv for table, should be able to see db sql """GRANT SELECT_PRIV ON ${dbName}.${tableName} TO ${user}""" - def result1 = connect(user=user, password="${pwd}", url=url) { + def result1 = connect(user, "${pwd}", url) { sql """show databases like '${dbName}'""" } assertEquals(result1.size(), 1) @@ -53,7 +53,7 @@ suite("test_auth_show", "account") { // With show_view priv for table, should be able to see db sql """GRANT SHOW_VIEW_PRIV ON ${dbName}.${tableName} TO ${user}""" - def result2 = connect(user=user, password="${pwd}", url=url) { + def result2 = connect(user, "${pwd}", url) { sql """show databases like '${dbName}'""" } assertEquals(result2.size(), 1) diff --git a/regression-test/suites/account_p0/test_grant_priv.groovy b/regression-test/suites/account_p0/test_grant_priv.groovy index abb95e9d1228aa..d2e04945905bee 100644 --- a/regression-test/suites/account_p0/test_grant_priv.groovy +++ b/regression-test/suites/account_p0/test_grant_priv.groovy @@ -38,7 +38,7 @@ suite("test_grant_priv") { // test only have select_priv, can not grant to other user sql """grant select_priv on ${dbName}.* to ${user1}""" - connect(user=user1, password="${pwd}", url=url) { + connect(user1, "${pwd}", url) { try { sql """grant select_priv on ${dbName}.* to ${user2}""" Assert.fail("can not grant to other user"); @@ -49,7 +49,7 @@ suite("test_grant_priv") { // test both have select_priv and grant_priv , can grant to other user sql """grant grant_priv on ${dbName}.* to ${user1}""" - connect(user=user1, password="${pwd}", url=url) { + connect(user1, "${pwd}", url) { try { sql """grant select_priv on ${dbName}.* to ${user2}""" } catch (Exception e) { diff --git a/regression-test/suites/account_p0/test_grant_priv_resource.groovy b/regression-test/suites/account_p0/test_grant_priv_resource.groovy index f679835e1ca96e..c8eea500a07dc5 100644 --- a/regression-test/suites/account_p0/test_grant_priv_resource.groovy +++ b/regression-test/suites/account_p0/test_grant_priv_resource.groovy @@ -33,7 +33,7 @@ suite("test_grant_priv_resource") { // test only have USAGE_PRIV, can not grant to other user sql """grant USAGE_PRIV on RESOURCE ${resource1} to ${user1}""" - connect(user=user1, password="${pwd}", url=url) { + connect(user1, "${pwd}", url) { try { sql """grant USAGE_PRIV on RESOURCE ${resource1} to ${user2}""" Assert.fail("can not grant to other user"); @@ -44,7 +44,7 @@ suite("test_grant_priv_resource") { // test both have USAGE_PRIV and grant_priv , can grant to other user sql """grant grant_priv on RESOURCE * to ${user1}""" - connect(user=user1, password="${pwd}", url=url) { + connect(user1, "${pwd}", url) { try { sql """grant USAGE_PRIV on RESOURCE ${resource1} to ${user2}""" } catch (Exception e) { diff --git a/regression-test/suites/account_p0/test_grant_priv_workload.groovy b/regression-test/suites/account_p0/test_grant_priv_workload.groovy index 291cfe1fa4cd02..12149f0fa7a8b7 100644 --- a/regression-test/suites/account_p0/test_grant_priv_workload.groovy +++ b/regression-test/suites/account_p0/test_grant_priv_workload.groovy @@ -33,7 +33,7 @@ suite("test_grant_priv_workload") { // test only have USAGE_PRIV, can not grant to other user sql """grant USAGE_PRIV on WORKLOAD GROUP ${workload1} to ${user1}""" - connect(user=user1, password="${pwd}", url=url) { + connect(user1, "${pwd}", url) { try { sql """grant USAGE_PRIV on WORKLOAD GROUP ${workload1} to ${user2}""" Assert.fail("can not grant to other user"); @@ -44,7 +44,7 @@ suite("test_grant_priv_workload") { // test both have USAGE_PRIV and grant_priv , can grant to other user sql """grant grant_priv on WORKLOAD GROUP ${workload1} to ${user1}""" - connect(user=user1, password="${pwd}", url=url) { + connect(user1, "${pwd}", url) { try { sql """grant USAGE_PRIV on WORKLOAD GROUP ${workload1} to ${user2}""" } catch (Exception e) { diff --git a/regression-test/suites/account_p0/test_nereids_authentication.groovy b/regression-test/suites/account_p0/test_nereids_authentication.groovy index a0d9c4b4514c08..c2ee5f12e8cb1d 100644 --- a/regression-test/suites/account_p0/test_nereids_authentication.groovy +++ b/regression-test/suites/account_p0/test_nereids_authentication.groovy @@ -54,26 +54,26 @@ suite("test_nereids_authentication", "query") { def tokens = context.config.jdbcUrl.split('/') def url=tokens[0] + "//" + tokens[2] + "/" + dbName + "?" - def result = connect(user=user, password='Doris_123456', url=url) { + def result = connect(user, 'Doris_123456', url) { sql "SELECT * FROM ${tableName1}" } assertEquals(result.size(), 0) - connect(user=user, password='Doris_123456', url=url) { + connect(user, 'Doris_123456', url) { test { sql "SELECT * FROM ${tableName2}" exception "denied" } } - connect(user=user, password='Doris_123456', url=url) { + connect(user, 'Doris_123456', url) { test { sql "SELECT count(*) FROM ${tableName2}" exception "denied" } } - connect(user=user, password='Doris_123456', url=url) { + connect(user, 'Doris_123456', url) { test { sql "SELECT * FROM ${tableName1}, ${tableName2} WHERE ${tableName1}.`key` = ${tableName2}.`key`" exception "denied" @@ -81,14 +81,14 @@ suite("test_nereids_authentication", "query") { } sql "GRANT SELECT_PRIV ON internal.${dbName}.${tableName2} TO ${user}" - connect(user=user, password='Doris_123456', url=url) { + connect(user, 'Doris_123456', url) { sql "SELECT * FROM ${tableName2}" } assertEquals(result.size(), 0) - connect(user=user, password='Doris_123456', url=url) { + connect(user, 'Doris_123456', url) { sql "SELECT count(*) FROM ${tableName2}" } - connect(user=user, password='Doris_123456', url=url) { + connect(user, 'Doris_123456', url) { sql "SELECT * FROM ${tableName1}, ${tableName2} WHERE ${tableName1}.`key` = ${tableName2}.`key`" } assertEquals(result.size(), 0) diff --git a/regression-test/suites/account_p0/test_nereids_row_policy.groovy b/regression-test/suites/account_p0/test_nereids_row_policy.groovy index ea7cf99fb28840..38426dc09e6ef4 100644 --- a/regression-test/suites/account_p0/test_nereids_row_policy.groovy +++ b/regression-test/suites/account_p0/test_nereids_row_policy.groovy @@ -32,10 +32,10 @@ suite("test_nereids_row_policy") { } def assertQueryResult = { size -> - def result = connect(user=user, password='123abc!@#', url=url) { + def result = connect(user, '123abc!@#', url) { sql "SELECT * FROM ${tableName}" } - connect(user=user, password='123abc!@#', url=url) { + connect(user, '123abc!@#', url) { test { sql "SELECT * FROM ${viewName}" exception "does not have privilege for" diff --git a/regression-test/suites/account_p0/test_role.groovy b/regression-test/suites/account_p0/test_role.groovy index 6d88238ebf5f03..24b4e6859795b2 100644 --- a/regression-test/suites/account_p0/test_role.groovy +++ b/regression-test/suites/account_p0/test_role.groovy @@ -32,13 +32,13 @@ suite("test_role", "account") { sql """GRANT SELECT_PRIV ON ${context.config.defaultDb} TO ROLE '${role}'""" sql """GRANT SELECT_PRIV ON ${dbName} TO ROLE '${role}'""" sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}' DEFAULT ROLE '${role}'""" - def result1 = connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + def result1 = connect(user, "${pwd}", context.config.jdbcUrl) { sql "show databases like '${dbName}'" } assertEquals(result1.size(), 1) sql """REVOKE SELECT_PRIV ON ${dbName} FROM ROLE '${role}'""" - def result2 = connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + def result2 = connect(user, "${pwd}", context.config.jdbcUrl) { sql "show databases like '${dbName}'" } assertEquals(result2.size(), 0) diff --git a/regression-test/suites/auth_call/test_account_management_grant_auth.groovy b/regression-test/suites/auth_call/test_account_management_grant_auth.groovy index 28cb71cdeacadb..eff62e64f88e8a 100644 --- a/regression-test/suites/auth_call/test_account_management_grant_auth.groovy +++ b/regression-test/suites/auth_call/test_account_management_grant_auth.groovy @@ -42,7 +42,7 @@ suite("test_account_management_grant_auth","p0,auth_call") { sql """grant select_priv on regression_test to ${user}""" sql """create database ${dbName}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE USER ${user_derive} IDENTIFIED BY '${pwd}';""" exception "denied" @@ -69,7 +69,7 @@ suite("test_account_management_grant_auth","p0,auth_call") { } } sql """grant grant_priv on *.*.* to '${user}'""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE USER ${user_derive} IDENTIFIED BY '${pwd}';""" sql """ALTER USER ${user_derive} IDENTIFIED BY "${pwd}";""" sql """SET PASSWORD FOR '${user_derive}' = PASSWORD('${pwd}')""" @@ -85,7 +85,7 @@ suite("test_account_management_grant_auth","p0,auth_call") { } sql """revoke grant_priv on *.*.* from '${user}'""" sql """grant admin_priv on *.*.* to '${user}'""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE USER ${user_derive} IDENTIFIED BY '${pwd}';""" sql """ALTER USER ${user_derive} IDENTIFIED BY "${pwd}";""" sql """SET PASSWORD FOR '${user_derive}' = PASSWORD('${pwd}')""" diff --git a/regression-test/suites/auth_call/test_account_management_role_auth.groovy b/regression-test/suites/auth_call/test_account_management_role_auth.groovy index 2a90eeedf67bc6..c3b278100815f8 100644 --- a/regression-test/suites/auth_call/test_account_management_role_auth.groovy +++ b/regression-test/suites/auth_call/test_account_management_role_auth.groovy @@ -45,7 +45,7 @@ suite("test_account_management_role_auth","p0,auth_call") { sql """create database ${dbName}""" sql """GRANT '${role}' TO ${user};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE ROLE ${role_derive}""" exception "denied" @@ -60,7 +60,7 @@ suite("test_account_management_role_auth","p0,auth_call") { } } sql """grant grant_priv on *.*.* to ROLE '${role}'""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE ROLE ${role_derive}""" sql """ALTER ROLE ${role_derive} COMMENT "this is my first role";""" sql """DROP ROLE ${role_derive}""" diff --git a/regression-test/suites/auth_call/test_account_management_user_auth.groovy b/regression-test/suites/auth_call/test_account_management_user_auth.groovy index 936071b1e9d9ef..fe6d6805f47f9b 100644 --- a/regression-test/suites/auth_call/test_account_management_user_auth.groovy +++ b/regression-test/suites/auth_call/test_account_management_user_auth.groovy @@ -41,7 +41,7 @@ suite("test_account_management_user_auth","p0,auth_call") { sql """grant select_priv on regression_test to ${user}""" sql """create database ${dbName}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE USER ${user_derive} IDENTIFIED BY '${pwd}';""" exception "denied" @@ -69,7 +69,7 @@ suite("test_account_management_user_auth","p0,auth_call") { } sql """grant grant_priv on *.*.* to '${user}'""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE USER ${user_derive} IDENTIFIED BY '${pwd}';""" sql """ALTER USER ${user_derive} IDENTIFIED BY "${pwd}";""" sql """SET PASSWORD FOR '${user_derive}' = PASSWORD('${pwd}')""" @@ -85,7 +85,7 @@ suite("test_account_management_user_auth","p0,auth_call") { } sql """revoke grant_priv on *.*.* from '${user}'""" sql """grant admin_priv on *.*.* to '${user}'""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE USER ${user_derive} IDENTIFIED BY '${pwd}';""" sql """ALTER USER ${user_derive} IDENTIFIED BY "${pwd}";""" sql """SET PASSWORD FOR '${user_derive}' = PASSWORD('${pwd}')""" diff --git a/regression-test/suites/auth_call/test_assistant_command_auth.groovy b/regression-test/suites/auth_call/test_assistant_command_auth.groovy index 339bd86a6c1645..49a149a28ce51f 100644 --- a/regression-test/suites/auth_call/test_assistant_command_auth.groovy +++ b/regression-test/suites/auth_call/test_assistant_command_auth.groovy @@ -60,7 +60,7 @@ suite("test_assistant_command_auth","p0,auth_call") { );""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """use ${dbName}""" exception "denied" @@ -81,13 +81,13 @@ suite("test_assistant_command_auth","p0,auth_call") { } sql """grant select_PRIV on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """DESC ${dbName}.${tableName} ALL;""" } sql """grant select_PRIV on ${catalogName}.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, password="${pwd}", context.config.jdbcUrl) { sql """REFRESH CATALOG ${catalogName};""" } diff --git a/regression-test/suites/auth_call/test_cluster_management_auth.groovy b/regression-test/suites/auth_call/test_cluster_management_auth.groovy index 396bcdc0f9a544..2061b9dbca773a 100644 --- a/regression-test/suites/auth_call/test_cluster_management_auth.groovy +++ b/regression-test/suites/auth_call/test_cluster_management_auth.groovy @@ -75,7 +75,7 @@ suite ("test_cluster_management_auth","nonConcurrent,p0,auth_call") { // pipeline can't support delete node, it can affect other case if (is_exists_follower()) { - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """show frontends""" exception "denied" @@ -92,7 +92,7 @@ suite ("test_cluster_management_auth","nonConcurrent,p0,auth_call") { } if (is_exists_observer()) { - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """show frontends""" exception "denied" @@ -109,7 +109,7 @@ suite ("test_cluster_management_auth","nonConcurrent,p0,auth_call") { } if (is_exists_backends()) { - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """show backends""" exception "denied" diff --git a/regression-test/suites/auth_call/test_database_management_auth.groovy b/regression-test/suites/auth_call/test_database_management_auth.groovy index 79114c18e789b5..d80e3347a67e5c 100644 --- a/regression-test/suites/auth_call/test_database_management_auth.groovy +++ b/regression-test/suites/auth_call/test_database_management_auth.groovy @@ -40,7 +40,7 @@ suite("test_database_management_auth","p0,auth_call") { sql """grant select_priv on regression_test to ${user}""" sql """create database ${dbName}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """SHOW FRONTEND CONFIG""" exception "denied" diff --git a/regression-test/suites/auth_call/test_ddl_backup_auth.groovy b/regression-test/suites/auth_call/test_ddl_backup_auth.groovy index 3e2d8d005d32ce..fdb2d6b2221973 100644 --- a/regression-test/suites/auth_call/test_ddl_backup_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_backup_auth.groovy @@ -76,7 +76,7 @@ suite("test_ddl_backup_auth","p0,auth_call") { )""" // ddl create,show,drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """BACKUP SNAPSHOT ${dbName}.${backupLabelName} TO ${repositoryName} @@ -100,7 +100,7 @@ suite("test_ddl_backup_auth","p0,auth_call") { } } sql """grant LOAD_PRIV on ${dbName}.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """BACKUP SNAPSHOT ${dbName}.${backupLabelName} TO ${repositoryName} ON (${tableName}) diff --git a/regression-test/suites/auth_call/test_ddl_catalog_auth.groovy b/regression-test/suites/auth_call/test_ddl_catalog_auth.groovy index 87c256c770e3b3..80f71a2e16f94b 100644 --- a/regression-test/suites/auth_call/test_ddl_catalog_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_catalog_auth.groovy @@ -43,7 +43,7 @@ suite("test_ddl_catalog_auth","p0,auth_call") { sql """grant select_priv on regression_test to ${user}""" // ddl create - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create catalog if not exists ${catalogName} properties ( 'type'='hms' @@ -58,7 +58,7 @@ suite("test_ddl_catalog_auth","p0,auth_call") { );""" sql """grant Create_priv on ${catalogName}.*.* to ${user}""" sql """drop catalog ${catalogName}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """create catalog if not exists ${catalogName} properties ( 'type'='hms' );""" @@ -69,14 +69,14 @@ suite("test_ddl_catalog_auth","p0,auth_call") { // ddl alter // user alter - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ALTER CATALOG ${catalogName} RENAME ${catalogNameNew};""" exception "denied" } } sql """grant ALTER_PRIV on ${catalogName}.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ALTER CATALOG ${catalogName} RENAME ${catalogNameNew};""" test { sql """show create catalog ${catalogNameNew}""" @@ -87,21 +87,21 @@ suite("test_ddl_catalog_auth","p0,auth_call") { } // root alter sql """ALTER CATALOG ${catalogNameNew} RENAME ${catalogName};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """show create catalog ${catalogName}""" def ctl_res = sql """show catalogs;""" assertTrue(ctl_res.size() == 2) } // ddl drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """drop CATALOG ${catalogName};""" exception "denied" } } sql """grant DROP_PRIV on ${catalogName}.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """drop CATALOG ${catalogName};""" def ctl_res = sql """show catalogs;""" assertTrue(ctl_res.size() == 1) diff --git a/regression-test/suites/auth_call/test_ddl_colocate_group_auth.groovy b/regression-test/suites/auth_call/test_ddl_colocate_group_auth.groovy index 3c243facdb4fbb..3d393a31db97dd 100644 --- a/regression-test/suites/auth_call/test_ddl_colocate_group_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_colocate_group_auth.groovy @@ -45,7 +45,7 @@ suite("test_ddl_colocate_group_auth","p0,auth_call") { );""" // ddl create - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ALTER COLOCATE GROUP ${dbName}.${colocateGroupName} SET ( @@ -55,7 +55,7 @@ suite("test_ddl_colocate_group_auth","p0,auth_call") { } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ALTER COLOCATE GROUP ${dbName}.${colocateGroupName} SET ( "replication_num"="1" diff --git a/regression-test/suites/auth_call/test_ddl_database_auth.groovy b/regression-test/suites/auth_call/test_ddl_database_auth.groovy index 80e6b1b6e76695..2821a375ddb559 100644 --- a/regression-test/suites/auth_call/test_ddl_database_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_database_auth.groovy @@ -40,7 +40,7 @@ suite("test_ddl_database_auth","p0,auth_call") { sql """grant select_priv on regression_test to ${user}""" // ddl create - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create database ${dbName};""" exception "denied" @@ -51,7 +51,7 @@ suite("test_ddl_database_auth","p0,auth_call") { sql """create database ${dbName};""" sql """grant Create_priv on ${dbName}.* to ${user}""" sql """drop database ${dbName};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """create database ${dbName};""" sql """show create database ${dbName}""" def db_res = sql """show databases;""" @@ -60,14 +60,14 @@ suite("test_ddl_database_auth","p0,auth_call") { // ddl alter // user alter - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ALTER database ${dbName} RENAME ${dbNameNew};""" exception "denied" } } sql """grant ALTER_PRIV on ${dbName}.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ALTER database ${dbName} RENAME ${dbNameNew};""" test { sql """show create database ${dbNameNew}""" @@ -78,21 +78,21 @@ suite("test_ddl_database_auth","p0,auth_call") { } // root alter sql """ALTER database ${dbNameNew} RENAME ${dbName};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """show create database ${dbName}""" def db_res = sql """show databases;""" assertTrue(db_res.size() == 4 || db_res.size() == 2) } // ddl drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """drop database ${dbName};""" exception "denied" } } sql """grant DROP_PRIV on ${dbName}.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """drop database ${dbName};""" def ctl_res = sql """show databases;""" assertTrue(ctl_res.size() == 3 || ctl_res.size() == 1) diff --git a/regression-test/suites/auth_call/test_ddl_encryptkey_auth.groovy b/regression-test/suites/auth_call/test_ddl_encryptkey_auth.groovy index e24c88d55864b5..0749bdab71780a 100644 --- a/regression-test/suites/auth_call/test_ddl_encryptkey_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_encryptkey_auth.groovy @@ -38,7 +38,7 @@ suite("test_ddl_encryptkey_auth","p0,auth_call") { sql """create database ${dbName}""" // ddl create,show,drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE ENCRYPTKEY ${encryptkeyName} AS "ABCD123456789";""" exception "denied" @@ -53,7 +53,7 @@ suite("test_ddl_encryptkey_auth","p0,auth_call") { } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """CREATE ENCRYPTKEY ${encryptkeyName} AS "ABCD123456789";""" def res = sql """SHOW ENCRYPTKEYS FROM ${dbName}""" diff --git a/regression-test/suites/auth_call/test_ddl_file_auth.groovy b/regression-test/suites/auth_call/test_ddl_file_auth.groovy index 73aa9204b54c02..e32c26ecc220d0 100644 --- a/regression-test/suites/auth_call/test_ddl_file_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_file_auth.groovy @@ -42,7 +42,7 @@ suite("test_ddl_file_auth","p0,auth_call") { def dataFilePath = "https://"+"${bucket}"+"."+"${s3_endpoint}"+"/regression/auth_test.key" // ddl create,show,drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE FILE "${fileName}" IN ${dbName} PROPERTIES @@ -62,13 +62,13 @@ suite("test_ddl_file_auth","p0,auth_call") { } } sql """grant select_priv on ${dbName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """SHOW FILE FROM ${dbName};""" } sql """revoke select_priv on ${dbName} from ${user}""" sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { checkNereidsExecute("""CREATE FILE "${fileName}" IN ${dbName} PROPERTIES ( diff --git a/regression-test/suites/auth_call/test_ddl_function_auth.groovy b/regression-test/suites/auth_call/test_ddl_function_auth.groovy index f8fd51cf1cf641..2fa524bf424bd0 100644 --- a/regression-test/suites/auth_call/test_ddl_function_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_function_auth.groovy @@ -40,7 +40,7 @@ suite("test_ddl_function_auth","p0,auth_call") { sql """grant select_priv on ${dbName}.* to ${user}""" // ddl create,show,drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE ALIAS FUNCTION ${dbName}.${functionName}(INT) WITH PARAMETER(id) AS CONCAT(LEFT(id, 3), '****', RIGHT(id, 4));""" exception "denied" @@ -56,7 +56,7 @@ suite("test_ddl_function_auth","p0,auth_call") { } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE ALIAS FUNCTION ${dbName}.${functionName}(INT) WITH PARAMETER(id) AS CONCAT(LEFT(id, 3), '****', RIGHT(id, 4));""" sql """use ${dbName}""" def res = sql """show functions""" @@ -74,7 +74,7 @@ suite("test_ddl_function_auth","p0,auth_call") { sql """use ${dbName}""" def func_res = sql """show functions""" assertTrue(func_res.size() == 1) - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" def res = sql """SHOW CREATE FUNCTION ${dbName}.${functionName}(INT)""" logger.info("res: " + res) diff --git a/regression-test/suites/auth_call/test_ddl_index_auth.groovy b/regression-test/suites/auth_call/test_ddl_index_auth.groovy index baa8d79f8c79c8..53ba3a0d4b3123 100644 --- a/regression-test/suites/auth_call/test_ddl_index_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_index_auth.groovy @@ -80,7 +80,7 @@ suite("test_ddl_index_auth","p0,auth_call") { assertTrue(index_res_tmp.size() == 0) // ddl create - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE INDEX IF NOT EXISTS ${indexName} ON ${dbName}.${tableName} (username3) USING INVERTED COMMENT 'balabala';""" exception "denied" @@ -97,7 +97,7 @@ suite("test_ddl_index_auth","p0,auth_call") { } } sql """grant ALTER_PRIV on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def ss = sql """show grants""" logger.info("ss:" + ss) sql """use ${dbName}""" diff --git a/regression-test/suites/auth_call/test_ddl_job_auth.groovy b/regression-test/suites/auth_call/test_ddl_job_auth.groovy index 376cf8efbe90a6..45798191e48568 100644 --- a/regression-test/suites/auth_call/test_ddl_job_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_job_auth.groovy @@ -50,7 +50,7 @@ suite("test_ddl_job_auth","p0,auth_call") { sql """create table ${dbName}.${tableNameDst} like ${dbName}.${tableName}""" // ddl create,show,drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE JOB ${jobName} ON SCHEDULE AT '2020-01-01 00:00:00' DO INSERT INTO ${dbName}.${tableNameDst} SELECT * FROM ${dbName}.${tableName};""" exception "denied" @@ -75,7 +75,7 @@ suite("test_ddl_job_auth","p0,auth_call") { } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE JOB ${jobName} ON SCHEDULE AT '2100-01-01 00:00:00' DO INSERT INTO ${dbName}.${tableNameDst} SELECT * FROM ${dbName}.${tableName};""" def res = sql """select * from jobs("type"="insert") where Name="${jobName}";""" assertTrue(res.size() == 1) diff --git a/regression-test/suites/auth_call/test_ddl_mask_view_auth.groovy b/regression-test/suites/auth_call/test_ddl_mask_view_auth.groovy index 319eec2963ee4d..590e75781f19f2 100644 --- a/regression-test/suites/auth_call/test_ddl_mask_view_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_mask_view_auth.groovy @@ -55,14 +55,14 @@ suite("test_ddl_mask_view_auth","p0,auth_call") { AS SELECT mask(id) as k1, mask(username) as v1 FROM ${dbName}.${tableName} GROUP BY k1, v1;""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """select * from ${dbName}.${viewName};""" exception "denied" } } sql """grant select_PRIV on ${dbName}.${viewName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def res = sql """select * from ${dbName}.${viewName};""" assertTrue(res[0][0] == "n") assertTrue(res[0][1] == "nnnxxxXXX") diff --git a/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy b/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy index 3aa146f58890e5..4db2177ee6ce18 100644 --- a/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy @@ -48,7 +48,7 @@ suite("test_ddl_mtmv_auth","p0,auth_call") { );""" // ddl create - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE MATERIALIZED VIEW ${dbName}.${mtmvName} BUILD IMMEDIATE REFRESH AUTO ON MANUAL @@ -64,7 +64,7 @@ suite("test_ddl_mtmv_auth","p0,auth_call") { PROPERTIES ('replication_num' = '1') AS select username, sum(id) as sum_id from ${dbName}.${tableName} group by username""" sql """grant Create_priv on ${dbName}.${mtmvName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE MATERIALIZED VIEW ${dbName}.${mtmvName} BUILD IMMEDIATE REFRESH AUTO ON MANUAL @@ -76,7 +76,7 @@ suite("test_ddl_mtmv_auth","p0,auth_call") { } sql """grant select_priv on ${dbName}.${tableName} to ${user}""" sql """drop MATERIALIZED VIEW ${dbName}.${mtmvName};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE MATERIALIZED VIEW ${dbName}.${mtmvName} BUILD IMMEDIATE REFRESH AUTO ON MANUAL DISTRIBUTED BY RANDOM BUCKETS 1 @@ -88,7 +88,7 @@ suite("test_ddl_mtmv_auth","p0,auth_call") { assertTrue(tb_res.size() == 2) } sql """revoke select_priv on ${dbName}.${tableName} from ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """refresh MATERIALIZED VIEW ${mtmvName} auto;""" @@ -122,7 +122,7 @@ suite("test_ddl_mtmv_auth","p0,auth_call") { // ddl alter // user alter sql """revoke Create_priv on ${dbName}.${mtmvName} from ${user};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ALTER MATERIALIZED VIEW ${mtmvName} rename ${mtmvNameNew};""" exception "denied" @@ -133,7 +133,7 @@ suite("test_ddl_mtmv_auth","p0,auth_call") { } } sql """grant ALTER_PRIV on ${dbName}.${mtmvName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """show create materialized view ${mtmvName}""" sql """ALTER MATERIALIZED VIEW ${mtmvName} rename ${mtmvNameNew};""" @@ -148,7 +148,7 @@ suite("test_ddl_mtmv_auth","p0,auth_call") { // root alter sql """use ${dbName}""" sql """ALTER MATERIALIZED VIEW ${mtmvNameNew} RENAME ${mtmvName};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """show create materialized view ${mtmvName}""" def db_res = sql """show tables;""" @@ -156,20 +156,20 @@ suite("test_ddl_mtmv_auth","p0,auth_call") { } // dml select - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """select username from ${dbName}.${mtmvName}""" exception "denied" } } sql """grant select_priv(username) on ${dbName}.${mtmvName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """select username from ${dbName}.${mtmvName}""" } sql """revoke select_priv(username) on ${dbName}.${mtmvName} from ${user}""" // ddl drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """use ${dbName}""" sql """drop materialized view ${mtmvName};""" @@ -177,7 +177,7 @@ suite("test_ddl_mtmv_auth","p0,auth_call") { } } sql """grant DROP_PRIV on ${dbName}.${mtmvName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """drop materialized view ${mtmvName};""" def ctl_res = sql """show tables;""" diff --git a/regression-test/suites/auth_call/test_ddl_mv_auth.groovy b/regression-test/suites/auth_call/test_ddl_mv_auth.groovy index 485343df67392c..4dbf54fdf0df72 100644 --- a/regression-test/suites/auth_call/test_ddl_mv_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_mv_auth.groovy @@ -54,7 +54,7 @@ suite("test_ddl_mv_auth","p0,auth_call") { """ // ddl create - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create materialized view ${mvName} as select username from ${dbName}.${tableName};""" exception "denied" @@ -65,7 +65,7 @@ suite("test_ddl_mv_auth","p0,auth_call") { } } sql """grant select_priv(username) on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" test { sql """create materialized view ${mvName} as select username from ${dbName}.${tableName};""" @@ -77,7 +77,7 @@ suite("test_ddl_mv_auth","p0,auth_call") { } } sql """grant alter_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """create materialized view ${mvName} as select username from ${dbName}.${tableName};""" waitingMVTaskFinishedByMvName(dbName, tableName) @@ -92,7 +92,7 @@ suite("test_ddl_mv_auth","p0,auth_call") { sql """revoke select_priv(username) on ${dbName}.${tableName} from ${user}""" // ddl drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """DROP MATERIALIZED VIEW IF EXISTS ${mvName} ON ${dbName}.${tableName};""" exception "denied" @@ -103,7 +103,7 @@ suite("test_ddl_mv_auth","p0,auth_call") { } } sql """grant alter_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """DROP MATERIALIZED VIEW IF EXISTS ${mvName} ON ${tableName};""" sql """ALTER TABLE ${dbName}.${tableName} DROP ROLLUP ${rollupName};""" diff --git a/regression-test/suites/auth_call/test_ddl_part_table_auth.groovy b/regression-test/suites/auth_call/test_ddl_part_table_auth.groovy index 0d1bfb8551fb11..34e4766e19e5e2 100644 --- a/regression-test/suites/auth_call/test_ddl_part_table_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_part_table_auth.groovy @@ -52,7 +52,7 @@ suite("test_ddl_part_table_auth","p0,auth_call") { logger.info("insert_res: " + insert_res) def partition_info = sql """show partitions from ${dbName}.${tableName}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """show partitions from ${dbName}.${tableName}""" exception "denied" @@ -63,14 +63,14 @@ suite("test_ddl_part_table_auth","p0,auth_call") { } } sql """grant select_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """show partitions from ${dbName}.${tableName}""" sql """show query stats""" } sql """revoke select_priv on ${dbName}.${tableName} from ${user}""" sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def res = sql """show partition ${partition_info[0][0]}""" assertTrue(res.size() == 1) } diff --git a/regression-test/suites/auth_call/test_ddl_policy_storage_auth.groovy b/regression-test/suites/auth_call/test_ddl_policy_storage_auth.groovy index 0b79c6d7f08d3a..59b7bf2bc6e2c7 100644 --- a/regression-test/suites/auth_call/test_ddl_policy_storage_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_policy_storage_auth.groovy @@ -53,7 +53,7 @@ suite("test_ddl_policy_storage_auth","p0,auth_call") { );""" // ddl create,show,drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use regression_test;""" test { sql """CREATE STORAGE POLICY ${storagePolicyName} @@ -77,7 +77,7 @@ suite("test_ddl_policy_storage_auth","p0,auth_call") { } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE STORAGE POLICY ${storagePolicyName} PROPERTIES( "storage_resource" = "${resourceName}", diff --git a/regression-test/suites/auth_call/test_ddl_repository_auth.groovy b/regression-test/suites/auth_call/test_ddl_repository_auth.groovy index 8e127778f5680e..bfd1d9cf3008f4 100644 --- a/regression-test/suites/auth_call/test_ddl_repository_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_repository_auth.groovy @@ -42,7 +42,7 @@ suite("test_ddl_repository_auth","p0,auth_call") { sql """create database ${dbName}""" // ddl create,show,drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE REPOSITORY `${repositoryName}` WITH S3 @@ -67,7 +67,7 @@ suite("test_ddl_repository_auth","p0,auth_call") { } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE REPOSITORY `${repositoryName}` WITH S3 ON LOCATION "s3://${bucket}/${repositoryName}" diff --git a/regression-test/suites/auth_call/test_ddl_resource_auth.groovy b/regression-test/suites/auth_call/test_ddl_resource_auth.groovy index a9d64ed901735f..25cd53d8e19fe7 100644 --- a/regression-test/suites/auth_call/test_ddl_resource_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_resource_auth.groovy @@ -36,7 +36,7 @@ suite("test_ddl_resource_auth","p0,auth_call") { sql """create database ${dbName}""" // ddl create,show,drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE RESOURCE IF NOT EXISTS "${resourceName}" PROPERTIES( @@ -68,7 +68,7 @@ suite("test_ddl_resource_auth","p0,auth_call") { } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE RESOURCE IF NOT EXISTS "${resourceName}" PROPERTIES( "type" = "s3", diff --git a/regression-test/suites/auth_call/test_ddl_restore_auth.groovy b/regression-test/suites/auth_call/test_ddl_restore_auth.groovy index 91b7c1378fd9a0..635c57a585acf8 100644 --- a/regression-test/suites/auth_call/test_ddl_restore_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_restore_auth.groovy @@ -117,14 +117,14 @@ suite("test_ddl_restore_auth","p0,auth_call") { sql """truncate table ${dbName}.`${tableName}`""" sql """grant admin_PRIV on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def show_snapshot_res = sql """SHOW SNAPSHOT ON ${repositoryName};""" logger.info("show_snapshot_res: " + show_snapshot_res) } sql """revoke admin_PRIV on *.*.* from ${user}""" // ddl create,show,drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """SHOW SNAPSHOT ON ${repositoryName};""" exception "denied" @@ -154,7 +154,7 @@ suite("test_ddl_restore_auth","p0,auth_call") { } } sql """grant LOAD_PRIV on ${dbName}.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """RESTORE SNAPSHOT ${dbName}.`${restoreLabelName}` FROM `${repositoryName}` ON ( `${tableName}` ) diff --git a/regression-test/suites/auth_call/test_ddl_row_policy_auth.groovy b/regression-test/suites/auth_call/test_ddl_row_policy_auth.groovy index 106e22d20e9024..af1e074f8d7d8c 100644 --- a/regression-test/suites/auth_call/test_ddl_row_policy_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_row_policy_auth.groovy @@ -48,7 +48,7 @@ suite("test_ddl_row_policy_auth","p0,auth_call") { );""" // ddl create - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE ROW POLICY ${rowPolicyName} ON ${dbName}.${tableName} AS RESTRICTIVE TO ${user} USING (id = 1);""" exception "denied" @@ -64,7 +64,7 @@ suite("test_ddl_row_policy_auth","p0,auth_call") { } sql """grant grant_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE ROW POLICY ${rowPolicyName} ON ${dbName}.${tableName} AS RESTRICTIVE TO ${user} USING (id = 1);""" test { @@ -75,7 +75,7 @@ suite("test_ddl_row_policy_auth","p0,auth_call") { sql """DROP ROW POLICY ${rowPolicyName} on ${dbName}.${tableName} for ${user}""" } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE ROW POLICY ${rowPolicyName} ON ${dbName}.${tableName} AS RESTRICTIVE TO ${user} USING (id = 1);""" def res = sql """SHOW ROW POLICY FOR ${user}""" assertTrue(res.size() == 1) diff --git a/regression-test/suites/auth_call/test_ddl_sql_block_rule_auth.groovy b/regression-test/suites/auth_call/test_ddl_sql_block_rule_auth.groovy index f5693686fada17..3941897a5e9dd5 100644 --- a/regression-test/suites/auth_call/test_ddl_sql_block_rule_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_sql_block_rule_auth.groovy @@ -48,7 +48,7 @@ suite("test_ddl_sql_block_rule_auth","p0,auth_call") { );""" // ddl create,show,drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE SQL_BLOCK_RULE ${sqlBlockRuleName} PROPERTIES( @@ -75,7 +75,7 @@ suite("test_ddl_sql_block_rule_auth","p0,auth_call") { } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE SQL_BLOCK_RULE ${sqlBlockRuleName} PROPERTIES( "sql"="select \\\\* from ${dbName}\\\\.${tableName}", diff --git a/regression-test/suites/auth_call/test_ddl_table_auth.groovy b/regression-test/suites/auth_call/test_ddl_table_auth.groovy index 4c74699f55fcbf..c96aeb0d5e2cad 100644 --- a/regression-test/suites/auth_call/test_ddl_table_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_table_auth.groovy @@ -68,7 +68,7 @@ suite("test_ddl_table_auth","p0,auth_call") { } // ddl create - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create table ${dbName}.${tableName} ( id BIGINT, @@ -98,7 +98,7 @@ suite("test_ddl_table_auth","p0,auth_call") { );""" sql """grant Create_priv on ${dbName}.${tableName} to ${user}""" sql """drop table ${dbName}.${tableName};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """create table ${dbName}.${tableName} ( id BIGINT, username VARCHAR(20) @@ -119,7 +119,7 @@ suite("test_ddl_table_auth","p0,auth_call") { // ddl alter // user alter - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ALTER table ${tableName} RENAME ${tableNameNew};""" exception "denied" @@ -132,7 +132,7 @@ suite("test_ddl_table_auth","p0,auth_call") { assertTrue(res.size() == 0) } sql """grant ALTER_PRIV on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """ALTER table ${tableName} RENAME ${tableNameNew};""" @@ -146,7 +146,7 @@ suite("test_ddl_table_auth","p0,auth_call") { // root alter sql """use ${dbName}""" sql """ALTER table ${tableNameNew} RENAME ${tableName};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """show create table ${tableName}""" def db_res = sql """show tables;""" @@ -154,7 +154,7 @@ suite("test_ddl_table_auth","p0,auth_call") { } // show - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """ALTER TABLE ${tableName} ADD COLUMN new_col INT KEY DEFAULT "0";""" def res = sql """SHOW ALTER TABLE COLUMN;""" @@ -162,20 +162,20 @@ suite("test_ddl_table_auth","p0,auth_call") { } // dml select - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """select id from ${dbName}.${tableName}""" exception "denied" } } sql """grant select_priv(id) on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """select id from ${dbName}.${tableName}""" } sql """revoke select_priv(id) on ${dbName}.${tableName} from ${user}""" // ddl create table like - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create table ${cteLikeDstDb}.${cteLikeDstTb} like ${dbName}.${tableName};""" exception "denied" @@ -185,21 +185,21 @@ suite("test_ddl_table_auth","p0,auth_call") { sql """create table ${cteLikeDstDb}.${cteLikeDstTb} like ${dbName}.${tableName};""" sql """grant Create_priv on ${cteLikeDstDb}.${cteLikeDstTb} to ${user}""" sql """drop table ${cteLikeDstDb}.${cteLikeDstTb};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create table ${cteLikeDstDb}.${cteLikeDstTb} like ${dbName}.${tableName};""" exception "denied" } } sql """grant SELECT_PRIV on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """create table ${cteLikeDstDb}.${cteLikeDstTb} like ${dbName}.${tableName};""" } sql """revoke SELECT_PRIV on ${dbName}.${tableName} from ${user}""" // ddl create table select sql """create database ${cteSelectDstDb}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create table ${cteSelectDstDb}.${cteSelectDstTb}(username) PROPERTIES("replication_num" = "1") as select username from ${dbName}.${tableName};""" exception "denied" @@ -208,7 +208,7 @@ suite("test_ddl_table_auth","p0,auth_call") { sql """create table ${cteSelectDstDb}.${cteSelectDstTb}(username) PROPERTIES("replication_num" = "1") as select username from ${dbName}.${tableName};""" sql """grant Create_priv on ${cteSelectDstDb}.${cteSelectDstTb} to ${user}""" sql """drop table ${cteSelectDstDb}.${cteSelectDstTb}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create table ${cteSelectDstDb}.${cteSelectDstTb}(username) PROPERTIES("replication_num" = "1") as select username from ${dbName}.${tableName};""" exception "denied" @@ -217,20 +217,20 @@ suite("test_ddl_table_auth","p0,auth_call") { sql """create table ${cteSelectDstDb}.${cteSelectDstTb}(username) PROPERTIES("replication_num" = "1") as select username from ${dbName}.${tableName};""" sql """grant LOAD_PRIV on ${cteSelectDstDb}.${cteSelectDstTb} to ${user}""" sql """drop table ${cteSelectDstDb}.${cteSelectDstTb}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create table ${cteSelectDstDb}.${cteSelectDstTb}(username) PROPERTIES("replication_num" = "1") as select username from ${dbName}.${tableName};""" exception "denied" } } sql """grant select_priv(username) on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """create table ${cteSelectDstDb}.${cteSelectDstTb}(username) PROPERTIES("replication_num" = "1") as select username from ${dbName}.${tableName};""" } waitingChangeTaskFinished(dbName) // ddl truncate - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """use ${dbName}""" sql """truncate table ${tableName};""" @@ -238,13 +238,13 @@ suite("test_ddl_table_auth","p0,auth_call") { } } sql """grant LOAD_PRIV on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """truncate table ${tableName};""" } // ddl drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """use ${dbName}""" sql """drop table ${tableName};""" @@ -252,7 +252,7 @@ suite("test_ddl_table_auth","p0,auth_call") { } } sql """grant DROP_PRIV on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """drop table ${tableName};""" def ctl_res = sql """show tables;""" diff --git a/regression-test/suites/auth_call/test_ddl_view_auth.groovy b/regression-test/suites/auth_call/test_ddl_view_auth.groovy index bf967e54fcb02c..05f263ada20066 100644 --- a/regression-test/suites/auth_call/test_ddl_view_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_view_auth.groovy @@ -53,7 +53,7 @@ suite("test_ddl_view_auth","p0,auth_call") { """ // ddl create - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE VIEW ${dbName}.${viewName} (k1, v1) AS @@ -67,7 +67,7 @@ suite("test_ddl_view_auth","p0,auth_call") { } } sql """grant select_priv(id) on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE VIEW ${dbName}.${viewName} (k1, v1) AS @@ -84,7 +84,7 @@ suite("test_ddl_view_auth","p0,auth_call") { WHERE id = 1 GROUP BY k1;""" sql """grant Create_priv on ${dbName}.${viewName} to ${user}""" sql """drop view ${dbName}.${viewName}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE VIEW ${dbName}.${viewName} (k1, v1) AS SELECT id as k1, SUM(id) FROM ${dbName}.${tableName} @@ -93,7 +93,7 @@ suite("test_ddl_view_auth","p0,auth_call") { def res = sql """SHOW VIEW from ${tableName} from ${dbName}""" assertTrue(res.size() == 1) } - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE VIEW ${dbName}.${viewName} (k1, v1) AS @@ -105,7 +105,7 @@ suite("test_ddl_view_auth","p0,auth_call") { // ddl alter // user alter - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """alter VIEW ${dbName}.${viewName} (k1, v1) AS @@ -115,7 +115,7 @@ suite("test_ddl_view_auth","p0,auth_call") { } } sql """grant ALTER_PRIV on ${dbName}.${viewName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """alter VIEW ${dbName}.${viewName} (k1, v1) AS SELECT id as k1, SUM(id) FROM ${dbName}.${tableName} @@ -123,26 +123,26 @@ suite("test_ddl_view_auth","p0,auth_call") { } // dml show - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """select * from ${dbName}.${viewName};""" exception "denied" } } sql """grant select_PRIV on ${dbName}.${viewName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """select * from ${dbName}.${viewName};""" } // ddl drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """drop table ${dbName}.${viewName};""" exception 'denied' } } sql """grant DROP_PRIV on ${dbName}.${viewName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """drop view ${viewName};""" def ctl_res = sql """show tables;""" diff --git a/regression-test/suites/auth_call/test_ddl_workload_group_auth.groovy b/regression-test/suites/auth_call/test_ddl_workload_group_auth.groovy index 7657055d9d4fcb..32589515c6baa2 100644 --- a/regression-test/suites/auth_call/test_ddl_workload_group_auth.groovy +++ b/regression-test/suites/auth_call/test_ddl_workload_group_auth.groovy @@ -39,7 +39,7 @@ suite("test_ddl_workload_group_auth","p0,auth_call") { sql """create database ${dbName}""" // ddl create,show,drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """CREATE WORKLOAD GROUP "${workloadGroupName}" PROPERTIES ( @@ -64,7 +64,7 @@ suite("test_ddl_workload_group_auth","p0,auth_call") { } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE WORKLOAD GROUP "${workloadGroupName}" PROPERTIES ( "cpu_share"="10" diff --git a/regression-test/suites/auth_call/test_dml_analyze_auth.groovy b/regression-test/suites/auth_call/test_dml_analyze_auth.groovy index 5db5da61f945f0..59706f140e69b1 100644 --- a/regression-test/suites/auth_call/test_dml_analyze_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_analyze_auth.groovy @@ -48,7 +48,7 @@ suite("test_dml_analyze_auth","p0,auth_call") { "replication_num" = "1" );""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ analyze table ${dbName}.${tableName} with sync; @@ -69,7 +69,7 @@ suite("test_dml_analyze_auth","p0,auth_call") { } } sql """grant select_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ analyze table ${dbName}.${tableName} with sync; """ @@ -80,7 +80,7 @@ suite("test_dml_analyze_auth","p0,auth_call") { sql """show table stats ${dbName}.${tableName};""" } sql """grant select_priv on ${dbName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """show table status from ${dbName};""" } diff --git a/regression-test/suites/auth_call/test_dml_broker_load_auth.groovy b/regression-test/suites/auth_call/test_dml_broker_load_auth.groovy index 524513a570c0dd..3ec26146699bce 100644 --- a/regression-test/suites/auth_call/test_dml_broker_load_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_broker_load_auth.groovy @@ -68,7 +68,7 @@ suite("test_dml_broker_load_auth","p0,auth_call") { );""" sql """use ${dbName}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ LOAD LABEL ${loadLabelName} ( @@ -104,7 +104,7 @@ suite("test_dml_broker_load_auth","p0,auth_call") { } } sql """grant load_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName};""" sql """ LOAD LABEL ${loadLabelName} ( @@ -149,7 +149,7 @@ suite("test_dml_broker_load_auth","p0,auth_call") { } sql """grant load_priv on ${dbName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def res = sql """SHOW LOAD FROM ${dbName} WHERE LABEL LIKE '${loadLabelName}'""" logger.info("res: " + res) assertTrue(res.size() == 1) diff --git a/regression-test/suites/auth_call/test_dml_cancel_profile_auth.groovy b/regression-test/suites/auth_call/test_dml_cancel_profile_auth.groovy index 84c5a5ef5ba20e..f1aa5d0fa95105 100644 --- a/regression-test/suites/auth_call/test_dml_cancel_profile_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_cancel_profile_auth.groovy @@ -35,7 +35,7 @@ suite("test_dml_cancel_profile_auth","p0,auth_call,nonConcurrent") { sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ CLEAN ALL PROFILE; @@ -44,7 +44,7 @@ suite("test_dml_cancel_profile_auth","p0,auth_call,nonConcurrent") { } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { checkNereidsExecute("CLEAN ALL PROFILE") sql """ CLEAN ALL PROFILE; diff --git a/regression-test/suites/auth_call/test_dml_delete_table_auth.groovy b/regression-test/suites/auth_call/test_dml_delete_table_auth.groovy index 541902ebd68b92..d325250f2ce696 100644 --- a/regression-test/suites/auth_call/test_dml_delete_table_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_delete_table_auth.groovy @@ -54,7 +54,7 @@ suite("test_dml_delete_table_auth","p0,auth_call") { (3, "333"); """ - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """DELETE FROM ${dbName}.${tableName} WHERE id = 3;""" exception "denied" @@ -64,7 +64,7 @@ suite("test_dml_delete_table_auth","p0,auth_call") { assertTrue(del_res.size() == 0) } sql """grant load_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """DELETE FROM ${dbName}.${tableName} WHERE id = 3;""" exception "denied" @@ -73,7 +73,7 @@ suite("test_dml_delete_table_auth","p0,auth_call") { assertTrue(del_res.size() == 0) } sql """grant select_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """DELETE FROM ${dbName}.${tableName} WHERE id = 3;""" def del_res = sql """show DELETE from ${dbName}""" logger.info("del_res: " + del_res) @@ -114,7 +114,7 @@ suite("test_dml_delete_table_auth","p0,auth_call") { (4), (5);""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """DELETE FROM ${dbName}.${tableName1} USING ${dbName}.${tableName2} INNER JOIN ${dbName}.${tableName3} @@ -124,7 +124,7 @@ suite("test_dml_delete_table_auth","p0,auth_call") { } } sql """grant load_priv on ${dbName}.${tableName1} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """DELETE FROM ${dbName}.${tableName1} USING ${dbName}.${tableName2} INNER JOIN ${dbName}.${tableName3} @@ -136,7 +136,7 @@ suite("test_dml_delete_table_auth","p0,auth_call") { sql """grant select_priv on ${dbName}.${tableName1} to ${user}""" sql """grant select_priv on ${dbName}.${tableName2} to ${user}""" sql """grant select_priv on ${dbName}.${tableName3} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """DELETE FROM ${dbName}.${tableName1} USING ${dbName}.${tableName2} INNER JOIN ${dbName}.${tableName3} ON ${dbName}.${tableName2}.id = ${dbName}.${tableName3}.id diff --git a/regression-test/suites/auth_call/test_dml_export_table_auth.groovy b/regression-test/suites/auth_call/test_dml_export_table_auth.groovy index 8d13bc4bddb71b..12812fdf0dde09 100644 --- a/regression-test/suites/auth_call/test_dml_export_table_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_export_table_auth.groovy @@ -66,7 +66,7 @@ suite("test_dml_export_table_auth","p0,auth_call") { String region = getS3Region() String bucket = context.config.otherConfigs.get("s3BucketName"); - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """EXPORT TABLE ${dbName}.${tableName} TO "s3://${bucket}/test_outfile/exp_${exportLabel}" PROPERTIES( @@ -91,7 +91,7 @@ suite("test_dml_export_table_auth","p0,auth_call") { } } sql """grant select_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """EXPORT TABLE ${dbName}.${tableName} TO "s3://${bucket}/test_outfile/exp_${exportLabel}" PROPERTIES( "format" = "csv", @@ -109,7 +109,7 @@ suite("test_dml_export_table_auth","p0,auth_call") { assertTrue(res.size() == 1) } sql """grant select_priv on ${dbName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" def res = sql """show export;""" logger.info("res: " + res) diff --git a/regression-test/suites/auth_call/test_dml_insert_auth.groovy b/regression-test/suites/auth_call/test_dml_insert_auth.groovy index 6a04281b1c0aeb..6cfe66cb10c6d5 100644 --- a/regression-test/suites/auth_call/test_dml_insert_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_insert_auth.groovy @@ -63,7 +63,7 @@ suite("test_dml_insert_auth","p0,auth_call") { (3, "333") """ - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def insert_res = sql """SHOW LAST INSERT""" logger.info("insert_res: " + insert_res) test { @@ -83,7 +83,7 @@ suite("test_dml_insert_auth","p0,auth_call") { } } sql """grant load_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ INSERT INTO ${dbName}.${tableName} (id, username) VALUES (1, "111"), @@ -101,7 +101,7 @@ suite("test_dml_insert_auth","p0,auth_call") { assertTrue(rows[0][0] == 3) // insert overwrite - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ INSERT OVERWRITE table ${dbName}.${tableName} VALUES (4, "444"); """ @@ -110,7 +110,7 @@ suite("test_dml_insert_auth","p0,auth_call") { assertTrue(rows[0][0] == 1) sql """grant select_priv on ${dbName}.${srcTableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """INSERT OVERWRITE table ${dbName}.${tableName} SELECT * FROM ${dbName}.${srcTableName};""" } rows = sql """select count() from ${dbName}.${tableName}""" diff --git a/regression-test/suites/auth_call/test_dml_multi_routine_load_auth.groovy b/regression-test/suites/auth_call/test_dml_multi_routine_load_auth.groovy index 1d9c6b8395603d..11fd6c43db4602 100644 --- a/regression-test/suites/auth_call/test_dml_multi_routine_load_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_multi_routine_load_auth.groovy @@ -69,7 +69,7 @@ suite("test_dml_multi_routine_load_auth","p0,auth_call") { sql new File("""${context.file.parent}/ddl/${tableName1}.sql""").text sql new File("""${context.file.parent}/ddl/${tableName2}.sql""").text - connect(user = user, password = "${pwd}", url = context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ CREATE ROUTINE LOAD ${dbName}.${labelName} @@ -92,7 +92,7 @@ suite("test_dml_multi_routine_load_auth","p0,auth_call") { } sql """grant load_priv on ${dbName}.${tableName1} to ${user}""" - connect(user = user, password = "${pwd}", url = context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ CREATE ROUTINE LOAD ${dbName}.${labelName} @@ -114,7 +114,7 @@ suite("test_dml_multi_routine_load_auth","p0,auth_call") { } } sql """grant load_priv on ${dbName}.${tableName2} to ${user}""" - connect(user = user, password = "${pwd}", url = context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ CREATE ROUTINE LOAD ${dbName}.${labelName} @@ -136,7 +136,7 @@ suite("test_dml_multi_routine_load_auth","p0,auth_call") { } } sql """grant load_priv on ${dbName}.* to ${user}""" - connect(user = user, password = "${pwd}", url = context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ CREATE ROUTINE LOAD ${dbName}.${labelName} COLUMNS TERMINATED BY "|" diff --git a/regression-test/suites/auth_call/test_dml_mysql_load_auth.groovy b/regression-test/suites/auth_call/test_dml_mysql_load_auth.groovy index 6010b4b8b744d9..3963fe9433ef45 100644 --- a/regression-test/suites/auth_call/test_dml_mysql_load_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_mysql_load_auth.groovy @@ -50,7 +50,7 @@ suite("test_dml_mysql_load_auth","p0,auth_call") { sql """use ${dbName}""" def path_file = "${context.file.parent}/../../data/auth_call/stream_load_data.csv" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ LOAD DATA LOCAL @@ -64,7 +64,7 @@ suite("test_dml_mysql_load_auth","p0,auth_call") { } } sql """grant load_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName};""" sql """ LOAD DATA LOCAL diff --git a/regression-test/suites/auth_call/test_dml_outfile_auth.groovy b/regression-test/suites/auth_call/test_dml_outfile_auth.groovy index 5318b1dbe31ccf..7edf476883a93b 100644 --- a/regression-test/suites/auth_call/test_dml_outfile_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_outfile_auth.groovy @@ -58,7 +58,7 @@ suite("test_dml_outfile_auth","p0,auth_call") { String region = getS3Region() String bucket = context.config.otherConfigs.get("s3BucketName") - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ SELECT * FROM ${dbName}.${tableName} t ORDER BY id @@ -74,7 +74,7 @@ suite("test_dml_outfile_auth","p0,auth_call") { } } sql """grant select_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ SELECT * FROM ${dbName}.${tableName} t ORDER BY id INTO OUTFILE "s3://${bucket}/outfile/auth/exp_" diff --git a/regression-test/suites/auth_call/test_dml_routine_load_auth.groovy b/regression-test/suites/auth_call/test_dml_routine_load_auth.groovy index 8ee5236960baa7..db6698b01af194 100644 --- a/regression-test/suites/auth_call/test_dml_routine_load_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_routine_load_auth.groovy @@ -68,7 +68,7 @@ suite("test_dml_routine_load_auth","p0,auth_call") { PROPERTIES("replication_num" = "1"); ;""" - connect(user = user, password = "${pwd}", url = context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ CREATE ROUTINE LOAD ${dbName}.${labelName} ON ${tableName} @@ -86,7 +86,7 @@ suite("test_dml_routine_load_auth","p0,auth_call") { } sql """grant load_priv on ${dbName}.${tableName} to ${user}""" - connect(user = user, password = "${pwd}", url = context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ CREATE ROUTINE LOAD ${dbName}.${labelName} ON ${tableName} COLUMNS(a,b), @@ -101,7 +101,7 @@ suite("test_dml_routine_load_auth","p0,auth_call") { } sql """revoke load_priv on ${dbName}.${tableName} from ${user}""" - connect(user = user, password = "${pwd}", url = context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ ALTER ROUTINE LOAD FOR ${dbName}.${labelName} @@ -130,7 +130,7 @@ suite("test_dml_routine_load_auth","p0,auth_call") { } } sql """grant load_priv on ${dbName}.${tableName} to ${user}""" - connect(user = user, password = "${pwd}", url = context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """PAUSE ROUTINE LOAD FOR ${dbName}.${labelName};""" sql """ ALTER ROUTINE LOAD FOR ${dbName}.${labelName} diff --git a/regression-test/suites/auth_call/test_dml_select_udf_auth.groovy b/regression-test/suites/auth_call/test_dml_select_udf_auth.groovy index 72413b3e292ceb..b2f565fc02ef8a 100644 --- a/regression-test/suites/auth_call/test_dml_select_udf_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_select_udf_auth.groovy @@ -61,14 +61,14 @@ suite("test_dml_select_udf_auth","p0,auth_call") { """ sql """ INSERT INTO ${dbName}.${tableName} VALUES ("abc"), ("123"), ("123"); """ - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ SELECT ${dbName}.${udfName}(col_1) as a FROM ${dbName}.${tableName} ORDER BY a; """ exception "Can not found function" } } sql """grant select_priv on ${dbName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ SELECT ${dbName}.${udfName}(col_1) as a FROM ${dbName}.${tableName} ORDER BY a; """ } diff --git a/regression-test/suites/auth_call/test_dml_stream_load_auth.groovy b/regression-test/suites/auth_call/test_dml_stream_load_auth.groovy index 30f01c0e72d9c5..26ee5526f1ea69 100644 --- a/regression-test/suites/auth_call/test_dml_stream_load_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_stream_load_auth.groovy @@ -90,7 +90,7 @@ suite("test_dml_stream_load_auth","p0,auth_call") { int pos3 = sout.indexOf(":", pos1) def tsc_id = sout.substring(pos3+2, pos2) - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """SHOW TRANSACTION FROM ${dbName} WHERE ID=${tsc_id};""" exception "denied" @@ -105,7 +105,7 @@ suite("test_dml_stream_load_auth","p0,auth_call") { sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def transaction_res = sql """SHOW TRANSACTION FROM ${dbName} WHERE ID=${tsc_id};""" assertTrue(transaction_res.size() == 1) } diff --git a/regression-test/suites/auth_call/test_dml_update_table_auth.groovy b/regression-test/suites/auth_call/test_dml_update_table_auth.groovy index 10c9a3fcb80f2a..153dad5026a930 100644 --- a/regression-test/suites/auth_call/test_dml_update_table_auth.groovy +++ b/regression-test/suites/auth_call/test_dml_update_table_auth.groovy @@ -55,21 +55,21 @@ suite("test_dml_update_table_auth","p0,auth_call") { (3, "333"); """ - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """UPDATE ${dbName}.${tableName} SET username = "444" WHERE id=1;""" exception "denied" } } sql """grant load_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """UPDATE ${dbName}.${tableName} SET username = "444" WHERE id=1;""" exception "denied" } } sql """grant select_priv(id) on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """UPDATE ${dbName}.${tableName} SET username = "444" WHERE id=1;""" } diff --git a/regression-test/suites/auth_call/test_grant_show_view_priv_auth.groovy b/regression-test/suites/auth_call/test_grant_show_view_priv_auth.groovy index 59a7dc1efa8b5e..3a736fe4703816 100644 --- a/regression-test/suites/auth_call/test_grant_show_view_priv_auth.groovy +++ b/regression-test/suites/auth_call/test_grant_show_view_priv_auth.groovy @@ -64,11 +64,11 @@ suite("test_grant_show_view_priv_auth","p0,auth_call") { sql """grant grant_priv on *.*.* to '${user}'""" sql """grant SHOW_VIEW_PRIV on ${dbName}.${viewName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """CREATE USER ${user_derive} IDENTIFIED BY '${pwd}';""" sql """grant select_priv on regression_test to ${user_derive}""" - connect(user=user_derive, password="${pwd}", url=context.config.jdbcUrl) { + connect(user_derive, "${pwd}", context.config.jdbcUrl) { test { sql """show create table ${dbName}.${viewName};""" exception "denied" @@ -79,7 +79,7 @@ suite("test_grant_show_view_priv_auth","p0,auth_call") { } } sql """grant SHOW_VIEW_PRIV on ${dbName}.${viewName} to ${user_derive}""" - connect(user=user_derive, password="${pwd}", url=context.config.jdbcUrl) { + connect(user_derive, "${pwd}", context.config.jdbcUrl) { sql """show create table ${dbName}.${viewName};""" test { sql """select * from ${dbName}.${viewName};""" diff --git a/regression-test/suites/auth_call/test_hive_base_case_auth.groovy b/regression-test/suites/auth_call/test_hive_base_case_auth.groovy index b1f432ddfb293d..271015bec7c154 100644 --- a/regression-test/suites/auth_call/test_hive_base_case_auth.groovy +++ b/regression-test/suites/auth_call/test_hive_base_case_auth.groovy @@ -52,7 +52,7 @@ suite("test_hive_base_case_auth", "p0,auth_call") { sql """grant select_priv on regression_test to ${user}""" // create catalog - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create catalog if not exists ${catalogName} properties ( 'type'='hms' @@ -67,7 +67,7 @@ suite("test_hive_base_case_auth", "p0,auth_call") { );""" sql """grant Create_priv on ${catalogName}.*.* to ${user}""" try_sql """drop catalog if exists ${catalogName}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """create catalog if not exists ${catalogName} properties ( 'type'='hms', 'hive.metastore.uris' = 'thrift://${externalEnvIp}:${hms_port}', @@ -81,7 +81,7 @@ suite("test_hive_base_case_auth", "p0,auth_call") { sql """revoke Create_priv on ${catalogName}.*.* from ${user}""" // create database - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create database ${catalogName}.${dbName};""" exception "denied" @@ -91,13 +91,13 @@ suite("test_hive_base_case_auth", "p0,auth_call") { sql """grant Create_priv on ${catalogName}.${dbName}.* to ${user}""" sql """drop table if exists ${catalogName}.${dbName}.${tableName};""" sql """drop database ${catalogName}.${dbName};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """create database ${catalogName}.${dbName};""" } sql """revoke Create_priv on ${catalogName}.${dbName}.* from ${user}""" // create table - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """create table ${catalogName}.${dbName}.${tableName} ( id BIGINT, @@ -118,7 +118,7 @@ suite("test_hive_base_case_auth", "p0,auth_call") { );""" sql """grant Create_priv on ${catalogName}.${dbName}.${tableName} to ${user}""" sql """drop table ${catalogName}.${dbName}.${tableName}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """create table ${catalogName}.${dbName}.${tableName} ( id BIGINT, username VARCHAR(20) @@ -135,7 +135,7 @@ suite("test_hive_base_case_auth", "p0,auth_call") { sql """revoke Create_priv on ${catalogName}.${dbName}.${tableName} from ${user}""" // load - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ insert into ${catalogName}.${dbName}.${tableName} values @@ -146,7 +146,7 @@ suite("test_hive_base_case_auth", "p0,auth_call") { } } sql """grant LOAD_PRIV on ${catalogName}.${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ insert into ${catalogName}.${dbName}.${tableName} values (1, "111"), @@ -156,21 +156,21 @@ suite("test_hive_base_case_auth", "p0,auth_call") { sql """revoke LOAD_PRIV on ${catalogName}.${dbName}.${tableName} from ${user}""" // alter -// connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { +// connect(user, "${pwd}", context.config.jdbcUrl) { // test { // sql """ALTER table ${catalogName}.${dbName}.${tableName} RENAME ${tableNameNew};""" // exception "denied" // } // } // sql """grant ALTER_PRIV on ${catalogName}.${dbName}.${tableName} to ${user}""" -// connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { +// connect(user, "${pwd}", context.config.jdbcUrl) { // sql """ALTER table ${catalogName}.${dbName}.${tableName} RENAME ${tableNameNew};""" // } // sql """revoke ALTER_PRIV on ${catalogName}.${dbName}.${tableName} from ${user}""" // sql """ALTER table ${catalogName}.${dbName}.${tableNameNew} RENAME ${tableName};""" // drop - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """drop catalog ${catalogName}""" exception "denied" @@ -185,7 +185,7 @@ suite("test_hive_base_case_auth", "p0,auth_call") { } } sql """grant DROP_PRIV on ${catalogName}.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """drop table ${catalogName}.${dbName}.${tableName}""" sql """drop database ${catalogName}.${dbName}""" sql """drop catalog ${catalogName}""" diff --git a/regression-test/suites/auth_call/test_show_backend_auth.groovy b/regression-test/suites/auth_call/test_show_backend_auth.groovy index 16df2a6c10b398..adccf3637e6e2a 100644 --- a/regression-test/suites/auth_call/test_show_backend_auth.groovy +++ b/regression-test/suites/auth_call/test_show_backend_auth.groovy @@ -33,14 +33,14 @@ suite("test_show_backend_auth","p0,auth_call") { sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """SHOW BACKENDS""" exception "denied" } } sql """grant node_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def res = sql """SHOW BACKENDS""" assertTrue(res.size() > 0) } diff --git a/regression-test/suites/auth_call/test_show_broker_auth.groovy b/regression-test/suites/auth_call/test_show_broker_auth.groovy index 6ce1c4b361ac66..d8fa9bd10ebe01 100644 --- a/regression-test/suites/auth_call/test_show_broker_auth.groovy +++ b/regression-test/suites/auth_call/test_show_broker_auth.groovy @@ -33,14 +33,14 @@ suite("test_show_broker_auth","p0,auth_call") { sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """SHOW BROKER;""" exception "denied" } } sql """grant node_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """SHOW BROKER;""" } diff --git a/regression-test/suites/auth_call/test_show_charset_auth.groovy b/regression-test/suites/auth_call/test_show_charset_auth.groovy index 803810dc204ab2..3ca23f7f6becf7 100644 --- a/regression-test/suites/auth_call/test_show_charset_auth.groovy +++ b/regression-test/suites/auth_call/test_show_charset_auth.groovy @@ -36,7 +36,7 @@ suite("test_show_no_auth","p0,auth_call") { sql """CREATE USER '${user1}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """SHOW CHARSET""" sql """SHOW DATA TYPES""" sql """SHOW ENGINES""" @@ -57,7 +57,7 @@ suite("test_show_no_auth","p0,auth_call") { } } sql """grant grant_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def res = sql """show PROPERTY for ${user1}""" logger.info("res: " + res) assertTrue(res.size() > 0) @@ -68,7 +68,7 @@ suite("test_show_no_auth","p0,auth_call") { } sql """revoke grant_priv on *.*.* from ${user}""" sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def res = sql """SHOW TRASH;""" logger.info("res: " + res) assertTrue(res.size() >= 1) diff --git a/regression-test/suites/auth_call/test_show_convert_light_sc_auth.groovy b/regression-test/suites/auth_call/test_show_convert_light_sc_auth.groovy index c7a765fe9a3599..d54862f1710845 100644 --- a/regression-test/suites/auth_call/test_show_convert_light_sc_auth.groovy +++ b/regression-test/suites/auth_call/test_show_convert_light_sc_auth.groovy @@ -33,14 +33,14 @@ suite("test_show_convert_light_sc_auth","p0,auth_call") { sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """SHOW CONVERT_LIGHT_SCHEMA_CHANGE_PROCESS;""" exception "denied" } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """SHOW CONVERT_LIGHT_SCHEMA_CHANGE_PROCESS;""" } diff --git a/regression-test/suites/auth_call/test_show_create_table_auth.groovy b/regression-test/suites/auth_call/test_show_create_table_auth.groovy index 6152806ce6fbb6..2a85ea42e6c8da 100644 --- a/regression-test/suites/auth_call/test_show_create_table_auth.groovy +++ b/regression-test/suites/auth_call/test_show_create_table_auth.groovy @@ -45,7 +45,7 @@ suite("test_show_create_table_auth","p0,auth_call") { "replication_num" = "1" );""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """show create table ${dbName}.${tableName}""" exception "denied" @@ -56,7 +56,7 @@ suite("test_show_create_table_auth","p0,auth_call") { } } sql """grant select_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """show create table ${tableName}""" sql """SHOW DATA SKEW FROM ${tableName};""" @@ -64,7 +64,7 @@ suite("test_show_create_table_auth","p0,auth_call") { sql """revoke select_priv on ${dbName}.${tableName} from ${user}""" sql """grant create_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """show create table ${tableName}""" sql """SHOW DATA SKEW FROM ${tableName};""" @@ -72,7 +72,7 @@ suite("test_show_create_table_auth","p0,auth_call") { sql """revoke create_priv on ${dbName}.${tableName} from ${user}""" sql """grant drop_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """show create table ${tableName}""" sql """SHOW DATA SKEW FROM ${tableName};""" @@ -80,7 +80,7 @@ suite("test_show_create_table_auth","p0,auth_call") { sql """revoke drop_priv on ${dbName}.${tableName} from ${user}""" sql """grant alter_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """show create table ${tableName}""" sql """SHOW DATA SKEW FROM ${tableName};""" diff --git a/regression-test/suites/auth_call/test_show_data_auth.groovy b/regression-test/suites/auth_call/test_show_data_auth.groovy index 84bf9497f546e8..c6f3b6dd1536ba 100644 --- a/regression-test/suites/auth_call/test_show_data_auth.groovy +++ b/regression-test/suites/auth_call/test_show_data_auth.groovy @@ -55,7 +55,7 @@ suite("test_show_data_auth","p0,auth_call") { "replication_num" = "1" );""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """show data from ${dbName}.${tableName}""" exception "denied" @@ -68,7 +68,7 @@ suite("test_show_data_auth","p0,auth_call") { } sql """grant select_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use ${dbName}""" sql """show data from ${dbName}.${tableName}""" test { @@ -80,7 +80,7 @@ suite("test_show_data_auth","p0,auth_call") { sql """revoke select_priv on ${dbName}.${tableName} from ${user}""" sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """SHOW DATA;""" } diff --git a/regression-test/suites/auth_call/test_show_database_id_auth.groovy b/regression-test/suites/auth_call/test_show_database_id_auth.groovy index 0a0d44be07476d..e30dc8d0db74a4 100644 --- a/regression-test/suites/auth_call/test_show_database_id_auth.groovy +++ b/regression-test/suites/auth_call/test_show_database_id_auth.groovy @@ -37,7 +37,7 @@ suite("test_show_database_id_auth","p0,auth_call") { sql """grant select_priv on regression_test to ${user}""" sql """create database ${dbName}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """show database 1001""" exception "denied" @@ -52,7 +52,7 @@ suite("test_show_database_id_auth","p0,auth_call") { } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """show database 1001""" sql """show table 1001""" sql """SHOW CATALOG RECYCLE BIN;""" diff --git a/regression-test/suites/auth_call/test_show_dynamic_table_auth.groovy b/regression-test/suites/auth_call/test_show_dynamic_table_auth.groovy index 248e1d1c3559d7..727d705664311b 100644 --- a/regression-test/suites/auth_call/test_show_dynamic_table_auth.groovy +++ b/regression-test/suites/auth_call/test_show_dynamic_table_auth.groovy @@ -52,12 +52,12 @@ suite("test_show_dynamic_table_auth","p0,auth_call") { "dynamic_partition.start_day_of_month" = "3" );""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def res = sql """SHOW DYNAMIC PARTITION TABLES from ${dbName};""" assertTrue(res.size() == 0) } sql """grant select_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { checkNereidsExecute("SHOW DYNAMIC PARTITION TABLES from ${dbName};"); diff --git a/regression-test/suites/auth_call/test_show_frontend_auth.groovy b/regression-test/suites/auth_call/test_show_frontend_auth.groovy index 2844ee992c2a98..f4a9bc15b074ec 100644 --- a/regression-test/suites/auth_call/test_show_frontend_auth.groovy +++ b/regression-test/suites/auth_call/test_show_frontend_auth.groovy @@ -33,7 +33,7 @@ suite("test_show_frontend_auth","p0,auth_call") { sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """SHOW frontends""" exception "denied" @@ -44,7 +44,7 @@ suite("test_show_frontend_auth","p0,auth_call") { } } sql """grant node_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def res = sql """SHOW frontends""" assertTrue(res.size() > 0) diff --git a/regression-test/suites/auth_call/test_show_grant_auth.groovy b/regression-test/suites/auth_call/test_show_grant_auth.groovy index 5c6c3f069e32bf..1223faf6739d4a 100644 --- a/regression-test/suites/auth_call/test_show_grant_auth.groovy +++ b/regression-test/suites/auth_call/test_show_grant_auth.groovy @@ -33,7 +33,7 @@ suite("test_show_grant_auth","p0,auth_call") { sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """show grants;""" test { sql """show all grants;""" @@ -46,7 +46,7 @@ suite("test_show_grant_auth","p0,auth_call") { } } sql """grant grant_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """show grants;""" sql """show all grants;""" sql """show roles;""" diff --git a/regression-test/suites/auth_call/test_show_proc_auth.groovy b/regression-test/suites/auth_call/test_show_proc_auth.groovy index 725a9785a7af5c..1daf8d97f703f2 100644 --- a/regression-test/suites/auth_call/test_show_proc_auth.groovy +++ b/regression-test/suites/auth_call/test_show_proc_auth.groovy @@ -33,14 +33,14 @@ suite("test_show_proc_auth","p0,auth_call") { sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """SHOW PROC "/";""" exception "denied" } } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """SHOW PROC "/";""" } diff --git a/regression-test/suites/auth_call/test_show_query_stats_auth.groovy b/regression-test/suites/auth_call/test_show_query_stats_auth.groovy index 1a9e8898fff432..ba951a47465ee3 100644 --- a/regression-test/suites/auth_call/test_show_query_stats_auth.groovy +++ b/regression-test/suites/auth_call/test_show_query_stats_auth.groovy @@ -34,7 +34,7 @@ suite("test_show_query_stats_auth","p0,auth_call") { sql """grant select_priv on regression_test to ${user}""" logger.info("context.config.jdbcUrl: " + context.config.jdbcUrl) - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def res = sql """show query stats;""" logger.info("res:" + res) } diff --git a/regression-test/suites/auth_call/test_show_repository_auth.groovy b/regression-test/suites/auth_call/test_show_repository_auth.groovy index 5d7c51ed59c3b1..43f6785e0ea7f5 100644 --- a/regression-test/suites/auth_call/test_show_repository_auth.groovy +++ b/regression-test/suites/auth_call/test_show_repository_auth.groovy @@ -52,7 +52,7 @@ suite("test_show_repository_auth","p0,auth_call") { "s3.secret_key" = "${sk}" )""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """SHOW CREATE REPOSITORY for ${repositoryName};""" exception "denied" @@ -64,7 +64,7 @@ suite("test_show_repository_auth","p0,auth_call") { } sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """SHOW CREATE REPOSITORY for ${repositoryName};""" def res = sql """SHOW REPOSITORIES;""" diff --git a/regression-test/suites/auth_call/test_show_tablet_auth.groovy b/regression-test/suites/auth_call/test_show_tablet_auth.groovy index d071dcae074dec..3ac938d8462228 100644 --- a/regression-test/suites/auth_call/test_show_tablet_auth.groovy +++ b/regression-test/suites/auth_call/test_show_tablet_auth.groovy @@ -52,7 +52,7 @@ suite("test_show_tablet_auth","p0,auth_call") { """ sql """grant select_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """SHOW TABLETS FROM ${dbName}.${tableName}""" exception "denied" @@ -73,7 +73,7 @@ suite("test_show_tablet_auth","p0,auth_call") { sql """revoke select_priv on ${dbName}.${tableName} from ${user}""" sql """grant admin_priv on *.*.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { def res = sql """SHOW TABLETS FROM ${dbName}.${tableName}""" def tablet_res = sql """SHOW TABLET ${res[0][0]}""" diff --git a/regression-test/suites/auth_call/test_show_typecast_auth.groovy b/regression-test/suites/auth_call/test_show_typecast_auth.groovy index 104e8107e1fb76..8df4a2e2dc18c2 100644 --- a/regression-test/suites/auth_call/test_show_typecast_auth.groovy +++ b/regression-test/suites/auth_call/test_show_typecast_auth.groovy @@ -33,7 +33,7 @@ suite("test_show_typecast_auth","p0,auth_call") { sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """use regression_test""" sql """show type_cast;""" } diff --git a/regression-test/suites/auth_p0/test_admin_copy_tablet_auth.groovy b/regression-test/suites/auth_p0/test_admin_copy_tablet_auth.groovy index c040dfb8e956c3..9bfffadb730e66 100644 --- a/regression-test/suites/auth_p0/test_admin_copy_tablet_auth.groovy +++ b/regression-test/suites/auth_p0/test_admin_copy_tablet_auth.groovy @@ -23,7 +23,7 @@ suite("test_admin_copy_tablet_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "ADMIN COPY TABLET 10010 PROPERTIES('backend_id' = '10001');" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_alter_policy_auth.groovy b/regression-test/suites/auth_p0/test_alter_policy_auth.groovy index 3b1e9af6e2c609..c5b720dbf92d23 100644 --- a/regression-test/suites/auth_p0/test_alter_policy_auth.groovy +++ b/regression-test/suites/auth_p0/test_alter_policy_auth.groovy @@ -23,7 +23,7 @@ suite("test_alter_policy_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql """ ALTER STORAGE POLICY has_test_policy_to_alter PROPERTIES("cooldown_datetime" = "2023-06-08 00:00:00"); diff --git a/regression-test/suites/auth_p0/test_alter_view_auth.groovy b/regression-test/suites/auth_p0/test_alter_view_auth.groovy index 52bf8ac75c7217..137af46f32fb16 100644 --- a/regression-test/suites/auth_p0/test_alter_view_auth.groovy +++ b/regression-test/suites/auth_p0/test_alter_view_auth.groovy @@ -42,7 +42,7 @@ suite("test_alter_view_auth","p0,auth") { """ sql """grant select_priv on regression_test to ${user}""" sql """create view ${dbName}.${viewName} as select * from ${dbName}.${tableName};""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "alter view ${dbName}.${viewName} as select * from ${dbName}.${tableName};" } catch (Exception e) { @@ -51,7 +51,7 @@ suite("test_alter_view_auth","p0,auth") { } } sql """grant Alter_priv on ${dbName}.${viewName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "alter view ${dbName}.${viewName} as select * from ${dbName}.${tableName};" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_cancel_alter_system_auth.groovy b/regression-test/suites/auth_p0/test_cancel_alter_system_auth.groovy index 0e630fdae8e9cc..6dc93a817ad942 100644 --- a/regression-test/suites/auth_p0/test_cancel_alter_system_auth.groovy +++ b/regression-test/suites/auth_p0/test_cancel_alter_system_auth.groovy @@ -23,7 +23,7 @@ suite("test_cancel_alter_system_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "CANCEL DECOMMISSION BACKEND 'id1';" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_create_policy_auth.groovy b/regression-test/suites/auth_p0/test_create_policy_auth.groovy index 8debfaedb273a7..db7968dc64ddf8 100644 --- a/regression-test/suites/auth_p0/test_create_policy_auth.groovy +++ b/regression-test/suites/auth_p0/test_create_policy_auth.groovy @@ -23,7 +23,7 @@ suite("test_create_policy_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "CREATE ROW POLICY test_create_policy_auth ON test.table1 AS RESTRICTIVE TO test USING (c1 = 'a');" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_create_view_auth.groovy b/regression-test/suites/auth_p0/test_create_view_auth.groovy index 4e708c8e694579..17e61e0a97d78d 100644 --- a/regression-test/suites/auth_p0/test_create_view_auth.groovy +++ b/regression-test/suites/auth_p0/test_create_view_auth.groovy @@ -39,7 +39,7 @@ suite("test_create_view_auth","p0,auth") { ); """ sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "create view ${dbName}.v1 as select * from ${dbName}.t1;" } catch (Exception e) { @@ -48,7 +48,7 @@ suite("test_create_view_auth","p0,auth") { } } sql """grant create_priv on ${dbName}.* to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "create view ${dbName}.v1 as select * from ${dbName}.${tableName};" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_drop_materialized_view_auth.groovy b/regression-test/suites/auth_p0/test_drop_materialized_view_auth.groovy index 4d55b1482cff12..47ca778de217d9 100644 --- a/regression-test/suites/auth_p0/test_drop_materialized_view_auth.groovy +++ b/regression-test/suites/auth_p0/test_drop_materialized_view_auth.groovy @@ -23,7 +23,7 @@ suite("test_drop_materialized_view_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "DROP MATERIALIZED VIEW mv_name ON table_name;" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_drop_policy_auth.groovy b/regression-test/suites/auth_p0/test_drop_policy_auth.groovy index 0d6a9e103d173f..748a56bf7b45bf 100644 --- a/regression-test/suites/auth_p0/test_drop_policy_auth.groovy +++ b/regression-test/suites/auth_p0/test_drop_policy_auth.groovy @@ -23,7 +23,7 @@ suite("test_drop_policy_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "DROP ROW POLICY test_row_policy_1 on table1;" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy b/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy index f6e36bc0e463a2..90228ebf3a5130 100644 --- a/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy +++ b/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy @@ -115,7 +115,7 @@ suite ("test_follower_consistent_auth","p0,auth") { logger.info("url_tmp1:" + url_tmp1) logger.info("new_jdbc_url:" + new_jdbc_url) - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { try { sql "SHOW CATALOG RECYCLE BIN WHERE NAME = '${catalog_name}'" } catch (Exception e) { @@ -123,7 +123,7 @@ suite ("test_follower_consistent_auth","p0,auth") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { try { sql "SHOW CATALOG RECYCLE BIN WHERE NAME = '${catalog_name}'" } catch (Exception e) { @@ -131,7 +131,7 @@ suite ("test_follower_consistent_auth","p0,auth") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { try { sql "SHOW DATA" } catch (Exception e) { @@ -139,7 +139,7 @@ suite ("test_follower_consistent_auth","p0,auth") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { try { sql "SHOW DATA" } catch (Exception e) { @@ -148,7 +148,7 @@ suite ("test_follower_consistent_auth","p0,auth") { } } - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { try { sql "select username from ${dbName}.${tableName}" } catch (Exception e) { @@ -156,7 +156,7 @@ suite ("test_follower_consistent_auth","p0,auth") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { try { sql "select username from ${dbName}.${tableName}" } catch (Exception e) { @@ -165,15 +165,15 @@ suite ("test_follower_consistent_auth","p0,auth") { } } sql """grant select_priv(username) on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { sql "select username from ${dbName}.${tableName}" } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { sql "select username from ${dbName}.${tableName}" } - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { try { sql "select username from ${dbName}.${view_name}" } catch (Exception e) { @@ -181,7 +181,7 @@ suite ("test_follower_consistent_auth","p0,auth") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { try { sql "select username from ${dbName}.${view_name}" } catch (Exception e) { @@ -190,15 +190,15 @@ suite ("test_follower_consistent_auth","p0,auth") { } } sql """grant select_priv(username) on ${dbName}.${view_name} to ${user}""" - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { sql "select username from ${dbName}.${view_name}" } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { sql "select username from ${dbName}.${view_name}" } - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { try { sql "select username from ${dbName}.${mtmv_name}" } catch (Exception e) { @@ -206,7 +206,7 @@ suite ("test_follower_consistent_auth","p0,auth") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { try { sql "select username from ${dbName}.${mtmv_name}" } catch (Exception e) { @@ -215,10 +215,10 @@ suite ("test_follower_consistent_auth","p0,auth") { } } sql """grant select_priv(username) on ${dbName}.${mtmv_name} to ${user}""" - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { sql "select username from ${dbName}.${mtmv_name}" } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { sql "select username from ${dbName}.${mtmv_name}" } @@ -228,15 +228,15 @@ suite ("test_follower_consistent_auth","p0,auth") { // user sql """grant select_priv on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { sql "select username from ${dbName}.${tableName}" } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { sql "select username from ${dbName}.${tableName}" } sql """revoke select_priv on ${dbName}.${tableName} from ${user}""" - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { try { sql "select username from ${dbName}.${tableName}" } catch (Exception e) { @@ -244,7 +244,7 @@ suite ("test_follower_consistent_auth","p0,auth") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { try { sql "select username from ${dbName}.${tableName}" } catch (Exception e) { @@ -257,17 +257,17 @@ suite ("test_follower_consistent_auth","p0,auth") { sql """grant select_priv on ${dbName}.${tableName} to ROLE '${role}'""" sql """grant Load_priv on ${dbName}.${tableName} to ROLE '${role}'""" sql """grant '${role}' to '${user}'""" - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { sql "select username from ${dbName}.${tableName}" sql """insert into ${dbName}.`${tableName}` values (4, "444")""" } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { sql "select username from ${dbName}.${tableName}" sql """insert into ${dbName}.`${tableName}` values (4, "444")""" } sql """revoke '${role}' from '${user}'""" - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { try { sql "select username from ${dbName}.${tableName}" } catch (Exception e) { @@ -275,7 +275,7 @@ suite ("test_follower_consistent_auth","p0,auth") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { try { sql "select username from ${dbName}.${tableName}" } catch (Exception e) { @@ -286,7 +286,7 @@ suite ("test_follower_consistent_auth","p0,auth") { // workload group - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { sql """set workload_group = '${wg}';""" try { sql "select username from ${dbName}.${tableName}" @@ -295,7 +295,7 @@ suite ("test_follower_consistent_auth","p0,auth") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { sql """set workload_group = '${wg}';""" try { sql "select username from ${dbName}.${tableName}" @@ -305,31 +305,31 @@ suite ("test_follower_consistent_auth","p0,auth") { } } sql """GRANT USAGE_PRIV ON WORKLOAD GROUP '${wg}' TO '${user}';""" - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { sql """set workload_group = '${wg}';""" sql """select username from ${dbName}.${tableName}""" } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { sql """set workload_group = '${wg}';""" sql """select username from ${dbName}.${tableName}""" } // resource group - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { def res = sql """SHOW RESOURCES;""" assertTrue(res == []) } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { def res = sql """SHOW RESOURCES;""" assertTrue(res == []) } sql """GRANT USAGE_PRIV ON RESOURCE ${rg} TO ${user};""" - connect(user=user, password="${pwd}", url=url_tmp1) { + connect(user, "${pwd}", url_tmp1) { ArrayList res = sql """SHOW RESOURCES;""" logger.info("res:" + res) assertTrue(res.size() == 10) } - connect(user=user, password="${pwd}", url=new_jdbc_url) { + connect(user, "${pwd}", new_jdbc_url) { ArrayList res = sql """SHOW RESOURCES;""" logger.info("res:" + res) assertTrue(res.size() == 10) diff --git a/regression-test/suites/auth_p0/test_select_column_auth.groovy b/regression-test/suites/auth_p0/test_select_column_auth.groovy index 3c3216d0500bb0..52f1dc02697dd4 100644 --- a/regression-test/suites/auth_p0/test_select_column_auth.groovy +++ b/regression-test/suites/auth_p0/test_select_column_auth.groovy @@ -74,7 +74,7 @@ suite("test_select_column_auth","p0,auth") { sql """grant select_priv on regression_test to ${user}""" // table column - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "select username from ${dbName}.${tableName}" } catch (Exception e) { @@ -83,12 +83,12 @@ suite("test_select_column_auth","p0,auth") { } } sql """grant select_priv(username) on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql "select username from ${dbName}.${tableName}" } // view column - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "select username from ${dbName}.${mv_name}" } catch (Exception e) { @@ -97,12 +97,12 @@ suite("test_select_column_auth","p0,auth") { } } sql """grant select_priv(username) on ${dbName}.${mv_name} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql "select username from ${dbName}.${mv_name}" } // mtmv column - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "select username from ${dbName}.${mtmv_name}" } catch (Exception e) { @@ -111,13 +111,13 @@ suite("test_select_column_auth","p0,auth") { } } sql """grant select_priv(username) on ${dbName}.${mtmv_name} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql "select username from ${dbName}.${mtmv_name}" } // mtmv hit - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql "SET enable_materialized_view_rewrite=true" try { sql "select username, sum(id) from ${dbName}.${tableName} group by username" @@ -129,7 +129,7 @@ suite("test_select_column_auth","p0,auth") { sql """grant select_priv(username) on ${dbName}.${mtmv_name} to ${user}""" sql """grant select_priv(sum_id) on ${dbName}.${mtmv_name} to ${user}""" sql """grant select_priv(id) on ${dbName}.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql "SET enable_materialized_view_rewrite=true" explain { sql("""select username, sum(id) from ${dbName}.${tableName} group by username""") diff --git a/regression-test/suites/auth_p0/test_select_view_auth.groovy b/regression-test/suites/auth_p0/test_select_view_auth.groovy index 87ec8cf0aeb758..9a5020ea163ce6 100644 --- a/regression-test/suites/auth_p0/test_select_view_auth.groovy +++ b/regression-test/suites/auth_p0/test_select_view_auth.groovy @@ -68,7 +68,7 @@ suite("test_select_view_auth","p0,auth") { sql """grant select_priv on regression_test to ${user}""" // table column - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "select * from ${dbName}.${viewName}" } catch (Exception e) { @@ -77,7 +77,7 @@ suite("test_select_view_auth","p0,auth") { } } sql """grant select_priv on ${dbName}.${viewName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql "select * from ${dbName}.${viewName}" } diff --git a/regression-test/suites/auth_p0/test_set_ldap_admin_password_auth.groovy b/regression-test/suites/auth_p0/test_set_ldap_admin_password_auth.groovy index 6c5032f7ef9867..e72e1e1774c8a5 100644 --- a/regression-test/suites/auth_p0/test_set_ldap_admin_password_auth.groovy +++ b/regression-test/suites/auth_p0/test_set_ldap_admin_password_auth.groovy @@ -23,7 +23,7 @@ suite("test_set_ldap_admin_password_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "SET LDAP_ADMIN_PASSWORD = PASSWORD('plain password')" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_show_catalog_recycle_bin_auth.groovy b/regression-test/suites/auth_p0/test_show_catalog_recycle_bin_auth.groovy index aa3ba7f8e2bfa2..9c9d7a07cdd8f3 100644 --- a/regression-test/suites/auth_p0/test_show_catalog_recycle_bin_auth.groovy +++ b/regression-test/suites/auth_p0/test_show_catalog_recycle_bin_auth.groovy @@ -23,7 +23,7 @@ suite("test_show_catalog_recycle_bin_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "SHOW CATALOG RECYCLE BIN WHERE NAME = 'test'" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_show_create_database_auth.groovy b/regression-test/suites/auth_p0/test_show_create_database_auth.groovy index c4efff7d662478..4562a301fc3986 100644 --- a/regression-test/suites/auth_p0/test_show_create_database_auth.groovy +++ b/regression-test/suites/auth_p0/test_show_create_database_auth.groovy @@ -23,7 +23,7 @@ suite("test_show_create_database_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "SHOW CREATE DATABASE db_name" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_show_create_repository_auth.groovy b/regression-test/suites/auth_p0/test_show_create_repository_auth.groovy index 5e787aead258bf..717b70a723e435 100644 --- a/regression-test/suites/auth_p0/test_show_create_repository_auth.groovy +++ b/regression-test/suites/auth_p0/test_show_create_repository_auth.groovy @@ -23,7 +23,7 @@ suite("test_show_create_repository_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "SHOW CREATE REPOSITORY for repository_name" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_show_data_auth.groovy b/regression-test/suites/auth_p0/test_show_data_auth.groovy index fdd42d2759664f..75176d14a442c4 100644 --- a/regression-test/suites/auth_p0/test_show_data_auth.groovy +++ b/regression-test/suites/auth_p0/test_show_data_auth.groovy @@ -23,7 +23,7 @@ suite("test_show_data_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "SHOW DATA" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_show_encryptkeys_auth.groovy b/regression-test/suites/auth_p0/test_show_encryptkeys_auth.groovy index 1e2cf4c27fd212..ccc6de1b7213b9 100644 --- a/regression-test/suites/auth_p0/test_show_encryptkeys_auth.groovy +++ b/regression-test/suites/auth_p0/test_show_encryptkeys_auth.groovy @@ -23,7 +23,7 @@ suite("test_show_encryptkeys_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "use regression_test" sql "SHOW ENCRYPTKEYS" diff --git a/regression-test/suites/auth_p0/test_show_plugins_auth.groovy b/regression-test/suites/auth_p0/test_show_plugins_auth.groovy index b5b4de84265162..bb91edc2ea5d58 100644 --- a/regression-test/suites/auth_p0/test_show_plugins_auth.groovy +++ b/regression-test/suites/auth_p0/test_show_plugins_auth.groovy @@ -23,7 +23,7 @@ suite("test_show_plugins_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "SHOW PLUGINS" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_show_repositories_auth.groovy b/regression-test/suites/auth_p0/test_show_repositories_auth.groovy index 507d8768669973..4b4e68ed6cae08 100644 --- a/regression-test/suites/auth_p0/test_show_repositories_auth.groovy +++ b/regression-test/suites/auth_p0/test_show_repositories_auth.groovy @@ -23,7 +23,7 @@ suite("test_show_repositories_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "SHOW REPOSITORIES" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_show_snapshot_auth.groovy b/regression-test/suites/auth_p0/test_show_snapshot_auth.groovy index f90e1fdc57aaab..9ef808e7fee2f7 100644 --- a/regression-test/suites/auth_p0/test_show_snapshot_auth.groovy +++ b/regression-test/suites/auth_p0/test_show_snapshot_auth.groovy @@ -23,7 +23,7 @@ suite("test_show_snapshot_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "SHOW SNAPSHOT ON example_repo" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_show_stream_load_auth.groovy b/regression-test/suites/auth_p0/test_show_stream_load_auth.groovy index cb2446f04405f3..f64f0fa73dd220 100644 --- a/regression-test/suites/auth_p0/test_show_stream_load_auth.groovy +++ b/regression-test/suites/auth_p0/test_show_stream_load_auth.groovy @@ -59,13 +59,13 @@ suite("test_show_stream_load_auth","p0,auth") { sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { res = sql "SHOW STREAM LOAD from regression_test_auth_p0 where label = '${label}'" log.info(res.toString()) assertFalse(res.toString().contains("${label}")) } sql """grant load_priv on regression_test_auth_p0.${tableName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { res = sql "SHOW STREAM LOAD from regression_test_auth_p0 where label = '${label}'" log.info(res.toString()) assertTrue(res.toString().contains("${label}")) diff --git a/regression-test/suites/auth_p0/test_show_tablets_belong_auth.groovy b/regression-test/suites/auth_p0/test_show_tablets_belong_auth.groovy index b7d66af9348f0d..b86a840bae1be9 100644 --- a/regression-test/suites/auth_p0/test_show_tablets_belong_auth.groovy +++ b/regression-test/suites/auth_p0/test_show_tablets_belong_auth.groovy @@ -23,7 +23,7 @@ suite("test_show_tablets_belong_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "SHOW TABLETS BELONG 27028" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_show_transaction_auth.groovy b/regression-test/suites/auth_p0/test_show_transaction_auth.groovy index f4e564c52889a0..9e6303a2a925b8 100644 --- a/regression-test/suites/auth_p0/test_show_transaction_auth.groovy +++ b/regression-test/suites/auth_p0/test_show_transaction_auth.groovy @@ -23,7 +23,7 @@ suite("test_show_transaction_auth","p0,auth") { try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """grant select_priv on regression_test to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { try { sql "SHOW TRANSACTION WHERE ID=4005;" } catch (Exception e) { diff --git a/regression-test/suites/auth_p0/test_use_encryptkey_auth.groovy b/regression-test/suites/auth_p0/test_use_encryptkey_auth.groovy index 78fc2e4c8a8caa..965bd4b3b162bb 100644 --- a/regression-test/suites/auth_p0/test_use_encryptkey_auth.groovy +++ b/regression-test/suites/auth_p0/test_use_encryptkey_auth.groovy @@ -36,7 +36,7 @@ suite("test_use_encryptkey_auth","p0,auth") { } sql """CREATE ENCRYPTKEY ${key} AS 'ABCD123456789'""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { test { sql """ SELECT HEX(AES_ENCRYPT("Doris is Great", KEY ${dbName}.${key})); @@ -45,7 +45,7 @@ suite("test_use_encryptkey_auth","p0,auth") { } } sql """grant select_priv on ${dbName} to ${user}""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ SELECT HEX(AES_ENCRYPT("Doris is Great", KEY ${dbName}.${key})); """ diff --git a/regression-test/suites/auth_up_down_p0/load.groovy b/regression-test/suites/auth_up_down_p0/load.groovy index df164a7c2a1331..7ac11b627abe9e 100644 --- a/regression-test/suites/auth_up_down_p0/load.groovy +++ b/regression-test/suites/auth_up_down_p0/load.groovy @@ -128,15 +128,15 @@ suite("test_upgrade_downgrade_prepare_auth","p0,auth,restart_fe") { // user sql """grant select_priv on ${dbName}.${tableName1} to ${user1}""" sql """grant select_priv on ${dbName}.${tableName2} to ${user1}""" - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { sql "select username from ${dbName}.${tableName1}" } - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { sql "select username from ${dbName}.${tableName2}" } sql """revoke select_priv on ${dbName}.${tableName1} from ${user1}""" - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { try { sql "select username from ${dbName}.${tableName1}" } catch (Exception e) { @@ -144,7 +144,7 @@ suite("test_upgrade_downgrade_prepare_auth","p0,auth,restart_fe") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { sql "select username from ${dbName}.${tableName2}" } @@ -152,13 +152,13 @@ suite("test_upgrade_downgrade_prepare_auth","p0,auth,restart_fe") { sql """grant select_priv on ${dbName}.${tableName1} to ROLE '${role1}'""" sql """grant Load_priv on ${dbName}.${tableName1} to ROLE '${role2}'""" sql """grant '${role1}', '${role2}' to '${user2}'""" - connect(user=user2, password="${pwd}", url=context.config.jdbcUrl) { + connect(user2, "${pwd}", context.config.jdbcUrl) { sql "select username from ${dbName}.${tableName1}" sql """insert into ${dbName}.`${tableName1}` values (4, "444")""" } sql """revoke '${role1}' from '${user2}'""" - connect(user=user2, password="${pwd}", url=context.config.jdbcUrl) { + connect(user2, "${pwd}", context.config.jdbcUrl) { try { sql "select username from ${dbName}.${tableName1}" } catch (Exception e) { @@ -166,12 +166,12 @@ suite("test_upgrade_downgrade_prepare_auth","p0,auth,restart_fe") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user2, password="${pwd}", url=context.config.jdbcUrl) { + connect(user2, "${pwd}", context.config.jdbcUrl) { sql """insert into ${dbName}.`${tableName1}` values (5, "555")""" } // workload group - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { sql """set workload_group = '${wg1}';""" try { sql "select username from ${dbName}.${tableName2}" @@ -181,18 +181,18 @@ suite("test_upgrade_downgrade_prepare_auth","p0,auth,restart_fe") { } } sql """GRANT USAGE_PRIV ON WORKLOAD GROUP '${wg1}' TO '${user1}';""" - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { sql """set workload_group = '${wg1}';""" sql """select username from ${dbName}.${tableName2}""" } // resource group - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { def res = sql """SHOW RESOURCES;""" assertTrue(res == []) } sql """GRANT USAGE_PRIV ON RESOURCE ${rg1} TO ${user1};""" - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { def res = sql """SHOW RESOURCES;""" assertTrue(res.size() == 10) } diff --git a/regression-test/suites/auth_up_down_p0/test_grant_revoke_auth.groovy b/regression-test/suites/auth_up_down_p0/test_grant_revoke_auth.groovy index 9a57cf146d31e5..61b953e03706fe 100644 --- a/regression-test/suites/auth_up_down_p0/test_grant_revoke_auth.groovy +++ b/regression-test/suites/auth_up_down_p0/test_grant_revoke_auth.groovy @@ -45,7 +45,7 @@ suite("test_upgrade_downgrade_compatibility_auth","p0,auth,restart_fe") { } // user - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { try { sql "select username from ${dbName}.${tableName1}" } catch (Exception e) { @@ -53,12 +53,12 @@ suite("test_upgrade_downgrade_compatibility_auth","p0,auth,restart_fe") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { sql "select username from ${dbName}.${tableName2}" } // role - connect(user=user2, password="${pwd}", url=context.config.jdbcUrl) { + connect(user2, "${pwd}", context.config.jdbcUrl) { try { sql "select username from ${dbName}.${tableName1}" } catch (Exception e) { @@ -66,18 +66,18 @@ suite("test_upgrade_downgrade_compatibility_auth","p0,auth,restart_fe") { assertTrue(e.getMessage().contains("denied")) } } - connect(user=user2, password="${pwd}", url=context.config.jdbcUrl) { + connect(user2, "${pwd}", context.config.jdbcUrl) { sql """insert into ${dbName}.`${tableName1}` values (5, "555")""" } // workload group - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { sql """set workload_group = '${wg1}';""" sql """select username from ${dbName}.${tableName2}""" } // resource group - connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) { + connect(user1, "${pwd}", context.config.jdbcUrl) { def res = sql """SHOW RESOURCES;""" assertTrue(res.size() == 10) } diff --git a/regression-test/suites/cloud_p0/auth/test_disable_revoke_admin_auth.groovy b/regression-test/suites/cloud_p0/auth/test_disable_revoke_admin_auth.groovy index 2a36ecf8879d9d..19add1d2c87503 100644 --- a/regression-test/suites/cloud_p0/auth/test_disable_revoke_admin_auth.groovy +++ b/regression-test/suites/cloud_p0/auth/test_disable_revoke_admin_auth.groovy @@ -30,7 +30,7 @@ suite("test_disable_revoke_admin_auth", "cloud_auth") { } try { - result = connect(user = "${user}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user}", 'Cloud12345', context.config.jdbcUrl) { sql """ revoke 'admin' from 'admin' """ diff --git a/regression-test/suites/cloud_p0/auth/test_grant_revoke_cluster_role.groovy b/regression-test/suites/cloud_p0/auth/test_grant_revoke_cluster_role.groovy index bd08353381e64a..f5594c226e8713 100644 --- a/regression-test/suites/cloud_p0/auth/test_grant_revoke_cluster_role.groovy +++ b/regression-test/suites/cloud_p0/auth/test_grant_revoke_cluster_role.groovy @@ -138,7 +138,7 @@ suite("test_grant_revoke_cluster_stage_to_role", "cloud_auth") { insert into ${tbl} (k1, k2) values (1, "10"); """ - connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user1}", 'Cloud12345', context.config.jdbcUrl) { sql """use @${validCluster}""" def sqlRet = sql """SELECT * FROM ${db}.${tbl}""" assertEquals(sqlRet[0][0] as int, 1) @@ -276,7 +276,7 @@ suite("test_grant_revoke_cluster_stage_to_role", "cloud_auth") { assertEquals(m.values().toUnique().asList().get(0) as String, "Cluster_usage_priv") // still can select, because have global * cluster - connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user1}", 'Cloud12345', context.config.jdbcUrl) { sql """use @${validCluster}""" def sqlRet = sql """SELECT * FROM ${db}.${tbl}""" assertEquals(sqlRet[0][0] as int, 1) @@ -312,7 +312,7 @@ suite("test_grant_revoke_cluster_stage_to_role", "cloud_auth") { commonAuth result, "'${user1}'@'%'", "Yes", "testRole", "Select_priv" // can not use @cluster, because no cluster auth - connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user1}", 'Cloud12345', context.config.jdbcUrl) { test { sql """use @${validCluster}""" exception "USAGE denied to user" diff --git a/regression-test/suites/cloud_p0/auth/test_grant_revoke_cluster_to_user.groovy b/regression-test/suites/cloud_p0/auth/test_grant_revoke_cluster_to_user.groovy index 916da2490f1562..a61b4f96954e9c 100644 --- a/regression-test/suites/cloud_p0/auth/test_grant_revoke_cluster_to_user.groovy +++ b/regression-test/suites/cloud_p0/auth/test_grant_revoke_cluster_to_user.groovy @@ -97,14 +97,14 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") { sql """create user ${user3} identified by 'Cloud12345'""" sql """GRANT SELECT_PRIV ON *.*.* TO '${user3}'@'%'""" - result = connect(user = "${user3}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user3}", 'Cloud12345', context.config.jdbcUrl) { sql """SHOW CLUSTERS""" } // not grant any cluster to user3 assertTrue(result.isEmpty()) def db = context.dbName - connect(user = "${user3}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user3}", 'Cloud12345', context.config.jdbcUrl) { test { sql """select * from ${db}.${tbl}""" exception "the user is not granted permission to the compute group" @@ -118,7 +118,7 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") { sql "sync" // admin role user can grant cluster to use - result = connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user1}", 'Cloud12345', context.config.jdbcUrl) { sql """GRANT USAGE_PRIV ON CLUSTER '${cluster1}' TO '${user1}'""" } @@ -132,7 +132,7 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") { commonAuth result, "'${user1}'@'%'" as String, "Yes", "admin", "Admin_priv" assertTrue((result.CloudClusterPrivs as String).contains("${cluster1}: Cluster_usage_priv")) - connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user1}", 'Cloud12345', context.config.jdbcUrl) { test { sql """use @${cluster1}""" exception "${cluster1} not exist" @@ -145,7 +145,7 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") { sql """GRANT USAGE_PRIV ON CLUSTER '${cluster1}' TO '${user2}'""" try { - result = connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { sql """GRANT USAGE_PRIV ON CLUSTER '${cluster1}' TO '${user1}'""" } } catch (Exception e) { @@ -163,7 +163,7 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") { result = getProperty("default_cloud_cluster", "${user1}") assertEquals(result.Value as String, "${validCluster}" as String) - connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { result = sql """use @${validCluster}""" assertEquals(result[0][0], 0) result = getProperty("default_cloud_cluster", "") @@ -171,7 +171,7 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") { } // set default_cloud_cluster to '' sql """SET PROPERTY FOR '${user2}' 'default_cloud_cluster' = ''""" - connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { result = getProperty("default_cloud_cluster", "") assertEquals(result.Value as String, "" as String) } @@ -179,14 +179,14 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") { sql """SET PROPERTY FOR '${user2}' 'default_cloud_cluster' = '${validCluster}'""" result = sql """REVOKE USAGE_PRIV ON CLUSTER '${validCluster}' FROM '${user2}'""" assertEquals(result[0][0], 0) - connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { test { sql """use @${cluster1}""" exception "USAGE denied to user" } } - connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { test { sql """use @${validCluster}""" exception "USAGE denied to user" @@ -195,20 +195,20 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") { sql """GRANT USAGE_PRIV ON CLUSTER '${cluster1}' TO '${user2}'""" sql """GRANT USAGE_PRIV ON CLUSTER '${validCluster}' TO '${user2}'""" - show_cluster_2 = connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + show_cluster_2 = connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { getCluster(validCluster) } assertTrue(show_cluster_2[2].equals(user2), "Expect just only have user ${user2}") - result = connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { sql """USE @${validCluster}""" } assertEquals(result[0][0], 0) sql """REVOKE USAGE_PRIV ON CLUSTER '${validCluster}' FROM '${user2}'""" - connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { test { sql """use @${validCluster}""" exception "USAGE denied to user" @@ -231,7 +231,7 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") { sql "sync" // 3. revoke cluster // admin role user can revoke cluster - result = connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user1}", 'Cloud12345', context.config.jdbcUrl) { sql """REVOKE USAGE_PRIV ON CLUSTER '${cluster1}' FROM '${user1}'""" } @@ -242,7 +242,7 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") { // general user can't revoke cluster try { - result = connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { sql """REVOKE USAGE_PRIV ON CLUSTER '${cluster1}' FROM '${user2}'""" } } catch (Exception e) { @@ -267,7 +267,7 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") { // user1 no admin auth, so failed to set other default cloud cluster try { - result = connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user1}", 'Cloud12345', context.config.jdbcUrl) { sql """SET PROPERTY FOR '${user2}' 'default_cloud_cluster' = '${validCluster}'""" } } catch (Exception e) { diff --git a/regression-test/suites/cloud_p0/auth/test_grant_revoke_compute_group_to_user.groovy b/regression-test/suites/cloud_p0/auth/test_grant_revoke_compute_group_to_user.groovy index 1256028ed317d3..09205433a3988e 100644 --- a/regression-test/suites/cloud_p0/auth/test_grant_revoke_compute_group_to_user.groovy +++ b/regression-test/suites/cloud_p0/auth/test_grant_revoke_compute_group_to_user.groovy @@ -104,14 +104,14 @@ suite("test_grant_revoke_compute_group_to_user", "cloud_auth") { logAndExecuteSql """create user ${user3} identified by 'Cloud12345'""" logAndExecuteSql """GRANT SELECT_PRIV ON *.*.* TO '${user3}'@'%'""" - result = connect(user = "${user3}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user3}", 'Cloud12345', context.config.jdbcUrl) { sql """SHOW COMPUTE GROUPS""" } // not grant any group to user3 assertTrue(result.isEmpty()) def db = context.dbName - connect(user = "${user3}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user3}", 'Cloud12345', context.config.jdbcUrl) { test { sql """select * from ${db}.${tbl}""" exception "the user is not granted permission to the compute group" @@ -125,7 +125,7 @@ suite("test_grant_revoke_compute_group_to_user", "cloud_auth") { logAndExecuteSql "sync" // admin role user can grant group to use - result = connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user1}", 'Cloud12345', context.config.jdbcUrl) { sql """GRANT USAGE_PRIV ON COMPUTE GROUP '${group1}' TO '${user1}'""" } @@ -139,7 +139,7 @@ suite("test_grant_revoke_compute_group_to_user", "cloud_auth") { commonAuth result, "'${user1}'@'%'" as String, "Yes", "admin", "Admin_priv" assertTrue((result.ComputeGroupPrivs as String).contains("${group1}: Cluster_usage_priv")) - connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user1}", 'Cloud12345', context.config.jdbcUrl) { test { sql """use @${group1}""" exception "${group1} not exist" @@ -152,7 +152,7 @@ suite("test_grant_revoke_compute_group_to_user", "cloud_auth") { logAndExecuteSql """GRANT USAGE_PRIV ON COMPUTE GROUP '${group1}' TO '${user2}'""" try { - result = connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { sql """GRANT USAGE_PRIV ON COMPUTE GROUP '${group1}' TO '${user1}'""" } } catch (Exception e) { @@ -170,7 +170,7 @@ suite("test_grant_revoke_compute_group_to_user", "cloud_auth") { result = getProperty("default_compute_group", "${user1}") assertEquals(result.Value as String, "${validCluster}" as String) - connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { result = sql """use @${validCluster}""" assertEquals(result[0][0], 0) result = getProperty("default_compute_group", "") @@ -178,7 +178,7 @@ suite("test_grant_revoke_compute_group_to_user", "cloud_auth") { } // set default_compute_group to '' logAndExecuteSql """SET PROPERTY FOR '${user2}' 'default_compute_group' = ''""" - connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { result = getProperty("default_compute_group", "") assertEquals(result.Value as String, "" as String) } @@ -186,14 +186,14 @@ suite("test_grant_revoke_compute_group_to_user", "cloud_auth") { logAndExecuteSql """SET PROPERTY FOR '${user2}' 'default_compute_group' = '${validCluster}'""" result = logAndExecuteSql """REVOKE USAGE_PRIV ON COMPUTE GROUP '${validCluster}' FROM '${user2}'""" assertEquals(result[0][0], 0) - connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { test { sql """use @${group1}""" exception "USAGE denied to user" } } - connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { test { sql """use @${validCluster}""" exception "USAGE denied to user" @@ -202,20 +202,20 @@ suite("test_grant_revoke_compute_group_to_user", "cloud_auth") { logAndExecuteSql """GRANT USAGE_PRIV ON COMPUTE GROUP '${group1}' TO '${user2}'""" logAndExecuteSql """GRANT USAGE_PRIV ON COMPUTE GROUP '${validCluster}' TO '${user2}'""" - show_group_2 = connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + show_group_2 = connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { getCluster(validCluster) } assertTrue(show_group_2[2].equals(user2), "Expect just only have user ${user2}") - result = connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { sql """USE @${validCluster}""" } assertEquals(result[0][0], 0) logAndExecuteSql """REVOKE USAGE_PRIV ON COMPUTE GROUP '${validCluster}' FROM '${user2}'""" - connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { test { sql """use @${validCluster}""" exception "USAGE denied to user" @@ -238,7 +238,7 @@ suite("test_grant_revoke_compute_group_to_user", "cloud_auth") { logAndExecuteSql "sync" // 3. revoke group // admin role user can revoke group - result = connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user1}", 'Cloud12345', context.config.jdbcUrl) { sql """REVOKE USAGE_PRIV ON COMPUTE GROUP '${group1}' FROM '${user1}'""" } @@ -249,7 +249,7 @@ suite("test_grant_revoke_compute_group_to_user", "cloud_auth") { // general user can't revoke group try { - result = connect(user = "${user2}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user2}", 'Cloud12345', context.config.jdbcUrl) { sql """REVOKE USAGE_PRIV ON COMPUTE GROUP '${group1}' FROM '${user2}'""" } } catch (Exception e) { @@ -274,7 +274,7 @@ suite("test_grant_revoke_compute_group_to_user", "cloud_auth") { // user1 no admin auth, so failed to set other default compute group try { - result = connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect("${user1}", 'Cloud12345', context.config.jdbcUrl) { sql """SET PROPERTY FOR '${user2}' 'default_compute_group' = '${validCluster}'""" } } catch (Exception e) { diff --git a/regression-test/suites/cloud_p0/multi_cluster/test_auto_start.groovy b/regression-test/suites/cloud_p0/multi_cluster/test_auto_start.groovy index d9b105ec92d552..ce45bcfe093972 100644 --- a/regression-test/suites/cloud_p0/multi_cluster/test_auto_start.groovy +++ b/regression-test/suites/cloud_p0/multi_cluster/test_auto_start.groovy @@ -141,7 +141,7 @@ suite('test_auto_start_in_cloud', 'multi_cluster, docker') { def begin = System.currentTimeMillis(); // root cant resume, due to deamon thread use root def connInfo = context.threadLocalConn.get() - result = connect(user = 'admin', password = '', url = connInfo.conn.getMetaData().getURL()) { + result = connect('admin', '', connInfo.conn.getMetaData().getURL()) { sql 'SELECT * FROM table1' } def cost = System.currentTimeMillis() - begin; diff --git a/regression-test/suites/compaction/test_compaction_uniq_keys_row_store.groovy b/regression-test/suites/compaction/test_compaction_uniq_keys_row_store.groovy index e00e8c3b764289..82b8f2b8d5a06b 100644 --- a/regression-test/suites/compaction/test_compaction_uniq_keys_row_store.groovy +++ b/regression-test/suites/compaction/test_compaction_uniq_keys_row_store.groovy @@ -75,7 +75,7 @@ suite("test_compaction_uniq_keys_row_store", "p0") { } // set server side prepared statment url def url="jdbc:mysql://" + sql_ip + ":" + sql_port + "/" + realDb + "?&useServerPrepStmts=true" - def result1 = connect(user=user, password=password, url=url) { + def result1 = connect(user, password, url) { def stmt = prepareStatement """ SELECT /*+ SET_VAR(enable_nereids_planner=true,enable_fallback_to_original_planner=false) */ * FROM ${tableName} t where user_id = ? and date = ? and datev2 = ? and datetimev2_1 = ? and datetimev2_2 = ? and city = ? and age = ? and sex = ?; """ setPrepareStmtArgs stmt, 1, '2017-10-01', '2017-10-01', '2017-10-01 11:11:11.21', '2017-10-01 11:11:11.11', 'Beijing', 10, 1 qe_point_select stmt @@ -95,7 +95,7 @@ suite("test_compaction_uniq_keys_row_store", "p0") { qe_point_select stmt } - def result2 = connect(user=user, password=password, url=url) { + def result2 = connect(user, password, url) { def stmt = prepareStatement """ SELECT datetimev2_1,datetime_val1,datetime_val2,max_dwell_time FROM ${tableName} t where user_id = ? and date = ? and datev2 = ? and datetimev2_1 = ? and datetimev2_2 = ? and city = ? and age = ? and sex = ?; """ setPrepareStmtArgs stmt, 1, '2017-10-01', '2017-10-01', '2017-10-01 11:11:11.21', '2017-10-01 11:11:11.11', 'Beijing', 10, 1 qe_point_select stmt diff --git a/regression-test/suites/compaction/test_compaction_uniq_keys_row_store_ck.groovy b/regression-test/suites/compaction/test_compaction_uniq_keys_row_store_ck.groovy index b37c58e2be0a1c..5145e810c1b020 100644 --- a/regression-test/suites/compaction/test_compaction_uniq_keys_row_store_ck.groovy +++ b/regression-test/suites/compaction/test_compaction_uniq_keys_row_store_ck.groovy @@ -75,7 +75,7 @@ suite("test_compaction_uniq_keys_row_store_ck", "p0") { } // set server side prepared statment url def url="jdbc:mysql://" + sql_ip + ":" + sql_port + "/" + realDb + "?&useServerPrepStmts=true" - def result1 = connect(user=user, password=password, url=url) { + def result1 = connect(user, password, url) { def stmt = prepareStatement """ SELECT /*+ SET_VAR(enable_nereids_planner=true,enable_fallback_to_original_planner=false) */ * FROM ${tableName} t where user_id = ? and date = ? and datev2 = ? and datetimev2_1 = ? and datetimev2_2 = ? and city = ? and age = ? and sex = ?; """ setPrepareStmtArgs stmt, 1, '2017-10-01', '2017-10-01', '2017-10-01 11:11:11.21', '2017-10-01 11:11:11.11', 'Beijing', 10, 1 qe_point_select stmt @@ -95,7 +95,7 @@ suite("test_compaction_uniq_keys_row_store_ck", "p0") { qe_point_select stmt } - def result2 = connect(user=user, password=password, url=url) { + def result2 = connect(user, password, url) { def stmt = prepareStatement """ SELECT datetimev2_1,datetime_val1,datetime_val2,max_dwell_time FROM ${tableName} t where user_id = ? and date = ? and datev2 = ? and datetimev2_1 = ? and datetimev2_2 = ? and city = ? and age = ? and sex = ?; """ setPrepareStmtArgs stmt, 1, '2017-10-01', '2017-10-01', '2017-10-01 11:11:11.21', '2017-10-01 11:11:11.11', 'Beijing', 10, 1 qe_point_select stmt diff --git a/regression-test/suites/delete_p0/test_delete_on_mor.groovy b/regression-test/suites/delete_p0/test_delete_on_mor.groovy index b39642058d8cf8..79658bf9524724 100644 --- a/regression-test/suites/delete_p0/test_delete_on_mor.groovy +++ b/regression-test/suites/delete_p0/test_delete_on_mor.groovy @@ -19,7 +19,7 @@ suite("test_delete_on_mor") { String db = context.config.getDbNameByFile(context.file) sql "select 1;" // to create database - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect(context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableA = "test_delete_on_mor1" diff --git a/regression-test/suites/demo_p0/connect_action.groovy b/regression-test/suites/demo_p0/connect_action.groovy index 437b8fe6651bb8..f269ae35225129 100644 --- a/regression-test/suites/demo_p0/connect_action.groovy +++ b/regression-test/suites/demo_p0/connect_action.groovy @@ -17,7 +17,7 @@ suite("connect_action") { logger.info("ok") - def result1 = connect(user = 'admin', password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + def result1 = connect('admin', context.config.jdbcPassword, context.config.jdbcUrl) { // execute sql with admin user sql 'select 99 + 1' } diff --git a/regression-test/suites/external_table_p0/hive/test_external_catalog_hive.groovy b/regression-test/suites/external_table_p0/hive/test_external_catalog_hive.groovy index b71c72957e9c02..16c8c1f6707d04 100644 --- a/regression-test/suites/external_table_p0/hive/test_external_catalog_hive.groovy +++ b/regression-test/suites/external_table_p0/hive/test_external_catalog_hive.groovy @@ -154,7 +154,7 @@ suite("test_external_catalog_hive", "p0,external,hive,external_docker,external_d try_sql("DROP USER ${user}") sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'""" sql """GRANT SELECT_PRIV on *.*.* to '${user}'""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """switch hms;""" test { sql "show tables" diff --git a/regression-test/suites/external_table_p0/hive/test_external_sql_block_rule.groovy b/regression-test/suites/external_table_p0/hive/test_external_sql_block_rule.groovy index 37e7993b1cf2ea..f9a94f92b8d4a1 100644 --- a/regression-test/suites/external_table_p0/hive/test_external_sql_block_rule.groovy +++ b/regression-test/suites/external_table_p0/hive/test_external_sql_block_rule.groovy @@ -61,21 +61,21 @@ suite("test_external_sql_block_rule", "external_docker,hive,external_docker_hive sql """grant all on *.*.* to external_block_user3;""" // login as external_block_user1 - def result1 = connect(user = 'external_block_user1', password = '', url = context.config.jdbcUrl) { + def result1 = connect('external_block_user1', '', context.config.jdbcUrl) { test { sql """select * from ${catalog_name}.`default`.parquet_partition_table order by l_linenumber limit 10;""" exception """sql hits sql block rule: external_hive_partition, reach partition_num : 3""" } } // login as external_block_user2 - def result2 = connect(user = 'external_block_user2', password = '', url = context.config.jdbcUrl) { + def result2 = connect('external_block_user2', '', context.config.jdbcUrl) { test { sql """select * from ${catalog_name}.`default`.parquet_partition_table order by l_linenumber limit 10;""" exception """sql hits sql block rule: external_hive_partition2, reach tablet_num : 3""" } } // login as external_block_user3 - def result3 = connect(user = 'external_block_user3', password = '', url = context.config.jdbcUrl) { + def result3 = connect('external_block_user3', '', context.config.jdbcUrl) { test { sql """select * from ${catalog_name}.`default`.parquet_partition_table order by l_linenumber limit 10;""" exception """sql hits sql block rule: external_hive_partition3, reach cardinality : 3""" diff --git a/regression-test/suites/external_table_p0/hive/test_hive_other.groovy b/regression-test/suites/external_table_p0/hive/test_hive_other.groovy index 936790c6dc23d9..198c746d42e3f0 100644 --- a/regression-test/suites/external_table_p0/hive/test_hive_other.groovy +++ b/regression-test/suites/external_table_p0/hive/test_hive_other.groovy @@ -74,7 +74,7 @@ suite("test_hive_other", "p0,external,hive,external_docker,external_docker_hive" sql """create user ext_catalog_user identified by '12345'""" sql """grant all on internal.${context.config.defaultDb}.* to ext_catalog_user""" sql """grant all on ${catalog_name}.*.* to ext_catalog_user""" - connect(user = 'ext_catalog_user', password = '12345', url = context.config.jdbcUrl) { + connect('ext_catalog_user', '12345', context.config.jdbcUrl) { def database_lists = sql """show databases from ${catalog_name}""" boolean ok = false; for (int i = 0; i < database_lists.size(); ++i) { diff --git a/regression-test/suites/external_table_p0/iceberg/iceberg_drop_rest_table.groovy b/regression-test/suites/external_table_p0/iceberg/iceberg_drop_rest_table.groovy index 35293a22177e2c..8bb779d759c317 100644 --- a/regression-test/suites/external_table_p0/iceberg/iceberg_drop_rest_table.groovy +++ b/regression-test/suites/external_table_p0/iceberg/iceberg_drop_rest_table.groovy @@ -65,7 +65,7 @@ suite("iceberg_drop_rest_table", "p0,external,doris,external_docker,external_doc sql """ grant all on internal.*.* to user1 """ sql """ grant SELECT_PRIV on ${catalog_name}.${db}.${tb} to user1 """ - def result1 = connect(user = 'user1', password = '12345', url = context.config.jdbcUrl) { + def result1 = connect('user1', '12345', context.config.jdbcUrl) { sql """ use ${catalog_name}.${db} """ qt_q1 """ select * from ${tb} """ test { diff --git a/regression-test/suites/external_table_p0/jdbc/test_jdbc_call.groovy b/regression-test/suites/external_table_p0/jdbc/test_jdbc_call.groovy index bb9e39562cf657..e9e00b7084fba0 100644 --- a/regression-test/suites/external_table_p0/jdbc/test_jdbc_call.groovy +++ b/regression-test/suites/external_table_p0/jdbc/test_jdbc_call.groovy @@ -122,7 +122,7 @@ suite("test_jdbc_call", "p0,external,doris,external_docker,external_docker_doris sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user2}"""; } - def result1 = connect(user="${user1}", password="", url=context.config.jdbcUrl) { + def result1 = connect("${user1}", "", context.config.jdbcUrl) { sql """set enable_nereids_planner=true;""" sql """set enable_fallback_to_original_planner=false;""" test { @@ -131,7 +131,7 @@ suite("test_jdbc_call", "p0,external,doris,external_docker,external_docker_doris } } - def result2 = connect(user="${user2}", password="", url=context.config.jdbcUrl) { + def result2 = connect("${user2}", "", context.config.jdbcUrl) { sql """set enable_nereids_planner=true;""" sql """set enable_fallback_to_original_planner=false;""" sql """call execute_stmt("${catalog_name}", "insert into ${internal_db_name}.${internal_tbl_name} values (9, 10)")""" diff --git a/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy b/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy index 3db6c227555f31..5845cf79479c98 100644 --- a/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy +++ b/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy @@ -192,7 +192,7 @@ suite("test_mysql_jdbc_catalog", "p0,external,mysql,external_docker,external_doc // test insert String uuid1 = UUID.randomUUID().toString(); - connect(user=user, password="${pwd}", url=url) { + connect(user, "${pwd}", url) { try { sql """ insert into ${catalog_name}.${ex_db_name}.${test_insert} values ('${uuid1}', 'doris1', 18) """ fail() @@ -203,7 +203,7 @@ suite("test_mysql_jdbc_catalog", "p0,external,mysql,external_docker,external_doc sql """GRANT LOAD_PRIV ON ${catalog_name}.${ex_db_name}.${test_insert} TO ${user}""" - connect(user=user, password="${pwd}", url=url) { + connect(user, "${pwd}", url) { try { sql """ insert into ${catalog_name}.${ex_db_name}.${test_insert} values ('${uuid1}', 'doris1', 18) """ } catch (Exception e) { diff --git a/regression-test/suites/external_table_p0/trino_connector/hive/test_trino_hive_other.groovy b/regression-test/suites/external_table_p0/trino_connector/hive/test_trino_hive_other.groovy index 6d410b2cb9ad27..a54866931eff7e 100644 --- a/regression-test/suites/external_table_p0/trino_connector/hive/test_trino_hive_other.groovy +++ b/regression-test/suites/external_table_p0/trino_connector/hive/test_trino_hive_other.groovy @@ -80,7 +80,7 @@ suite("test_trino_hive_other", "external,hive,external_docker,external_docker_hi sql """create user ext_catalog_user identified by '12345'""" sql """grant all on internal.${context.config.defaultDb}.* to ext_catalog_user""" sql """grant all on ${catalog_name}.*.* to ext_catalog_user""" - connect(user = 'ext_catalog_user', password = '12345', url = context.config.jdbcUrl) { + connect('ext_catalog_user', '12345', context.config.jdbcUrl) { def database_lists = sql """show databases from ${catalog_name}""" boolean ok = false; for (int i = 0; i < database_lists.size(); ++j) { diff --git a/regression-test/suites/external_table_p0/tvf/test_catalogs_tvf.groovy b/regression-test/suites/external_table_p0/tvf/test_catalogs_tvf.groovy index 748a7e49d14c77..2d68c2078172ba 100644 --- a/regression-test/suites/external_table_p0/tvf/test_catalogs_tvf.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_catalogs_tvf.groovy @@ -108,7 +108,7 @@ suite("test_catalogs_tvf","p0,external,tvf,external_docker") { - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ switch internal """ order_qt_test_15 """ select CatalogName,CatalogType,Property,Value from catalogs() where CatalogName = "catalog_tvf_test_dlf" and Property= "type" """ order_qt_test_16 """ select CatalogName,CatalogType,Property,Value from catalogs() """ @@ -117,7 +117,7 @@ suite("test_catalogs_tvf","p0,external,tvf,external_docker") { sql """GRANT SELECT_PRIV on `catalog_tvf_test_dlf`.``.`` to '${user}'""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ switch internal """ order_qt_test_17 """ select CatalogName,CatalogType,Property,Value from catalogs() where CatalogName = "catalog_tvf_test_dlf" and Property= "dlf.secret_key" """ @@ -129,7 +129,7 @@ suite("test_catalogs_tvf","p0,external,tvf,external_docker") { sql """REVOKE SELECT_PRIV on `catalog_tvf_test_dlf`.``.`` FROM '${user}'""" - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ switch internal """ order_qt_test_21 """ select CatalogName,CatalogType,Property,Value from catalogs() where CatalogName = "catalog_tvf_test_dlf" and Property= "dlf.secret_key" """ diff --git a/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy b/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy index c10fc1a12228c5..c23878b4d1b64f 100644 --- a/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy @@ -96,7 +96,7 @@ suite("test_insert_from_tvf_with_common_user", "p0") { sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${common_user}"""; } - connect(user = "${common_user}", password = '12345', url = context.config.jdbcUrl) { + connect("${common_user}", '12345', context.config.jdbcUrl) { sql """ use regression_test_external_table_p0_tvf """ sql """ INSERT INTO ${load_table_name} diff --git a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy index 23116cca9330bd..bbee5fccc4ca07 100644 --- a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy @@ -206,7 +206,7 @@ suite("test_s3_tvf_with_resource", "p0") { sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}"""; } // not have usage priv, can not select tvf with resource - connect(user=user, password="${pwd}", url=url) { + connect(user, "${pwd}", url) { test { sql """ SELECT * FROM S3 ( @@ -221,7 +221,7 @@ suite("test_s3_tvf_with_resource", "p0") { } // only have select_priv of view,can select view with resource - connect(user=user, password="${pwd}", url=url) { + connect(user, "${pwd}", url) { sql """SELECT * FROM ${viewName};""" } diff --git a/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.groovy b/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.groovy index 99eb18a4917066..0247e2ce4d614a 100644 --- a/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.groovy +++ b/regression-test/suites/fault_injection_p0/cloud/test_cloud_mow_insert_with_retry.groovy @@ -42,7 +42,7 @@ suite("test_cloud_mow_insert_with_retry", "nonConcurrent") { "enable_unique_key_merge_on_write" = "true", "disable_auto_compaction" = "true", "replication_num" = "1"); """ - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl + "&useLocalSessionState=true") { + connect(context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl + "&useLocalSessionState=true") { def timeout = 2000 def now = System.currentTimeMillis() sql "insert into ${table1} values(1,1,1);" diff --git a/regression-test/suites/insert_p0/insert_group_commit_into.groovy b/regression-test/suites/insert_p0/insert_group_commit_into.groovy index 67907b5a69b923..ae6262c3597294 100644 --- a/regression-test/suites/insert_p0/insert_group_commit_into.groovy +++ b/regression-test/suites/insert_p0/insert_group_commit_into.groovy @@ -120,7 +120,7 @@ suite("insert_group_commit_into") { ); """ - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl + "&useLocalSessionState=true") { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl + "&useLocalSessionState=true") { sql """ set group_commit = async_mode; """ // 1. insert into @@ -258,7 +258,7 @@ suite("insert_group_commit_into") { if (observer_fe != null) { def url = "jdbc:mysql://${observer_fe.Host}:${observer_fe.QueryPort}/" logger.info("observer url: " + url) - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = url) { + connect( context.config.jdbcUser, context.config.jdbcPassword, url) { sql """ set group_commit = async_mode; """ // 1. insert into @@ -320,7 +320,7 @@ suite("insert_group_commit_into") { PROPERTIES ("replication_allocation" = "tag.location.default: 1", "group_commit_interval_ms" = "200") """ - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = async_mode; """ // 1. insert into @@ -390,7 +390,7 @@ suite("insert_group_commit_into") { select ordernum,max(dnt) as dnt from ${table} group by ordernum ORDER BY ordernum;""") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = async_mode; """ // 1. insert into @@ -487,7 +487,7 @@ suite("insert_group_commit_into") { ); """ - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = async_mode; """ group_commit_insert """ insert into ${table} values(1, 'test'); """, 1 group_commit_insert """ insert into ${table}(k1,`or`) values (2,"or"); """, 1 diff --git a/regression-test/suites/insert_p0/insert_group_commit_into_max_filter_ratio.groovy b/regression-test/suites/insert_p0/insert_group_commit_into_max_filter_ratio.groovy index fb936fdc54faff..a2dad1b686c39e 100644 --- a/regression-test/suites/insert_p0/insert_group_commit_into_max_filter_ratio.groovy +++ b/regression-test/suites/insert_p0/insert_group_commit_into_max_filter_ratio.groovy @@ -169,7 +169,7 @@ suite("insert_group_commit_into_max_filter_ratio") { // 100 rows(success, fail), 10000 rows(success, fail), 15000 rows(success, fail) // async mode, sync mode, off mode sql """ truncate table ${tableName} """ - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect(context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = sync_mode; """ group_commit_insert """ insert into ${dbTableName} values (1, 'a', 10); """, 1 diff --git a/regression-test/suites/insert_p0/insert_group_commit_into_unique.groovy b/regression-test/suites/insert_p0/insert_group_commit_into_unique.groovy index 74f2f345780200..f4ab4e41065bcf 100644 --- a/regression-test/suites/insert_p0/insert_group_commit_into_unique.groovy +++ b/regression-test/suites/insert_p0/insert_group_commit_into_unique.groovy @@ -91,7 +91,7 @@ suite("insert_group_commit_into_unique") { """ // 1. insert into - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect(context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = async_mode; """ group_commit_insert """ insert into ${dbTableName} values (1, 'a', 10),(5, 'q', 50); """, 2 group_commit_insert """ insert into ${dbTableName}(id) values(6); """, 1 @@ -170,7 +170,7 @@ suite("insert_group_commit_into_unique") { """ // 1. insert into - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect(context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = async_mode; """ group_commit_insert """ insert into ${dbTableName} values (1, 'a', 10),(5, 'q', 50); """, 2 @@ -251,7 +251,7 @@ suite("insert_group_commit_into_unique") { """ // 1. insert into - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect(context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = async_mode; """ group_commit_insert """ insert into ${dbTableName}(id, name, score, __DORIS_SEQUENCE_COL__) values (1, 'a', 10, 100),(5, 'q', 50, 500); """, 2 diff --git a/regression-test/suites/insert_p0/insert_group_commit_into_unique_sync_mode.groovy b/regression-test/suites/insert_p0/insert_group_commit_into_unique_sync_mode.groovy index 50586c829345ae..0af8611922a68e 100644 --- a/regression-test/suites/insert_p0/insert_group_commit_into_unique_sync_mode.groovy +++ b/regression-test/suites/insert_p0/insert_group_commit_into_unique_sync_mode.groovy @@ -128,7 +128,7 @@ suite("insert_group_commit_into_unique_sync_mode") { """ // 1. insert into - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect(context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = sync_mode; """ group_commit_insert """ insert into ${dbTableName} values (1, 'a', 10),(5, 'q', 50); """, 2 @@ -209,7 +209,7 @@ suite("insert_group_commit_into_unique_sync_mode") { """ // 1. insert into - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect(context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = sync_mode; """ group_commit_insert """ insert into ${dbTableName} values (1, 'a', 10),(5, 'q', 50); """, 2 @@ -293,7 +293,7 @@ suite("insert_group_commit_into_unique_sync_mode") { """ // 1. insert into - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect(context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = sync_mode; """ group_commit_insert """ insert into ${dbTableName}(id, name, score, __DORIS_SEQUENCE_COL__) values (1, 'a', 10, 100),(5, 'q', 50, 500); """, 2 diff --git a/regression-test/suites/insert_p0/insert_group_commit_with_large_data.groovy b/regression-test/suites/insert_p0/insert_group_commit_with_large_data.groovy index 989446fd097656..8fa975f56ed0c2 100644 --- a/regression-test/suites/insert_p0/insert_group_commit_with_large_data.groovy +++ b/regression-test/suites/insert_p0/insert_group_commit_with_large_data.groovy @@ -66,7 +66,7 @@ suite("insert_group_commit_with_large_data") { ); """ - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = async_mode; """ sql """ use ${db}; """ diff --git a/regression-test/suites/insert_p0/prepare_insert.groovy b/regression-test/suites/insert_p0/prepare_insert.groovy index ee4b5c3d654bd8..5d9457b9d9e515 100644 --- a/regression-test/suites/insert_p0/prepare_insert.groovy +++ b/regression-test/suites/insert_p0/prepare_insert.groovy @@ -101,7 +101,7 @@ suite("prepare_insert") { } } - def result1 = connect(user = user, password = password, url = url) { + def result1 = connect(user, password, url) { def stmt = prepareStatement "insert into ${tableName} values(?, ?, ?)" check {assertEquals(com.mysql.cj.jdbc.ServerPreparedStatement, stmt.class)} stmt.setInt(1, 1) @@ -142,7 +142,7 @@ suite("prepare_insert") { } // insert with null - result1 = connect(user = user, password = password, url = url) { + result1 = connect(user, password, url) { def stmt = prepareStatement "insert into ${tableName} values(?, ?, ?)" check {assertEquals(com.mysql.cj.jdbc.ServerPreparedStatement, stmt.class)} stmt.setNull(1, java.sql.Types.INTEGER) @@ -157,7 +157,7 @@ suite("prepare_insert") { // insert with label def label = "insert_" + System.currentTimeMillis() - result1 = connect(user = user, password = password, url = url) { + result1 = connect(user, password, url) { def stmt = prepareStatement "insert into ${tableName} with label ${label} values(?, ?, ?)" assertEquals(com.mysql.cj.jdbc.ClientPreparedStatement, stmt.class) stmt.setInt(1, 5) @@ -171,7 +171,7 @@ suite("prepare_insert") { } url += "&rewriteBatchedStatements=true" - result1 = connect(user = user, password = password, url = url) { + result1 = connect(user, password, url) { def stmt = prepareStatement "insert into ${tableName} values(?, ?, ?)" check {assertEquals(com.mysql.cj.jdbc.ServerPreparedStatement, stmt.class)} stmt.setInt(1, 10) @@ -211,7 +211,7 @@ suite("prepare_insert") { } url += "&cachePrepStmts=true" - result1 = connect(user = user, password = password, url = url) { + result1 = connect(user, password, url) { def stmt = prepareStatement "insert into ${tableName} values(?, ?, ?)" check {assertEquals(com.mysql.cj.jdbc.ServerPreparedStatement, stmt.class)} stmt.setInt(1, 10) diff --git a/regression-test/suites/insert_p0/test_group_commit_data_bytes_property.groovy b/regression-test/suites/insert_p0/test_group_commit_data_bytes_property.groovy index 2fc08b68fb1edc..461c60cd089198 100644 --- a/regression-test/suites/insert_p0/test_group_commit_data_bytes_property.groovy +++ b/regression-test/suites/insert_p0/test_group_commit_data_bytes_property.groovy @@ -59,7 +59,7 @@ suite("test_group_commit_data_bytes_property") { ); """ - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = async_mode; """ diff --git a/regression-test/suites/insert_p0/test_group_commit_interval_ms_property.groovy b/regression-test/suites/insert_p0/test_group_commit_interval_ms_property.groovy index 688c8575366374..e05acca703aeb7 100644 --- a/regression-test/suites/insert_p0/test_group_commit_interval_ms_property.groovy +++ b/regression-test/suites/insert_p0/test_group_commit_interval_ms_property.groovy @@ -56,7 +56,7 @@ suite("test_group_commit_interval_ms_property") { ); """ - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql """ set group_commit = async_mode; """ diff --git a/regression-test/suites/insert_p0/test_jdbc.groovy b/regression-test/suites/insert_p0/test_jdbc.groovy index acd275983aaeae..9beadaff1c4393 100644 --- a/regression-test/suites/insert_p0/test_jdbc.groovy +++ b/regression-test/suites/insert_p0/test_jdbc.groovy @@ -62,7 +62,7 @@ suite("test_jdbc") { ] def insert = { jdbc_url -> - connect(user = user, password = password, url = jdbc_url) { + connect(user, password, jdbc_url) { logger.info("insert url: {}", jdbc_url) def ps = prepareStatement "insert into ${tableName} values(?, ?)" for (int i = 0; i < batchSize; i++) { @@ -79,7 +79,7 @@ suite("test_jdbc") { } def update = { jdbc_url -> - connect(user = user, password = password, url = jdbc_url) { + connect(user, password, jdbc_url) { logger.info("update url: {}", jdbc_url) def ps = prepareStatement "update ${tableName} set phone = ? where id = ?"; for (int i = 0; i < batchSize; i++) { diff --git a/regression-test/suites/insert_p0/transaction/txn_insert.groovy b/regression-test/suites/insert_p0/transaction/txn_insert.groovy index b54fc66e714fbd..424a03ee173f5a 100644 --- a/regression-test/suites/insert_p0/transaction/txn_insert.groovy +++ b/regression-test/suites/insert_p0/transaction/txn_insert.groovy @@ -291,7 +291,7 @@ suite("txn_insert") { def observer_fe_url = get_observer_fe_url() if (observer_fe_url != null) { logger.info("observer url: $observer_fe_url") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = observer_fe_url) { + connect( context.config.jdbcUser, context.config.jdbcPassword, observer_fe_url) { result = sql """ select count() from regression_test_insert_p0_transaction.${table}_0 """ logger.info("select from observer result: $result") assertEquals(79, result[0][0]) diff --git a/regression-test/suites/insert_p0/transaction/txn_insert_restart_fe.groovy b/regression-test/suites/insert_p0/transaction/txn_insert_restart_fe.groovy index 9a743bfc9859ba..def0df33bdf455 100644 --- a/regression-test/suites/insert_p0/transaction/txn_insert_restart_fe.groovy +++ b/regression-test/suites/insert_p0/transaction/txn_insert_restart_fe.groovy @@ -85,7 +85,7 @@ suite("txn_insert_restart_fe", 'docker') { def observer_fe_url = get_observer_fe_url() if (observer_fe_url != null) { logger.info("observer url: $observer_fe_url") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = observer_fe_url) { + connect( context.config.jdbcUser, context.config.jdbcPassword, observer_fe_url) { order_qt_select_observer """ select * from ${dbName}.tbl_2 """ } } @@ -110,7 +110,7 @@ suite("txn_insert_restart_fe", 'docker') { if (observer_fe_url != null) { logger.info("observer url: $observer_fe_url") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = observer_fe_url) { + connect( context.config.jdbcUser, context.config.jdbcPassword, observer_fe_url) { order_qt_select_observer_2 """ select * from ${dbName}.tbl_2 """ } } diff --git a/regression-test/suites/internal_schema_p0/operate_internal_schema.groovy b/regression-test/suites/internal_schema_p0/operate_internal_schema.groovy index 1f89fa921b87d9..2ad3be51d260bb 100644 --- a/regression-test/suites/internal_schema_p0/operate_internal_schema.groovy +++ b/regression-test/suites/internal_schema_p0/operate_internal_schema.groovy @@ -58,7 +58,7 @@ suite("operate_internal_schema") { sql """GRANT ADMIN_PRIV ON *.*.* TO ${user}""" def tokens = context.config.jdbcUrl.split('/') def url=tokens[0] + "//" + tokens[2] + "/" + "__internal_schema" + "?" - connect(user=user, password="${pwd}", url=url) { + connect(user, "${pwd}", url) { sql "use __internal_schema;" if (!isCloudMode()) { try { diff --git a/regression-test/suites/javaudf_p0/test_javaudf_auth.groovy b/regression-test/suites/javaudf_p0/test_javaudf_auth.groovy index f961b2ec6e570e..0729f14bb333f1 100644 --- a/regression-test/suites/javaudf_p0/test_javaudf_auth.groovy +++ b/regression-test/suites/javaudf_p0/test_javaudf_auth.groovy @@ -58,7 +58,7 @@ suite("test_javaudf_auth") { "symbol"="org.apache.doris.udf.IntTest", "type"="JAVA_UDF" ); """ - connect(user=user, password="${pwd}", url=url) { + connect(user, "${pwd}", url) { try { sql "select ${dbName}.java_udf_auth_test(1)" fail() @@ -68,7 +68,7 @@ suite("test_javaudf_auth") { } sql """GRANT SELECT_PRIV ON ${dbName}.* TO ${user}""" - connect(user=user, password="${pwd}", url=url) { + connect(user, "${pwd}", url) { try { sql "select ${dbName}.java_udf_auth_test(1)" } catch (Exception e) { diff --git a/regression-test/suites/load_p0/routine_load/test_routine_load_with_user.groovy b/regression-test/suites/load_p0/routine_load/test_routine_load_with_user.groovy index 4f9522c73bccc6..7b01dbacc6fa2d 100644 --- a/regression-test/suites/load_p0/routine_load/test_routine_load_with_user.groovy +++ b/regression-test/suites/load_p0/routine_load/test_routine_load_with_user.groovy @@ -68,7 +68,7 @@ suite("test_routine_load_with_user","p0") { sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}"""; } - connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + connect(user, "${pwd}", context.config.jdbcUrl) { sql """ DROP TABLE IF EXISTS ${tableName}""" sql """ CREATE TABLE IF NOT EXISTS ${tableName} ( diff --git a/regression-test/suites/manager/test_manager_interface_3.groovy b/regression-test/suites/manager/test_manager_interface_3.groovy index 587fa48f9ebb01..22af98d5648ca7 100644 --- a/regression-test/suites/manager/test_manager_interface_3.groovy +++ b/regression-test/suites/manager/test_manager_interface_3.groovy @@ -93,7 +93,7 @@ suite('test_manager_interface_3',"p0") { sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user2}"""; } - connect(user=user1, password="${pwd}", url=url) { + connect(user1, "${pwd}", url) { test { sql """ select 1""" result( @@ -131,7 +131,7 @@ suite('test_manager_interface_3',"p0") { sql """grant DROP_PRIV on ${dbName} TO ROLE '${role1}' """ sql """grant CREATE_PRIV on ${dbName} TO '${user1}' """ - connect(user=user1, password="${pwd}", url=url) { + connect(user1, "${pwd}", url) { sql """ create table test_manager_tb_2 ( k1 TINYINT, @@ -145,7 +145,7 @@ suite('test_manager_interface_3',"p0") { sql """grant LOAD_PRIV on ${dbName} TO '${user2}' """ sql """ grant "${role1}" to '${user2}' """ - connect(user=user2, password="${pwd}", url=url) { + connect(user2, "${pwd}", url) { test { sql """ create table test_manager_tb_2 ( @@ -214,7 +214,7 @@ suite('test_manager_interface_3',"p0") { assertTrue(x == 4) sql """ revoke CREATE_PRIV on ${dbName} from '${user1}' """ - connect(user=user1, password="${pwd}", url=url) { + connect(user1, "${pwd}", url) { test { sql """ create table test_manager_tb_2 ( k1 TINYINT, @@ -228,7 +228,7 @@ suite('test_manager_interface_3',"p0") { } sql """ revoke LOAD_PRIV on ${dbName} from '${user2}' """ - connect(user=user2, password="${pwd}", url=url) { + connect(user2, "${pwd}", url) { test{ sql """ insert into test_manager_tb values(1,"2"); """ exception """LOAD command denied to user""" @@ -317,14 +317,14 @@ suite('test_manager_interface_3',"p0") { PROPERTIES ('replication_num' = '1');""" - connect(user=user1, password="${pwd}", url=url) { + connect(user1, "${pwd}", url) { test { sql """ Drop table ${dbName}.test_manager_tb_2""" exception "Access denied; you need (at least one of) the (DROP) privilege(s) for this operation" } } - connect(user=user2, password="${pwd}", url=url) { + connect(user2, "${pwd}", url) { test{ sql """ Drop table ${dbName}.test_manager_tb_2""" exception "Access denied; you need (at least one of) the (DROP) privilege(s) for this operation" @@ -333,13 +333,13 @@ suite('test_manager_interface_3',"p0") { sql """set password for '${user2}' = password('${new_pwd}')""" try { - connect(user =user2, password = '${pwd}', url = url) {} + connect(user2, '${pwd}', url) {} assertTrue(false. "should not be able to login") } catch (Exception e) { assertTrue(e.getMessage().contains("Access denied for user"), e.getMessage()) } - connect(user=user2, password="${new_pwd}", url=url) { + connect(user2, "${new_pwd}", url) { result = sql """ select k1 from ${dbName}.${tbName} order by k1 desc limit 1""" assertTrue(result[0][0] == 3) @@ -359,7 +359,7 @@ suite('test_manager_interface_3',"p0") { sql """ revoke "${role1}" from "${user2}" """ try { - connect(user =user2, password = '${pwd}', url = url) {} + connect(user2, '${pwd}', url) {} assertTrue(false. "should not be able to login") } catch (Exception e) { assertTrue(e.getMessage().contains("Access denied for user"), e.getMessage()) @@ -426,7 +426,7 @@ suite('test_manager_interface_3',"p0") { } assertTrue(x == 20) - connect(user=user, password="${pwd}", url=url) { + connect(user, "${pwd}", url) { result = sql """ show resources """ x = 0 for(int i = 0;i> result = sql """ show property like "max_query_instances" """ assertTrue(result[0][0]=="max_query_instances") assertTrue(result[0][1]=="-1") diff --git a/regression-test/suites/nereids_p0/authorization/column_authorization.groovy b/regression-test/suites/nereids_p0/authorization/column_authorization.groovy index 493aa03243681e..c2e22f10c22678 100644 --- a/regression-test/suites/nereids_p0/authorization/column_authorization.groovy +++ b/regression-test/suites/nereids_p0/authorization/column_authorization.groovy @@ -56,7 +56,7 @@ suite("column_authorization") { def defaultDbUrl = context.config.jdbcUrl.substring(0, context.config.jdbcUrl.lastIndexOf("/")) logger.info("connect to ${defaultDbUrl}".toString()) - connect(user = user1, password = null, url = defaultDbUrl) { + connect(user1, null, defaultDbUrl) { sql "set enable_fallback_to_original_planner=false" // no privilege to name diff --git a/regression-test/suites/nereids_p0/authorization/view_authorization.groovy b/regression-test/suites/nereids_p0/authorization/view_authorization.groovy index cd11f8ed0e15d2..51503c3cd2d737 100644 --- a/regression-test/suites/nereids_p0/authorization/view_authorization.groovy +++ b/regression-test/suites/nereids_p0/authorization/view_authorization.groovy @@ -59,7 +59,7 @@ suite("view_authorization") { def defaultDbUrl = context.config.jdbcUrl.substring(0, context.config.jdbcUrl.lastIndexOf("/")) logger.info("connect to ${defaultDbUrl}".toString()) - connect(user = user1, password = null, url = defaultDbUrl) { + connect(user1, null, defaultDbUrl) { sql "set enable_fallback_to_original_planner=false" // no privilege to base table diff --git a/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy b/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy index 3635936e8be083..8c9e77bba7876e 100644 --- a/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy +++ b/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy @@ -309,7 +309,7 @@ suite("parse_sql_from_sql_cache") { extraThread("test_cache_user1_thread", { - connect(user = "test_cache_user1", password="DORIS@2024") { + connect("test_cache_user1", "DORIS@2024") { sql "use ${dbName}" sql "set enable_nereids_planner=true" sql "set enable_fallback_to_original_planner=false" @@ -345,7 +345,7 @@ suite("parse_sql_from_sql_cache") { sql "sync" extraThread("test_cache_user2_thread", { - connect(user = "test_cache_user2", password="DORIS@2024") { + connect("test_cache_user2", "DORIS@2024") { sql "use ${dbName}" sql "set enable_nereids_planner=true" sql "set enable_fallback_to_original_planner=false" @@ -367,7 +367,7 @@ suite("parse_sql_from_sql_cache") { // after row policy changed, the cache is invalidate extraThread("test_cache_user2_thread2", { - connect(user = "test_cache_user2", password="DORIS@2024") { + connect("test_cache_user2", "DORIS@2024") { sql "use ${dbName}" sql "set enable_nereids_planner=true" sql "set enable_fallback_to_original_planner=false" @@ -409,7 +409,7 @@ suite("parse_sql_from_sql_cache") { sleep(10000) extraThread("test_cache_user3_thread", { - connect(user = "test_cache_user3", password="DORIS@2024") { + connect("test_cache_user3", "DORIS@2024") { sql "use ${dbName}" sql "set enable_nereids_planner=true" sql "set enable_fallback_to_original_planner=false" @@ -430,7 +430,7 @@ suite("parse_sql_from_sql_cache") { // after row policy changed, the cache is invalidate extraThread("test_cache_user3_thread2", { - connect(user = "test_cache_user3", password="DORIS@2024") { + connect("test_cache_user3", "DORIS@2024") { sql "use ${dbName}" sql "set enable_nereids_planner=true" sql "set enable_fallback_to_original_planner=false" @@ -463,7 +463,7 @@ suite("parse_sql_from_sql_cache") { sql "sync" extraThread("test_cache_user4_thread", { - connect(user = "test_cache_user4", password="DORIS@2024") { + connect("test_cache_user4", "DORIS@2024") { sql "use ${dbName}" sql "set enable_nereids_planner=true" sql "set enable_fallback_to_original_planner=false" @@ -481,7 +481,7 @@ suite("parse_sql_from_sql_cache") { // after privileges changed, the cache is invalidate extraThread("test_cache_user4_thread2", { - connect(user = "test_cache_user4", password="DORIS@2024") { + connect("test_cache_user4", "DORIS@2024") { sql "set enable_nereids_planner=true" sql "set enable_fallback_to_original_planner=false" sql "set enable_sql_cache=true" @@ -638,7 +638,7 @@ suite("parse_sql_from_sql_cache") { def dbName = context.config.getDbNameByFile(context.file) log.info("connect to fe: ${fe1}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = "jdbc:mysql://${fe1}") { + connect( context.config.jdbcUser, context.config.jdbcPassword, "jdbc:mysql://${fe1}") { sql "ADMIN SET FRONTEND CONFIG ('cache_last_version_interval_second' = '10')" sql "use ${dbName}" @@ -660,7 +660,7 @@ suite("parse_sql_from_sql_cache") { } log.info("connect to fe: ${fe2}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = "jdbc:mysql://${fe2}") { + connect( context.config.jdbcUser, context.config.jdbcPassword, "jdbc:mysql://${fe2}") { sql "ADMIN SET FRONTEND CONFIG ('cache_last_version_interval_second' = '10')" sql "use ${dbName}" diff --git a/regression-test/suites/nereids_p0/ddl/account/test_nereids_role.groovy b/regression-test/suites/nereids_p0/ddl/account/test_nereids_role.groovy index a3bee25cf5822a..71798f226d79e1 100644 --- a/regression-test/suites/nereids_p0/ddl/account/test_nereids_role.groovy +++ b/regression-test/suites/nereids_p0/ddl/account/test_nereids_role.groovy @@ -32,13 +32,13 @@ suite("test_nereids_role") { sql """GRANT SELECT_PRIV ON ${context.config.defaultDb} TO ROLE '${role}'""" sql """GRANT SELECT_PRIV ON ${dbName} TO ROLE '${role}'""" sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}' DEFAULT ROLE '${role}'""" - def result1 = connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + def result1 = connect(user, "${pwd}", context.config.jdbcUrl) { sql "show databases like '${dbName}'" } assertEquals(result1.size(), 1) sql """REVOKE SELECT_PRIV ON ${dbName} FROM ROLE '${role}'""" - def result2 = connect(user=user, password="${pwd}", url=context.config.jdbcUrl) { + def result2 = connect(user, "${pwd}", context.config.jdbcUrl) { sql "show databases like '${dbName}'" } assertEquals(result2.size(), 0) diff --git a/regression-test/suites/nereids_p0/delete/delete_cte.groovy b/regression-test/suites/nereids_p0/delete/delete_cte.groovy index 711ba1dac4f752..8d58866216b69d 100644 --- a/regression-test/suites/nereids_p0/delete/delete_cte.groovy +++ b/regression-test/suites/nereids_p0/delete/delete_cte.groovy @@ -23,7 +23,7 @@ suite('nereids_delete_cte') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def t1 = 't1_cte' diff --git a/regression-test/suites/nereids_p0/delete/delete_cte_ck.groovy b/regression-test/suites/nereids_p0/delete/delete_cte_ck.groovy index 2e9bd1f8fb3fa9..090b3fb15529dc 100644 --- a/regression-test/suites/nereids_p0/delete/delete_cte_ck.groovy +++ b/regression-test/suites/nereids_p0/delete/delete_cte_ck.groovy @@ -23,7 +23,7 @@ suite('nereids_delete_cte_ck') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def t1 = 't1_cte_ck' diff --git a/regression-test/suites/nereids_p0/delete/delete_mow_partial_update.groovy b/regression-test/suites/nereids_p0/delete/delete_mow_partial_update.groovy index ec78ec35f43719..a03a9a92fa746e 100644 --- a/regression-test/suites/nereids_p0/delete/delete_mow_partial_update.groovy +++ b/regression-test/suites/nereids_p0/delete/delete_mow_partial_update.groovy @@ -23,7 +23,7 @@ suite('nereids_delete_mow_partial_update') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql 'set enable_nereids_planner=true' diff --git a/regression-test/suites/nereids_p0/delete/delete_using.groovy b/regression-test/suites/nereids_p0/delete/delete_using.groovy index 061d748d8a3321..d38c89277214b8 100644 --- a/regression-test/suites/nereids_p0/delete/delete_using.groovy +++ b/regression-test/suites/nereids_p0/delete/delete_using.groovy @@ -23,7 +23,7 @@ suite('nereids_delete_using') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql 'drop table if exists t1' diff --git a/regression-test/suites/nereids_p0/insert_into_table/insert_auth.groovy b/regression-test/suites/nereids_p0/insert_into_table/insert_auth.groovy index 490ff5cbee473e..4c9968746d13c1 100644 --- a/regression-test/suites/nereids_p0/insert_into_table/insert_auth.groovy +++ b/regression-test/suites/nereids_p0/insert_into_table/insert_auth.groovy @@ -56,7 +56,7 @@ suite('nereids_insert_auth') { sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}"""; } - connect(user=user, password="${pwd}", url=url) { + connect(user, "${pwd}", url) { try { sql """ insert into ${db}.${t1} values (1, 1) """ fail() @@ -67,7 +67,7 @@ suite('nereids_insert_auth') { sql """GRANT LOAD_PRIV ON ${db}.${t1} TO ${user}""" - connect(user=user, password="${pwd}", url=url) { + connect(user, "${pwd}", url) { try { sql """ insert into ${db}.${t1} values (1, 1) """ } catch (Exception e) { @@ -76,7 +76,7 @@ suite('nereids_insert_auth') { } } - connect(user=user, password="${pwd}", url=url) { + connect(user, "${pwd}", url) { try { sql """ insert overwrite table ${db}.${t1} values (2, 2) """ } catch (Exception e) { diff --git a/regression-test/suites/nereids_p0/insert_into_table/partial_update.groovy b/regression-test/suites/nereids_p0/insert_into_table/partial_update.groovy index 153cbe83938de3..6a54d6a5e71702 100644 --- a/regression-test/suites/nereids_p0/insert_into_table/partial_update.groovy +++ b/regression-test/suites/nereids_p0/insert_into_table/partial_update.groovy @@ -24,7 +24,7 @@ suite("nereids_partial_update_native_insert_stmt", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "set enable_nereids_dml=true;" diff --git a/regression-test/suites/nereids_p0/insert_into_table/partial_update_complex.groovy b/regression-test/suites/nereids_p0/insert_into_table/partial_update_complex.groovy index 7b33dca57a4d52..1d5a827160d0d1 100644 --- a/regression-test/suites/nereids_p0/insert_into_table/partial_update_complex.groovy +++ b/regression-test/suites/nereids_p0/insert_into_table/partial_update_complex.groovy @@ -23,7 +23,7 @@ suite("nereids_partial_update_native_insert_stmt_complex", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "set enable_nereids_dml=true;" diff --git a/regression-test/suites/nereids_p0/insert_into_table/partial_update_seq_col.groovy b/regression-test/suites/nereids_p0/insert_into_table/partial_update_seq_col.groovy index 8e3ae2f422445c..6ae4fd78e2a87e 100644 --- a/regression-test/suites/nereids_p0/insert_into_table/partial_update_seq_col.groovy +++ b/regression-test/suites/nereids_p0/insert_into_table/partial_update_seq_col.groovy @@ -24,7 +24,7 @@ suite("nereids_partial_update_native_insert_seq_col", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "set enable_nereids_dml=true;" diff --git a/regression-test/suites/nereids_rules_p0/mv/with_auth/with_select_table_auth.groovy b/regression-test/suites/nereids_rules_p0/mv/with_auth/with_select_table_auth.groovy index c51dea2f5a7403..09296bbbc1b69e 100644 --- a/regression-test/suites/nereids_rules_p0/mv/with_auth/with_select_table_auth.groovy +++ b/regression-test/suites/nereids_rules_p0/mv/with_auth/with_select_table_auth.groovy @@ -135,7 +135,7 @@ suite("with_select_table_auth","p0,auth") { l_suppkey; """) - connect(user=user_name, password="${pwd}", url=context.config.jdbcUrl) { + connect(user_name, "${pwd}", context.config.jdbcUrl) { sql "use ${db}" mv_rewrite_success( """ @@ -156,7 +156,7 @@ suite("with_select_table_auth","p0,auth") { ) } - connect(user=user_name, password="${pwd}", url=context.config.jdbcUrl) { + connect(user_name, "${pwd}", context.config.jdbcUrl) { sql "use ${db}" test { sql """select * from mv1;""" diff --git a/regression-test/suites/point_query_p0/test_point_query.groovy b/regression-test/suites/point_query_p0/test_point_query.groovy index f84012a8fd77d3..7c3a255b10eb73 100644 --- a/regression-test/suites/point_query_p0/test_point_query.groovy +++ b/regression-test/suites/point_query_p0/test_point_query.groovy @@ -63,7 +63,7 @@ suite("test_point_query", "nonConcurrent") { def nprep_sql = { sql_str -> def url_without_prep = "jdbc:mysql://" + sql_ip + ":" + sql_port + "/" + realDb - connect(user = user, password = password, url = url_without_prep) { + connect(user, password, url_without_prep) { // set to false to invalid cache correcly sql "set enable_memtable_on_sink_node = false" sql sql_str @@ -137,7 +137,7 @@ suite("test_point_query", "nonConcurrent") { sql """ INSERT INTO ${tableName} VALUES(252, 120939.11130, "${generateString(252)}", "laooq", "2030-01-02", "2020-01-01 12:36:38", 252, "7022-01-01 11:30:38", 0, 90696620686827832.374, [0], null) """ sql """ INSERT INTO ${tableName} VALUES(298, 120939.11130, "${generateString(298)}", "laooq", "2030-01-02", "2020-01-01 12:36:38", 298, "7022-01-01 11:30:38", 1, 90696620686827832.374, [], []) """ - def result1 = connect(user=user, password=password, url=prepare_url) { + def result1 = connect(user, password, prepare_url) { def stmt = prepareStatement "select /*+ SET_VAR(enable_nereids_planner=true) */ * from ${tableName} where k1 = ? and k2 = ? and k3 = ?" assertEquals(stmt.class, com.mysql.cj.jdbc.ServerPreparedStatement); stmt.setInt(1, 1231) @@ -224,7 +224,7 @@ suite("test_point_query", "nonConcurrent") { qe_point_select stmt } // disable useServerPrepStmts - def result2 = connect(user=user, password=password, url=context.config.jdbcUrl) { + def result2 = connect(user, password, context.config.jdbcUrl) { qt_sql """select /*+ SET_VAR(enable_nereids_planner=true) */ * from ${tableName} where k1 = 1231 and k2 = 119291.11 and k3 = 'ddd'""" qt_sql """select /*+ SET_VAR(enable_nereids_planner=true) */ * from ${tableName} where k1 = 1237 and k2 = 120939.11130 and k3 = 'a ddd'""" qt_sql """select /*+ SET_VAR(enable_nereids_planner=true) */ hex(k3), hex(k4), k7 + 10.1 from ${tableName} where k1 = 1237 and k2 = 120939.11130 and k3 = 'a ddd'""" diff --git a/regression-test/suites/point_query_p0/test_point_query_ck.groovy b/regression-test/suites/point_query_p0/test_point_query_ck.groovy index 33c31dc0970929..f7c53c7207e99e 100644 --- a/regression-test/suites/point_query_p0/test_point_query_ck.groovy +++ b/regression-test/suites/point_query_p0/test_point_query_ck.groovy @@ -63,7 +63,7 @@ suite("test_point_query_ck") { def nprep_sql = { sql_str -> def url_without_prep = "jdbc:mysql://" + sql_ip + ":" + sql_port + "/" + realDb - connect(user = user, password = password, url = url_without_prep) { + connect(user, password, url_without_prep) { // set to false to invalid cache correcly sql "set enable_memtable_on_sink_node = false" sql sql_str @@ -138,7 +138,7 @@ suite("test_point_query_ck") { sql """ INSERT INTO ${tableName} VALUES(252, 120939.11130, "${generateString(252)}", "laooq", "2030-01-02", "2020-01-01 12:36:38", 252, "7022-01-01 11:30:38", 0, 90696620686827832.374, [0], null) """ sql """ INSERT INTO ${tableName} VALUES(298, 120939.11130, "${generateString(298)}", "laooq", "2030-01-02", "2020-01-01 12:36:38", 298, "7022-01-01 11:30:38", 1, 90696620686827832.374, [], []) """ - def result1 = connect(user=user, password=password, url=prepare_url) { + def result1 = connect(user, password, prepare_url) { def stmt = prepareStatement "select /*+ SET_VAR(enable_nereids_planner=true) */ * from ${tableName} where k1 = ? and k2 = ? and k3 = ?" assertEquals(stmt.class, com.mysql.cj.jdbc.ServerPreparedStatement); stmt.setInt(1, 1231) @@ -225,7 +225,7 @@ suite("test_point_query_ck") { qe_point_select stmt } // disable useServerPrepStmts - def result2 = connect(user=user, password=password, url=context.config.jdbcUrl) { + def result2 = connect(user, password, context.config.jdbcUrl) { qt_sql """select /*+ SET_VAR(enable_nereids_planner=true) */ * from ${tableName} where k1 = 1231 and k2 = 119291.11 and k3 = 'ddd'""" qt_sql """select /*+ SET_VAR(enable_nereids_planner=true) */ * from ${tableName} where k1 = 1237 and k2 = 120939.11130 and k3 = 'a ddd'""" qt_sql """select /*+ SET_VAR(enable_nereids_planner=true) */ hex(k3), hex(k4), k7 + 10.1 from ${tableName} where k1 = 1237 and k2 = 120939.11130 and k3 = 'a ddd'""" diff --git a/regression-test/suites/point_query_p0/test_point_query_partition.groovy b/regression-test/suites/point_query_p0/test_point_query_partition.groovy index 5062677c842b29..848729b44232a7 100644 --- a/regression-test/suites/point_query_p0/test_point_query_partition.groovy +++ b/regression-test/suites/point_query_p0/test_point_query_partition.groovy @@ -48,7 +48,7 @@ suite("test_point_query_partition") { def nprep_sql = { sql_str -> def url_without_prep = "jdbc:mysql://" + sql_ip + ":" + sql_port + "/" + realDb - connect(user = user, password = password, url = url_without_prep) { + connect(user, password, url_without_prep) { sql sql_str } } @@ -85,7 +85,7 @@ suite("test_point_query_partition") { sql """INSERT INTO ${tableName} VALUES (33, 'f')""" sql """INSERT INTO ${tableName} VALUES (45, 'g')""" sql """INSERT INTO ${tableName} VALUES (999, 'h')""" - def result1 = connect(user=user, password=password, url=prepare_url) { + def result1 = connect(user, password, prepare_url) { def stmt = prepareStatement "select * from ${tableName} where k1 = ?" assertEquals(stmt.class, com.mysql.cj.jdbc.ServerPreparedStatement); stmt.setInt(1, 1) @@ -139,7 +139,7 @@ suite("test_point_query_partition") { """ sql """insert into regression_test_serving_p0.customer(customer_key, customer_value_0, customer_value_1) values(686612, "686612", "686612")""" sql """insert into regression_test_serving_p0.customer(customer_key, customer_value_0, customer_value_1) values(686613, "686613", "686613")""" - def result3 = connect(user=user, password=password, url=prepare_url) { + def result3 = connect(user, password, prepare_url) { def stmt = prepareStatement "select /*+ SET_VAR(enable_nereids_planner=true) */ * from regression_test_serving_p0.customer where customer_key = ?" stmt.setInt(1, 686612) qe_point_selectxxx stmt diff --git a/regression-test/suites/point_query_p0/test_point_query_partition_ck.groovy b/regression-test/suites/point_query_p0/test_point_query_partition_ck.groovy index 5428b1a6f16aaa..658a0ecfb71be6 100644 --- a/regression-test/suites/point_query_p0/test_point_query_partition_ck.groovy +++ b/regression-test/suites/point_query_p0/test_point_query_partition_ck.groovy @@ -48,7 +48,7 @@ suite("test_point_query_partition_ck") { def nprep_sql = { sql_str -> def url_without_prep = "jdbc:mysql://" + sql_ip + ":" + sql_port + "/" + realDb - connect(user = user, password = password, url = url_without_prep) { + connect(user, password, url_without_prep) { sql sql_str } } @@ -86,7 +86,7 @@ suite("test_point_query_partition_ck") { sql """INSERT INTO ${tableName} VALUES (33, 'f')""" sql """INSERT INTO ${tableName} VALUES (45, 'g')""" sql """INSERT INTO ${tableName} VALUES (999, 'h')""" - def result1 = connect(user=user, password=password, url=prepare_url) { + def result1 = connect(user, password, prepare_url) { def stmt = prepareStatement "select * from ${tableName} where k1 = ?" assertEquals(stmt.class, com.mysql.cj.jdbc.ServerPreparedStatement); stmt.setInt(1, 1) @@ -142,7 +142,7 @@ suite("test_point_query_partition_ck") { """ sql """insert into ${tableName}(customer_key, customer_value_0, customer_value_1) values(686612, "686612", "686612")""" sql """insert into ${tableName}(customer_key, customer_value_0, customer_value_1) values(686613, "686613", "686613")""" - def result3 = connect(user=user, password=password, url=prepare_url) { + def result3 = connect(user, password, prepare_url) { def stmt = prepareStatement "select /*+ SET_VAR(enable_nereids_planner=true) */ * from ${tableName} where customer_key = ?" stmt.setInt(1, 686612) qe_point_selectxxx stmt diff --git a/regression-test/suites/point_query_p0/test_rowstore.groovy b/regression-test/suites/point_query_p0/test_rowstore.groovy index d24d6767d48b4f..13279e3ce877fc 100644 --- a/regression-test/suites/point_query_p0/test_rowstore.groovy +++ b/regression-test/suites/point_query_p0/test_rowstore.groovy @@ -197,7 +197,7 @@ suite("test_rowstore", "p0,nonConcurrent") { """ // set server side prepared statement url - connect(user = user, password = password, url = prepare_url) { + connect(user, password, prepare_url) { def prep_sql = { sql_str, k -> def stmt = prepareStatement sql_str stmt.setInt(1, k) diff --git a/regression-test/suites/point_query_p0/test_rowstore_ck.groovy b/regression-test/suites/point_query_p0/test_rowstore_ck.groovy index 82968e2aae5352..957aa976ee62c0 100644 --- a/regression-test/suites/point_query_p0/test_rowstore_ck.groovy +++ b/regression-test/suites/point_query_p0/test_rowstore_ck.groovy @@ -203,7 +203,7 @@ suite("test_rowstore_ck", "p0,nonConcurrent") { """ // set server side prepared statement url - connect(user = user, password = password, url = prepare_url) { + connect(user, password, prepare_url) { def prep_sql = { sql_str, k -> def stmt = prepareStatement sql_str stmt.setInt(1, k) diff --git a/regression-test/suites/prepared_stmt_p0/prepared_stmt.groovy b/regression-test/suites/prepared_stmt_p0/prepared_stmt.groovy index e01e574976f1bc..d32fbd1532ee4d 100644 --- a/regression-test/suites/prepared_stmt_p0/prepared_stmt.groovy +++ b/regression-test/suites/prepared_stmt_p0/prepared_stmt.groovy @@ -24,7 +24,7 @@ suite("test_prepared_stmt", "nonConcurrent") { def password = context.config.jdbcPassword // def url = context.config.jdbcUrl + "&useServerPrepStmts=true&useCursorFetch=true" String url = getServerPrepareJdbcUrl(context.config.jdbcUrl, "regression_test_prepared_stmt_p0") - def result1 = connect(user=user, password=password, url=url) { + def result1 = connect(user, password, url) { sql """DROP TABLE IF EXISTS ${tableName} """ sql """ CREATE TABLE IF NOT EXISTS ${tableName} ( diff --git a/regression-test/suites/prepared_stmt_p0/prepared_stmt_in_list.groovy b/regression-test/suites/prepared_stmt_p0/prepared_stmt_in_list.groovy index 3c972e83fd9fa0..54ec1efa4b373d 100644 --- a/regression-test/suites/prepared_stmt_p0/prepared_stmt_in_list.groovy +++ b/regression-test/suites/prepared_stmt_p0/prepared_stmt_in_list.groovy @@ -24,7 +24,7 @@ suite("test_prepared_stmt_in_list", "nonConcurrent") { // def url = context.config.jdbcUrl + "&useServerPrepStmts=true" String url = getServerPrepareJdbcUrl(context.config.jdbcUrl, "regression_test_prepared_stmt_p0") sql """set global max_prepared_stmt_count = 1024""" - def result1 = connect(user=user, password=password, url=url) { + def result1 = connect(user, password, url) { sql """DROP TABLE IF EXISTS ${tableName} """ sql """ CREATE TABLE IF NOT EXISTS ${tableName} ( diff --git a/regression-test/suites/query_p0/system/test_partitions_schema.groovy b/regression-test/suites/query_p0/system/test_partitions_schema.groovy index 0cf83d67e66995..98b12c3705c777 100644 --- a/regression-test/suites/query_p0/system/test_partitions_schema.groovy +++ b/regression-test/suites/query_p0/system/test_partitions_schema.groovy @@ -184,17 +184,17 @@ suite("test_partitions_schema") { def tokens = context.config.jdbcUrl.split('/') def url=tokens[0] + "//" + tokens[2] + "/" + "information_schema" + "?" - connect(user=user, password='123abc!@#', url=url) { + connect(user, '123abc!@#', url) { order_qt_select_check_3 """select $listOfColum from information_schema.partitions where table_schema=\"${dbName}\"""" } sql "GRANT SELECT_PRIV ON ${dbName}.duplicate_table TO ${user}" - connect(user=user, password='123abc!@#', url=url) { + connect(user, '123abc!@#', url) { order_qt_select_check_4 """select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,PARTITION_NAME from information_schema.partitions where table_schema=\"${dbName}\"""" } sql "REVOKE SELECT_PRIV ON ${dbName}.duplicate_table FROM ${user}" - connect(user=user, password='123abc!@#', url=url) { + connect(user, '123abc!@#', url) { order_qt_select_check_5 """select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,PARTITION_NAME from information_schema.partitions where table_schema=\"${dbName}\"""" } diff --git a/regression-test/suites/query_p0/system/test_table_options.groovy b/regression-test/suites/query_p0/system/test_table_options.groovy index 9d2e99ab974413..fef118a82b280b 100644 --- a/regression-test/suites/query_p0/system/test_table_options.groovy +++ b/regression-test/suites/query_p0/system/test_table_options.groovy @@ -199,17 +199,17 @@ suite("test_table_options") { def tokens = context.config.jdbcUrl.split('/') def url=tokens[0] + "//" + tokens[2] + "/" + "information_schema" + "?" - connect(user=user, password='123abc!@#', url=url) { + connect(user, '123abc!@#', url) { qt_select_check_3 """select * from information_schema.table_options ORDER BY TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_MODEL,TABLE_MODEL_KEY,DISTRIBUTE_KEY,DISTRIBUTE_TYPE,BUCKETS_NUM,PARTITION_NUM; """ } sql "GRANT SELECT_PRIV ON ${dbName}.duplicate_table TO ${user}" - connect(user=user, password='123abc!@#', url=url) { + connect(user, '123abc!@#', url) { qt_select_check_4 """select * from information_schema.table_options ORDER BY TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_MODEL,TABLE_MODEL_KEY,DISTRIBUTE_KEY,DISTRIBUTE_TYPE,BUCKETS_NUM,PARTITION_NUM; """ } sql "REVOKE SELECT_PRIV ON ${dbName}.duplicate_table FROM ${user}" - connect(user=user, password='123abc!@#', url=url) { + connect(user, '123abc!@#', url) { qt_select_check_5 """select * from information_schema.table_options ORDER BY TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_MODEL,TABLE_MODEL_KEY,DISTRIBUTE_KEY,DISTRIBUTE_TYPE,BUCKETS_NUM,PARTITION_NUM; """ } diff --git a/regression-test/suites/query_p0/system/test_table_properties.groovy b/regression-test/suites/query_p0/system/test_table_properties.groovy index 3314975d689c0f..1861ae4d6280d6 100644 --- a/regression-test/suites/query_p0/system/test_table_properties.groovy +++ b/regression-test/suites/query_p0/system/test_table_properties.groovy @@ -105,17 +105,17 @@ suite("test_table_properties") { def tokens = context.config.jdbcUrl.split('/') def url=tokens[0] + "//" + tokens[2] + "/" + "information_schema" + "?" - connect(user=user, password='123abc!@#', url=url) { + connect(user, '123abc!@#', url) { qt_select_check_4 """select * from information_schema.table_properties where PROPERTY_NAME != "default.replication_allocation" ORDER BY TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,PROPERTY_NAME,PROPERTY_VALUE""" } sql "GRANT SELECT_PRIV ON ${dbName}.duplicate_table TO ${user}" - connect(user=user, password='123abc!@#', url=url) { + connect(user, '123abc!@#', url) { qt_select_check_5 """select * from information_schema.table_properties where PROPERTY_NAME != "default.replication_allocation" ORDER BY TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,PROPERTY_NAME,PROPERTY_VALUE""" } sql "REVOKE SELECT_PRIV ON ${dbName}.duplicate_table FROM ${user}" - connect(user=user, password='123abc!@#', url=url) { + connect(user, '123abc!@#', url) { qt_select_check_6 """select * from information_schema.table_properties where PROPERTY_NAME != "default.replication_allocation" ORDER BY TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,PROPERTY_NAME,PROPERTY_VALUE""" } diff --git a/regression-test/suites/query_p0/test_row_policy.groovy b/regression-test/suites/query_p0/test_row_policy.groovy index 01766e9a084057..4af498e55e3b46 100644 --- a/regression-test/suites/query_p0/test_row_policy.groovy +++ b/regression-test/suites/query_p0/test_row_policy.groovy @@ -37,7 +37,7 @@ suite("test_row_policy") { sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}"""; } - connect(user=user, password='123456', url=url) { + connect(user, '123456', url) { sql "set enable_nereids_planner = true" sql "set enable_fallback_to_original_planner = false" sql "SELECT * FROM ${tableName} a JOIN ${tableName} b ON a.id = b.id" diff --git a/regression-test/suites/schema_change_p0/test_alter_table_column_rename.groovy b/regression-test/suites/schema_change_p0/test_alter_table_column_rename.groovy index 3650b93ccbb282..f2c2ae657913b3 100644 --- a/regression-test/suites/schema_change_p0/test_alter_table_column_rename.groovy +++ b/regression-test/suites/schema_change_p0/test_alter_table_column_rename.groovy @@ -39,7 +39,7 @@ suite("test_alter_table_column_rename") { for (row : result) { //println row String jdbcUrl = "jdbc:mysql://" + row[1] + ":" + row[4] - def result1 = connect(user = 'root', password = '', jdbcUrl) { + def result1 = connect('root', '', jdbcUrl) { sql """ SYNC """ sql """ use regression_test_schema_change_p0 """ sql """ select * from ${tbName} where new_col = 2 """ diff --git a/regression-test/suites/show_p0/test_show_backend_config.groovy b/regression-test/suites/show_p0/test_show_backend_config.groovy index b2e0bea26c1fe6..326b6104257eea 100644 --- a/regression-test/suites/show_p0/test_show_backend_config.groovy +++ b/regression-test/suites/show_p0/test_show_backend_config.groovy @@ -33,7 +33,7 @@ suite("test_show_backend_config") { } } - connect(user = userName, password = passwd, url = context.config.jdbcUrl) { + connect(userName, passwd, context.config.jdbcUrl) { def backends = sql_return_maparray """ show backends """ def beId = backends[0].BackendId def bePort = backends[0].BePort diff --git a/regression-test/suites/show_p0/test_show_backends.groovy b/regression-test/suites/show_p0/test_show_backends.groovy index 0c41cd68ec7ac2..7a503f09b3282b 100644 --- a/regression-test/suites/show_p0/test_show_backends.groovy +++ b/regression-test/suites/show_p0/test_show_backends.groovy @@ -23,11 +23,11 @@ suite("test_show_backends", "show") { sql """grant ADMIN_PRIV on *.*.* to test_show_backends_user1""" - def result1 = connect(user = 'test_show_backends_user1', password = '12345', url = context.config.jdbcUrl) { + def result1 = connect('test_show_backends_user1', '12345', context.config.jdbcUrl) { sql """ show backends """ } log.info(result1.toString()) - def result2 = connect(user = 'test_show_backends_user1', password = '12345', url = context.config.jdbcUrl) { + def result2 = connect('test_show_backends_user1', '12345', context.config.jdbcUrl) { sql """ show proc '/backends' """ } log.info(result2.toString()) diff --git a/regression-test/suites/show_p0/test_show_statistic_proc.groovy b/regression-test/suites/show_p0/test_show_statistic_proc.groovy index 50825868789bb4..4a37b92fc0f172 100644 --- a/regression-test/suites/show_p0/test_show_statistic_proc.groovy +++ b/regression-test/suites/show_p0/test_show_statistic_proc.groovy @@ -26,10 +26,10 @@ suite("test_show_statistic_proc", "nonConcurrent") { sql """drop database if exists test_statistic_proc_db""" sql """create database test_statistic_proc_db""" - def result1 = connect(user = 'test_show_statistic_proc_user1', password = '12345', url = context.config.jdbcUrl) { + def result1 = connect('test_show_statistic_proc_user1', '12345', context.config.jdbcUrl) { sql """ show proc '/statistic' """ } - def result2 = connect(user = 'test_show_statistic_proc_user1', password = '12345', url = context.config.jdbcUrl) { + def result2 = connect('test_show_statistic_proc_user1', '12345', context.config.jdbcUrl) { sql """ show databases """ } assertEquals(result1.size(), result2.size()) diff --git a/regression-test/suites/statistics/test_analyze_mtmv.groovy b/regression-test/suites/statistics/test_analyze_mtmv.groovy index 49e1b75a476dbb..614a04ba7e5770 100644 --- a/regression-test/suites/statistics/test_analyze_mtmv.groovy +++ b/regression-test/suites/statistics/test_analyze_mtmv.groovy @@ -31,7 +31,7 @@ suite("test_analyze_mtmv") { def tokens = context.config.jdbcUrl.split('/') def url=tokens[0] + "//" + host + ":" + port logger.info("Master url is " + url) - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url) { + connect(context.config.jdbcUser, context.config.jdbcPassword, url) { sql """use ${db}""" result = sql """show frontends;""" logger.info("show frontends result master: " + result) diff --git a/regression-test/suites/statistics/test_analyze_mv.groovy b/regression-test/suites/statistics/test_analyze_mv.groovy index 64e86439be1ce5..657eb235453808 100644 --- a/regression-test/suites/statistics/test_analyze_mv.groovy +++ b/regression-test/suites/statistics/test_analyze_mv.groovy @@ -49,7 +49,7 @@ suite("test_analyze_mv") { def tokens = context.config.jdbcUrl.split('/') def url=tokens[0] + "//" + host + ":" + port logger.info("Master url is " + url) - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url) { + connect(context.config.jdbcUser, context.config.jdbcPassword, url) { sql """use ${db}""" result = sql """show frontends;""" logger.info("show frontends result master: " + result) diff --git a/regression-test/suites/statistics/test_auto_analyze_black_white_list.groovy b/regression-test/suites/statistics/test_auto_analyze_black_white_list.groovy index f27ecdc5e1616b..223a69cfa380f9 100644 --- a/regression-test/suites/statistics/test_auto_analyze_black_white_list.groovy +++ b/regression-test/suites/statistics/test_auto_analyze_black_white_list.groovy @@ -31,7 +31,7 @@ suite("test_auto_analyze_black_white_list") { def tokens = context.config.jdbcUrl.split('/') def url=tokens[0] + "//" + host + ":" + port logger.info("Master url is " + url) - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url) { + connect(context.config.jdbcUser, context.config.jdbcPassword, url) { sql """use ${db}""" result = sql """show frontends;""" logger.info("show frontends result master: " + result) diff --git a/regression-test/suites/statistics/test_partition_stats.groovy b/regression-test/suites/statistics/test_partition_stats.groovy index 96be61296eadf0..fac20fa6e20293 100644 --- a/regression-test/suites/statistics/test_partition_stats.groovy +++ b/regression-test/suites/statistics/test_partition_stats.groovy @@ -34,7 +34,7 @@ suite("test_partition_stats") { def tokens = context.config.jdbcUrl.split('/') def url=tokens[0] + "//" + host + ":" + port logger.info("Master url is " + url) - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url) { + connect(context.config.jdbcUser, context.config.jdbcPassword, url) { sql """use ${db}""" result = sql """show frontends;""" logger.info("show frontends result master: " + result) diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_mix_partial_update.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_mix_partial_update.groovy index 7bcda3debb6694..4a6d587d3f72ae 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_mix_partial_update.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_mix_partial_update.groovy @@ -23,7 +23,7 @@ suite('test_mix_partial_update') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "set enable_nereids_planner=true" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_new_partial_update_delete.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_new_partial_update_delete.groovy index 22d5fe9cade6bd..76772ad19b3966 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_new_partial_update_delete.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_new_partial_update_delete.groovy @@ -23,7 +23,7 @@ suite('test_new_partial_update_delete') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "set enable_nereids_planner=true" @@ -146,7 +146,7 @@ suite('test_new_partial_update_delete') { } } - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" try { def tableAggName = "test_new_partial_update_agg_delete" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update.groovy index 34a62e6da0c990..9a04f731ac5c9c 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update" // create table diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_2pc_schema_change.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_2pc_schema_change.groovy index e576cb86cb48b3..e7205620ef319f 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_2pc_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_2pc_schema_change.groovy @@ -42,7 +42,7 @@ suite("test_partial_update_2pc_schema_change", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_partial_update_2pc_schema_change" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_after_delete.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_after_delete.groovy index 066f76fb372589..c00bba7ae341c5 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_after_delete.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_after_delete.groovy @@ -23,7 +23,7 @@ suite("test_partial_update_after_delete", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "SET enable_nereids_planner=true;" sql "SET enable_fallback_to_original_planner=false;" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_auto_inc.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_auto_inc.groovy index 14e26ccab8818d..63a14ec70eba1d 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_auto_inc.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_auto_inc.groovy @@ -23,7 +23,7 @@ suite("test_partial_update_auto_inc") { for (def use_mow : [/*false,*/ true]) { for (def use_nereids_planner : [false, true]) { logger.info("current params: use_mow: ${use_mow}, use_nereids_planner: ${use_nereids_planner}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" if (use_nereids_planner) { diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_case_insensitivity.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_case_insensitivity.groovy index a5766f478d366b..5431ec266662c3 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_case_insensitivity.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_case_insensitivity.groovy @@ -23,7 +23,7 @@ suite("test_partial_update_case_insensitivity", "p0") { for (def use_row_store : [false, true]) { for (def use_nereids_planner : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}, use_nereids_planner: ${use_nereids_planner}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" if (use_nereids_planner) { sql """ set enable_nereids_dml = true; """ diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_complex_type.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_complex_type.groovy index 1b22d404e4c5f2..910bdeacd68232 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_complex_type.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_complex_type.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_complex_type", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_complex_type" // NOTE: diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_complex_type_schema_change.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_complex_type_schema_change.groovy index 8a2ed39cf7055e..de74fe6ad13224 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_complex_type_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_complex_type_schema_change.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_complex_type_schema_change", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_complex_type_schema_change" // create table diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_default_value.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_default_value.groovy index a688ccab2fc167..1a66075d2ab5de 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_default_value.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_default_value.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_default_value", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_default_value" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_delete.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_delete.groovy index 3d6d4582629aac..99fb042bb685d2 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_delete.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_delete.groovy @@ -23,7 +23,7 @@ suite('test_partial_update_delete') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName1 = "test_partial_update_delete1" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_delete_sign.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_delete_sign.groovy index ba38e92eb15909..2805b0b669c3e1 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_delete_sign.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_delete_sign.groovy @@ -23,7 +23,7 @@ suite('test_partial_update_delete_sign') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName1 = "test_partial_update_delete_sign1" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy index cc6faa03dc0d79..135c18f4fc7141 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy @@ -29,7 +29,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" // ===== light schema change ===== diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_seq_col.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_seq_col.groovy index 44396dc5254725..6dc7169ed2bd25 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_seq_col.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_seq_col.groovy @@ -24,7 +24,7 @@ suite("test_partial_update_native_insert_seq_col", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "sync;" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_native_insert_stmt.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_native_insert_stmt.groovy index 604978c31472ca..76a65d21728781 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_native_insert_stmt.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_native_insert_stmt.groovy @@ -24,7 +24,7 @@ suite("test_partial_update_native_insert_stmt", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "sync;" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_native_insert_stmt_complex.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_native_insert_stmt_complex.groovy index 1593030b7af472..c03eff973db1ae 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_native_insert_stmt_complex.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_native_insert_stmt_complex.groovy @@ -23,7 +23,7 @@ suite("test_partial_update_native_insert_stmt_complex", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "sync;" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col.groovy index 884882b7c93934..ef8829bcb8ab35 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col.groovy @@ -27,7 +27,7 @@ suite("test_primary_key_partial_update_seq_col", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_seq_col" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col_delete.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col_delete.groovy index b37cdc68525d77..5193d876cf89ed 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col_delete.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col_delete.groovy @@ -27,7 +27,7 @@ suite("test_primary_key_partial_update_seq_col_delete", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_seq_col_delete" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type.groovy index 3075faa022240f..49d40ed8426a97 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type.groovy @@ -27,7 +27,7 @@ suite("test_primary_key_partial_update_seq_type", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_seq_type" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type_delete.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type_delete.groovy index 142feebef559c1..2d256c6369fae1 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type_delete.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type_delete.groovy @@ -27,7 +27,7 @@ suite("test_primary_key_partial_update_seq_type_delete", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_seq_type_delete" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy index 313fc97d06ba55..3cf0ef814e9998 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy @@ -27,7 +27,7 @@ suite("test_partial_update_strict_mode", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_partial_update_strict_mode" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_upsert.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_upsert.groovy index c8203cb0f9da53..b6b72287c3f8ab 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_upsert.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_upsert.groovy @@ -27,7 +27,7 @@ suite("test_partial_update_upsert", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_partial_update_upsert1" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_delete_stmt.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_delete_stmt.groovy index b853ce2d328295..6dfd3bad4a5026 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_delete_stmt.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_delete_stmt.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_with_delete_stmt", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_with_delete_stmt" diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_inverted_index.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_inverted_index.groovy index 3395757d876516..0b01d421a29278 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_inverted_index.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_inverted_index.groovy @@ -27,7 +27,7 @@ suite("test_partial_update_with_inverted_index", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_partial_update_with_inverted_index" // create table diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_update_stmt.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_update_stmt.groovy index 0a29b382b306ae..60fe8167dc9ce5 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_update_stmt.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_update_stmt.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_with_update_stmt", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_with_update_stmt" diff --git a/regression-test/suites/unique_with_mow_c_p0/test_delete_sign.groovy b/regression-test/suites/unique_with_mow_c_p0/test_delete_sign.groovy index 8192aa2de1d7b6..0437bf709d5b9f 100644 --- a/regression-test/suites/unique_with_mow_c_p0/test_delete_sign.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/test_delete_sign.groovy @@ -24,7 +24,7 @@ suite("test_delete_sign", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_delete_sign" // test delete sigin X sequence column diff --git a/regression-test/suites/unique_with_mow_p0/flexible/legacy/test_f_2pc_schema_change.groovy b/regression-test/suites/unique_with_mow_p0/flexible/legacy/test_f_2pc_schema_change.groovy index 5d099fc0d102f8..23a9dce1001eb0 100644 --- a/regression-test/suites/unique_with_mow_p0/flexible/legacy/test_f_2pc_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_p0/flexible/legacy/test_f_2pc_schema_change.groovy @@ -44,7 +44,7 @@ suite("test_f_2pc_schema_change", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_f_2pc_schema_change" diff --git a/regression-test/suites/unique_with_mow_p0/flexible/legacy/test_f_complex_type_schema_change.groovy b/regression-test/suites/unique_with_mow_p0/flexible/legacy/test_f_complex_type_schema_change.groovy index 71f2f22cf78185..6f8002d7f15e99 100644 --- a/regression-test/suites/unique_with_mow_p0/flexible/legacy/test_f_complex_type_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_p0/flexible/legacy/test_f_complex_type_schema_change.groovy @@ -22,7 +22,7 @@ suite("test_f_partial_update_complex_type_schema_change", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_f_partial_update_complex_type_schema_change" sql """ DROP TABLE IF EXISTS ${tableName} """ diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_mix_partial_update.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_mix_partial_update.groovy index 35b5e0cce81177..8e82e051562333 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_mix_partial_update.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_mix_partial_update.groovy @@ -23,7 +23,7 @@ suite('test_mix_partial_update') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "set enable_nereids_planner=true" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_new_partial_update_delete.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_new_partial_update_delete.groovy index 32cb8eedc1279c..b856f6a452f01b 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_new_partial_update_delete.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_new_partial_update_delete.groovy @@ -23,7 +23,7 @@ suite('test_new_partial_update_delete') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "set enable_nereids_planner=true" @@ -143,7 +143,7 @@ suite('test_new_partial_update_delete') { } } - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" try { def tableAggName = "test_new_partial_update_agg_delete" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update.groovy index 9643f9501ed48a..5e91790baf932a 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update" // create table diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_2pc_schema_change.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_2pc_schema_change.groovy index 6f000786fa9cc1..9b323dec19c7a8 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_2pc_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_2pc_schema_change.groovy @@ -42,7 +42,7 @@ suite("test_partial_update_2pc_schema_change", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_partial_update_2pc_schema_change" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_after_delete.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_after_delete.groovy index 9757b9e7685846..e12674407d6b33 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_after_delete.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_after_delete.groovy @@ -23,7 +23,7 @@ suite("test_partial_update_after_delete", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "set enable_unique_key_partial_update=false;" sql "set enable_insert_strict=true;" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_auto_inc.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_auto_inc.groovy index d689deeb8afe02..6f79ddf7f9e532 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_auto_inc.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_auto_inc.groovy @@ -19,7 +19,7 @@ suite("test_partial_update_auto_inc") { String db = context.config.getDbNameByFile(context.file) sql "select 1;" // to create database - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql """ DROP TABLE IF EXISTS test_primary_key_partial_update_auto_inc """ diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_case_insensitivity.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_case_insensitivity.groovy index 4e114349ce025c..4d6db47fac869e 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_case_insensitivity.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_case_insensitivity.groovy @@ -21,7 +21,7 @@ suite("test_partial_update_case_insensitivity", "p0") { sql "select 1;" // to create database for (def use_row_store : [false, true]) { - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_partial_update_case_insensitivity" sql """ DROP TABLE IF EXISTS ${tableName} """ diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_complex_type.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_complex_type.groovy index ba13bfbeef9b13..ebd32310fd2b45 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_complex_type.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_complex_type.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_complex_type", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_complex_type" // NOTE: diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_complex_type_schema_change.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_complex_type_schema_change.groovy index 6604ced55bcad7..43e6a2a3f9de13 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_complex_type_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_complex_type_schema_change.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_complex_type_schema_change", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_complex_type_schema_change" // create table diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_default_value.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_default_value.groovy index cacdc5113fd4fa..28d1d0ed42d556 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_default_value.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_default_value.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_default_value", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_default_value" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete.groovy index 7b25982f896849..bf49c95d38f0bb 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete.groovy @@ -22,7 +22,7 @@ suite('test_partial_update_delete') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "sync;" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete_sign.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete_sign.groovy index f2d93d9d715413..c6ac7f501f1bb1 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete_sign.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_delete_sign.groovy @@ -23,7 +23,7 @@ suite('test_partial_update_delete_sign') { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName1 = "test_partial_update_delete_sign1" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_light_schema_change.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_light_schema_change.groovy index f085a1bb7d3a20..d92dc41a68bc34 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_light_schema_change.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_light_schema_change.groovy @@ -26,7 +26,7 @@ suite("test_partial_update_insert_light_schema_change", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" // ===== light schema change ===== diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_seq_col.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_seq_col.groovy index 4c6cbaaa9ccbf8..05725604f330a9 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_seq_col.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_insert_seq_col.groovy @@ -24,7 +24,7 @@ suite("test_partial_update_native_insert_seq_col", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "sync;" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_merge_type.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_merge_type.groovy index f1919e8b066a80..dfaa9aca3068f0 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_merge_type.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_merge_type.groovy @@ -34,7 +34,7 @@ suite("test_partial_update_merge_type", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_partial_update_merge_type" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_native_insert_stmt.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_native_insert_stmt.groovy index 457961e2fec60c..c3e25a3a690c44 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_native_insert_stmt.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_native_insert_stmt.groovy @@ -24,7 +24,7 @@ suite("test_partial_update_native_insert_stmt", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "sync;" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_native_insert_stmt_complex.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_native_insert_stmt_complex.groovy index f014beb309efcd..350d0f9b00827a 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_native_insert_stmt_complex.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_native_insert_stmt_complex.groovy @@ -23,7 +23,7 @@ suite("test_partial_update_native_insert_stmt_complex", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" sql "sync;" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_only_keys.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_only_keys.groovy index 29f1257f9cb4ad..722f1fccb7643c 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_only_keys.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_only_keys.groovy @@ -24,7 +24,7 @@ suite("test_partial_update_only_keys", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_partial_update_only_keys" sql """ DROP TABLE IF EXISTS ${tableName} force""" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_col.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_col.groovy index 4479a66fdc8e9a..900c01d80e3f8e 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_col.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_col.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_seq_col", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_seq_col" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_col_delete.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_col_delete.groovy index a4163f44cc0feb..f59605211ae66b 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_col_delete.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_col_delete.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_seq_col_delete", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_seq_col_delete" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_type.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_type.groovy index f38d39c91e8209..09a93c2ca5b071 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_type.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_type.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_seq_type", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_seq_type" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_type_delete.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_type_delete.groovy index ab38bb9929b09e..76d9cdecc900ca 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_type_delete.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_seq_type_delete.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_seq_type_delete", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_seq_type_delete" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_strict_mode.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_strict_mode.groovy index fe47a5ebc89450..c4d26baee8f481 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_strict_mode.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_strict_mode.groovy @@ -24,7 +24,7 @@ suite("test_partial_update_strict_mode", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_partial_update_strict_mode" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_upsert.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_upsert.groovy index 5e4a02f5407904..ad2e4b2f4ff229 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_upsert.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_upsert.groovy @@ -24,7 +24,7 @@ suite("test_partial_update_upsert", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_partial_update_upsert1" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_delete_stmt.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_delete_stmt.groovy index b853ce2d328295..6dfd3bad4a5026 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_delete_stmt.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_delete_stmt.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_with_delete_stmt", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_with_delete_stmt" diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_inverted_index.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_inverted_index.groovy index f72160bb594ee9..5247a7db707cae 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_inverted_index.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_inverted_index.groovy @@ -24,7 +24,7 @@ suite("test_partial_update_with_inverted_index", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_partial_update_with_inverted_index" // create table diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_update_stmt.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_update_stmt.groovy index c04c535c080d88..d597ff968ea6c0 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_update_stmt.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_with_update_stmt.groovy @@ -24,7 +24,7 @@ suite("test_primary_key_partial_update_with_update_stmt", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_primary_key_partial_update_with_update_stmt" diff --git a/regression-test/suites/unique_with_mow_p0/test_delete_sign.groovy b/regression-test/suites/unique_with_mow_p0/test_delete_sign.groovy index c067b757c091a2..94564b3409179e 100644 --- a/regression-test/suites/unique_with_mow_p0/test_delete_sign.groovy +++ b/regression-test/suites/unique_with_mow_p0/test_delete_sign.groovy @@ -24,7 +24,7 @@ suite("test_delete_sign", "p0") { for (def use_row_store : [false, true]) { logger.info("current params: use_row_store: ${use_row_store}") - connect(user = context.config.jdbcUser, password = context.config.jdbcPassword, url = context.config.jdbcUrl) { + connect( context.config.jdbcUser, context.config.jdbcPassword, context.config.jdbcUrl) { sql "use ${db};" def tableName = "test_delete_sign" // test delete sigin X sequence column diff --git a/regression-test/suites/variant_p0/variant_with_rowstore.groovy b/regression-test/suites/variant_p0/variant_with_rowstore.groovy index 69957c25859da3..e3df1866309672 100644 --- a/regression-test/suites/variant_p0/variant_with_rowstore.groovy +++ b/regression-test/suites/variant_p0/variant_with_rowstore.groovy @@ -92,7 +92,7 @@ suite("regression_test_variant_rowstore", "variant_type"){ properties("replication_num" = "1", "disable_auto_compaction" = "false", "store_row_column" = "true", "enable_unique_key_merge_on_write" = "true"); """ sql """insert into ${table_name} select k, cast(v as string), cast(v as string) from var_rowstore""" - def result1 = connect(user=user, password=password, url=prepare_url) { + def result1 = connect(user, password, prepare_url) { def stmt = prepareStatement "select * from var_rs_pq where k = ?" assertEquals(stmt.class, com.mysql.cj.jdbc.ServerPreparedStatement); stmt.setInt(1, -3) @@ -124,7 +124,7 @@ suite("regression_test_variant_rowstore", "variant_type"){ ); """ sql """insert into table_rs_invalid_json values (1, '1|[""]')""" - def result2 = connect(user=user, password=password, url=prepare_url) { + def result2 = connect(user, password, prepare_url) { def stmt = prepareStatement "select * from table_rs_invalid_json where col0 = ?" stmt.setInt(1, 1) qe_point_select stmt diff --git a/regression-test/suites/vault_p0/privilege/test_vault_privilege.groovy b/regression-test/suites/vault_p0/privilege/test_vault_privilege.groovy index feedbadb3b714e..3238a4d4857469 100644 --- a/regression-test/suites/vault_p0/privilege/test_vault_privilege.groovy +++ b/regression-test/suites/vault_p0/privilege/test_vault_privilege.groovy @@ -77,7 +77,7 @@ suite("test_vault_privilege", "nonConcurrent") { def vault2 = "test_privilege_vault2" // Only users with admin role can create storage vault - connect(user = user1, password = 'Cloud12345', url = context.config.jdbcUrl) { + connect(user1, 'Cloud12345', context.config.jdbcUrl) { expectExceptionLike({ sql """ CREATE STORAGE VAULT IF NOT EXISTS ${vault2} @@ -91,14 +91,14 @@ suite("test_vault_privilege", "nonConcurrent") { } // Only users with admin role can set/unset default storage vault - connect(user = user1, password = 'Cloud12345', url = context.config.jdbcUrl) { + connect(user1, 'Cloud12345', context.config.jdbcUrl) { expectExceptionLike({ sql """ SET ${vault1} AS DEFAULT STORAGE VAULT """ }, "denied") } - connect(user = user1, password = 'Cloud12345', url = context.config.jdbcUrl) { + connect(user1, 'Cloud12345', context.config.jdbcUrl) { expectExceptionLike({ sql """ UNSET DEFAULT STORAGE VAULT @@ -106,7 +106,7 @@ suite("test_vault_privilege", "nonConcurrent") { }, "denied") } - def result = connect(user = user1, password = 'Cloud12345', url = context.config.jdbcUrl) { + def result = connect(user1, 'Cloud12345', context.config.jdbcUrl) { sql " SHOW STORAGE VAULT; " } assertTrue(result.isEmpty()) @@ -114,7 +114,7 @@ suite("test_vault_privilege", "nonConcurrent") { sql """ DROP TABLE IF EXISTS ${table2}; """ - connect(user = user1, password = 'Cloud12345', url = context.config.jdbcUrl) { + connect(user1, 'Cloud12345', context.config.jdbcUrl) { expectExceptionLike({ sql """ CREATE TABLE IF NOT EXISTS ${table2} ( @@ -135,13 +135,13 @@ suite("test_vault_privilege", "nonConcurrent") { GRANT usage_priv ON STORAGE VAULT '${vault1}' TO '${user1}'; """ - result = connect(user = user1, password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect(user1, 'Cloud12345', context.config.jdbcUrl) { sql " SHOW STORAGE VAULT; " } storageVaults = result.stream().map(row -> row[0]).collect(Collectors.toSet()) assertTrue(storageVaults.contains(vault1)) - connect(user = user1, password = 'Cloud12345', url = context.config.jdbcUrl) { + connect(user1, 'Cloud12345', context.config.jdbcUrl) { sql """ CREATE TABLE IF NOT EXISTS ${table2} ( C_CUSTKEY INTEGER NOT NULL, @@ -160,7 +160,7 @@ suite("test_vault_privilege", "nonConcurrent") { REVOKE usage_priv ON STORAGE VAULT '${vault1}' FROM '${user1}'; """ - result = connect(user = user1, password = 'Cloud12345', url = context.config.jdbcUrl) { + result = connect(user1, 'Cloud12345', context.config.jdbcUrl) { sql " SHOW STORAGE VAULT; " } assertTrue(result.isEmpty()) @@ -168,7 +168,7 @@ suite("test_vault_privilege", "nonConcurrent") { sql """ DROP TABLE IF EXISTS ${table3}; """ - connect(user = user1, password = 'Cloud12345', url = context.config.jdbcUrl) { + connect(user1, 'Cloud12345', context.config.jdbcUrl) { expectExceptionLike({ sql """ CREATE TABLE IF NOT EXISTS ${table3} ( diff --git a/regression-test/suites/vault_p0/privilege/test_vault_privilege_restart.groovy b/regression-test/suites/vault_p0/privilege/test_vault_privilege_restart.groovy index 7ff5ec0792b90d..fa5475c1762e96 100644 --- a/regression-test/suites/vault_p0/privilege/test_vault_privilege_restart.groovy +++ b/regression-test/suites/vault_p0/privilege/test_vault_privilege_restart.groovy @@ -112,7 +112,7 @@ suite("test_vault_privilege_restart", "nonConcurrent") { // Test user privilege, the newly created user cannot create or set default vault // Only users with admin role can create storage vault - connect(user = user1, password = passwd, url = context.config.jdbcUrl) { + connect(user1, passwd, context.config.jdbcUrl) { sql """use ${db}""" expectExceptionLike({ sql """ @@ -126,7 +126,7 @@ suite("test_vault_privilege_restart", "nonConcurrent") { }, "denied") } // Only users with admin role can set/unset default storage vault - connect(user = user1, password = passwd, url = context.config.jdbcUrl) { + connect(user1, passwd, context.config.jdbcUrl) { sql """use ${db}""" expectExceptionLike({ sql """ @@ -134,7 +134,7 @@ suite("test_vault_privilege_restart", "nonConcurrent") { """ }, "denied") } - connect(user = user1, password = passwd, url = context.config.jdbcUrl) { + connect(user1, passwd, context.config.jdbcUrl) { sql """use ${db}""" expectExceptionLike({ sql """ @@ -144,7 +144,7 @@ suite("test_vault_privilege_restart", "nonConcurrent") { } // user1 should see vault1 - def result = connect(user = user1, password = passwd, url = context.config.jdbcUrl) { + def result = connect(user1, passwd, context.config.jdbcUrl) { sql """use ${db}""" sql " SHOW STORAGE VAULT; " } @@ -159,7 +159,7 @@ suite("test_vault_privilege_restart", "nonConcurrent") { sql """ DROP TABLE IF EXISTS ${table2} force; """ - connect(user = user1, password = passwd, url = context.config.jdbcUrl) { + connect(user1, passwd, context.config.jdbcUrl) { sql """use ${db}""" sql """ CREATE TABLE ${table2} ( @@ -175,7 +175,7 @@ suite("test_vault_privilege_restart", "nonConcurrent") { """ } - result = connect(user = user1, password = passwd, url = context.config.jdbcUrl) { + result = connect(user1, passwd, context.config.jdbcUrl) { sql """use ${db}""" sql " SHOW create table ${table2}; " } diff --git a/regression-test/suites/vault_p0/privilege/test_vault_privilege_with_role.groovy b/regression-test/suites/vault_p0/privilege/test_vault_privilege_with_role.groovy index 4d541989c154f3..7d406cf471a714 100644 --- a/regression-test/suites/vault_p0/privilege/test_vault_privilege_with_role.groovy +++ b/regression-test/suites/vault_p0/privilege/test_vault_privilege_with_role.groovy @@ -55,7 +55,7 @@ suite("test_vault_privilege_with_role", "nonConcurrent") { sql """CREATE USER ${userName} identified by '${userPassword}' DEFAULT ROLE '${roleName}'""" sql """GRANT create_priv ON *.*.* TO '${userName}'; """ - connect(user = userName, password = userPassword, url = context.config.jdbcUrl) { + connect(userName, userPassword, context.config.jdbcUrl) { expectExceptionLike({ sql """ CREATE TABLE IF NOT EXISTS ${dbName}.${tableName} ( @@ -74,7 +74,7 @@ suite("test_vault_privilege_with_role", "nonConcurrent") { sql """ GRANT usage_priv ON STORAGE VAULT '${vaultName}' TO ROLE '${roleName}';""" - connect(user = userName, password = userPassword, url = context.config.jdbcUrl) { + connect(userName, userPassword, context.config.jdbcUrl) { sql """ CREATE TABLE IF NOT EXISTS ${dbName}.${tableName} ( C_CUSTKEY INTEGER NOT NULL, @@ -93,7 +93,7 @@ suite("test_vault_privilege_with_role", "nonConcurrent") { REVOKE usage_priv ON STORAGE VAULT '${vaultName}' FROM ROLE '${roleName}'; """ - connect(user = userName, password = userPassword, url = context.config.jdbcUrl) { + connect(userName, userPassword, context.config.jdbcUrl) { expectExceptionLike({ sql """ CREATE TABLE IF NOT EXISTS ${dbName}.${tableName}_2 ( diff --git a/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy b/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy index 5c3e0aafe76857..be54bec5e2ecda 100644 --- a/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy +++ b/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy @@ -341,11 +341,11 @@ suite("test_crud_wlg") { sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO test_wlg_user"""; } - connect(user = 'test_wlg_user', password = '12345', url = context.config.jdbcUrl) { + connect('test_wlg_user', '12345', context.config.jdbcUrl) { sql """ select count(1) from information_schema.backend_active_tasks; """ } - connect(user = 'test_wlg_user', password = '12345', url = context.config.jdbcUrl) { + connect('test_wlg_user', '12345', context.config.jdbcUrl) { sql """ set workload_group = test_group; """ test { sql """ select count(1) from information_schema.backend_active_tasks; """ @@ -355,7 +355,7 @@ suite("test_crud_wlg") { sql "GRANT USAGE_PRIV ON WORKLOAD GROUP 'test_group' TO 'test_wlg_user'@'%';" - connect(user = 'test_wlg_user', password = '12345', url = context.config.jdbcUrl) { + connect('test_wlg_user', '12345', context.config.jdbcUrl) { sql """ set workload_group = test_group; """ sql """ select count(1) from information_schema.backend_active_tasks; """ } @@ -731,7 +731,7 @@ suite("test_crud_wlg") { def validCluster = clusters[0][0] sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO test_wg_priv_user2"""; } - connect(user = 'test_wg_priv_user2', password = '', url = context.config.jdbcUrl) { + connect('test_wg_priv_user2', '', context.config.jdbcUrl) { qt_select_wgp_11 "select GRANTEE,WORKLOAD_GROUP_NAME,PRIVILEGE_TYPE,IS_GRANTABLE from information_schema.workload_group_privileges where grantee like '%test_wg_priv%' order by GRANTEE,WORKLOAD_GROUP_NAME,PRIVILEGE_TYPE,IS_GRANTABLE; " } diff --git a/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy b/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy index 6f80ca3490a608..06e10688397689 100644 --- a/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy +++ b/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy @@ -157,7 +157,7 @@ suite("test_workload_sched_policy") { // 1 create test_set_var_policy sql "create workload policy test_set_var_policy conditions(username='test_workload_sched_user')" + "actions(set_session_variable 'workload_group=test_set_session_wg');" - def result1 = connect(user = 'test_workload_sched_user', password = '12345', url = context.config.jdbcUrl) { + def result1 = connect('test_workload_sched_user', '12345', context.config.jdbcUrl) { logger.info("begin sleep 15s to wait") Thread.sleep(15000) sql "show variables like 'workload_group';" @@ -168,7 +168,7 @@ suite("test_workload_sched_policy") { // 2 create test_set_var_policy2 with higher priority sql "create workload policy test_set_var_policy2 conditions(username='test_workload_sched_user') " + "actions(set_session_variable 'workload_group=test_set_session_wg2') properties('priority'='10');" - def result2 = connect(user = 'test_workload_sched_user', password = '12345', url = context.config.jdbcUrl) { + def result2 = connect('test_workload_sched_user', '12345', context.config.jdbcUrl) { Thread.sleep(3000) sql "show variables like 'workload_group';" } @@ -177,7 +177,7 @@ suite("test_workload_sched_policy") { // 3 disable test_set_var_policy2 sql "alter workload policy test_set_var_policy2 properties('enabled'='false');" - def result3 = connect(user = 'test_workload_sched_user', password = '12345', url = context.config.jdbcUrl) { + def result3 = connect('test_workload_sched_user', '12345', context.config.jdbcUrl) { Thread.sleep(3000) sql "show variables like 'workload_group';" } @@ -242,7 +242,7 @@ suite("test_workload_sched_policy") { def curTime = System.currentTimeMillis() def totalTime = 30 * 60 * 1000 // 30min - connect(user = 'test_policy_user', password = '12345', url = context.config.jdbcUrl) { + connect('test_policy_user', '12345', context.config.jdbcUrl) { sql "set workload_group=policy_group" boolean flag = false long lastTime = System.currentTimeMillis() @@ -250,13 +250,13 @@ suite("test_workload_sched_policy") { while (curTime - startTime <= totalTime) { if (curTime - lastTime > 20000) { if (flag) { - connect(user = 'root', password = '', url = context.config.jdbcUrl) { + connect('root', '', context.config.jdbcUrl) { sql "alter workload policy test_cancel_query_policy properties('workload_group'='policy_group2');" sql "alter workload policy test_cancel_query_policy2 properties('workload_group'='policy_group');" } flag = false } else { - connect(user = 'root', password = '', url = context.config.jdbcUrl) { + connect('root', '', context.config.jdbcUrl) { sql "alter workload policy test_cancel_query_policy properties('workload_group'='policy_group');" sql "alter workload policy test_cancel_query_policy2 properties('workload_group'='policy_group2');" }