thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32845 from ClickHouse/revert-32788-buildfix

Browse Source 
Revert "Fix build issue related to azure blob storage"
This commit is contained in:
alesapin 2021-12-16 14:37:33 +03:00 committed by GitHub
commit 6a45f5a060
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/azure-cmake/CMakeLists.txt
View File

@ -46,17 +46,14 @@ include("${AZURE_DIR}/cmake-modules/AzureTransportAdapters.cmake")
add_library(azure_sdk ${AZURE_SDK_UNIFIED_SRC})
if (COMPILER_CLANG)
target_compile_options(azure_sdk PRIVATE
target_compile_options(azure_sdk PUBLIC
-Wno-deprecated-copy-dtor
-Wno-extra-semi
-Wno-suggest-destructor-override
-Wno-inconsistent-missing-destructor-override
-Wno-error=unknown-warning-option
-Wno-reserved-identifier
)
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13)
target_compile_options(azure_sdk PRIVATE -Wno-reserved-identifier)
endif()
endif()
# Originally, on Windows azure-core is built with bcrypt and crypt32 by default

14
src/CMakeLists.txt
View File

@ -385,20 +385,6 @@ dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${PDQSORT_INCLUDE_DIR})
target_include_directories(clickhouse_common_io BEFORE PUBLIC ${MINISELECT_INCLUDE_DIR})
dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${MINISELECT_INCLUDE_DIR})
macro (add_check_flag_definitions flag modules)
if (${flag})
if (MAKE_STATIC_LIBRARIES OR NOT SPLIT_SHARED_LIBRARIES)
target_compile_definitions(clickhouse_common_io PRIVATE ${flag})
target_compile_definitions(dbms PRIVATE ${flag})
else ()
foreach (module ${modules})
target_compile_definitions(${module} PRIVATE ${flag})
endforeach ()
endif ()
endif ()
endmacro ()
add_check_flag_definitions(HAS_SUGGEST_DESTRUCTOR_OVERRIDE "clickhouse_common_io;clickhouse_disks")
if (ZSTD_LIBRARY)
dbms_target_link_libraries(PRIVATE ${ZSTD_LIBRARY})
target_link_libraries (clickhouse_common_io PUBLIC ${ZSTD_LIBRARY})

18
src/Disks/BlobStorage/BlobStorageAuth.h
View File

@ -7,26 +7,8 @@
#if USE_AZURE_BLOB_STORAGE
#include <Disks/IDiskRemote.h>
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Winconsistent-missing-destructor-override"
# pragma clang diagnostic ignored "-Wdeprecated-copy-dtor"
# pragma clang diagnostic ignored "-Wextra-semi"
# ifdef HAS_SUGGEST_DESTRUCTOR_OVERRIDE
# pragma clang diagnostic ignored "-Wsuggest-destructor-override"
# endif
# ifdef HAS_RESERVED_IDENTIFIER
# pragma clang diagnostic ignored "-Wreserved-identifier"
# endif
#endif
#include <azure/storage/blobs.hpp>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
namespace DB
{

16
src/Disks/BlobStorage/DiskBlobStorage.h
View File

@ -11,25 +11,9 @@
#include <IO/WriteBufferFromBlobStorage.h>
#include <IO/SeekAvoidingReadBuffer.h>
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Winconsistent-missing-destructor-override"
# pragma clang diagnostic ignored "-Wdeprecated-copy-dtor"
# pragma clang diagnostic ignored "-Wextra-semi"
# ifdef HAS_SUGGEST_DESTRUCTOR_OVERRIDE
# pragma clang diagnostic ignored "-Wsuggest-destructor-override"
# endif
# ifdef HAS_RESERVED_IDENTIFIER
# pragma clang diagnostic ignored "-Wreserved-identifier"
# endif
#endif
#include <azure/identity/managed_identity_credential.hpp>
#include <azure/storage/blobs.hpp>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
namespace DB
{

19
src/Disks/IO/ReadBufferFromRemoteFSGather.h
View File

@ -6,26 +6,7 @@
#include <IO/ReadSettings.h>
#if USE_AZURE_BLOB_STORAGE
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Winconsistent-missing-destructor-override"
# pragma clang diagnostic ignored "-Wdeprecated-copy-dtor"
# pragma clang diagnostic ignored "-Wextra-semi"
# ifdef HAS_SUGGEST_DESTRUCTOR_OVERRIDE
# pragma clang diagnostic ignored "-Wsuggest-destructor-override"
# endif
# ifdef HAS_RESERVED_IDENTIFIER
# pragma clang diagnostic ignored "-Wreserved-identifier"
# endif
#endif
#include <azure/storage/blobs.hpp>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
#endif
namespace Aws

18
src/IO/ReadBufferFromBlobStorage.h
View File

@ -9,26 +9,8 @@
#include <IO/HTTPCommon.h>
#include <IO/SeekableReadBuffer.h>
#include <IO/ReadSettings.h>
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Winconsistent-missing-destructor-override"
# pragma clang diagnostic ignored "-Wdeprecated-copy-dtor"
# pragma clang diagnostic ignored "-Wextra-semi"
# ifdef HAS_SUGGEST_DESTRUCTOR_OVERRIDE
# pragma clang diagnostic ignored "-Wsuggest-destructor-override"
# endif
# ifdef HAS_RESERVED_IDENTIFIER
# pragma clang diagnostic ignored "-Wreserved-identifier"
# endif
#endif
#include <azure/storage/blobs.hpp>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
namespace DB
{

17
src/IO/WriteBufferFromBlobStorage.h
View File

@ -10,26 +10,9 @@
#include <IO/BufferWithOwnMemory.h>
#include <IO/WriteBuffer.h>
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Winconsistent-missing-destructor-override"
# pragma clang diagnostic ignored "-Wdeprecated-copy-dtor"
# pragma clang diagnostic ignored "-Wextra-semi"
# ifdef HAS_SUGGEST_DESTRUCTOR_OVERRIDE
# pragma clang diagnostic ignored "-Wsuggest-destructor-override"
# endif
# ifdef HAS_RESERVED_IDENTIFIER
# pragma clang diagnostic ignored "-Wreserved-identifier"
# endif
#endif
#include <azure/storage/blobs.hpp>
#include <azure/core/io/body_stream.hpp>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
namespace DB
{