Skip to content

GH-51354: [C++][Parquet] Update bundled Apache Thrift to 0.24.0 #51559

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

Open
Hanayoshi-8744 wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −185
Open

GH-51354: [C++][Parquet] Update bundled Apache Thrift to 0.24.0 #51559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 0 additions & 21 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,29 +1784,8 @@ function(build_thrift)
if(CMAKE_VERSION VERSION_LESS 3.26)
message(FATAL_ERROR "Require CMake 3.26 or later for building bundled Apache Thrift")
endif()
set(THRIFT_PATCH_COMMAND)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
find_program(PATCH patch)
if(PATCH)
list(APPEND
THRIFT_PATCH_COMMAND
${PATCH}
-p1
-i)
else()
find_program(GIT git)
if(GIT)
list(APPEND THRIFT_PATCH_COMMAND ${GIT} apply)
endif()
endif()
if(THRIFT_PATCH_COMMAND)
# https://github.com/apache/thrift/pull/3187
list(APPEND THRIFT_PATCH_COMMAND ${CMAKE_CURRENT_LIST_DIR}/thrift-3187.patch)
endif()
endif()
fetchcontent_declare(thrift
${FC_DECLARE_COMMON_OPTIONS}
PATCH_COMMAND ${THRIFT_PATCH_COMMAND}
URL ${THRIFT_SOURCE_URL}
URL_HASH "SHA256=${ARROW_THRIFT_BUILD_SHA256_CHECKSUM}")

Expand Down
162 changes: 0 additions & 162 deletions cpp/cmake_modules/thrift-3187.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions cpp/thirdparty/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ ARROW_SUBSTRAIT_BUILD_VERSION=v0.44.0
ARROW_SUBSTRAIT_BUILD_SHA256_CHECKSUM=f989a862f694e7dbb695925ddb7c4ce06aa6c51aca945105c075139aed7e55a2
ARROW_S2N_TLS_BUILD_VERSION=v1.7.0
ARROW_S2N_TLS_BUILD_SHA256_CHECKSUM=a6e8228e238239bb3c17b1eda3ed702bcbb2eaebc792eac4d754cc5619b0ea06
ARROW_THRIFT_BUILD_VERSION=0.22.0
ARROW_THRIFT_BUILD_SHA256_CHECKSUM=794a0e455787960d9f27ab92c38e34da27e8deeda7a5db0e59dc64a00df8a1e5
ARROW_THRIFT_BUILD_VERSION=0.24.0
ARROW_THRIFT_BUILD_SHA256_CHECKSUM=e0fa5839a4c5c1d631b0931cf2c554ebbfa4e2fee3a9fb3ffd4f82ce4396c6e4
ARROW_UTF8PROC_BUILD_VERSION=v2.10.0
ARROW_UTF8PROC_BUILD_SHA256_CHECKSUM=6f4f1b639daa6dca9f80bc5db1233e9cbaa31a67790887106160b33ef743f136
# WIL (Windows Implementation Libraries) is required by Azure SDK on Windows for WinHTTP transport
Expand Down
Loading