This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 7884316fefd branch-4.0:[fix](case)fix unstable external pipeline
case.(#56618) (#56620)
7884316fefd is described below
commit 7884316fefd0ce0ae63a4a1de2b0fd96d9fa26b8
Author: daidai <[email protected]>
AuthorDate: Tue Sep 30 08:53:45 2025 +0800
branch-4.0:[fix](case)fix unstable external pipeline case.(#56618) (#56620)
### What problem does this PR solve?
bp #56618
Problem Summary:
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
.../hive/test_hive_topn_rf_null.out | 192 ++++++++++-----------
.../hive/test_hive_topn_rf_null.groovy | 37 ++--
.../hive/test_parquet_complex_cross_page.groovy | 2 +
3 files changed, 116 insertions(+), 115 deletions(-)
diff --git
a/regression-test/data/external_table_p0/hive/test_hive_topn_rf_null.out
b/regression-test/data/external_table_p0/hive/test_hive_topn_rf_null.out
index 6cccfa3d1dc..c6cea0d8e74 100644
--- a/regression-test/data/external_table_p0/hive/test_hive_topn_rf_null.out
+++ b/regression-test/data/external_table_p0/hive/test_hive_topn_rf_null.out
@@ -8,22 +8,22 @@
-- !sql_test_2 --
10 1000
-9 \N
8 800
+9 \N
-- !sql_test_3 --
-\N Ivan
-\N Grace
\N \N
+\N Grace
+\N Ivan
100 Alice
200 \N
-- !sql_test_4 --
10
-8
-6
-4
3
+4
+6
+8
-- !sql_test_5 --
\N
@@ -34,15 +34,15 @@ Charlie
-- !sql_test_6 --
10 Judy
-9 Ivan
-7 Grace
-6 Frank
4 David
+6 Frank
+7 Grace
+9 Ivan
-- !sql_test_7 --
1000
-800
600
+800
-- !sql_test_8 --
1 Alice
@@ -54,27 +54,27 @@ Charlie
7 Grace
-- !sql_test_9 --
-9 \N Ivan
-7 \N Grace
-5 \N \N
1 100 Alice
+10 1000 Judy
2 200 \N
3 300 Charlie
4 400 David
+5 \N \N
6 600 Frank
+7 \N Grace
8 800 \N
-10 1000 Judy
+9 \N Ivan
-- !sql_test_10 --
\N
\N
-- !sql_test_11 --
-9 \N Ivan
-7 \N Grace
-5 \N \N
1 100 Alice
2 200 \N
+5 \N \N
+7 \N Grace
+9 \N Ivan
-- !sql_test_12 --
1 100
@@ -84,18 +84,18 @@ Charlie
6 600
-- !sql_test_13 --
-\N Ivan
-\N Grace
\N \N
+\N Grace
+\N Ivan
1000 Judy
800 \N
-- !sql_test_14 --
10
-8
-6
-4
3
+4
+6
+8
-- !sql_test_15 --
\N
@@ -112,14 +112,14 @@ Charlie
7 Grace
-- !sql_test_17 --
-200
\N
+200
800
-- !sql_test_18 --
10 1000 Judy
-9 \N Ivan
7 \N Grace
+9 \N Ivan
-- !sql_test_1 --
1 100 Alice
@@ -130,22 +130,22 @@ Charlie
-- !sql_test_2 --
10 1000
-9 \N
8 800
+9 \N
-- !sql_test_3 --
-\N Ivan
-\N Grace
\N \N
+\N Grace
+\N Ivan
100 Alice
200 \N
-- !sql_test_4 --
10
-8
-6
-4
3
+4
+6
+8
-- !sql_test_5 --
\N
@@ -156,15 +156,15 @@ Charlie
-- !sql_test_6 --
10 Judy
-9 Ivan
-7 Grace
-6 Frank
4 David
+6 Frank
+7 Grace
+9 Ivan
-- !sql_test_7 --
1000
-800
600
+800
-- !sql_test_8 --
1 Alice
@@ -176,27 +176,27 @@ Charlie
7 Grace
-- !sql_test_9 --
-9 \N Ivan
-7 \N Grace
-5 \N \N
1 100 Alice
+10 1000 Judy
2 200 \N
3 300 Charlie
4 400 David
+5 \N \N
6 600 Frank
+7 \N Grace
8 800 \N
-10 1000 Judy
+9 \N Ivan
-- !sql_test_10 --
\N
\N
-- !sql_test_11 --
-9 \N Ivan
-7 \N Grace
-5 \N \N
1 100 Alice
2 200 \N
+5 \N \N
+7 \N Grace
+9 \N Ivan
-- !sql_test_12 --
1 100
@@ -206,18 +206,18 @@ Charlie
6 600
-- !sql_test_13 --
-\N Ivan
-\N Grace
\N \N
+\N Grace
+\N Ivan
1000 Judy
800 \N
-- !sql_test_14 --
10
-8
-6
-4
3
+4
+6
+8
-- !sql_test_15 --
\N
@@ -234,14 +234,14 @@ Charlie
7 Grace
-- !sql_test_17 --
-200
\N
+200
800
-- !sql_test_18 --
10 1000 Judy
-9 \N Ivan
7 \N Grace
+9 \N Ivan
-- !sql_test_1 --
1 100 Alice
@@ -252,22 +252,22 @@ Charlie
-- !sql_test_2 --
10 1000
-9 \N
8 800
+9 \N
-- !sql_test_3 --
-\N Ivan
-\N Grace
\N \N
+\N Grace
+\N Ivan
100 Alice
200 \N
-- !sql_test_4 --
10
-8
-6
-4
3
+4
+6
+8
-- !sql_test_5 --
\N
@@ -278,15 +278,15 @@ Charlie
-- !sql_test_6 --
10 Judy
-9 Ivan
-7 Grace
-6 Frank
4 David
+6 Frank
+7 Grace
+9 Ivan
-- !sql_test_7 --
1000
-800
600
+800
-- !sql_test_8 --
1 Alice
@@ -298,27 +298,27 @@ Charlie
7 Grace
-- !sql_test_9 --
-9 \N Ivan
-7 \N Grace
-5 \N \N
1 100 Alice
+10 1000 Judy
2 200 \N
3 300 Charlie
4 400 David
+5 \N \N
6 600 Frank
+7 \N Grace
8 800 \N
-10 1000 Judy
+9 \N Ivan
-- !sql_test_10 --
\N
\N
-- !sql_test_11 --
-9 \N Ivan
-7 \N Grace
-5 \N \N
1 100 Alice
2 200 \N
+5 \N \N
+7 \N Grace
+9 \N Ivan
-- !sql_test_12 --
1 100
@@ -328,18 +328,18 @@ Charlie
6 600
-- !sql_test_13 --
-\N Ivan
-\N Grace
\N \N
+\N Grace
+\N Ivan
1000 Judy
800 \N
-- !sql_test_14 --
10
-8
-6
-4
3
+4
+6
+8
-- !sql_test_15 --
\N
@@ -356,14 +356,14 @@ Charlie
7 Grace
-- !sql_test_17 --
-200
\N
+200
800
-- !sql_test_18 --
10 1000 Judy
-9 \N Ivan
7 \N Grace
+9 \N Ivan
-- !sql_test_1 --
1 100 Alice
@@ -374,22 +374,22 @@ Charlie
-- !sql_test_2 --
10 1000
-9 \N
8 800
+9 \N
-- !sql_test_3 --
-\N Ivan
-\N Grace
\N \N
+\N Grace
+\N Ivan
100 Alice
200 \N
-- !sql_test_4 --
10
-8
-6
-4
3
+4
+6
+8
-- !sql_test_5 --
\N
@@ -400,15 +400,15 @@ Charlie
-- !sql_test_6 --
10 Judy
-9 Ivan
-7 Grace
-6 Frank
4 David
+6 Frank
+7 Grace
+9 Ivan
-- !sql_test_7 --
1000
-800
600
+800
-- !sql_test_8 --
1 Alice
@@ -420,27 +420,27 @@ Charlie
7 Grace
-- !sql_test_9 --
-9 \N Ivan
-7 \N Grace
-5 \N \N
1 100 Alice
+10 1000 Judy
2 200 \N
3 300 Charlie
4 400 David
+5 \N \N
6 600 Frank
+7 \N Grace
8 800 \N
-10 1000 Judy
+9 \N Ivan
-- !sql_test_10 --
\N
\N
-- !sql_test_11 --
-9 \N Ivan
-7 \N Grace
-5 \N \N
1 100 Alice
2 200 \N
+5 \N \N
+7 \N Grace
+9 \N Ivan
-- !sql_test_12 --
1 100
@@ -450,18 +450,18 @@ Charlie
6 600
-- !sql_test_13 --
-\N Ivan
-\N Grace
\N \N
+\N Grace
+\N Ivan
1000 Judy
800 \N
-- !sql_test_14 --
10
-8
-6
-4
3
+4
+6
+8
-- !sql_test_15 --
\N
@@ -478,12 +478,12 @@ Charlie
7 Grace
-- !sql_test_17 --
-200
\N
+200
800
-- !sql_test_18 --
10 1000 Judy
-9 \N Ivan
7 \N Grace
+9 \N Ivan
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_topn_rf_null.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_topn_rf_null.groovy
index a191a086cbd..abaf1118a99 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_topn_rf_null.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_topn_rf_null.groovy
@@ -23,25 +23,24 @@ suite("test_hive_topn_rf_null",
"p0,external,hive,external_docker,external_docke
}
def runTopnRfNullTest = {
for (String table_name in ["test_topn_rf_null_orc",
"test_topn_rf_null_parquet"]) {
-
- qt_sql_test_1 """SELECT id, value, name FROM ${table_name} ORDER
BY id ASC LIMIT 5;"""
- qt_sql_test_2 """SELECT id, value FROM ${table_name} ORDER BY id
DESC LIMIT 3;"""
- qt_sql_test_3 """SELECT value, name FROM ${table_name} ORDER BY
value ASC LIMIT 5;"""
- qt_sql_test_4 """SELECT id FROM ${table_name} ORDER BY value DESC
LIMIT 5;"""
- qt_sql_test_5 """SELECT name FROM ${table_name} ORDER BY name ASC
LIMIT 5;"""
- qt_sql_test_6 """SELECT id, name FROM ${table_name} ORDER BY name
DESC LIMIT 5;"""
- qt_sql_test_7 """SELECT value FROM ${table_name} ORDER BY value
DESC LIMIT 3;"""
- qt_sql_test_8 """SELECT id, name FROM ${table_name} ORDER BY id
ASC LIMIT 7;"""
- qt_sql_test_9 """SELECT * FROM ${table_name} ORDER BY value ASC
LIMIT 10;"""
- qt_sql_test_10 """SELECT name FROM ${table_name} ORDER BY name ASC
LIMIT 2;"""
- qt_sql_test_11 """SELECT id, value, name FROM ${table_name} ORDER
BY value ASC NULLS FIRST LIMIT 5;"""
- qt_sql_test_12 """SELECT id, value FROM ${table_name} ORDER BY
value ASC NULLS LAST LIMIT 5;"""
- qt_sql_test_13 """SELECT value, name FROM ${table_name} ORDER BY
value DESC NULLS FIRST LIMIT 5;"""
- qt_sql_test_14 """SELECT id FROM ${table_name} ORDER BY value DESC
NULLS LAST LIMIT 5;"""
- qt_sql_test_15 """SELECT name FROM ${table_name} ORDER BY name ASC
NULLS FIRST LIMIT 5;"""
- qt_sql_test_16 """SELECT id, name FROM ${table_name} ORDER BY name
ASC NULLS LAST LIMIT 5;"""
- qt_sql_test_17 """SELECT value FROM ${table_name} ORDER BY name
DESC NULLS FIRST LIMIT 3;"""
- qt_sql_test_18 """SELECT * FROM ${table_name} ORDER BY name DESC
NULLS LAST LIMIT 3;"""
+ order_qt_sql_test_1 """SELECT id, value, name FROM ${table_name}
ORDER BY id ASC LIMIT 5;"""
+ order_qt_sql_test_2 """SELECT id, value FROM ${table_name} ORDER
BY id DESC LIMIT 3;"""
+ order_qt_sql_test_3 """SELECT value, name FROM ${table_name}
ORDER BY value ASC LIMIT 5;"""
+ order_qt_sql_test_4 """SELECT id FROM ${table_name} ORDER BY
value DESC LIMIT 5;"""
+ order_qt_sql_test_5 """SELECT name FROM ${table_name} ORDER BY
name ASC LIMIT 5;"""
+ order_qt_sql_test_6 """SELECT id, name FROM ${table_name} ORDER
BY name DESC LIMIT 5;"""
+ order_qt_sql_test_7 """SELECT value FROM ${table_name} ORDER BY
value DESC LIMIT 3;"""
+ order_qt_sql_test_8 """SELECT id, name FROM ${table_name} ORDER
BY id ASC LIMIT 7;"""
+ order_qt_sql_test_9 """SELECT * FROM ${table_name} ORDER BY value
ASC LIMIT 10;"""
+ order_qt_sql_test_10 """SELECT name FROM ${table_name} ORDER BY
name ASC LIMIT 2;"""
+ order_qt_sql_test_11 """SELECT id, value, name FROM ${table_name}
ORDER BY value ASC NULLS FIRST LIMIT 5;"""
+ order_qt_sql_test_12 """SELECT id, value FROM ${table_name} ORDER
BY value ASC NULLS LAST LIMIT 5;"""
+ order_qt_sql_test_13 """SELECT value, name FROM ${table_name}
ORDER BY value DESC NULLS FIRST LIMIT 5;"""
+ order_qt_sql_test_14 """SELECT id FROM ${table_name} ORDER BY
value DESC NULLS LAST LIMIT 5;"""
+ order_qt_sql_test_15 """SELECT name FROM ${table_name} ORDER BY
name ASC NULLS FIRST LIMIT 5;"""
+ order_qt_sql_test_16 """SELECT id, name FROM ${table_name} ORDER
BY name ASC NULLS LAST LIMIT 5;"""
+ order_qt_sql_test_17 """SELECT value FROM ${table_name} ORDER BY
name DESC NULLS FIRST LIMIT 3;"""
+ order_qt_sql_test_18 """SELECT * FROM ${table_name} ORDER BY name
DESC NULLS LAST LIMIT 3;"""
}
}
diff --git
a/regression-test/suites/external_table_p2/hive/test_parquet_complex_cross_page.groovy
b/regression-test/suites/external_table_p2/hive/test_parquet_complex_cross_page.groovy
index 685f5f3204d..4d6fd115756 100644
---
a/regression-test/suites/external_table_p2/hive/test_parquet_complex_cross_page.groovy
+++
b/regression-test/suites/external_table_p2/hive/test_parquet_complex_cross_page.groovy
@@ -43,6 +43,8 @@ suite("test_parquet_complex_cross_page",
"p2,external,hive,external_remote,exter
sql """ set dry_run_query=true; """
+ sql """ set net_read_timeout = 1800; """
+
qt_1 """ SELECT * FROM test_parquet_complex_cross_page WHERE
device_id='DZ692' and format_time between 1737693770300 and 1737693770500
and date between '20250124' and '20250124' and project='GA20230001' ; """
qt_2 """ SELECT functions_pnc_ssm_road_di_objects from
test_parquet_complex_cross_page ; """
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
