diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml index 92e576fb2e1779..ec5d993c6f343b 100644 --- a/fe/fe-core/pom.xml +++ b/fe/fe-core/pom.xml @@ -587,6 +587,10 @@ under the License. org.apache.arrow arrow-memory-netty + + org.apache.arrow + arrow-memory-netty-buffer-patch + org.apache.arrow arrow-format @@ -815,6 +819,10 @@ under the License. org.apache.arrow arrow-memory-netty + + org.apache.arrow + arrow-memory-netty-buffer-patch + io.grpc grpc-netty diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/RuntimeFilterPushDownVisitor.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/RuntimeFilterPushDownVisitor.java index f1b488c6e68ae8..9a5c6a1daa9692 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/RuntimeFilterPushDownVisitor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/RuntimeFilterPushDownVisitor.java @@ -49,7 +49,7 @@ import org.apache.doris.thrift.TMinMaxRuntimeFilterType; import org.apache.doris.thrift.TRuntimeFilterType; -import cfjd.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/fe/pom.xml b/fe/pom.xml index 96c152b7dc1854..d670f1529af3da 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -266,13 +266,15 @@ under the License. 2.0.6 4.0.2 - 4.1.104.Final + + 4.1.110.Final 3.10.6.Final 2.1 1.34.0 - 1.60.1 + + 1.63.0 3.43.0 3.24.3 @@ -312,7 +314,7 @@ under the License. 1.4.3 0.45.2-public 1.11.3 - 15.0.2 + 17.0.0 0.14.1 2.7.4-11 @@ -413,6 +415,20 @@ under the License. + + io.netty + netty-bom + ${netty-all.version} + pom + import + + + io.grpc + grpc-bom + ${grpc.version} + pom + import + com.fasterxml.jackson jackson-bom @@ -910,109 +926,6 @@ under the License. metrics-core ${metrics-core.version} - - - io.netty - netty - test - ${netty-3-test.version} - - - io.netty - netty-all - ${netty-all.version} - - - io.netty - netty-buffer - ${netty-all.version} - - - io.netty - netty-common - ${netty-all.version} - - - io.netty - netty-codec - ${netty-all.version} - - - io.netty - netty-transport-udt - ${netty-all.version} - - - io.netty - netty-transport-sctp - ${netty-all.version} - - - io.netty - netty-transport-sctp - ${netty-all.version} - - - io.netty - netty-transport-classes-kqueue - ${netty-all.version} - - - io.netty - netty-transport-native-epoll - linux-x86_64 - ${netty-all.version} - - - io.netty - netty-transport-rxtx - ${netty-all.version} - - - io.netty - netty-codec-memcache - ${netty-all.version} - - - io.netty - netty-codec-mqtt - ${netty-all.version} - - - io.netty - netty-transport - ${netty-all.version} - - - io.netty - netty-codec-http - ${netty-all.version} - - - io.netty - netty-codec-http2 - ${netty-all.version} - - - io.netty - netty-resolver - ${netty-all.version} - - - io.netty - netty-handler - ${netty-all.version} - - - io.netty - netty-transport-classes-epoll - ${netty-all.version} - - - io.netty - netty-transport-native-unix-common - ${netty-all.version} - org.apache.velocity @@ -1069,26 +982,6 @@ under the License. objenesis ${objenesis.version} - - io.grpc - grpc-netty-shaded - ${grpc.version} - - - io.grpc - grpc-protobuf - ${grpc.version} - - - io.grpc - grpc-stub - ${grpc.version} - - - io.grpc - grpc-core - ${grpc.version} - com.google.protobuf @@ -1628,25 +1521,10 @@ under the License. tomcat-embed-core ${tomcat-embed-core.version} - - io.grpc - grpc-netty - ${grpc.version} - - - io.grpc - grpc-context - ${grpc.version} - io.netty netty-tcnative-boringssl-static - - io.grpc - grpc-api - ${grpc.version} - com.google.flatbuffers flatbuffers-java @@ -1662,6 +1540,11 @@ under the License. arrow-memory-netty ${arrow.version} + + org.apache.arrow + arrow-memory-netty-buffer-patch + ${arrow.version} + org.apache.arrow flight-core diff --git a/regression-test/framework/pom.xml b/regression-test/framework/pom.xml index f70b4fdb2afb4d..aded781c08bb71 100644 --- a/regression-test/framework/pom.xml +++ b/regression-test/framework/pom.xml @@ -75,7 +75,7 @@ under the License. 4.9.3 2.8.0 1.11.95 - 15.0.2 + 17.0.0 diff --git a/thirdparty/CHANGELOG.md b/thirdparty/CHANGELOG.md index 44eac377984b71..a779a539c73ed1 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 15.0.2 -> 17.0.0 + ## 20240813 - Modified: hadoop-libs 3.3.6.1 -> 3.3.6.2 diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh index 680b33044bae91..7a01eff478f36b 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-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" +ARROW_DOWNLOAD="https://github.com/apache/arrow/archive/refs/tags/apache-arrow-17.0.0.tar.gz" +ARROW_NAME="apache-arrow-17.0.0.tar.gz" +ARROW_SOURCE="arrow-apache-arrow-17.0.0" +ARROW_MD5SUM="ba18bf83e2164abd34b9ac4cb164f0f0" # Abseil ABSEIL_DOWNLOAD="https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz" @@ -412,11 +412,11 @@ BENCHMARK_SOURCE=benchmark-1.8.0 BENCHMARK_MD5SUM="8ddf8571d3f6198d37852bcbd964f817" # xsimd -# for arrow-13.0.0, if arrow upgrade, this version may also need to be changed -XSIMD_DOWNLOAD="https://github.com/xtensor-stack/xsimd/archive/refs/tags/9.0.1.tar.gz" -XSIMD_NAME="xsimd-9.0.1.tar.gz" -XSIMD_SOURCE=xsimd-9.0.1 -XSIMD_MD5SUM="59f38fe3364acd7ed137771258812d6c" +# for arrow-17.0.0, if arrow upgrade, this version may also need to be changed +XSIMD_DOWNLOAD="https://github.com/xtensor-stack/xsimd/archive/refs/tags/13.0.0.tar.gz" +XSIMD_NAME="13.0.0.tar.gz" +XSIMD_SOURCE=xsimd-13.0.0 +XSIMD_MD5SUM="c661deb91836e82d3070f81032014fe6" # simdjson SIMDJSON_DOWNLOAD="https://github.com/simdjson/simdjson/archive/refs/tags/v3.0.1.tar.gz"