diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlConnectProcessor.java b/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlConnectProcessor.java
index 20b377eb5c..75deda2a7f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlConnectProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlConnectProcessor.java
@@ -182,11 +182,11 @@ public class FlightSqlConnectProcessor extends ConnectProcessor implements AutoC
public void close() throws Exception {
ctx.setCommand(MysqlCommand.COM_SLEEP);
ctx.clear();
- // TODO support query profile
for (StmtExecutor asynExecutor : returnResultFromRemoteExecutor) {
asynExecutor.finalizeQuery();
}
returnResultFromRemoteExecutor.clear();
+ executor.finalizeQuery();
ConnectContext.remove();
}
}
diff --git a/regression-test/data/arrow_flight_sql_p0/test_select.out b/regression-test/data/arrow_flight_sql_p0/test_select.out
new file mode 100644
index 0000000000..f2f4b86bbf
--- /dev/null
+++ b/regression-test/data/arrow_flight_sql_p0/test_select.out
@@ -0,0 +1,8 @@
+-- This file is automatically generated. You should know what you did if you want to edit this
+-- !arrow_flight_sql --
+777 4
+
+-- !arrow_flight_sql_datetime --
+333 plsql333 2024-07-21 12:00:00.123456 2024-07-21 12:00:00.0
+222 plsql222 2024-07-20 12:00:00.123456 2024-07-20 12:00:00.0
+111 plsql111 2024-07-19 12:00:00.123456 2024-07-19 12:00:00.0
\ No newline at end of file
diff --git a/regression-test/framework/pom.xml b/regression-test/framework/pom.xml
index 400702208b..ea4866787e 100644
--- a/regression-test/framework/pom.xml
+++ b/regression-test/framework/pom.xml
@@ -74,6 +74,7 @@ under the License.
4.0.19
4.9.3
2.8.0
+
17.0.0
diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
index 745d204761..c1395b6d4c 100644
--- a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
+++ b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
@@ -706,19 +706,23 @@ class Config {
return DriverManager.getConnection(dbUrl, jdbcUser, jdbcPassword)
}
- Connection getConnectionByArrowFlightSql(String dbName) {
+ Connection getConnectionByArrowFlightSqlDbName(String dbName) {
Class.forName("org.apache.arrow.driver.jdbc.ArrowFlightJdbcDriver")
String arrowFlightSqlHost = otherConfigs.get("extArrowFlightSqlHost")
String arrowFlightSqlPort = otherConfigs.get("extArrowFlightSqlPort")
String arrowFlightSqlUrl = "jdbc:arrow-flight-sql://${arrowFlightSqlHost}:${arrowFlightSqlPort}" +
"/?useServerPrepStmts=false&useSSL=false&useEncryption=false"
- // TODO jdbc:arrow-flight-sql not support connect db
- String dbUrl = buildUrlWithDbImpl(arrowFlightSqlUrl, dbName)
+ // Arrow 17.0.0-rc03 support jdbc:arrow-flight-sql connect db
+ // https://github.com/apache/arrow/issues/41947
+ if (dbName?.trim()) {
+ arrowFlightSqlUrl = "jdbc:arrow-flight-sql://${arrowFlightSqlHost}:${arrowFlightSqlPort}" +
+ "/catalog=" + dbName + "?useServerPrepStmts=false&useSSL=false&useEncryption=false"
+ }
tryCreateDbIfNotExist(dbName)
- log.info("connect to ${dbUrl}".toString())
+ log.info("connect to ${arrowFlightSqlUrl}".toString())
String arrowFlightSqlJdbcUser = otherConfigs.get("extArrowFlightSqlUser")
String arrowFlightSqlJdbcPassword = otherConfigs.get("extArrowFlightSqlPassword")
- return DriverManager.getConnection(dbUrl, arrowFlightSqlJdbcUser, arrowFlightSqlJdbcPassword)
+ return DriverManager.getConnection(arrowFlightSqlUrl, arrowFlightSqlJdbcUser, arrowFlightSqlJdbcPassword)
}
Connection getDownstreamConnection() {
diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/SuiteContext.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/SuiteContext.groovy
index f5f001b530..2423a9dac9 100644
--- a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/SuiteContext.groovy
+++ b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/SuiteContext.groovy
@@ -156,7 +156,7 @@ class SuiteContext implements Closeable {
def threadConnInfo = threadArrowFlightSqlConn.get()
if (threadConnInfo == null) {
threadConnInfo = new ConnectionInfo()
- threadConnInfo.conn = config.getConnectionByArrowFlightSql(dbName)
+ threadConnInfo.conn = config.getConnectionByArrowFlightSqlDbName(dbName)
threadConnInfo.username = config.jdbcUser
threadConnInfo.password = config.jdbcPassword
threadArrowFlightSqlConn.set(threadConnInfo)
diff --git a/regression-test/suites/arrow_flight_sql_p0/test_select.groovy b/regression-test/suites/arrow_flight_sql_p0/test_select.groovy
new file mode 100644
index 0000000000..950fb4af7e
--- /dev/null
+++ b/regression-test/suites/arrow_flight_sql_p0/test_select.groovy
@@ -0,0 +1,43 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("test_select", "arrow_flight_sql") {
+ def tableName = "test_select"
+ sql "DROP TABLE IF EXISTS ${tableName}"
+ sql """
+ create table ${tableName} (id int, name varchar(20)) DUPLICATE key(`id`) distributed by hash (`id`) buckets 4
+ properties ("replication_num"="1");
+ """
+ sql """INSERT INTO ${tableName} VALUES(111, "plsql111")"""
+ sql """INSERT INTO ${tableName} VALUES(222, "plsql222")"""
+ sql """INSERT INTO ${tableName} VALUES(333, "plsql333")"""
+ sql """INSERT INTO ${tableName} VALUES(111, "plsql333")"""
+
+ qt_arrow_flight_sql "select sum(id) as a, count(1) as b from ${tableName}"
+
+ tableName = "test_select_datetime"
+ sql "DROP TABLE IF EXISTS ${tableName}"
+ sql """
+ create table ${tableName} (id int, name varchar(20), f_datetime_p datetime(6), f_datetime datetime) DUPLICATE key(`id`) distributed by hash (`id`) buckets 4
+ properties ("replication_num"="1");
+ """
+ sql """INSERT INTO ${tableName} VALUES(111, "plsql111","2024-07-19 12:00:00.123456","2024-07-19 12:00:00")"""
+ sql """INSERT INTO ${tableName} VALUES(222, "plsql222","2024-07-20 12:00:00.123456","2024-07-20 12:00:00")"""
+ sql """INSERT INTO ${tableName} VALUES(333, "plsql333","2024-07-21 12:00:00.123456","2024-07-21 12:00:00")"""
+
+ qt_arrow_flight_sql_datetime "select * from ${tableName} order by id desc"
+}
diff --git a/regression-test/suites/query_p0/aggregate/aggregate_count1.groovy b/regression-test/suites/query_p0/aggregate/aggregate_count1.groovy
index 3971f304e3..cf657cc8ef 100644
--- a/regression-test/suites/query_p0/aggregate/aggregate_count1.groovy
+++ b/regression-test/suites/query_p0/aggregate/aggregate_count1.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-suite("aggregate_count1", "query,arrow_flight_sql") {
+suite("aggregate_count1", "query") {
sql """ DROP TABLE IF EXISTS aggregate_count1 """
sql """create table if not exists aggregate_count1 (
name varchar(128),
diff --git a/regression-test/suites/query_p0/aggregate/select_distinct.groovy b/regression-test/suites/query_p0/aggregate/select_distinct.groovy
index 2d6a8679d8..6456158bda 100644
--- a/regression-test/suites/query_p0/aggregate/select_distinct.groovy
+++ b/regression-test/suites/query_p0/aggregate/select_distinct.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("select_distinct", "arrow_flight_sql") {
+suite("select_distinct") {
sql """DROP TABLE IF EXISTS decimal_a;"""
sql """DROP TABLE IF EXISTS decimal_b;"""
sql """DROP TABLE IF EXISTS decimal_c;"""
diff --git a/regression-test/suites/query_p0/casesensetive_column/join_with_column_casesensetive.groovy b/regression-test/suites/query_p0/casesensetive_column/join_with_column_casesensetive.groovy
index 8bd3b19088..45499fc6f2 100644
--- a/regression-test/suites/query_p0/casesensetive_column/join_with_column_casesensetive.groovy
+++ b/regression-test/suites/query_p0/casesensetive_column/join_with_column_casesensetive.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("join_with_column_casesensetive", "arrow_flight_sql") {
+suite("join_with_column_casesensetive") {
def tables=["ad_order_data_v1","ad_order_data"]
for (String table in tables) {
diff --git a/regression-test/suites/query_p0/cast/test_cast.groovy b/regression-test/suites/query_p0/cast/test_cast.groovy
index dae669e296..947d61bc82 100644
--- a/regression-test/suites/query_p0/cast/test_cast.groovy
+++ b/regression-test/suites/query_p0/cast/test_cast.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite('test_cast', "arrow_flight_sql") {
+suite('test_cast') {
def date = "date '2020-01-01'"
def datev2 = "datev2 '2020-01-01'"
def datetime = "timestamp '2020-01-01 12:34:45'"
diff --git a/regression-test/suites/query_p0/except/test_query_except.groovy b/regression-test/suites/query_p0/except/test_query_except.groovy
index 410e24f89b..1a2aa742d2 100644
--- a/regression-test/suites/query_p0/except/test_query_except.groovy
+++ b/regression-test/suites/query_p0/except/test_query_except.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_query_except", "arrow_flight_sql") {
+suite("test_query_except") {
// test query except, depend on query_test_data_load.groovy
sql "use test_query_db"
qt_select_except1 """
diff --git a/regression-test/suites/query_p0/group_concat/test_group_concat.groovy b/regression-test/suites/query_p0/group_concat/test_group_concat.groovy
index 522d66ed64..5054dc2ee3 100644
--- a/regression-test/suites/query_p0/group_concat/test_group_concat.groovy
+++ b/regression-test/suites/query_p0/group_concat/test_group_concat.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_group_concat", "query,p0,arrow_flight_sql") {
+suite("test_group_concat", "query,p0") {
qt_select """
SELECT group_concat(k6) FROM test_query_db.test where k6='false'
"""
diff --git a/regression-test/suites/query_p0/grouping_sets/test_grouping_sets1.groovy b/regression-test/suites/query_p0/grouping_sets/test_grouping_sets1.groovy
index f8180b0ab4..1f12de6628 100644
--- a/regression-test/suites/query_p0/grouping_sets/test_grouping_sets1.groovy
+++ b/regression-test/suites/query_p0/grouping_sets/test_grouping_sets1.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_grouping_sets1", "arrow_flight_sql") {
+suite("test_grouping_sets1") {
qt_select """
select
col1
diff --git a/regression-test/suites/query_p0/having/having.groovy b/regression-test/suites/query_p0/having/having.groovy
index bbad236c97..fb32b3834a 100644
--- a/regression-test/suites/query_p0/having/having.groovy
+++ b/regression-test/suites/query_p0/having/having.groovy
@@ -19,7 +19,7 @@
// /testing/trino-product-tests/src/main/resources/sql-tests/testcases/aggregate
// and modified by Doris.
-suite("having", "query,p0,arrow_flight_sql") {
+suite("having", "query,p0") {
sql """DROP TABLE IF EXISTS supplier"""
sql """CREATE TABLE `supplier` (
`s_suppkey` int(11) NOT NULL,
diff --git a/regression-test/suites/query_p0/intersect/test_intersect.groovy b/regression-test/suites/query_p0/intersect/test_intersect.groovy
index 7919bec324..1c007b95d7 100644
--- a/regression-test/suites/query_p0/intersect/test_intersect.groovy
+++ b/regression-test/suites/query_p0/intersect/test_intersect.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_intersect", "arrow_flight_sql") {
+suite("test_intersect") {
qt_select """
SELECT * FROM (SELECT k1 FROM test_query_db.baseall
INTERSECT SELECT k1 FROM test_query_db.test) a ORDER BY k1
diff --git a/regression-test/suites/query_p0/join/test_join2.groovy b/regression-test/suites/query_p0/join/test_join2.groovy
index fb8cdb95f0..14ba5fa6e0 100644
--- a/regression-test/suites/query_p0/join/test_join2.groovy
+++ b/regression-test/suites/query_p0/join/test_join2.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_join2", "query,p0,arrow_flight_sql") {
+suite("test_join2", "query,p0") {
def DBname = "regression_test_join2"
def TBname1 = "J1_TBL"
def TBname2 = "J2_TBL"
diff --git a/regression-test/suites/query_p0/join/test_left_join1.groovy b/regression-test/suites/query_p0/join/test_left_join1.groovy
index 104adab4a8..d4cbeeee65 100644
--- a/regression-test/suites/query_p0/join/test_left_join1.groovy
+++ b/regression-test/suites/query_p0/join/test_left_join1.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_left_join1", "query,p0,arrow_flight_sql") {
+suite("test_left_join1", "query,p0") {
def tableName = "test_left_join1"
sql """drop table if exists ${tableName}"""
diff --git a/regression-test/suites/query_p0/join/test_nestedloop_outer_join.groovy b/regression-test/suites/query_p0/join/test_nestedloop_outer_join.groovy
index f99dfa0424..ad19e55469 100644
--- a/regression-test/suites/query_p0/join/test_nestedloop_outer_join.groovy
+++ b/regression-test/suites/query_p0/join/test_nestedloop_outer_join.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_nestedloop_outer_join", "query_p0,arrow_flight_sql") {
+suite("test_nestedloop_outer_join", "query_p0") {
def tbl1 = "test_nestedloop_outer_join1"
def tbl2 = "test_nestedloop_outer_join2"
diff --git a/regression-test/suites/query_p0/join/test_partitioned_hash_join.groovy b/regression-test/suites/query_p0/join/test_partitioned_hash_join.groovy
index 676cdd0627..cbe09ec527 100644
--- a/regression-test/suites/query_p0/join/test_partitioned_hash_join.groovy
+++ b/regression-test/suites/query_p0/join/test_partitioned_hash_join.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_partitioned_hash_join", "query,p0,arrow_flight_sql") {
+suite("test_partitioned_hash_join", "query,p0") {
sql "drop table if exists test_partitioned_hash_join_l"
sql "drop table if exists test_partitioned_hash_join_r"
sql """ create table test_partitioned_hash_join_l (
diff --git a/regression-test/suites/query_p0/lateral_view/lateral_view.groovy b/regression-test/suites/query_p0/lateral_view/lateral_view.groovy
index fb319a8923..ad210711f5 100644
--- a/regression-test/suites/query_p0/lateral_view/lateral_view.groovy
+++ b/regression-test/suites/query_p0/lateral_view/lateral_view.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("lateral_view", "arrow_flight_sql") {
+suite("lateral_view") {
sql """ DROP TABLE IF EXISTS `test_explode_bitmap` """
sql """
CREATE TABLE `test_explode_bitmap` (
diff --git a/regression-test/suites/query_p0/limit/OffsetInSubqueryWithJoin.groovy b/regression-test/suites/query_p0/limit/OffsetInSubqueryWithJoin.groovy
index caa75ac7be..da0c7231f4 100644
--- a/regression-test/suites/query_p0/limit/OffsetInSubqueryWithJoin.groovy
+++ b/regression-test/suites/query_p0/limit/OffsetInSubqueryWithJoin.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_offset_in_subquery_with_join", "query,arrow_flight_sql") {
+suite("test_offset_in_subquery_with_join", "query") {
// define a sql table
def testTable = "test_offset_in_subquery_with_join"
diff --git a/regression-test/suites/query_p0/literal_view/lietral_test.groovy b/regression-test/suites/query_p0/literal_view/lietral_test.groovy
index 27b82c1624..6e9d51f0a0 100644
--- a/regression-test/suites/query_p0/literal_view/lietral_test.groovy
+++ b/regression-test/suites/query_p0/literal_view/lietral_test.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("literal_view_test", "arrow_flight_sql") {
+suite("literal_view_test") {
sql """DROP TABLE IF EXISTS table1"""
diff --git a/regression-test/suites/query_p0/operator/test_set_operator.groovy b/regression-test/suites/query_p0/operator/test_set_operator.groovy
index 7d6219585e..cb05e18b3e 100644
--- a/regression-test/suites/query_p0/operator/test_set_operator.groovy
+++ b/regression-test/suites/query_p0/operator/test_set_operator.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_set_operators", "query,p0,arrow_flight_sql") {
+suite("test_set_operators", "query,p0") {
sql """
DROP TABLE IF EXISTS t1;
diff --git a/regression-test/suites/query_p0/operator/test_sort_operator.groovy b/regression-test/suites/query_p0/operator/test_sort_operator.groovy
index ae58b45df6..44ba506223 100644
--- a/regression-test/suites/query_p0/operator/test_sort_operator.groovy
+++ b/regression-test/suites/query_p0/operator/test_sort_operator.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_sort_operator", "query,p0,arrow_flight_sql") {
+suite("test_sort_operator", "query,p0") {
sql """
DROP TABLE IF EXISTS dim_org_ful;
diff --git a/regression-test/suites/query_p0/session_variable/test_default_limit.groovy b/regression-test/suites/query_p0/session_variable/test_default_limit.groovy
index 2ce3b64714..edda5d5179 100644
--- a/regression-test/suites/query_p0/session_variable/test_default_limit.groovy
+++ b/regression-test/suites/query_p0/session_variable/test_default_limit.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite('test_default_limit', "arrow_flight_sql") {
+suite('test_default_limit') {
sql 'drop table if exists baseall'
sql 'drop table if exists bigtable'
diff --git a/regression-test/suites/query_p0/show/test_show_create_table.groovy b/regression-test/suites/query_p0/show/test_show_create_table.groovy
index 1e3fc7ff5c..6325cbe319 100644
--- a/regression-test/suites/query_p0/show/test_show_create_table.groovy
+++ b/regression-test/suites/query_p0/show/test_show_create_table.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_show_create_table", "query,arrow_flight_sql") {
+suite("test_show_create_table", "query") {
String tb_name = "tb_show_create_table";
try {
sql """drop table if exists ${tb_name} """
diff --git a/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.groovy b/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.groovy
index 5748fac089..dbc6a998a5 100644
--- a/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.groovy
+++ b/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_aggregate_all_functions.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_aggregate_all_functions", "arrow_flight_sql") {
+suite("test_aggregate_all_functions") {
sql "set batch_size = 4096"
diff --git a/regression-test/suites/query_p0/sql_functions/case_function/test_case_function_null.groovy b/regression-test/suites/query_p0/sql_functions/case_function/test_case_function_null.groovy
index 5138db6e73..269a0bf0db 100644
--- a/regression-test/suites/query_p0/sql_functions/case_function/test_case_function_null.groovy
+++ b/regression-test/suites/query_p0/sql_functions/case_function/test_case_function_null.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_case_function_null", "query,p0,arrow_flight_sql") {
+suite("test_case_function_null", "query,p0") {
sql """ drop table if exists case_null0 """
sql """ create table case_null0 (
`c0` decimalv3(17, 1) NULL,
diff --git a/regression-test/suites/query_p0/sql_functions/hash_functions/test_hash_function.groovy b/regression-test/suites/query_p0/sql_functions/hash_functions/test_hash_function.groovy
index d547e9fb28..590ccd1082 100644
--- a/regression-test/suites/query_p0/sql_functions/hash_functions/test_hash_function.groovy
+++ b/regression-test/suites/query_p0/sql_functions/hash_functions/test_hash_function.groovy
@@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-suite("test_hash_function", "arrow_flight_sql") {
+suite("test_hash_function") {
sql "set batch_size = 4096;"
sql "set enable_profile = true;"
diff --git a/regression-test/suites/query_p0/sql_functions/ip_functions/test_ip_functions.groovy b/regression-test/suites/query_p0/sql_functions/ip_functions/test_ip_functions.groovy
index 54ee3ab0e2..be84f95680 100644
--- a/regression-test/suites/query_p0/sql_functions/ip_functions/test_ip_functions.groovy
+++ b/regression-test/suites/query_p0/sql_functions/ip_functions/test_ip_functions.groovy
@@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-suite("test_ip_functions", "arrow_flight_sql") {
+suite("test_ip_functions") {
sql "set batch_size = 4096;"
qt_sql "SELECT ipv4_num_to_string(-1);"
diff --git a/regression-test/suites/query_p0/sql_functions/json_function/test_query_json_insert.groovy b/regression-test/suites/query_p0/sql_functions/json_function/test_query_json_insert.groovy
index b586503453..c885e3ae34 100644
--- a/regression-test/suites/query_p0/sql_functions/json_function/test_query_json_insert.groovy
+++ b/regression-test/suites/query_p0/sql_functions/json_function/test_query_json_insert.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_query_json_insert", "query,arrow_flight_sql") {
+suite("test_query_json_insert", "query") {
qt_sql "select json_insert('{\"a\": 1, \"b\": [2, 3]}', '\$', null);"
qt_sql "select json_insert('{\"k\": [1, 2]}', '\$.k[0]', null, '\$.[1]', null);"
def tableName = "test_query_json_insert"
diff --git a/regression-test/suites/query_p0/sql_functions/json_functions/test_json_function.groovy b/regression-test/suites/query_p0/sql_functions/json_functions/test_json_function.groovy
index 4bd88bf131..aa0deec96f 100644
--- a/regression-test/suites/query_p0/sql_functions/json_functions/test_json_function.groovy
+++ b/regression-test/suites/query_p0/sql_functions/json_functions/test_json_function.groovy
@@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-suite("test_json_function", "arrow_flight_sql") {
+suite("test_json_function") {
sql "set batch_size = 4096;"
qt_sql "SELECT get_json_double('{\"k1\":1.3, \"k2\":\"2\"}', \"\$.k1\");"
diff --git a/regression-test/suites/query_p0/sql_functions/math_functions/test_conv.groovy b/regression-test/suites/query_p0/sql_functions/math_functions/test_conv.groovy
index 3a74abfe9c..6c4867174d 100644
--- a/regression-test/suites/query_p0/sql_functions/math_functions/test_conv.groovy
+++ b/regression-test/suites/query_p0/sql_functions/math_functions/test_conv.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_conv", "arrow_flight_sql") {
+suite("test_conv") {
qt_select "SELECT CONV(15,10,2)"
sql """ drop table if exists test_conv; """
diff --git a/regression-test/suites/query_p0/sql_functions/search_functions/test_multi_string_search.groovy b/regression-test/suites/query_p0/sql_functions/search_functions/test_multi_string_search.groovy
index f1487d283d..061665d3b9 100644
--- a/regression-test/suites/query_p0/sql_functions/search_functions/test_multi_string_search.groovy
+++ b/regression-test/suites/query_p0/sql_functions/search_functions/test_multi_string_search.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_multi_string_search", "arrow_flight_sql") {
+suite("test_multi_string_search") {
def table_name = "test_multi_string_search_strings"
sql """ DROP TABLE IF EXISTS ${table_name} """
diff --git a/regression-test/suites/query_p0/sql_functions/spatial_functions/test_gis_function.groovy b/regression-test/suites/query_p0/sql_functions/spatial_functions/test_gis_function.groovy
index f76cb44cb4..e98e11ba7e 100644
--- a/regression-test/suites/query_p0/sql_functions/spatial_functions/test_gis_function.groovy
+++ b/regression-test/suites/query_p0/sql_functions/spatial_functions/test_gis_function.groovy
@@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-suite("test_gis_function", "arrow_flight_sql") {
+suite("test_gis_function") {
sql "set batch_size = 4096;"
qt_sql "SELECT ST_AsText(ST_Point(24.7, 56.7));"
diff --git a/regression-test/suites/query_p0/sql_functions/string_functions/test_string_function.groovy b/regression-test/suites/query_p0/sql_functions/string_functions/test_string_function.groovy
index eb38c3e0fa..b3f367ad59 100644
--- a/regression-test/suites/query_p0/sql_functions/string_functions/test_string_function.groovy
+++ b/regression-test/suites/query_p0/sql_functions/string_functions/test_string_function.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_string_function", "arrow_flight_sql") {
+suite("test_string_function") {
sql "set batch_size = 4096;"
qt_sql "select elt(0, \"hello\", \"doris\");"
diff --git a/regression-test/suites/query_p0/sql_functions/table_function/explode_split.groovy b/regression-test/suites/query_p0/sql_functions/table_function/explode_split.groovy
index 53db931c03..b7dd4d6407 100644
--- a/regression-test/suites/query_p0/sql_functions/table_function/explode_split.groovy
+++ b/regression-test/suites/query_p0/sql_functions/table_function/explode_split.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("explode_split", "arrow_flight_sql") {
+suite("explode_split") {
def tableName = "test_lv_str"
sql """ DROP TABLE IF EXISTS ${tableName} """
diff --git a/regression-test/suites/query_p0/sql_functions/test_alias_function.groovy b/regression-test/suites/query_p0/sql_functions/test_alias_function.groovy
index 9cf4003c27..c53e2e89b5 100644
--- a/regression-test/suites/query_p0/sql_functions/test_alias_function.groovy
+++ b/regression-test/suites/query_p0/sql_functions/test_alias_function.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite('test_alias_function', "arrow_flight_sql") {
+suite('test_alias_function') {
sql '''
CREATE ALIAS FUNCTION IF NOT EXISTS f1(DATETIMEV2(3), INT)
with PARAMETER (datetime1, int1) as date_trunc(days_sub(datetime1, int1), 'day')'''
diff --git a/regression-test/suites/query_p0/sql_functions/test_predicate.groovy b/regression-test/suites/query_p0/sql_functions/test_predicate.groovy
index 6cca6b62c9..20b3c179ad 100644
--- a/regression-test/suites/query_p0/sql_functions/test_predicate.groovy
+++ b/regression-test/suites/query_p0/sql_functions/test_predicate.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_predicate", "arrow_flight_sql") {
+suite("test_predicate") {
sql """drop table if exists t1;"""
sql """
create table t1 (
diff --git a/regression-test/suites/query_p0/sql_functions/width_bucket_fuctions/test_width_bucket_function.groovy b/regression-test/suites/query_p0/sql_functions/width_bucket_fuctions/test_width_bucket_function.groovy
index 1a455da924..d0862a580c 100644
--- a/regression-test/suites/query_p0/sql_functions/width_bucket_fuctions/test_width_bucket_function.groovy
+++ b/regression-test/suites/query_p0/sql_functions/width_bucket_fuctions/test_width_bucket_function.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_width_bucket_function", "arrow_flight_sql") {
+suite("test_width_bucket_function") {
qt_sql "select width_bucket(1, 2, 3, 2)"
qt_sql "select width_bucket(null, 2, 3, 2)"
qt_sql "select width_bucket(6, 2, 6, 4)"
diff --git a/regression-test/suites/query_p0/subquery/test_subquery2.groovy b/regression-test/suites/query_p0/subquery/test_subquery2.groovy
index a14a44fa15..e572459cc7 100644
--- a/regression-test/suites/query_p0/subquery/test_subquery2.groovy
+++ b/regression-test/suites/query_p0/subquery/test_subquery2.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_subquery2", "arrow_flight_sql") {
+suite("test_subquery2") {
sql """DROP TABLE IF EXISTS subquerytest2"""
diff --git a/regression-test/suites/query_p0/test_data_type_marks.groovy b/regression-test/suites/query_p0/test_data_type_marks.groovy
index f2de3d2d5b..ccbe727759 100644
--- a/regression-test/suites/query_p0/test_data_type_marks.groovy
+++ b/regression-test/suites/query_p0/test_data_type_marks.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_data_type_marks", "arrow_flight_sql") {
+suite("test_data_type_marks") {
def tbName = "org"
sql "DROP TABLE IF EXISTS ${tbName}"
sql """
diff --git a/regression-test/suites/query_p0/test_dict_with_null.groovy b/regression-test/suites/query_p0/test_dict_with_null.groovy
index 83d253fa4d..b3738bb68a 100644
--- a/regression-test/suites/query_p0/test_dict_with_null.groovy
+++ b/regression-test/suites/query_p0/test_dict_with_null.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("dict_with_null", "query,arrow_flight_sql") {
+suite("dict_with_null", "query") {
def tableName = "test_dict_with_null"
sql "DROP TABLE IF EXISTS ${tableName}"
sql """
diff --git a/regression-test/suites/query_p0/test_orderby_nullliteral.groovy b/regression-test/suites/query_p0/test_orderby_nullliteral.groovy
index e806060c8b..fe11c778af 100644
--- a/regression-test/suites/query_p0/test_orderby_nullliteral.groovy
+++ b/regression-test/suites/query_p0/test_orderby_nullliteral.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("orderby_nullliteral", "query,arrow_flight_sql") {
+suite("orderby_nullliteral", "query") {
def tableName = "test_orderby_nullliteral"
sql "DROP TABLE IF EXISTS ${tableName}"
diff --git a/regression-test/suites/query_p0/test_select_constant.groovy b/regression-test/suites/query_p0/test_select_constant.groovy
index 68f0a28a20..6015e19576 100644
--- a/regression-test/suites/query_p0/test_select_constant.groovy
+++ b/regression-test/suites/query_p0/test_select_constant.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_select_constant", "arrow_flight_sql") {
+suite("test_select_constant") {
qt_select1 'select 100, "test", date("2021-01-02");'
qt_select_geo1 'SELECT ST_AsText(ST_Point(123.12345678901234567890,89.1234567890));'
}
diff --git a/regression-test/suites/query_p0/test_select_with_predicate_like.groovy b/regression-test/suites/query_p0/test_select_with_predicate_like.groovy
index 0d01f1b958..9491c4271c 100644
--- a/regression-test/suites/query_p0/test_select_with_predicate_like.groovy
+++ b/regression-test/suites/query_p0/test_select_with_predicate_like.groovy
@@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-suite("test_select_with_predicate_like", "arrow_flight_sql") {
+suite("test_select_with_predicate_like") {
def tables=["test_basic_agg"]
for (String table in tables) {
diff --git a/regression-test/suites/query_p0/test_select_with_predicate_prune.groovy b/regression-test/suites/query_p0/test_select_with_predicate_prune.groovy
index ccd1b9160f..768e04b4c3 100644
--- a/regression-test/suites/query_p0/test_select_with_predicate_prune.groovy
+++ b/regression-test/suites/query_p0/test_select_with_predicate_prune.groovy
@@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-suite("test_select_with_predicate_prune", "arrow_flight_sql") {
+suite("test_select_with_predicate_prune") {
sql """
drop table if exists `test_select_with_predicate_prune`;
"""
diff --git a/regression-test/suites/query_p0/type_inference/test_largeint.groovy b/regression-test/suites/query_p0/type_inference/test_largeint.groovy
index 161359cfa9..d5cbfa4b47 100644
--- a/regression-test/suites/query_p0/type_inference/test_largeint.groovy
+++ b/regression-test/suites/query_p0/type_inference/test_largeint.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_largeint", "arrow_flight_sql") {
+suite("test_largeint") {
def tbName = "test_largeint"
sql "DROP TABLE IF EXISTS ${tbName}"
sql """
diff --git a/regression-test/suites/query_p0/with/test_with_and_two_phase_agg.groovy b/regression-test/suites/query_p0/with/test_with_and_two_phase_agg.groovy
index d563ef1630..99164a999c 100644
--- a/regression-test/suites/query_p0/with/test_with_and_two_phase_agg.groovy
+++ b/regression-test/suites/query_p0/with/test_with_and_two_phase_agg.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_with_and_two_phase_agg", "arrow_flight_sql") {
+suite("test_with_and_two_phase_agg") {
def tableName = "test_with_and_two_phase_agg_table"
sql """ DROP TABLE IF EXISTS ${tableName} """
sql """