From be5cb3b2bf0df8b8cc560a0b102085e2f8302cbb Mon Sep 17 00:00:00 2001 From: Alex Baden Date: Thu, 14 Sep 2023 11:30:48 -0500 Subject: [PATCH] Remove openssl dependency and associated code --- omniscidb/CMakeLists.txt | 31 +-- omniscidb/DataMgr/CMakeLists.txt | 5 - omniscidb/DataMgr/OmniSciAwsSdk.cpp | 91 --------- omniscidb/DataMgr/OmniSciAwsSdk.h | 30 --- omniscidb/README.md | 1 - omniscidb/Shared/CMakeLists.txt | 4 +- omniscidb/Shared/file_path_util.cpp | 43 ---- omniscidb/Shared/file_path_util.h | 59 ------ omniscidb/cmake/Modules/FindLibAwsS3.cmake | 188 ------------------ omniscidb/cmake/Modules/FindRdKafka.cmake | 79 -------- omniscidb/docs/source/quickstart/build.rst | 1 - omniscidb/scripts/mapd-deps-conda-dev-env.yml | 1 - .../scripts/mapd-deps-conda-windows-env.yml | 1 - recipe/build-hdk.sh | 2 +- 14 files changed, 3 insertions(+), 533 deletions(-) delete mode 100644 omniscidb/DataMgr/OmniSciAwsSdk.cpp delete mode 100644 omniscidb/DataMgr/OmniSciAwsSdk.h delete mode 100644 omniscidb/cmake/Modules/FindLibAwsS3.cmake delete mode 100644 omniscidb/cmake/Modules/FindRdKafka.cmake diff --git a/omniscidb/CMakeLists.txt b/omniscidb/CMakeLists.txt index f6d06de932..f9185a556d 100644 --- a/omniscidb/CMakeLists.txt +++ b/omniscidb/CMakeLists.txt @@ -117,7 +117,6 @@ if(PREFER_STATIC_LIBS) set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(Arrow_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON) - set(OPENSSL_USE_STATIC_LIBS ON) if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") endif() @@ -302,16 +301,6 @@ if(XCODE) add_definitions("-DXCODE") endif() -# fixme: hack works for Homebrew, might not work for Conda -if(ENABLE_CONDA) - set(OPENSSL_ROOT_DIR "$ENV{CONDA_PREFIX}") -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" ) - set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl/") -endif() - -find_package(OpenSSL REQUIRED) -include_directories(${OPENSSL_INCLUDE_DIR}) - if(MSVC) add_definitions(/bigobj) endif() @@ -535,17 +524,6 @@ if(WIN32) endif() add_subdirectory(ThirdParty/googlebenchmark) -# aws-sdk -option(ENABLE_AWS_S3 "Enable AWS S3 support" OFF) -if(ENABLE_AWS_S3) - find_package(LibAwsS3) - if(NOT LibAwsS3_FOUND) - set(ENABLE_AWS_S3 OFF CACHE BOOL "Enable AWS S3 support" FORCE) - else() - add_definitions("-DHAVE_AWS_S3") - endif() -endif() - # Arrow find_package(Arrow REQUIRED) add_definitions("-DARROW_NO_DEPRECATED_API") @@ -554,9 +532,6 @@ include_directories(${Arrow_INCLUDE_DIRS}) find_package(Parquet REQUIRED) list(APPEND Arrow_LIBRARIES ${Snappy_LIBRARIES}) -if(ENABLE_AWS_S3) - list(INSERT Arrow_LIBRARIES 0 ${LibAwsS3_LIBRARIES}) -endif() if (ENABLE_CUDA) list(INSERT Arrow_LIBRARIES 0 ${Arrow_GPU_CUDA_LIBRARIES}) endif() @@ -578,12 +553,8 @@ endif() find_package(SQLite3 REQUIRED) include_directories(${SQLite3_INCLUDE_DIRS}) +# TODO: required? find_package(CURL REQUIRED QUIET) -if(CURL_FOUND) - if(ENABLE_AWS_S3) - set(CURL_LIBRARIES ${LibAwsS3_SUPPORT_LIBRARIES}) - endif() -endif() # PicoSHA2 include_directories(ThirdParty/PicoSHA2) diff --git a/omniscidb/DataMgr/CMakeLists.txt b/omniscidb/DataMgr/CMakeLists.txt index 21be911a17..ad0400449f 100644 --- a/omniscidb/DataMgr/CMakeLists.txt +++ b/omniscidb/DataMgr/CMakeLists.txt @@ -36,11 +36,6 @@ function(set_arrow_has_private_aws_sdk) endif() endfunction() -if(ENABLE_AWS_S3) - list(APPEND datamgr_source_files OmniSciAwsSdk.cpp) - set_arrow_has_private_aws_sdk() -endif() - add_library(DataMgr ${datamgr_source_files}) set(DataMgrLibs CudaMgr L0Mgr Shared SchemaMgr IR ${Boost_THREAD_LIBRARY} TBB::tbb ${CMAKE_DL_LIBS} ${CUDA_LIBRARIES}) diff --git a/omniscidb/DataMgr/OmniSciAwsSdk.cpp b/omniscidb/DataMgr/OmniSciAwsSdk.cpp deleted file mode 100644 index 7db036042c..0000000000 --- a/omniscidb/DataMgr/OmniSciAwsSdk.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2020 OmniSci, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "OmniSciAwsSdk.h" - -#include -#include -#include - -#ifdef ARROW_HAS_PRIVATE_AWS_SDK -#include -#endif - -#include "Logger/Logger.h" - -#ifdef ARROW_HAS_PRIVATE_AWS_SDK -static Aws::SDKOptions awsapi_options; -#endif - -void omnisci_aws_sdk::init_sdk() { - auto ssl_config = omnisci_aws_sdk::get_ssl_config(); - arrow::fs::FileSystemGlobalOptions global_options; - global_options.tls_ca_dir_path = ssl_config.ca_path; - global_options.tls_ca_file_path = ssl_config.ca_file; - arrow::fs::Initialize(global_options); - arrow::fs::S3GlobalOptions s3_global_options; - auto status = arrow::fs::InitializeS3(s3_global_options); - CHECK(status.ok()) << "InitializeS3 resulted in an error: " << status.message(); -#ifdef ARROW_HAS_PRIVATE_AWS_SDK - // Directly initialize the AWS SDK, if Arrow uses a private version of the SDK - Aws::InitAPI(awsapi_options); -#endif -} - -void omnisci_aws_sdk::shutdown_sdk() { - auto status = arrow::fs::FinalizeS3(); - CHECK(status.ok()) << "FinalizeS3 resulted in an error: " << status.message(); -#ifdef ARROW_HAS_PRIVATE_AWS_SDK - // Directly shutdown the AWS SDK, if Arrow uses a private version of the SDK - Aws::ShutdownAPI(awsapi_options); -#endif -} - -using omnisci_aws_sdk::SslConfig; -SslConfig omnisci_aws_sdk::get_ssl_config() { - SslConfig ssl_config; - /* - Fix a wrong ca path established at building libcurl on Centos being carried to - Ubuntu. To fix the issue, this is this sequence of locating ca file: 1) if - `SSL_CERT_DIR` or `SSL_CERT_FILE` is set, set it to S3 ClientConfiguration. 2) if - none ^ is set, omnisci_server searches a list of known ca file paths. 3) if 2) - finds nothing, it is users' call to set correct SSL_CERT_DIR or SSL_CERT_FILE. S3 - c++ sdk: "we only want to override the default path if someone has explicitly told - us to." - */ - std::list v_known_ca_paths({ - "/etc/ssl/certs/ca-certificates.crt", - "/etc/pki/tls/certs/ca-bundle.crt", - "/usr/share/ssl/certs/ca-bundle.crt", - "/usr/local/share/certs/ca-root.crt", - "/etc/ssl/cert.pem", - "/etc/ssl/ca-bundle.pem", - }); - char* env; - if (nullptr != (env = getenv("SSL_CERT_DIR"))) { - ssl_config.ca_path = env; - } - if (nullptr != (env = getenv("SSL_CERT_FILE"))) { - v_known_ca_paths.push_front(env); - } - for (const auto& known_ca_path : v_known_ca_paths) { - if (boost::filesystem::exists(known_ca_path)) { - ssl_config.ca_file = known_ca_path; - break; - } - } - return ssl_config; -} diff --git a/omniscidb/DataMgr/OmniSciAwsSdk.h b/omniscidb/DataMgr/OmniSciAwsSdk.h deleted file mode 100644 index 8d8378b39f..0000000000 --- a/omniscidb/DataMgr/OmniSciAwsSdk.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2020 OmniSci, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include - -namespace omnisci_aws_sdk { -struct SslConfig { - std::string ca_path; - std::string ca_file; -}; - -void init_sdk(); -void shutdown_sdk(); -SslConfig get_ssl_config(); -}; // namespace omnisci_aws_sdk diff --git a/omniscidb/README.md b/omniscidb/README.md index d5cf990c0d..c813f83953 100644 --- a/omniscidb/README.md +++ b/omniscidb/README.md @@ -35,7 +35,6 @@ The following `cmake`/`ccmake` options can enable/disable different features: - `-DCMAKE_BUILD_TYPE=release` - Build type and compiler options to use. Options are `Debug`, `Release`, `RelWithDebInfo`, `MinSizeRel`, and unset. - `-DENABLE_ASAN=off` - Enable address sanitizer. Default is `off`. -- `-DENABLE_AWS_S3=on` - Enable AWS S3 support, if available. Default is `on`. - `-DENABLE_CUDA=off` - Disable CUDA. Default is `on`. - `-DENABLE_CUDA_KERNEL_DEBUG=off` - Enable debugging symbols for CUDA kernels. Will dramatically reduce kernel performance. Default is `off`. - `-DENABLE_DECODERS_BOUNDS_CHECKING=off` - Enable bounds checking for column decoding. Default is `off`. diff --git a/omniscidb/Shared/CMakeLists.txt b/omniscidb/Shared/CMakeLists.txt index 3a973d4836..d30ff258c7 100644 --- a/omniscidb/Shared/CMakeLists.txt +++ b/omniscidb/Shared/CMakeLists.txt @@ -24,6 +24,4 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/funcannotations.h add_library(Shared ${shared_source_files} "cleanup_global_namespace.h" "boost_stacktrace.hpp") target_link_libraries(Shared OSDependent Logger ${Boost_LIBRARIES} TBB::tbb ${Folly_LIBRARIES}) -if("${MAPD_EDITION_LOWER}" STREQUAL "ee") - target_link_libraries(Shared ${OPENSSL_LIBRARIES}) -endif() + diff --git a/omniscidb/Shared/file_path_util.cpp b/omniscidb/Shared/file_path_util.cpp index a138e9a38c..abf2d44545 100644 --- a/omniscidb/Shared/file_path_util.cpp +++ b/omniscidb/Shared/file_path_util.cpp @@ -126,47 +126,4 @@ std::vector local_glob_filter_sort_files( return result_files; } -#ifdef HAVE_AWS_S3 -namespace { - -std::vector arrow_fs_regex_file_filter( - const std::string& pattern, - const std::vector& file_info_list) { - boost::regex regex_pattern(pattern); - std::vector matched_file_info_list; - for (const auto& file_info : file_info_list) { - if (boost::regex_match(file_info.path(), regex_pattern)) { - matched_file_info_list.emplace_back(file_info); - } - } - if (matched_file_info_list.empty()) { - throw_no_filter_match(pattern); - } - return matched_file_info_list; -} - -} // namespace - -std::vector arrow_fs_filter_sort_files( - const std::vector& file_paths, - const std::optional& filter_regex, - const std::optional& sort_by, - const std::optional& sort_regex) { - auto result_files = filter_regex.has_value() - ? arrow_fs_regex_file_filter(filter_regex.value(), file_paths) - : file_paths; - // initial lexicographical order ensures a determinisitc ordering for files not matching - // sort_regex - auto initial_file_order = FileOrderArrow(std::nullopt, PATHNAME_ORDER_TYPE); - auto lexi_comp = initial_file_order.getFileComparator(); - std::stable_sort(result_files.begin(), result_files.end(), lexi_comp); - - auto file_order = FileOrderArrow(sort_regex, sort_by); - auto comp = file_order.getFileComparator(); - std::stable_sort(result_files.begin(), result_files.end(), comp); - return result_files; -} - -#endif // HAVE_AWS_S3 - } // namespace shared \ No newline at end of file diff --git a/omniscidb/Shared/file_path_util.h b/omniscidb/Shared/file_path_util.h index bcb6bd8dc8..de6706a506 100644 --- a/omniscidb/Shared/file_path_util.h +++ b/omniscidb/Shared/file_path_util.h @@ -29,9 +29,6 @@ #include #include -#ifdef HAVE_AWS_S3 -#include -#endif // HAVE_AWS_S3 #include #include @@ -41,10 +38,6 @@ namespace shared { using LocalFileComparator = std::function; -#ifdef HAVE_AWS_S3 -using ArrowFsComparator = - std::function; -#endif // HAVE_AWS_S3 inline const std::string FILE_SORT_ORDER_BY_KEY = "FILE_SORT_ORDER_BY"; inline const std::string FILE_SORT_REGEX_KEY = "FILE_SORT_REGEX"; @@ -100,14 +93,6 @@ std::vector local_glob_filter_sort_files( const std::optional& sort_by, const std::optional& sort_regex); -#ifdef HAVE_AWS_S3 -std::vector arrow_fs_filter_sort_files( - const std::vector& file_paths, - const std::optional& filter_regex, - const std::optional& sort_by, - const std::optional& sort_regex); -#endif // HAVE_AWS_S3 - const std::function common_regex_date_comp_ = [](const std::string& lhs, const std::string& rhs) -> bool { int64_t lhs_t; @@ -212,48 +197,4 @@ class FileOrderLocal : public FileOrderBase { }}}; }; -#ifdef HAVE_AWS_S3 - -class FileOrderArrow : public FileOrderBase { - public: - FileOrderArrow(const std::optional& sort_regex, - const std::optional& sort_by) - : FileOrderBase(sort_regex, sort_by) {} - - inline ArrowFsComparator getFileComparator() override { - auto comparator_pair = comparator_map_.find(getSortBy()); - CHECK(comparator_pair != comparator_map_.end()); - return comparator_pair->second; - } - - protected: - const std::map comparator_map_{ - {PATHNAME_ORDER_TYPE, - [](const arrow::fs::FileInfo& lhs, const arrow::fs::FileInfo& rhs) -> bool { - return lhs.path() < rhs.path(); - }}, - {DATE_MODIFIED_ORDER_TYPE, - [](const arrow::fs::FileInfo& lhs, const arrow::fs::FileInfo& rhs) -> bool { - return lhs.mtime() < rhs.mtime(); - }}, - {REGEX_ORDER_TYPE, - [this](const arrow::fs::FileInfo& lhs, const arrow::fs::FileInfo& rhs) -> bool { - auto lhs_name = lhs.path(); - auto rhs_name = rhs.path(); - return this->concatCaptureGroups(lhs_name) < this->concatCaptureGroups(rhs_name); - }}, - {REGEX_DATE_ORDER_TYPE, - [this](const arrow::fs::FileInfo& lhs, const arrow::fs::FileInfo& rhs) -> bool { - return common_regex_date_comp_(this->concatCaptureGroups(lhs.path()), - this->concatCaptureGroups(rhs.path())); - }}, - {REGEX_NUMBER_ORDER_TYPE, - [this](const arrow::fs::FileInfo& lhs, const arrow::fs::FileInfo& rhs) -> bool { - return common_regex_number_comp_(this->concatCaptureGroups(lhs.path()), - this->concatCaptureGroups(rhs.path())); - }}}; -}; - -#endif // HAVE_AWS_S3 - } // namespace shared diff --git a/omniscidb/cmake/Modules/FindLibAwsS3.cmake b/omniscidb/cmake/Modules/FindLibAwsS3.cmake deleted file mode 100644 index 0c49bc636c..0000000000 --- a/omniscidb/cmake/Modules/FindLibAwsS3.cmake +++ /dev/null @@ -1,188 +0,0 @@ -#.rst: -# FindLibAwsS3.cmake -# ------------- -# -# Find a LibAwsS3 installation. -# -# This module finds if LibAwsS3 is installed and selects a default -# configuration to use. -# -# find_package(LibAwsS3 ...) -# -# -# The following variables control which libraries are found:: -# -# LibAwsS3_USE_STATIC_LIBS - Set to ON to force use of static libraries. -# -# The following are set after the configuration is done: -# -# :: -# -# LibAwsS3_FOUND - Set to TRUE if LibAwsS3 was found. -# LibAwsS3_INCLUDE_DIRS - Include directories -# LibAwsS3_LIBRARIES - Path to the LibAwsS3 libraries. -# LibAwsS3_LIBRARY_DIRS - compile time link directories -# -# -# Sample usage: -# -# :: -# -# find_package(LibAwsS3) -# if(LibAwsS3_FOUND) -# target_link_libraries( ${LibAwsS3_LIBRARIES}) -# endif() - -# kept here just in case mind is changed to use brew 'aws-sdk-cpp' pkg instead of self-build -execute_process(COMMAND brew --prefix aws-sdk-cpp OUTPUT_VARIABLE PREFIX_LIBAWSS3) -string(STRIP "${PREFIX_LIBAWSS3}" PREFIX_LIBAWSS3) - -if(LibAwsS3_USE_STATIC_LIBS) - set(_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) -endif() - -find_library(libAwsCore_LIBRARY - NAMES aws-cpp-sdk-core - HINTS ENV LD_LIBRARY_PATH - HINTS ENV DYLD_LIBRARY_PATH - HINTS ${PREFIX_LIBAWSS3}/lib - PATHS - /usr/lib - /usr/local/lib - /usr/local/homebrew/lib - /opt/local/lib) - -find_library(libAwsCCommon_LIBRARY - NAMES aws-c-common - HINTS ENV LD_LIBRARY_PATH - HINTS ENV DYLD_LIBRARY_PATH - HINTS ${PREFIX_LIBAWSS3}/lib - PATHS - /usr/lib - /usr/local/lib - /usr/local/homebrew/lib - /opt/local/lib) - -find_library(libAwsCEventStream_LIBRARY - NAMES aws-c-event-stream - HINTS ENV LD_LIBRARY_PATH - HINTS ENV DYLD_LIBRARY_PATH - HINTS ${PREFIX_LIBAWSS3}/lib - PATHS - /usr/lib - /usr/local/lib - /usr/local/homebrew/lib - /opt/local/lib) - -find_library(libAwsChecksums_LIBRARY - NAMES aws-checksums - HINTS ENV LD_LIBRARY_PATH - HINTS ENV DYLD_LIBRARY_PATH - HINTS ${PREFIX_LIBAWSS3}/lib - PATHS - /usr/lib - /usr/local/lib - /usr/local/homebrew/lib - /opt/local/lib) - -find_library(LibAwsS3_LIBRARY - NAMES aws-cpp-sdk-s3 - HINTS ENV LD_LIBRARY_PATH - HINTS ENV DYLD_LIBRARY_PATH - HINTS ${PREFIX_LIBAWSS3}/lib - PATHS - /usr/lib - /usr/local/lib - /usr/local/homebrew/lib - /opt/local/lib) - -find_library(LibAwsSTS_LIBRARY - NAMES aws-cpp-sdk-sts - HINTS ENV LD_LIBRARY_PATH - HINTS ENV DYLD_LIBRARY_PATH - HINTS ${PREFIX_LIBAWSS3}/lib - PATHS - /usr/lib - /usr/local/lib - /usr/local/homebrew/lib - /opt/local/lib) - -find_library(LibAwsIM_LIBRARY - NAMES aws-cpp-sdk-identity-management - HINTS ENV LD_LIBRARY_PATH - HINTS ENV DYLD_LIBRARY_PATH - HINTS ${PREFIX_LIBAWSS3}/lib - PATHS - /usr/lib - /usr/local/lib - /usr/local/homebrew/lib - /opt/local/lib) - -find_library(LibAwsCI_LIBRARY - NAMES aws-cpp-sdk-cognito-identity - HINTS ENV LD_LIBRARY_PATH - HINTS ENV DYLD_LIBRARY_PATH - HINTS ${PREFIX_LIBAWSS3}/lib - PATHS - /usr/lib - /usr/local/lib - /usr/local/homebrew/lib - /opt/local/lib) - -find_library(LibCurl_LIBRARY - NAMES curl - HINTS ENV LD_LIBRARY_PATH - HINTS ENV DYLD_LIBRARY_PATH - PATHS - /usr/lib - /usr/local/lib - /usr/local/homebrew/lib - /opt/local/lib) - -find_package(OpenSSL REQUIRED) - -#message("libAwsCore_LIBRARY = ${libAwsCore_LIBRARY}") -#message("LibAwsS3_LIBRARY = ${LibAwsS3_LIBRARY}") -#message("LibCurl_LIBRARY = ${LibCurl_LIBRARY}") - -get_filename_component(LibAwsS3_LIBRARY_DIR ${LibAwsS3_LIBRARY} DIRECTORY) -find_path(LibAwsS3_INCLUDE_DIR - NAMES aws/core/Aws.h - HINTS ${LibAwsS3_LIBRARY_DIR}/../include - HINTS ${PREFIX_LIBAWSS3}/include - PATHS - /include - /usr/include - /usr/local/include - /usr/local/homebrew/include - /usr/local/opt/libarchive/include - /opt/local/include - ) -#message("LibAwsS3_LIBRARY_DIR= ${LibAwsS3_LIBRARY_DIR}") -#message("LibAwsS3_INCLUDE_DIR= ${LibAwsS3_INCLUDE_DIR}") - -# Set standard CMake FindPackage variables if found. -set(LibAwsS3_SUPPORT_LIBRARIES ${LibCurl_LIBRARY} ${OPENSSL_LIBRARIES}) -set(LibAwsS3_LIBRARIES ${LibAwsS3_LIBRARIES} ${LibAwsS3_LIBRARY} ${LibAwsIM_LIBRARY} ${LibAwsCI_LIBRARY} ${libAwsCore_LIBRARY} ${libAwsCEventStream_LIBRARY} ${libAwsCCommon_LIBRARY} ${libAwsChecksums_LIBRARY} ${LibAwsSTS_LIBRARY} ${LibAwsS3_SUPPORT_LIBRARIES}) -set(LibAwsS3_INCLUDE_DIRS ${LibAwsS3_INCLUDE_DIR}) -set(LibAwsS3_LIBRARY_DIRS ${LibAwsS3_LIBRARY_DIR}) - -if(LibAwsS3_USE_STATIC_LIBS) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_CMAKE_FIND_LIBRARY_SUFFIXES}) -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(LibAwsS3 REQUIRED_VARS - LibAwsS3_INCLUDE_DIR - LibAwsS3_LIBRARY - LibAwsSTS_LIBRARY - LibAwsIM_LIBRARY - LibAwsCI_LIBRARY - libAwsCore_LIBRARY - libAwsCCommon_LIBRARY - libAwsCEventStream_LIBRARY - libAwsChecksums_LIBRARY - OPENSSL_LIBRARIES - LibCurl_LIBRARY - ) diff --git a/omniscidb/cmake/Modules/FindRdKafka.cmake b/omniscidb/cmake/Modules/FindRdKafka.cmake deleted file mode 100644 index b78b59b1bc..0000000000 --- a/omniscidb/cmake/Modules/FindRdKafka.cmake +++ /dev/null @@ -1,79 +0,0 @@ -#.rst: -# FindRdKafka.cmake -# ------------- -# -# Find a RdKafka installation. -# -# This module finds if RdKafka is installed and selects a default -# configuration to use. -# -# find_package(RdKafka ...) -# -# -# The following variables control which libraries are found:: -# -# RdKafka_USE_STATIC_LIBS - Set to ON to force use of static libraries. -# -# The following are set after the configuration is done: -# -# :: -# -# RdKafka_FOUND - Set to TRUE if RdKafka was found. -# RdKafka_LIBRARIES - Path to the RdKafka libraries. -# RdKafka_LIBRARY_DIRS - compile time link directories -# RdKafka_INCLUDE_DIRS - compile time include directories -# -# -# Sample usage: -# -# :: -# -# find_package(RdKafka) -# if(RdKafka_FOUND) -# target_link_libraries( ${RdKafka_LIBRARIES}) -# endif() - -if(RdKafka_USE_STATIC_LIBS) - set(_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) -endif() - - -find_library(RdKafka_LIBRARY - NAMES rdkafka - HINTS - ENV LD_LIBRARY_PATH - ENV DYLD_LIBRARY_PATH - PATHS - /usr/lib - /usr/local/lib - /usr/local/homebrew/lib - /opt/local/lib) - -find_library(RdKafka++_LIBRARY - NAMES rdkafka++ - HINTS - ENV LD_LIBRARY_PATH - ENV DYLD_LIBRARY_PATH - PATHS - /usr/lib - /usr/local/lib - /usr/local/homebrew/lib - /opt/local/lib) - -if(RdKafka_USE_STATIC_LIBS) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_CMAKE_FIND_LIBRARY_SUFFIXES}) -endif() - -get_filename_component(RdKafka_LIBRARY_DIR ${RdKafka_LIBRARY} DIRECTORY) - -find_package(OpenSSL REQUIRED) -find_package(ZLIB REQUIRED) - -# Set standard CMake FindPackage variables if found. -set(RdKafka_LIBRARIES ${RdKafka++_LIBRARY} ${RdKafka_LIBRARY} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS}) -set(RdKafka_LIBRARY_DIRS ${RdKafka_LIBRARY_DIR}) -set(RdKafka_INCLUDE_DIRS ${RdKafka_LIBRARY_DIR}/../include) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(RdKafka REQUIRED_VARS RdKafka_LIBRARY) diff --git a/omniscidb/docs/source/quickstart/build.rst b/omniscidb/docs/source/quickstart/build.rst index f895a48cd0..632b8a630c 100644 --- a/omniscidb/docs/source/quickstart/build.rst +++ b/omniscidb/docs/source/quickstart/build.rst @@ -25,7 +25,6 @@ The following ``cmake``/``ccmake`` options can enable/disable different features * ``-DCMAKE_BUILD_TYPE=release`` - Build type and compiler options to use. * Options are ``Debug``, ``Release``, ``RelWithDebInfo``, ``MinSizeRel``, and unset. -* ``-DENABLE_AWS_S3=on`` - Enable AWS S3 support, if available. Default is ``on``. * ``-DENABLE_CUDA=off`` - Disable CUDA. Default is ``on``. * ``-DENABLE_CUDA_KERNEL_DEBUG=off`` - Enable debugging symbols for CUDA kernels. Will dramatically reduce kernel performance. Default is ``off``. * ``-DENABLE_DECODERS_BOUNDS_CHECKING=off`` - Enable bounds checking for column decoding. Default is ``off``. diff --git a/omniscidb/scripts/mapd-deps-conda-dev-env.yml b/omniscidb/scripts/mapd-deps-conda-dev-env.yml index f5a9c09b11..2f668f6a29 100644 --- a/omniscidb/scripts/mapd-deps-conda-dev-env.yml +++ b/omniscidb/scripts/mapd-deps-conda-dev-env.yml @@ -37,7 +37,6 @@ dependencies: - libkml - libiconv - ncurses - - openssl - xz - bzip2 - zlib diff --git a/omniscidb/scripts/mapd-deps-conda-windows-env.yml b/omniscidb/scripts/mapd-deps-conda-windows-env.yml index d5efc86633..ada7852f0a 100644 --- a/omniscidb/scripts/mapd-deps-conda-windows-env.yml +++ b/omniscidb/scripts/mapd-deps-conda-windows-env.yml @@ -33,7 +33,6 @@ dependencies: - gflags - libiconv #- ncurses - - openssl - xz - bzip2 - zlib diff --git a/recipe/build-hdk.sh b/recipe/build-hdk.sh index 6f2a182647..09a2240796 100644 --- a/recipe/build-hdk.sh +++ b/recipe/build-hdk.sh @@ -31,7 +31,7 @@ cmake -Wno-dev \ -DCMAKE_PREFIX_PATH=$PREFIX \ -DCMAKE_INSTALL_PREFIX=$PREFIX/$INSTALL_BASE \ -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_AWS_S3=off -B build -S . + -B build -S . cmake --build build --parallel $(nproc) cmake --install build --prefix $PREFIX/$INSTALL_BASE