Skip to content

Commit

Permalink
[fix](arrow-flight-sql) Revert arrow_flight_sql group from regressi…
Browse files Browse the repository at this point in the history
…on test (apache#44992)

After pipeline `P0 Regression (Doris Regression)` executes
`./run-regression-test.sh --run -g p0`, it will execute
`./run-regression-test.sh -g arrow_flight_sql` to run regression-test
again, can use `jdbc:arrow-flight-sql` to run all Suites whose group
contains arrow_flight_sql.
  • Loading branch information
xinyiZzz committed Dec 6, 2024
1 parent 682cec9 commit 955d181
Show file tree
Hide file tree
Showing 44 changed files with 43 additions and 44 deletions.
1 change: 0 additions & 1 deletion be/src/vec/sink/vresult_sink.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ Status VResultSink::send(RuntimeState* state, Block* block, bool eos) {
COUNTER_UPDATE(_blocks_sent_counter, 1);
COUNTER_UPDATE(_output_rows_counter, block->rows());
if (_fetch_option.use_two_phase_fetch && block->rows() > 0) {
DCHECK(_sink_type == TResultSinkType::MYSQL_PROTOCAL);
RETURN_IF_ERROR(second_phase_fetch_data(state, block));
}
RETURN_IF_ERROR(_writer->write(*block));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

suite("aggregate_count1", "query") {
suite("aggregate_count1", "query,arrow_flight_sql") {
sql """ DROP TABLE IF EXISTS aggregate_count1 """
sql """create table if not exists aggregate_count1 (
name varchar(128),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("select_distinct") {
suite("select_distinct", "arrow_flight_sql") {
sql """DROP TABLE IF EXISTS decimal_a;"""
sql """DROP TABLE IF EXISTS decimal_b;"""
sql """DROP TABLE IF EXISTS decimal_c;"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("join_with_column_casesensetive") {
suite("join_with_column_casesensetive", "arrow_flight_sql") {
def tables=["ad_order_data_v1","ad_order_data"]

for (String table in tables) {
Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/query_p0/cast/test_cast.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite('test_cast') {
suite('test_cast', "arrow_flight_sql") {
def date = "date '2020-01-01'"
def datev2 = "datev2 '2020-01-01'"
def datetime = "timestamp '2020-01-01 12:34:45'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_query_except") {
suite("test_query_except", "arrow_flight_sql") {
// test query except, depend on query_test_data_load.groovy
sql "use test_query_db"
qt_select_except1 """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_group_concat", "query,p0") {
suite("test_group_concat", "query,p0,arrow_flight_sql") {
qt_select """
SELECT group_concat(k6) FROM test_query_db.test where k6='false'
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_grouping_sets1") {
suite("test_grouping_sets1", "arrow_flight_sql") {
qt_select """
select
col1
Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/query_p0/having/having.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// /testing/trino-product-tests/src/main/resources/sql-tests/testcases/aggregate
// and modified by Doris.

suite("having", "query,p0") {
suite("having", "query,p0,arrow_flight_sql") {
sql """DROP TABLE IF EXISTS supplier"""
sql """CREATE TABLE `supplier` (
`s_suppkey` int(11) NOT NULL,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_intersect") {
suite("test_intersect", "arrow_flight_sql") {
qt_select """
SELECT * FROM (SELECT k1 FROM test_query_db.baseall
INTERSECT SELECT k1 FROM test_query_db.test) a ORDER BY k1
Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/query_p0/join/test_join2.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_join2", "query,p0") {
suite("test_join2", "query,p0,arrow_flight_sql") {
def DBname = "regression_test_join2"
def TBname1 = "J1_TBL"
def TBname2 = "J2_TBL"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_left_join1", "query,p0") {
suite("test_left_join1", "query,p0,arrow_flight_sql") {

def tableName = "test_left_join1"
sql """drop table if exists ${tableName}"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_nestedloop_outer_join", "query_p0") {
suite("test_nestedloop_outer_join", "query_p0,arrow_flight_sql") {
def tbl1 = "test_nestedloop_outer_join1"
def tbl2 = "test_nestedloop_outer_join2"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_partitioned_hash_join", "query,p0") {
suite("test_partitioned_hash_join", "query,p0,arrow_flight_sql") {
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 (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("lateral_view") {
suite("lateral_view", "arrow_flight_sql") {
sql """ DROP TABLE IF EXISTS `test_explode_bitmap` """
sql """
CREATE TABLE `test_explode_bitmap` (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_offset_in_subquery_with_join", "query") {
suite("test_offset_in_subquery_with_join", "query,arrow_flight_sql") {
// define a sql table
def testTable = "test_offset_in_subquery_with_join"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("literal_view_test") {
suite("literal_view_test", "arrow_flight_sql") {

sql """DROP TABLE IF EXISTS table1"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_set_operators", "query,p0") {
suite("test_set_operators", "query,p0,arrow_flight_sql") {

sql """
DROP TABLE IF EXISTS t1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_sort_operator", "query,p0") {
suite("test_sort_operator", "query,p0,arrow_flight_sql") {

sql """
DROP TABLE IF EXISTS dim_org_ful;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite('test_default_limit') {
suite('test_default_limit', "arrow_flight_sql") {
sql 'drop table if exists baseall'
sql 'drop table if exists bigtable'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_show_create_table", "query") {
suite("test_show_create_table", "query,arrow_flight_sql") {
String tb_name = "tb_show_create_table";
try {
sql """drop table if exists ${tb_name} """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_aggregate_all_functions") {
suite("test_aggregate_all_functions", "arrow_flight_sql") {

sql "set batch_size = 4096"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_case_function_null", "query,p0") {
suite("test_case_function_null", "query,p0,arrow_flight_sql") {
sql """ drop table if exists case_null0 """
sql """ create table case_null0 (
`c0` decimalv3(17, 1) NULL,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
suite("test_hash_function", "arrow_flight_sql") {
sql "set batch_size = 4096;"
sql "set enable_profile = true;"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
suite("test_ip_functions", "arrow_flight_sql") {
sql "set batch_size = 4096;"

qt_sql "SELECT ipv4_num_to_string(-1);"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_query_json_insert", "query") {
suite("test_query_json_insert", "query,arrow_flight_sql") {
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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
suite("test_json_function", "arrow_flight_sql") {
sql "set batch_size = 4096;"

qt_sql "SELECT get_json_double('{\"k1\":1.3, \"k2\":\"2\"}', \"\$.k1\");"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_conv") {
suite("test_conv", "arrow_flight_sql") {
qt_select "SELECT CONV(15,10,2)"

sql """ drop table if exists test_conv; """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_multi_string_search") {
suite("test_multi_string_search", "arrow_flight_sql") {
def table_name = "test_multi_string_search_strings"

sql """ DROP TABLE IF EXISTS ${table_name} """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
suite("test_gis_function", "arrow_flight_sql") {
sql "set batch_size = 4096;"

qt_sql "SELECT ST_AsText(ST_Point(24.7, 56.7));"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_string_function") {
suite("test_string_function", "arrow_flight_sql") {
sql "set batch_size = 4096;"

qt_sql "select elt(0, \"hello\", \"doris\");"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("explode_split") {
suite("explode_split", "arrow_flight_sql") {
def tableName = "test_lv_str"

sql """ DROP TABLE IF EXISTS ${tableName} """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite('test_alias_function') {
suite('test_alias_function', "arrow_flight_sql") {
sql '''
CREATE ALIAS FUNCTION IF NOT EXISTS f1(DATETIMEV2(3), INT)
with PARAMETER (datetime1, int1) as date_trunc(days_sub(datetime1, int1), 'day')'''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_predicate") {
suite("test_predicate", "arrow_flight_sql") {
sql """drop table if exists t1;"""
sql """
create table t1 (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_width_bucket_function") {
suite("test_width_bucket_function", "arrow_flight_sql") {
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)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_subquery2") {
suite("test_subquery2", "arrow_flight_sql") {

sql """DROP TABLE IF EXISTS subquerytest2"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_data_type_marks") {
suite("test_data_type_marks", "arrow_flight_sql") {
def tbName = "org"
sql "DROP TABLE IF EXISTS ${tbName}"
sql """
Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/query_p0/test_dict_with_null.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("dict_with_null", "query") {
suite("dict_with_null", "query,arrow_flight_sql") {
def tableName = "test_dict_with_null"
sql "DROP TABLE IF EXISTS ${tableName}"
sql """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("orderby_nullliteral", "query") {
suite("orderby_nullliteral", "query,arrow_flight_sql") {

def tableName = "test_orderby_nullliteral"
sql "DROP TABLE IF EXISTS ${tableName}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_select_constant") {
suite("test_select_constant", "arrow_flight_sql") {
qt_select1 'select 100, "test", date("2021-01-02");'
qt_select_geo1 'SELECT ST_AsText(ST_Point(123.12345678901234567890,89.1234567890));'
}
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
suite("test_select_with_predicate_like", "arrow_flight_sql") {
def tables=["test_basic_agg"]

for (String table in tables) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
suite("test_select_with_predicate_prune", "arrow_flight_sql") {
sql """
drop table if exists `test_select_with_predicate_prune`;
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_largeint") {
suite("test_largeint", "arrow_flight_sql") {
def tbName = "test_largeint"
sql "DROP TABLE IF EXISTS ${tbName}"
sql """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("test_with_and_two_phase_agg") {
suite("test_with_and_two_phase_agg", "arrow_flight_sql") {
def tableName = "test_with_and_two_phase_agg_table"
sql """ DROP TABLE IF EXISTS ${tableName} """
sql """
Expand Down

0 comments on commit 955d181

Please sign in to comment.