Build fixes (#5261)

dbms/programs/CMakeLists.txt

@@ -209,6 +209,9 @@ else ()
         install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-obfuscator DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-obfuscator)
     endif ()
+    if(ENABLE_CLICKHOUSE_ODBC_BRIDGE)
+        list(APPEND CLICKHOUSE_BUNDLE clickhouse-odbc-bridge)
+    endif()
 
     # install always because depian package want this files:
     add_custom_target (clickhouse-clang ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-clang DEPENDS clickhouse)

dbms/src/Common/StringSearcher.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Common/UTF8Helpers.h>
+#include <Core/Defines.h>
 #include <ext/range.h>
 #include <Poco/UTF8Encoding.h>
 #include <Poco/Unicode.h>

dbms/src/Functions/Regexps.h

@@ -11,6 +11,7 @@
 #include <Common/ObjectPool.h>
 #include <Common/OptimizedRegularExpression.h>
 #include <Common/ProfileEvents.h>
+#include <Common/Exception.h>
 #include <common/StringRef.h>
 
 

dbms/src/Storages/MergeTree/MergeTreeRangeReader.h

@@ -12,6 +12,7 @@ class ColumnVector;
 using ColumnUInt8 = ColumnVector<UInt8>;
 
 class MergeTreeReader;
+class MergeTreeIndexGranularity;
 
 /// MergeTreeReader iterator which allows sequential reading for arbitrary number of rows between pairs of marks in the same part.
 /// Stores reading state, which can be inside granule. Can skip rows in current granule and start reading from next mark.

release

@@ -111,7 +111,7 @@ if [ -z "$USE_PBUILDER" ] ; then
     DEB_CC=${DEB_CC:=`which gcc-7 gcc-8 gcc | head -n1`}
     DEB_CXX=${DEB_CXX:=`which g++-7 g++-8 g++ | head -n1`}
     # Build (only binary packages).
-    debuild -e PATH -e SSH_AUTH_SOCK \
+    debuild --preserve-env -e PATH \
     -e DEB_CC=$DEB_CC -e DEB_CXX=$DEB_CXX -e CMAKE_FLAGS="$CMAKE_FLAGS" \
     -b ${DEBUILD_NOSIGN_OPTIONS} ${DEBUILD_NODEPS_OPTIONS}
 else

utils/check-style/check-include

@@ -58,6 +58,8 @@ inc="-I. \
 -I./contrib/cppkafka/include \
 -I./contrib/librdkafka-cmake/include \
 -I./contrib/lz4/lib \
+-I./contrib/hyperscan/src \
+-I./contrib/simdjson/include \
 -I./dbms/src \
 -I${BUILD_DIR}/dbms/src"