Merge pull request ClickHouse#51285 from ClickHouse/Avogar-patch-1

Define Thrift version for parquet and use correct arrow version
xiedeyantu · Jun 26, 2023 · 97f76d7 · 97f76d7
2 parents eb64987 + 1d37910
commit 97f76d7
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/contrib/arrow-cmake/CMakeLists.txt b/contrib/arrow-cmake/CMakeLists.txt
@@ -31,12 +31,12 @@ endif()
 
 set (CMAKE_CXX_STANDARD 17)
 
-set(ARROW_VERSION "6.0.1")
+set(ARROW_VERSION "11.0.0")
 string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" ARROW_BASE_VERSION "${ARROW_VERSION}")
 
-set(ARROW_VERSION_MAJOR "6")
+set(ARROW_VERSION_MAJOR "11")
 set(ARROW_VERSION_MINOR "0")
-set(ARROW_VERSION_PATCH "1")
+set(ARROW_VERSION_PATCH "0")
 
 if(ARROW_VERSION_MAJOR STREQUAL "0")
     # Arrow 0.x.y => SO version is "x", full SO version is "x.y.0"
@@ -514,6 +514,10 @@ if (SANITIZE STREQUAL "undefined")
     target_compile_options(_arrow PRIVATE -fno-sanitize=undefined)
 endif ()
 
+# Define Thrift version for parquet (we use 0.16.0)
+add_definitions(-DPARQUET_THRIFT_VERSION_MAJOR=0)
+add_definitions(-DPARQUET_THRIFT_VERSION_MINOR=16)
+
 # === tools
 
 set(TOOLS_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/tools/parquet")