Implement zlib buffers [#METR-23582]

.gitignore

@@ -1,6 +1,7 @@
 # emacs files
 *~
 *\#
+.tramp_history
 
 # auto generated files
 *.logrt

CMakeLists.txt

@@ -167,6 +167,10 @@ include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libpoco/MongoDB/inc
 include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libpoco/Zip/include/)
 include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libboost/boost_1_62_0/)
 
+if (USE_STATIC_LIBRARIES)
+	include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libzlib-ng/)
+endif ()
+
 include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/libs/libcommon/include/)
 include_directories (BEFORE ${ClickHouse_BINARY_DIR}/libs/libcommon/include/)
 include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/libs/libdaemon/include/)

contrib/CMakeLists.txt

@@ -13,6 +13,7 @@ add_subdirectory (libzookeeper)
 add_subdirectory (libcityhash)
 add_subdirectory (libfarmhash)
 add_subdirectory (libmetrohash)
+add_subdirectory (libzlib-ng)
 
 if (ENABLE_LIBTCMALLOC)
 	add_subdirectory (libtcmalloc)

contrib/libpoco/CMakeLists.txt

@@ -117,9 +117,9 @@ endif ()
 
 if (POCO_UNBUNDLED)
 	add_definitions( -DPOCO_UNBUNDLED)
-	message(STATUS "Build with using external sqlite, libz, pcre, expat ...")
+	message(STATUS "Build with using external sqlite, pcre, expat ...")
 else ()
-	message(STATUS "Build with using internal copy of sqlite, libz, pcre, expat, ...")
+	message(STATUS "Build with using internal copy of sqlite, pcre, expat, ...")
 endif ()
 
 include(CheckTypeSize)

contrib/libpoco/Foundation/CMakeLists.txt

@@ -44,10 +44,6 @@ if (POCO_UNBUNDLED)
         src/pcre_ucd.c
         src/pcre_tables.c
     )
-
-    find_package(ZLIB REQUIRED)
-    set(SYSLIBS ${SYSLIBS} ${ZLIB_LIBRARIES})
-    include_directories(${ZLIB_INCLUDE_DIRS})
 else()
     # pcre
     POCO_SOURCES( SRCS pcre
@@ -73,27 +69,18 @@ else()
         src/pcre_valid_utf8.c
         src/pcre_xclass.c
     )
-
-    # zlib
-    POCO_HEADERS( SRCS zlib
-        include/Poco/zconf.h
-        include/Poco/zlib.h
-        )
-
-    POCO_SOURCES( SRCS zlib
-        src/adler32.c
-        src/compress.c
-        src/crc32.c
-        src/deflate.c
-        src/infback.c
-        src/inffast.c
-        src/inflate.c
-        src/inftrees.c
-        src/trees.c
-        src/zutil.c
-    )
 endif (POCO_UNBUNDLED)
 
+if (USE_STATIC_LIBRARIES)
+	# Use zlib from clickhouse contrib.
+	set(SYSLIBS ${SYSLIBS} zlibstatic)
+	include_directories("${ClickHouse_SOURCE_DIR}/contrib/libzlib-ng/")
+else()
+	find_package(ZLIB REQUIRED)
+	set(SYSLIBS ${SYSLIBS} ${ZLIB_LIBRARIES})
+	include_directories(${ZLIB_INCLUDE_DIRS})
+endif (USE_STATIC_LIBRARIES)
+
 if(WIN32)
     set(SYSLIBS ${SYSLIBS} iphlpapi)
 endif(WIN32)

contrib/libpoco/Foundation/include/Poco/DeflatingStream.h

@@ -24,11 +24,7 @@
 #include "Poco/BufferedStreamBuf.h"
 #include <istream>
 #include <ostream>
-#if defined(POCO_UNBUNDLED)
 #include <zlib.h>
-#else
-#include "Poco/zlib.h"
-#endif
 
 
 namespace Poco {

contrib/libpoco/Foundation/include/Poco/InflatingStream.h

@@ -24,11 +24,7 @@
 #include "Poco/BufferedStreamBuf.h"
 #include <istream>
 #include <ostream>
-#if defined(POCO_UNBUNDLED)
 #include <zlib.h>
-#else
-#include "Poco/zlib.h"
-#endif
 
 
 namespace Poco {

contrib/libpoco/Foundation/src/Checksum.cpp

@@ -15,11 +15,7 @@
 
 
 #include "Poco/Checksum.h"
-#if defined(POCO_UNBUNDLED)
 #include <zlib.h>
-#else
-#include "Poco/zlib.h"
-#endif
 
 
 namespace Poco {

contrib/libpoco/Zip/src/ZipStream.cpp

@@ -23,11 +23,7 @@
 #include "Poco/Exception.h"
 #include "Poco/InflatingStream.h"
 #include "Poco/DeflatingStream.h"
-#if defined(POCO_UNBUNDLED)
 #include <zlib.h>
-#else
-#include "Poco/zlib.h"
-#endif
 
 
 namespace Poco {

contrib/libzlib-ng/.gitignore

@@ -0,0 +1,52 @@
+*.diff
+*.patch
+*.orig
+*.rej
+
+*~
+*.a
+*.lo
+*.o
+*.dylib
+
+*.gcda
+*.gcno
+*.gcov
+
+/example
+/example64
+/examplesh
+/libz.so*
+/minigzip
+/minigzip64
+/minigzipsh
+/zlib.pc
+/CVE-2003-0107
+
+.DS_Store
+*.obj
+*.exe
+*.pdb
+*.exp
+*.lib
+*.dll
+*.res
+foo.gz
+*.manifest
+
+CMakeCache.txt
+CMakeFiles
+Testing
+*.cmake
+*.stackdump
+zconf.h
+zconf.h.cmakein
+zconf.h.included
+ztest*
+
+configure.log
+a.out
+
+/arch/arm/Makefile
+/arch/generic/Makefile
+/arch/x86/Makefile

contrib/libzlib-ng/.travis.yml

@@ -0,0 +1,12 @@
+language: c
+compiler:
+  - gcc
+  - clang
+env:
+  - BUILDDIR=. TOOL="./configure --zlib-compat"
+  - BUILDDIR=../build TOOL="../zlib-ng/configure --zlib-compat"
+  - BUILDDIR=. TOOL="./configure --zlib-compat --without-optimizations --without-new-strategies"
+  - BUILDDIR=. TOOL="cmake ."
+  - BUILDDIR=../build TOOL="cmake ../zlib-ng"
+script: mkdir -p $BUILDDIR && cd $BUILDDIR &&
+        $TOOL && make && make test