From 39b768b9eac3d5db671c5d4c23c2509dfde050bb Mon Sep 17 00:00:00 2001 From: Xinyi Zou Date: Wed, 27 Mar 2024 08:35:40 +0800 Subject: [PATCH] [branch-2.1](thirdparty) upgrade arrow to 15.0.2 #32827 --- fe/pom.xml | 9 ++++++++- regression-test/framework/pom.xml | 2 +- .../suites/query_p0/sql_functions/test_in_expr.groovy | 2 +- .../window_functions/test_window_fn.groovy | 4 +++- .../query_p0/test_two_phase_read_with_having.groovy | 2 +- thirdparty/CHANGELOG.md | 4 ++++ thirdparty/vars.sh | 10 +++++----- 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/fe/pom.xml b/fe/pom.xml index 4acfa6f166..a15b2709a1 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -206,6 +206,13 @@ under the License. + + + kr.motd.maven + os-maven-plugin + 1.7.0 + + fe-common @@ -305,7 +312,7 @@ under the License. 1.4.3 0.45.2-public 1.11.3 - 15.0.0 + 15.0.2 0.14.1 2.7.4-11 diff --git a/regression-test/framework/pom.xml b/regression-test/framework/pom.xml index 4c22fe22f1..79b76a684b 100644 --- a/regression-test/framework/pom.xml +++ b/regression-test/framework/pom.xml @@ -74,7 +74,7 @@ under the License. 4.0.19 4.9.3 2.8.0 - 15.0.0 + 15.0.2 diff --git a/regression-test/suites/query_p0/sql_functions/test_in_expr.groovy b/regression-test/suites/query_p0/sql_functions/test_in_expr.groovy index 9829c9d61a..b6955e8df1 100644 --- a/regression-test/suites/query_p0/sql_functions/test_in_expr.groovy +++ b/regression-test/suites/query_p0/sql_functions/test_in_expr.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_in_expr", "query,arrow_flight_sql") { +suite("test_in_expr", "query") { // "arrow_flight_sql", groovy not support print arrow array type, throw IndexOutOfBoundsException. def nullTableName = "in_expr_test_null" def notNullTableName = "in_expr_test_not_null" diff --git a/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy b/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy index 165d5cf1d4..66bbab89d2 100644 --- a/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy +++ b/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy @@ -14,7 +14,9 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -suite("test_window_fn", "arrow_flight_sql") { +suite("test_window_fn") { + // "arrow_flight_sql", groovy use flight sql connection to execute query `SUM(MAX(c1) OVER (PARTITION BY))` report error: + // `AGGREGATE clause must not contain analytic expressions`, but no problem in Java execute it with `jdbc::arrow-flight-sql`. def tbName1 = "empsalary" def tbName2 = "tenk1" sql """ DROP TABLE IF EXISTS ${tbName1} """ diff --git a/regression-test/suites/query_p0/test_two_phase_read_with_having.groovy b/regression-test/suites/query_p0/test_two_phase_read_with_having.groovy index d0207960db..28e5e0405e 100644 --- a/regression-test/suites/query_p0/test_two_phase_read_with_having.groovy +++ b/regression-test/suites/query_p0/test_two_phase_read_with_having.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_two_phase_read_with_having", "arrow_flight_sql") { +suite("test_two_phase_read_with_having") { // "arrow_flight_sql" not support two phase read sql """ set enable_partition_topn = 1; """ sql """ set topn_opt_limit_threshold = 1024; """ diff --git a/thirdparty/CHANGELOG.md b/thirdparty/CHANGELOG.md index 455233c83e..dd04eb07bf 100644 --- a/thirdparty/CHANGELOG.md +++ b/thirdparty/CHANGELOG.md @@ -2,6 +2,10 @@ This file contains version of the third-party dependency libraries in the build-env image. The docker build-env image is apache/doris, and the tag is `build-env-${version}` +## 20240325 + +- Modified: arrow 13.0.0 -> 15.0.2 + ## 20240112 - Modified: hadoop libhdfs 3.3.4.6 diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh index 0ac70fa2e9..ffbfe1e384 100644 --- a/thirdparty/vars.sh +++ b/thirdparty/vars.sh @@ -253,10 +253,10 @@ GRPC_SOURCE=grpc-1.54.3 GRPC_MD5SUM="af00a2edeae0f02bb25917cc3473b7de" # arrow -ARROW_DOWNLOAD="https://github.com/apache/arrow/archive/refs/tags/apache-arrow-13.0.0.tar.gz" -ARROW_NAME="apache-arrow-13.0.0.tar.gz" -ARROW_SOURCE="arrow-apache-arrow-13.0.0" -ARROW_MD5SUM="8ec1ec6a119514bcaea1cf7aabc9df1f" +ARROW_DOWNLOAD="https://github.com/apache/arrow/archive/refs/tags/apache-arrow-15.0.2.tar.gz" +ARROW_NAME="apache-arrow-15.0.2.tar.gz" +ARROW_SOURCE="arrow-apache-arrow-15.0.2" +ARROW_MD5SUM="d5d051b2698be901e5ad84e36d64e7ab" # Abseil ABSEIL_DOWNLOAD="https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz" @@ -313,7 +313,7 @@ JEMALLOC_DORIS_SOURCE="jemalloc-5.3.0" JEMALLOC_DORIS_MD5SUM="09a8328574dab22a7df848eae6dbbf53" # libunwind -LIBUNWIND_DOWNLOAD="http://download.savannah.nongnu.org/releases/libunwind/libunwind-1.6.2.tar.gz" +LIBUNWIND_DOWNLOAD="https://github.com/libunwind/libunwind/releases/download/v1.6.2/libunwind-1.6.2.tar.gz" LIBUNWIND_NAME="libunwind-1.6.2.tar.gz" LIBUNWIND_SOURCE="libunwind-1.6.2" LIBUNWIND_MD5SUM="f625b6a98ac1976116c71708a73dc44a"