From c7632313c589bd6579e17ef74d214bac82f9a83a Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Tue, 27 Oct 2026 23:54:29 +0800 Subject: [PATCH] build(deps): [1.18.x] upgrade Thrift to 0.25.0 Backport the relevant parts of #3855 directly from 0.23.0 to 0.25.0. Update the runtime and compiler together, align CI and build instructions, and implement the transport reset method required by Thrift 0.25.0. (cherry picked from commit b97860d73c3d38e6d6a61188f5ade88f5a071abc) Co-authored-by: Codex --- README.md | 12 ++++++------ dev/ci-before_install.sh | 2 +- .../org/apache/parquet/thrift/StubTTransport.java | 3 +++ pom.xml | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 1ce03d5fd0..c0706679d8 100644 --- a/README.md +++ b/README.md @@ -43,23 +43,23 @@ Parquet-Java uses Maven to build and depends on the thrift compiler (protoc is n To build and install the thrift compiler, run: ``` -wget -nv https://archive.apache.org/dist/thrift/0.23.0/thrift-0.23.0.tar.gz -tar xzf thrift-0.23.0.tar.gz -cd thrift-0.23.0 +wget -nv https://archive.apache.org/dist/thrift/0.25.0/thrift-0.25.0.tar.gz +tar xzf thrift-0.25.0.tar.gz +cd thrift-0.25.0 chmod +x ./configure ./configure --disable-libs sudo make install -j ``` Note: if you wish to verify the signature and checksum of a release: -1. The GPG and sha checksums can be found under https://archive.apache.org/dist/thrift/0.23.0/ +1. The GPG and sha checksums can be found under https://archive.apache.org/dist/thrift/0.25.0/ 2. Validate the signature of the artifact against the [Thrift committer KEYS](https://downloads.apache.org/thrift/KEYS). -If you're on OSX and use homebrew, you can instead install Thrift 0.23.0 with `brew` and ensure that it comes first in your `PATH`. +If you're on OSX and use homebrew, you can instead install Thrift 0.25.0 with `brew` and ensure that it comes first in your `PATH`. ``` brew install thrift -export PATH="/usr/local/opt/thrift@0.23.0/bin:$PATH" +export PATH="/usr/local/opt/thrift@0.25.0/bin:$PATH" ``` ### Build Parquet with Maven diff --git a/dev/ci-before_install.sh b/dev/ci-before_install.sh index e5dad054db..7e5343a1b6 100755 --- a/dev/ci-before_install.sh +++ b/dev/ci-before_install.sh @@ -20,7 +20,7 @@ # This script gets invoked by the CI system in a "before install" step ################################################################################ -export THRIFT_VERSION=0.23.0 +export THRIFT_VERSION=0.25.0 set -e set -o pipefail diff --git a/parquet-thrift/src/main/java/org/apache/parquet/thrift/StubTTransport.java b/parquet-thrift/src/main/java/org/apache/parquet/thrift/StubTTransport.java index 96718bb51f..4bdf189e42 100644 --- a/parquet-thrift/src/main/java/org/apache/parquet/thrift/StubTTransport.java +++ b/parquet-thrift/src/main/java/org/apache/parquet/thrift/StubTTransport.java @@ -71,4 +71,7 @@ public TConfiguration getConfiguration() { @Override public void updateKnownMessageSize(long l) {} + + @Override + public void resetMessageSizeAndConsumedBytes(long l) {} } diff --git a/pom.xml b/pom.xml index 0240031a12..88acb65fb0 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ thrift ${thrift.executable} 0.10.0 - 0.23.0 + 0.25.0 ${thrift.version} 8.5.19 0.9.33