Merge pull request ClickHouse#32845 from ClickHouse/revert-32788-buil…

…dfix Revert "Fix build issue related to azure blob storage"
Kyligence · Dec 16, 2021 · 6a45f5a · 6a45f5a
2 parents 2ae5eb4 + c338bee
commit 6a45f5a
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 107 deletions.
diff --git a/contrib/azure-cmake/CMakeLists.txt b/contrib/azure-cmake/CMakeLists.txt
@@ -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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -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})

diff --git a/src/Disks/BlobStorage/BlobStorageAuth.h b/src/Disks/BlobStorage/BlobStorageAuth.h
@@ -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
 {
 

diff --git a/src/Disks/BlobStorage/DiskBlobStorage.h b/src/Disks/BlobStorage/DiskBlobStorage.h
@@ -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
 {

diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.h b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
@@ -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

diff --git a/src/IO/ReadBufferFromBlobStorage.h b/src/IO/ReadBufferFromBlobStorage.h
@@ -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
 {
 

diff --git a/src/IO/WriteBufferFromBlobStorage.h b/src/IO/WriteBufferFromBlobStorage.h
@@ -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
 {