Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ jobs:
cd build
cmake .. -G "Visual Studio 17 2022" \
-DCMAKE_BUILD_TYPE=RELEASE \
-DBUILD_LIBHDFSPP=OFF \
-DBUILD_TOOLS=OFF \
-DBUILD_JAVA=OFF \
-DANALYZE_JAVA=OFF \
Expand Down
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ option (ANALYZE_JAVA
"Run static analysis of the Java"
OFF)

option (BUILD_LIBHDFSPP
"Include LIBHDFSPP library in the build process"
OFF)

option (BUILD_SPARSEHASH
"Include sparsehash library in the build process"
Expand Down
8 changes: 0 additions & 8 deletions c++/include/orc/OrcFile.hh
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,6 @@ namespace orc {
std::unique_ptr<InputStream> readLocalFile(const std::string& path,
ReaderMetrics* metrics = nullptr);

/**
* Create a stream to an HDFS file.
* @param path the uri of the file in HDFS
* @param metrics the metrics of the reader
*/
[[deprecated("readHdfsFile is deprecated in 2.0.1")]] std::unique_ptr<InputStream> readHdfsFile(
const std::string& path, ReaderMetrics* metrics = nullptr);

/**
* Create a reader to read the ORC file.
* @param stream the stream to read
Expand Down
10 changes: 0 additions & 10 deletions c++/libs/libhdfspp/imported_timestamp

This file was deleted.

Binary file removed c++/libs/libhdfspp/libhdfspp.tar.gz
Binary file not shown.
32 changes: 0 additions & 32 deletions c++/libs/libhdfspp/pull_hdfs.sh

This file was deleted.

8 changes: 0 additions & 8 deletions c++/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,6 @@ set(SOURCE_FILES
Vector.cc
Writer.cc)

if(BUILD_LIBHDFSPP)
set(SOURCE_FILES ${SOURCE_FILES} OrcHdfsFile.cc)
endif(BUILD_LIBHDFSPP)

if(BUILD_ENABLE_AVX512)
set(SOURCE_FILES
Expand All @@ -212,7 +209,6 @@ target_link_libraries (orc
$<BUILD_INTERFACE:orc::Snappy>
$<BUILD_INTERFACE:orc::lz4>
$<BUILD_INTERFACE:orc::zstd>
$<BUILD_INTERFACE:${LIBHDFSPP_LIBRARIES}>
$<BUILD_INTERFACE:$<TARGET_NAME_IF_EXISTS:orc::sparsehash>>
)

Expand All @@ -227,16 +223,12 @@ target_include_directories (orc
PRIVATE
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${LIBHDFSPP_INCLUDE_DIR}
)

if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(orc PRIVATE -Wall -Wextra $<$<BOOL:${STOP_BUILD_ON_WARNING}>:-Werror>)
endif ()

if (BUILD_LIBHDFSPP)
target_compile_definitions(orc PUBLIC -DBUILD_LIBHDFSPP)
endif (BUILD_LIBHDFSPP)

if (BUILD_SPARSEHASH)
target_compile_definitions(orc PUBLIC -DBUILD_SPARSEHASH)
Expand Down
10 changes: 1 addition & 9 deletions c++/src/OrcFile.cc
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,7 @@ namespace orc {
}

std::unique_ptr<InputStream> readFile(const std::string& path, ReaderMetrics* metrics) {
#ifdef BUILD_LIBHDFSPP
if (strncmp(path.c_str(), "hdfs://", 7) == 0) {
return orc::readHdfsFile(std::string(path), metrics);
} else {
#endif
return orc::readLocalFile(std::string(path), metrics);
#ifdef BUILD_LIBHDFSPP
}
#endif
return orc::readLocalFile(std::string(path), metrics);
}

DIAGNOSTIC_POP
Expand Down
178 changes: 0 additions & 178 deletions c++/src/OrcHdfsFile.cc

This file was deleted.

68 changes: 1 addition & 67 deletions cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -702,70 +702,4 @@ if(BUILD_SPARSEHASH)
endblock()
endif()

# ----------------------------------------------------------------------
# LIBHDFSPP
if(BUILD_LIBHDFSPP)
set (BUILD_LIBHDFSPP FALSE)
if(ORC_CXX_HAS_THREAD_LOCAL)
find_package(CyrusSASL)
find_package(OpenSSL)
find_package(Threads)
if (CYRUS_SASL_SHARED_LIB AND OPENSSL_LIBRARIES)
set (BUILD_LIBHDFSPP TRUE)
set (LIBHDFSPP_PREFIX "${THIRDPARTY_DIR}/libhdfspp_ep-install")
set (LIBHDFSPP_INCLUDE_DIR "${LIBHDFSPP_PREFIX}/include")
set (LIBHDFSPP_STATIC_LIB_NAME hdfspp_static)
set (LIBHDFSPP_STATIC_LIB "${LIBHDFSPP_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${LIBHDFSPP_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}")
set (LIBHDFSPP_SRC_URL "${PROJECT_SOURCE_DIR}/c++/libs/libhdfspp/libhdfspp.tar.gz")
set (LIBHDFSPP_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=${LIBHDFSPP_PREFIX}
-DPROTOBUF_INCLUDE_DIR=${PROTOBUF_INCLUDE_DIR}
-DPROTOBUF_LIBRARY=${PROTOBUF_STATIC_LIB}
-DPROTOBUF_PROTOC_LIBRARY=${PROTOC_STATIC_LIB}
-DPROTOBUF_PROTOC_EXECUTABLE=${PROTOBUF_EXECUTABLE}
-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
-DCMAKE_C_FLAGS=${EP_C_FLAGS}
-DBUILD_SHARED_LIBS=OFF
-DHDFSPP_LIBRARY_ONLY=TRUE
-DBUILD_SHARED_HDFSPP=FALSE)

if (BUILD_POSITION_INDEPENDENT_LIB)
set(LIBHDFSPP_CMAKE_ARGS ${LIBHDFSPP_CMAKE_ARGS} -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
endif ()

ExternalProject_Add (libhdfspp_ep
DEPENDS orc::protobuf
URL ${LIBHDFSPP_SRC_URL}
LOG_DOWNLOAD 0
LOG_CONFIGURE 0
LOG_BUILD 0
LOG_INSTALL 0
BUILD_BYPRODUCTS "${LIBHDFSPP_STATIC_LIB}"
CMAKE_ARGS ${LIBHDFSPP_CMAKE_ARGS})

orc_add_built_library(libhdfspp_ep libhdfspp ${LIBHDFSPP_STATIC_LIB} ${LIBHDFSPP_INCLUDE_DIR})

set (LIBHDFSPP_LIBRARIES
libhdfspp
${CYRUS_SASL_SHARED_LIB}
${OPENSSL_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT})

elseif(CYRUS_SASL_SHARED_LIB)
message(STATUS
"WARNING: Libhdfs++ library was not built because the required OpenSSL library was not found")
elseif(OPENSSL_LIBRARIES)
message(STATUS
"WARNING: Libhdfs++ library was not built because the required CyrusSASL library was not found")
else ()
message(STATUS
"WARNING: Libhdfs++ library was not built because the required CyrusSASL and OpenSSL libraries were not found")
endif(CYRUS_SASL_SHARED_LIB AND OPENSSL_LIBRARIES)
else(ORC_CXX_HAS_THREAD_LOCAL)
message(STATUS
"WARNING: Libhdfs++ library was not built because the required feature
thread_local storage is not supported by your compiler. Known compilers that
support this feature: GCC, Visual Studio, Clang (community version),
Clang (version for iOS 9 and later), Clang (version for Xcode 8 and later)")
endif(ORC_CXX_HAS_THREAD_LOCAL)
endif(BUILD_LIBHDFSPP)

1 change: 0 additions & 1 deletion conan/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ def generate(self):
tc.variables["BUILD_JAVA"] = False
tc.variables["BUILD_CPP_TESTS"] = False
tc.variables["BUILD_TOOLS"] = self.options.build_tools
tc.variables["BUILD_LIBHDFSPP"] = False
tc.variables["BUILD_POSITION_INDEPENDENT_LIB"] = bool(self.options.get_safe("fPIC", True))
tc.variables["INSTALL_VENDORED_LIBS"] = False
# AVX512 support is determined by ORC_USER_SIMD_LEVEL env var at runtime, defaults to off
Expand Down
Loading