HTTP Accept-Encoding: br; Expended ZlibCompressionMethod to generic...

HTTP Accept-Encoding: br; Expended ZlibCompressionMethod to generic CompressionMethod; Added brotli to CompressionMethod enum

dbms/programs/server/HTTPHandler.cpp

@@ -296,7 +296,7 @@ void HTTPHandler::processQuery(
     /// The client can pass a HTTP header indicating supported compression method (gzip or deflate).
     String http_response_compression_methods = request.get("Accept-Encoding", "");
     bool client_supports_http_compression = false;
-    ZlibCompressionMethod http_response_compression_method {};
+    CompressionMethod http_response_compression_method {};
 
     if (!http_response_compression_methods.empty())
     {
@@ -305,12 +305,16 @@ void HTTPHandler::processQuery(
         if (std::string::npos != http_response_compression_methods.find("gzip"))
         {
             client_supports_http_compression = true;
-            http_response_compression_method = ZlibCompressionMethod::Gzip;
+            http_response_compression_method = CompressionMethod::Gzip;
         }
         else if (std::string::npos != http_response_compression_methods.find("deflate"))
         {
             client_supports_http_compression = true;
-            http_response_compression_method = ZlibCompressionMethod::Zlib;
+            http_response_compression_method = CompressionMethod::Zlib;
+        }
+        else if (http_response_compression_methods == "br") {
+            client_supports_http_compression = true;
+            http_response_compression_method = CompressionMethod ::Brotli;
         }
     }
 
@@ -394,11 +398,11 @@ void HTTPHandler::processQuery(
     {
         if (http_request_compression_method_str == "gzip")
         {
-            in_post = std::make_unique<ZlibInflatingReadBuffer>(*in_post_raw, ZlibCompressionMethod::Gzip);
+            in_post = std::make_unique<ZlibInflatingReadBuffer>(*in_post_raw, CompressionMethod::Gzip);
         }
         else if (http_request_compression_method_str == "deflate")
         {
-            in_post = std::make_unique<ZlibInflatingReadBuffer>(*in_post_raw, ZlibCompressionMethod::Zlib);
+            in_post = std::make_unique<ZlibInflatingReadBuffer>(*in_post_raw, CompressionMethod::Zlib);
         }
 #if USE_BROTLI
         else if (http_request_compression_method_str == "br")

dbms/src/IO/ZlibCompressionMethod.h → dbms/src/IO/CompressionMethod.h

@@ -3,7 +3,7 @@
 namespace DB
 {
 
-enum class ZlibCompressionMethod
+enum class CompressionMethod
 {
     /// DEFLATE compression with gzip header and CRC32 checksum.
     /// This option corresponds to files produced by gzip(1) or HTTP Content-Encoding: gzip.
@@ -11,6 +11,7 @@ enum class ZlibCompressionMethod
     /// DEFLATE compression with zlib header and Adler32 checksum.
     /// This option corresponds to HTTP Content-Encoding: deflate.
     Zlib,
+    Brotli,
 };
 
 }

dbms/src/IO/WriteBufferFromHTTPServerResponse.cpp

@@ -76,7 +76,7 @@ void WriteBufferFromHTTPServerResponse::nextImpl()
         {
             if (compress)
             {
-                if (compression_method == ZlibCompressionMethod::Gzip)
+                if (compression_method == CompressionMethod::Gzip)
                 {
 #if defined(POCO_CLICKHOUSE_PATCH)
                     *response_header_ostr << "Content-Encoding: gzip\r\n";
@@ -84,7 +84,7 @@ void WriteBufferFromHTTPServerResponse::nextImpl()
                     response.set("Content-Encoding", "gzip");
 #endif
                 }
-                else if (compression_method == ZlibCompressionMethod::Zlib)
+                else if (compression_method == CompressionMethod::Zlib)
                 {
 #if defined(POCO_CLICKHOUSE_PATCH)
                     *response_header_ostr << "Content-Encoding: deflate\r\n";
@@ -133,7 +133,7 @@ WriteBufferFromHTTPServerResponse::WriteBufferFromHTTPServerResponse(
     Poco::Net::HTTPServerResponse & response_,
     unsigned keep_alive_timeout_,
     bool compress_,
-    ZlibCompressionMethod compression_method_,
+    CompressionMethod compression_method_,
     size_t size)
     : BufferWithOwnMemory<WriteBuffer>(size)
     , request(request_)

dbms/src/IO/WriteBufferFromHTTPServerResponse.h

@@ -49,7 +49,7 @@ private:
     bool add_cors_header = false;
     unsigned keep_alive_timeout = 0;
     bool compress = false;
-    ZlibCompressionMethod compression_method;
+    CompressionMethod compression_method;
     int compression_level = Z_DEFAULT_COMPRESSION;
 
     std::ostream * response_body_ostr = nullptr;
@@ -89,7 +89,7 @@ public:
         Poco::Net::HTTPServerResponse & response_,
         unsigned keep_alive_timeout_,
         bool compress_ = false,        /// If true - set Content-Encoding header and compress the result.
-        ZlibCompressionMethod compression_method_ = ZlibCompressionMethod::Gzip,
+        CompressionMethod compression_method_ = CompressionMethod::Gzip,
         size_t size = DBMS_DEFAULT_BUFFER_SIZE);
 
     /// Writes progess in repeating HTTP headers.

dbms/src/IO/ZlibDeflatingWriteBuffer.cpp

@@ -6,7 +6,7 @@ namespace DB
 
 ZlibDeflatingWriteBuffer::ZlibDeflatingWriteBuffer(
         WriteBuffer & out_,
-        ZlibCompressionMethod compression_method,
+        CompressionMethod compression_method,
         int compression_level,
         size_t buf_size,
         char * existing_memory,
@@ -23,7 +23,7 @@ ZlibDeflatingWriteBuffer::ZlibDeflatingWriteBuffer(
     zstr.avail_out = 0;
 
     int window_bits = 15;
-    if (compression_method == ZlibCompressionMethod::Gzip)
+    if (compression_method == CompressionMethod::Gzip)
     {
         window_bits += 16;
     }

dbms/src/IO/ZlibDeflatingWriteBuffer.h

@@ -2,7 +2,7 @@
 
 #include <IO/WriteBuffer.h>
 #include <IO/BufferWithOwnMemory.h>
-#include <IO/ZlibCompressionMethod.h>
+#include <IO/CompressionMethod.h>
 
 #include <zlib.h>
 
@@ -21,7 +21,7 @@ class ZlibDeflatingWriteBuffer : public BufferWithOwnMemory<WriteBuffer>
 public:
     ZlibDeflatingWriteBuffer(
             WriteBuffer & out_,
-            ZlibCompressionMethod compression_method,
+            CompressionMethod compression_method,
             int compression_level,
             size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
             char * existing_memory = nullptr,

dbms/src/IO/ZlibInflatingReadBuffer.cpp

@@ -6,7 +6,7 @@ namespace DB
 
 ZlibInflatingReadBuffer::ZlibInflatingReadBuffer(
         ReadBuffer & in_,
-        ZlibCompressionMethod compression_method,
+        CompressionMethod compression_method,
         size_t buf_size,
         char * existing_memory,
         size_t alignment)
@@ -23,7 +23,7 @@ ZlibInflatingReadBuffer::ZlibInflatingReadBuffer(
     zstr.avail_out = 0;
 
     int window_bits = 15;
-    if (compression_method == ZlibCompressionMethod::Gzip)
+    if (compression_method == CompressionMethod::Gzip)
     {
         window_bits += 16;
     }

dbms/src/IO/ZlibInflatingReadBuffer.h

@@ -2,7 +2,7 @@
 
 #include <IO/ReadBuffer.h>
 #include <IO/BufferWithOwnMemory.h>
-#include <IO/ZlibCompressionMethod.h>
+#include <IO/CompressionMethod.h>
 
 #include <zlib.h>
 
@@ -22,7 +22,7 @@ class ZlibInflatingReadBuffer : public BufferWithOwnMemory<ReadBuffer>
 public:
     ZlibInflatingReadBuffer(
             ReadBuffer & in_,
-            ZlibCompressionMethod compression_method,
+            CompressionMethod compression_method,
             size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
             char * existing_memory = nullptr,
             size_t alignment = 0);