Skip to content

[SPARK-46432][BUILD] Upgrade Netty to 4.1.106.Final #44384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

[SPARK-46432][BUILD] Upgrade Netty to 4.1.106.Final #44384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d7f0f8
[SPARK-46432][BUILD] Upgrade Netty to 4.1.104.Final
panbingkun Dec 17, 2023
3e4d47c
[SPARK-46432][BUILD] Upgrade Netty to 4.1.106.Final
panbingkun Jan 24, 2024
c073bd8
[SPARK-46432][BUILD] Upgrade Netty to 4.1.106.Final
panbingkun Jan 25, 2024
879cb46
Merge branch 'master' into SPARK-46432
panbingkun Jan 25, 2024
2beb166
[SPARK-46432][BUILD] Upgrade Netty to 4.1.106.Final
panbingkun Jan 25, 2024
aa0f416
Merge branch 'master' into SPARK-46432
panbingkun Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions common/network-yarn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,27 +173,29 @@
<id>unpack</id>
<phase>package</phase>
<configuration>
<target>
<echo message="Shade netty native libraries to ${spark.shade.native.packageName}" />
<unzip src="${shuffle.jar}" dest="${project.build.directory}/exploded/" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_x86_64.so"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_x86_64.so" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_x86_64.jnilib" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_aarch_64.so"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_aarch_64.so" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_aarch_64.jnilib"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_x86_64.so"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_x86_64.so" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_aarch_64.so"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_aarch_64.so" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_x86_64.jnilib" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_aarch_64.jnilib" />
<jar destfile="${shuffle.jar}" basedir="${project.build.directory}/exploded" />
</target>
<target>
<echo message="Shade netty native libraries to ${spark.shade.native.packageName}" />
<unzip src="${shuffle.jar}" dest="${project.build.directory}/exploded/" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_x86_64.so"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_x86_64.so" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_x86_64.jnilib" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_aarch_64.so"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_aarch_64.so" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_aarch_64.jnilib"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_riscv64.so"
Copy link
Contributor Author

@panbingkun panbingkun Jan 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only this entry has been added, and the rest has been adjusted for indentation, from 4 spaces to 2 spaces.

tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_riscv64.so" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_x86_64.so"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_x86_64.so" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_aarch_64.so"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_aarch_64.so" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_x86_64.jnilib" />
<move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib"
tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_aarch_64.jnilib" />
<jar destfile="${shuffle.jar}" basedir="${project.build.directory}/exploded" />
</target>
</configuration>
<goals>
<goal>run</goal>
Expand Down
37 changes: 19 additions & 18 deletions dev/deps/spark-deps-hadoop-3-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,31 +191,32 @@ metrics-jmx/4.2.21//metrics-jmx-4.2.21.jar
metrics-json/4.2.21//metrics-json-4.2.21.jar
metrics-jvm/4.2.21//metrics-jvm-4.2.21.jar
minlog/1.3.0//minlog-1.3.0.jar
netty-all/4.1.100.Final//netty-all-4.1.100.Final.jar
netty-buffer/4.1.100.Final//netty-buffer-4.1.100.Final.jar
netty-codec-http/4.1.100.Final//netty-codec-http-4.1.100.Final.jar
netty-codec-http2/4.1.100.Final//netty-codec-http2-4.1.100.Final.jar
netty-codec-socks/4.1.100.Final//netty-codec-socks-4.1.100.Final.jar
netty-codec/4.1.100.Final//netty-codec-4.1.100.Final.jar
netty-common/4.1.100.Final//netty-common-4.1.100.Final.jar
netty-handler-proxy/4.1.100.Final//netty-handler-proxy-4.1.100.Final.jar
netty-handler/4.1.100.Final//netty-handler-4.1.100.Final.jar
netty-resolver/4.1.100.Final//netty-resolver-4.1.100.Final.jar
netty-all/4.1.106.Final//netty-all-4.1.106.Final.jar
netty-buffer/4.1.106.Final//netty-buffer-4.1.106.Final.jar
netty-codec-http/4.1.106.Final//netty-codec-http-4.1.106.Final.jar
netty-codec-http2/4.1.106.Final//netty-codec-http2-4.1.106.Final.jar
netty-codec-socks/4.1.106.Final//netty-codec-socks-4.1.106.Final.jar
netty-codec/4.1.106.Final//netty-codec-4.1.106.Final.jar
netty-common/4.1.106.Final//netty-common-4.1.106.Final.jar
netty-handler-proxy/4.1.106.Final//netty-handler-proxy-4.1.106.Final.jar
netty-handler/4.1.106.Final//netty-handler-4.1.106.Final.jar
netty-resolver/4.1.106.Final//netty-resolver-4.1.106.Final.jar
netty-tcnative-boringssl-static/2.0.61.Final//netty-tcnative-boringssl-static-2.0.61.Final.jar
netty-tcnative-boringssl-static/2.0.61.Final/linux-aarch_64/netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar
netty-tcnative-boringssl-static/2.0.61.Final/linux-x86_64/netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar
netty-tcnative-boringssl-static/2.0.61.Final/osx-aarch_64/netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar
netty-tcnative-boringssl-static/2.0.61.Final/osx-x86_64/netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar
netty-tcnative-boringssl-static/2.0.61.Final/windows-x86_64/netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar
netty-tcnative-classes/2.0.61.Final//netty-tcnative-classes-2.0.61.Final.jar
netty-transport-classes-epoll/4.1.100.Final//netty-transport-classes-epoll-4.1.100.Final.jar
netty-transport-classes-kqueue/4.1.100.Final//netty-transport-classes-kqueue-4.1.100.Final.jar
netty-transport-native-epoll/4.1.100.Final/linux-aarch_64/netty-transport-native-epoll-4.1.100.Final-linux-aarch_64.jar
netty-transport-native-epoll/4.1.100.Final/linux-x86_64/netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
netty-transport-native-kqueue/4.1.100.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.100.Final-osx-aarch_64.jar
netty-transport-native-kqueue/4.1.100.Final/osx-x86_64/netty-transport-native-kqueue-4.1.100.Final-osx-x86_64.jar
netty-transport-native-unix-common/4.1.100.Final//netty-transport-native-unix-common-4.1.100.Final.jar
netty-transport/4.1.100.Final//netty-transport-4.1.100.Final.jar
netty-transport-classes-epoll/4.1.106.Final//netty-transport-classes-epoll-4.1.106.Final.jar
netty-transport-classes-kqueue/4.1.106.Final//netty-transport-classes-kqueue-4.1.106.Final.jar
netty-transport-native-epoll/4.1.106.Final/linux-aarch_64/netty-transport-native-epoll-4.1.106.Final-linux-aarch_64.jar
netty-transport-native-epoll/4.1.106.Final/linux-riscv64/netty-transport-native-epoll-4.1.106.Final-linux-riscv64.jar
netty-transport-native-epoll/4.1.106.Final/linux-x86_64/netty-transport-native-epoll-4.1.106.Final-linux-x86_64.jar
netty-transport-native-kqueue/4.1.106.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.106.Final-osx-aarch_64.jar
netty-transport-native-kqueue/4.1.106.Final/osx-x86_64/netty-transport-native-kqueue-4.1.106.Final-osx-x86_64.jar
netty-transport-native-unix-common/4.1.106.Final//netty-transport-native-unix-common-4.1.106.Final.jar
netty-transport/4.1.106.Final//netty-transport-4.1.106.Final.jar
objenesis/3.3//objenesis-3.3.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.15.0//okio-1.15.0.jar
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
<bouncycastle.version>1.77</bouncycastle.version>
<tink.version>1.9.0</tink.version>
<datasketches.version>5.0.1</datasketches.version>
<netty.version>4.1.100.Final</netty.version>
<netty.version>4.1.106.Final</netty.version>
<netty-tcnative.version>2.0.61.Final</netty-tcnative.version>
<!--
If you are changing Arrow version specification, please check
Expand Down