Merge branch 'master' into fix-drop-index-if-exists

contrib/croaring/CMakeLists.txt

 add_library(roaring
 	roaring.c
-	roaring.h
-	roaring.hh)
+	roaring/roaring.h
+	roaring/roaring.hh)
 
 target_include_directories (roaring PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

contrib/croaring/roaring.c

 /* auto-generated on Tue Dec 18 09:42:59 CST 2018. Do not edit! */
-#include "roaring.h"
+#include "roaring/roaring.h"
 
 /* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */
 #ifdef DMALLOC

dbms/programs/server/HTTPHandler.cpp

@@ -312,11 +312,13 @@ void HTTPHandler::processQuery(
             client_supports_http_compression = true;
             http_response_compression_method = CompressionMethod::Zlib;
         }
+#if USE_BROTLI
         else if (http_response_compression_methods == "br")
         {
             client_supports_http_compression = true;
             http_response_compression_method = CompressionMethod::Brotli;
         }
+#endif
     }
 
     /// Client can pass a 'compress' flag in the query string. In this case the query result is

dbms/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h

 #pragma once
 
-#include <roaring.h>
+#include <roaring/roaring.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <boost/noncopyable.hpp>
-#include <roaring.hh>
+#include <roaring/roaring.hh>
 #include <Common/HashTable/SmallTable.h>
 #include <Common/PODArray.h>
 

dbms/src/IO/WriteBufferFromHTTPServerResponse.cpp

@@ -128,6 +128,7 @@ void WriteBufferFromHTTPServerResponse::nextImpl()
                     deflating_buf.emplace(*out_raw, compression_method, compression_level, working_buffer.size(), working_buffer.begin());
                     out = &*deflating_buf;
                 }
+#if USE_BROTLI
                 else if (compression_method == CompressionMethod::Brotli)
                 {
 #if defined(POCO_CLICKHOUSE_PATCH)
@@ -140,6 +141,7 @@ void WriteBufferFromHTTPServerResponse::nextImpl()
                     brotli_buf.emplace(*out_raw, compression_level, working_buffer.size(), working_buffer.begin());
                     out = &*brotli_buf;
                 }
+#endif
 
                 else
                     throw Exception("Logical error: unknown compression method passed to WriteBufferFromHTTPServerResponse",

dbms/src/IO/WriteBufferFromHTTPServerResponse.h

@@ -61,7 +61,9 @@ private:
 
     std::optional<WriteBufferFromOStream> out_raw;
     std::optional<ZlibDeflatingWriteBuffer> deflating_buf;
+#if USE_BROTLI
     std::optional<BrotliWriteBuffer> brotli_buf;
+#endif
 
     WriteBuffer * out = nullptr;     /// Uncompressed HTTP body is written to this buffer. Points to out_raw or possibly to deflating_buf.