[orc] update to 2.0.0 (#37880)

This commit is contained in:
Deshan Xiao 2024-04-01 22:34:36 +00:00 committed by GitHub
parent 4079a2f5a5
commit 806fbc4020
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 81 additions and 32 deletions

View File

@ -1,8 +1,10 @@
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 972f2fc03..5b39554c8 100644
index 33ad5848..2a41e427 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -210,8 +210,16 @@ add_library (orc STATIC ${SOURCE_FILES})
@@ -208,15 +208,30 @@ endif(BUILD_ENABLE_AVX512)
add_library (orc STATIC ${SOURCE_FILES})
+include(GNUInstallDirs)
+
@ -24,7 +26,10 @@ index 972f2fc03..5b39554c8 100644
+ lz4::lz4
+ $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
${LIBHDFSPP_LIBRARIES}
@@ -219,2 +227,9 @@ target_link_libraries (orc
- )
+)
add_dependencies(orc orc-format_ep)
-install(TARGETS orc DESTINATION lib)
+install(TARGETS orc EXPORT unofficial-orc)
@ -35,66 +40,105 @@ index 972f2fc03..5b39554c8 100644
+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-orc"
+ NAMESPACE unofficial::orc::
+)
\ No newline at end of file
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 47c1a65ba..8570b6069 100644
index ec33193d..5b7a009d 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -73,2 +73,4 @@ endif ()
@@ -83,7 +83,8 @@ ExternalProject_Add (orc-format_ep
# ----------------------------------------------------------------------
# Snappy
-
+find_package(Snappy CONFIG REQUIRED)
+if (0)
if (NOT "${SNAPPY_HOME}" STREQUAL "")
@@ -113,2 +115,3 @@ if (SNAPPY_VENDORED)
if (NOT "${SNAPPY_HOME}" STREQUAL "" OR ORC_PACKAGE_KIND STREQUAL "conan")
find_package (Snappy REQUIRED)
set(SNAPPY_VENDORED FALSE)
@@ -130,10 +131,12 @@ if (SNAPPY_VENDORED)
DESTINATION "lib")
endif ()
endif ()
+endif ()
@@ -117,2 +120,4 @@ endif ()
# ----------------------------------------------------------------------
# ZLIB
-
+find_package(ZLIB REQUIRED)
+if (0)
if (NOT "${ZLIB_HOME}" STREQUAL "")
@@ -165,2 +170,3 @@ if (ZLIB_VENDORED)
if (NOT "${ZLIB_HOME}" STREQUAL "" OR ORC_PACKAGE_KIND STREQUAL "conan")
find_package (ZLIB REQUIRED)
set(ZLIB_VENDORED FALSE)
@@ -184,10 +187,11 @@ if (ZLIB_VENDORED)
DESTINATION "lib")
endif ()
endif ()
-
+endif ()
@@ -169,2 +175,4 @@ endif ()
# ----------------------------------------------------------------------
# Zstd
-
+find_package(zstd CONFIG REQUIRED)
+if (0)
if (NOT "${ZSTD_HOME}" STREQUAL "")
@@ -224,2 +232,3 @@ if (ZSTD_VENDORED)
if (NOT "${ZSTD_HOME}" STREQUAL "" OR ORC_PACKAGE_KIND STREQUAL "conan")
find_package (ZSTD REQUIRED)
set(ZSTD_VENDORED FALSE)
@@ -249,10 +253,11 @@ if (ZSTD_VENDORED)
DESTINATION "lib")
endif ()
endif ()
-
+endif ()
@@ -228,2 +237,4 @@ endif ()
# ----------------------------------------------------------------------
# LZ4
-
+find_package(lz4 CONFIG REQUIRED)
+if (0)
if (NOT "${LZ4_HOME}" STREQUAL "")
@@ -276,2 +287,3 @@ if (LZ4_VENDORED)
if (NOT "${LZ4_HOME}" STREQUAL "" OR ORC_PACKAGE_KIND STREQUAL "conan")
find_package (LZ4 REQUIRED)
set(LZ4_VENDORED FALSE)
@@ -307,11 +312,11 @@ if (LZ4_VENDORED)
DESTINATION "lib")
endif ()
endif ()
-
+endif ()
@@ -280,3 +292,3 @@ endif ()
# ----------------------------------------------------------------------
# IANA - Time Zone Database
-if (WIN32)
+if (WIN32 AND TEST_VALGRIND_MEMCHECK)
SET(CURRENT_TZDATA_FILE "")
@@ -383,2 +395,4 @@ endif ()
SET(CURRENT_TZDATA_SHA512 "")
File(DOWNLOAD "https://ftp.osuosl.org/pub/cygwin/noarch/release/tzdata/sha512.sum" ${CMAKE_CURRENT_BINARY_DIR}/sha512.sum)
@@ -413,7 +418,8 @@ endif ()
# ----------------------------------------------------------------------
# Protobuf
-
+find_package(Protobuf CONFIG REQUIRED)
+if (0)
if (NOT "${PROTOBUF_HOME}" STREQUAL "")
@@ -454,2 +468,3 @@ if (PROTOBUF_VENDORED)
if (NOT "${PROTOBUF_HOME}" STREQUAL "" OR ORC_PACKAGE_KIND STREQUAL "conan")
find_package (Protobuf REQUIRED)
set(PROTOBUF_VENDORED FALSE)
@@ -493,6 +499,7 @@ if (PROTOBUF_VENDORED)
DESTINATION "lib")
endif ()
endif ()
+endif ()
# ----------------------------------------------------------------------
# LIBHDFSPP
diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
index 3863c408e..b71ab5eae 100644
index 3863c408..b71ab5ea 100644
--- a/tools/src/CMakeLists.txt
+++ b/tools/src/CMakeLists.txt
@@ -72,3 +72,3 @@ target_link_libraries (orc-metadata
@@ -70,7 +70,7 @@ add_executable (orc-metadata
target_link_libraries (orc-metadata
orc
- orc::protobuf
+ protobuf::libprotobuf
${CMAKE_THREAD_LIBS_INIT}
)

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/orc
REF "v${VERSION}"
SHA512 f016fcf75e987998dbffd972b173a17d89824879b5f8de467fb2b1462655d0039c8a8228c608a225226bd0e8cdbe70351f465a7a05cc4748f71628a6574dbe92
SHA512 6109b27047b0688566756f9ca6833689cdf0bd7a5086c4212ef1fd6484fb73d9077fa3017137a7fd65f0ab51518c80fc43ab55bd308ad146f6f4b6d97c51b4fc
HEAD_REF master
PATCHES
fix-cmake.patch

View File

@ -1,6 +1,6 @@
{
"name": "orc",
"version": "1.9.3",
"version": "2.0.0",
"description": "The smallest, fastest columnar storage for Hadoop workloads.",
"homepage": "https://orc.apache.org/",
"license": "Apache-2.0",

View File

@ -6561,7 +6561,7 @@
"port-version": 1
},
"orc": {
"baseline": "1.9.3",
"baseline": "2.0.0",
"port-version": 0
},
"orocos-kdl": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e6a438a44734395e1e86c551a4507780209bbee0",
"version": "2.0.0",
"port-version": 0
},
{
"git-tree": "f98c97a0c642bec9feb965f59d1023dc8e49f812",
"version": "1.9.3",