Resolved conflicts

CHANGELOG.md

@@ -1,3 +1,13 @@
+# ClickHouse release 1.1.54385, 2018-06-01
+
+## Bug fixes:
+* Fixed an error that in some cases caused ZooKeeper operations to block.
+
+# ClickHouse release 1.1.54383, 2018-05-22
+
+## Bug fixes:
+* Fixed a slowdown of replication queue if a table has many replicas.
+
 # ClickHouse release 1.1.54381, 2018-05-14
 
 ## Bug fixes:

CHANGELOG_RU.md

@@ -1,3 +1,11 @@
+# ClickHouse release 1.1.54385, 2018-06-01
+## Исправление ошибок:
+* Исправлена ошибка, которая в некоторых случаях приводила к блокировке операций с ZooKeeper.
+
+# ClickHouse release 1.1.54383, 2018-05-22
+## Исправление ошибок:
+* Исправлена деградация скорости выполнения очереди репликации при большом количестве реплик
+
 # ClickHouse release 1.1.54381, 2018-05-14
 
 ## Исправление ошибок:

CMakeLists.txt

@@ -6,15 +6,20 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ClickHouse_SOURCE_DIR}/cmake/Modul
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     # Require at least gcc 7
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7 AND NOT CMAKE_VERSION VERSION_LESS 2.8.9)
-        message (FATAL_ERROR "GCC version must be at least 7! For example, if GCC 7 is available under gcc-7, g++-7 names, do the following: export CC=gcc-7 CXX=g++-7; rm -rf CMakeCache.txt CMakeFiles; and re run cmake or ./release.")
+        message (FATAL_ERROR "GCC version must be at least 7. For example, if GCC 7 is available under gcc-7, g++-7 names, do the following: export CC=gcc-7 CXX=g++-7; rm -rf CMakeCache.txt CMakeFiles; and re run cmake or ./release.")
     endif ()
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     # Require at least clang 5
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
-        message (FATAL_ERROR "Clang version must be at least 5!")
+        message (FATAL_ERROR "Clang version must be at least 5.")
     endif ()
 else ()
-    message (WARNING "You are using an unsupported compiler! Compilation has only been tested with Clang 5+ and GCC 7+.")
+    message (WARNING "You are using an unsupported compiler. Compilation has only been tested with Clang 5+ and GCC 7+.")
+endif ()
+
+# Check that submodules are present only if source was downloaded with git
+if (EXISTS "${ClickHouse_SOURCE_DIR}/.git" AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/boost/boost")
+    message (FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init --recursive")
 endif ()
 
 # Write compile_commands.json
@@ -128,14 +133,14 @@ endif ()
 #endif ()
 
 if (CMAKE_VERSION VERSION_LESS "3.8.0")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z")
+    if (NOT MSVC)
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z")
+    endif ()
 else ()
     set (CMAKE_CXX_STANDARD 17)
     set (CMAKE_CXX_EXTENSIONS 0) # https://cmake.org/cmake/help/latest/prop_tgt/CXX_EXTENSIONS.html#prop_tgt:CXX_EXTENSIONS
     set (CMAKE_CXX_STANDARD_REQUIRED ON)
     set (CXX_FLAGS_INTERNAL_COMPILER "-std=c++1z")
-    # This needs to propagate to vendored projects in contrib
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 endif ()
 
 set (CMAKE_BUILD_COLOR_MAKEFILE          ON)

cmake/find_llvm.cmake

@@ -55,3 +55,14 @@ if (ENABLE_EMBEDDED_COMPILER)
         message(STATUS "LLVM C++ compiler flags: ${LLVM_CXXFLAGS}")
     endif()
 endif()
+
+
+function(llvm_libs_all REQUIRED_LLVM_LIBRARIES)
+    llvm_map_components_to_libnames (result all)
+    list (REMOVE_ITEM result "LTO" "LLVM")
+    if (TERMCAP_LIBRARY)
+        list (APPEND result ${TERMCAP_LIBRARY})
+    endif ()
+    list (APPEND result ${CMAKE_DL_LIBS})
+    set (${REQUIRED_LLVM_LIBRARIES} ${result} PARENT_SCOPE)
+endfunction()

contrib/CMakeLists.txt

@@ -1,5 +1,5 @@
 if (NOT MSVC)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-old-style-cast")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-old-style-cast -Wno-unused-function -Wno-deprecated-declarations -Wno-non-virtual-dtor -std=c++1z")
 endif ()
 
 if (USE_INTERNAL_BOOST_LIBRARY)

contrib/libcityhash/src/config.h

@@ -116,3 +116,10 @@
 /* Define to the type of an unsigned integer type of width exactly 8 bits if
    such a type exists and the standard includes do not define it. */
 /* #undef uint8_t */
+
+#ifdef _MSC_VER
+    #include <basetsd.h>
+    typedef SSIZE_T ssize_t;
+#else
+    #include <sys/types.h>
+#endif

copy_headers.sh

@@ -1,4 +1,8 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
+#set -x
+#echo "Args: $*"; env | sort
 
 # Этот скрипт собирает все заголовочные файлы, нужные для компиляции некоторого translation unit-а
 #  и копирует их с сохранением путей в директорию DST.
@@ -17,7 +21,7 @@
 
 SOURCE_PATH=${1:-.}
 DST=${2:-$SOURCE_PATH/../headers}
-BUILD_PATH=${3:-$SOURCE_PATH/build}
+BUILD_PATH=${BUILD_PATH=${3:-$SOURCE_PATH/build}}
 
 PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:$PATH"
 
@@ -30,23 +34,30 @@ START_HEADERS=$(echo \
     $SOURCE_PATH/dbms/src/Interpreters/SpecializedAggregator.h \
     $SOURCE_PATH/dbms/src/AggregateFunctions/AggregateFunction*.h)
 
+for header in $START_HEADERS; do
+    START_HEADERS_INCLUDE+="-include $header "
+done
+
 # Опция -mcx16 для того, чтобы выбиралось больше заголовочных файлов (с запасом).
 # The latter options are the same that are added while building packages.
 
+# TODO: Does not work on macos:
 GCC_ROOT=`$CLANG -v 2>&1 | grep "Selected GCC installation"| sed -n -e 's/^.*: //p'`
 
 for src_file in $(echo | $CLANG -M -xc++ -std=c++1z -Wall -Werror -msse4 -mcx16 -mpopcnt -O3 -g -fPIC -fstack-protector -D_FORTIFY_SOURCE=2 \
     -I $GCC_ROOT/include \
     -I $GCC_ROOT/include-fixed \
     $(cat "$BUILD_PATH/include_directories.txt") \
-    $(echo $START_HEADERS | sed -r -e 's/[^ ]+/-include \0/g') \
+    $START_HEADERS_INCLUDE \
     - |
     tr -d '\\' |
-    sed -r -e 's/^-\.o://');
+    sed --posix -E -e 's/^-\.o://');
 do
     dst_file=$src_file;
-    dst_file=$(echo $dst_file | sed -r -e 's/build\///')    # for simplicity reasons, will put generated headers near the rest.
-    mkdir -p "$DST/$(echo $dst_file | sed -r -e 's/\/[^/]*$/\//')";
+    [ -n $BUILD_PATH ] && dst_file=$(echo $dst_file | sed --posix -E -e "s!^$BUILD_PATH!!")
+    [ -n $DESTDIR ] && dst_file=$(echo $dst_file | sed --posix -E -e "s!^$DESTDIR!!")
+    dst_file=$(echo $dst_file | sed --posix -E -e 's/build\///')    # for simplicity reasons, will put generated headers near the rest.
+    mkdir -p "$DST/$(echo $dst_file | sed --posix -E -e 's/\/[^/]*$/\//')";
     cp "$src_file" "$DST/$dst_file";
 done
 
@@ -56,19 +67,32 @@ done
 
 for src_file in $(ls -1 $($CLANG -v -xc++ - <<<'' 2>&1 | grep '^ /' | grep 'include' | grep -E '/lib/clang/|/include/clang/')/*.h | grep -vE 'arm|altivec|Intrin');
 do
-    mkdir -p "$DST/$(echo $src_file | sed -r -e 's/\/[^/]*$/\//')";
-    cp "$src_file" "$DST/$src_file";
+    dst_file=$src_file;
+    [ -n $BUILD_PATH ] && dst_file=$(echo $dst_file | sed --posix -E -e "s!^$BUILD_PATH!!")
+    [ -n $DESTDIR ] && dst_file=$(echo $dst_file | sed --posix -E -e "s!^$DESTDIR!!")
+    mkdir -p "$DST/$(echo $dst_file | sed --posix -E -e 's/\/[^/]*$/\//')";
+    cp "$src_file" "$DST/$dst_file";
 done
 
-# Even more platform-specific headers
-for src_file in $(ls -1 $SOURCE_PATH/contrib/boost/libs/smart_ptr/include/boost/smart_ptr/detail/*);
-do
-    mkdir -p "$DST/$(echo $src_file | sed -r -e 's/\/[^/]*$/\//')";
-    cp "$src_file" "$DST/$src_file";
-done
+if [ -d "$SOURCE_PATH/contrib/boost/libs/smart_ptr/include/boost/smart_ptr/detail" ]; then
+    # Even more platform-specific headers
+    for src_file in $(ls -1 $SOURCE_PATH/contrib/boost/libs/smart_ptr/include/boost/smart_ptr/detail/*);
+    do
+        dst_file=$src_file;
+        [ -n $BUILD_PATH ] && dst_file=$(echo $dst_file | sed --posix -E -e "s!^$BUILD_PATH!!")
+        [ -n $DESTDIR ] && dst_file=$(echo $dst_file | sed --posix -E -e "s!^$DESTDIR!!")
+        mkdir -p "$DST/$(echo $dst_file | sed --posix -E -e 's/\/[^/]*$/\//')";
+        cp "$src_file" "$DST/$dst_file";
+    done
+fi
 
-for src_file in $(ls -1 $SOURCE_PATH/contrib/boost/boost/smart_ptr/detail/*);
-do
-    mkdir -p "$DST/$(echo $src_file | sed -r -e 's/\/[^/]*$/\//')";
-    cp "$src_file" "$DST/$src_file";
-done
+if [ -d "$SOURCE_PATH/contrib/boost/boost/smart_ptr/detail" ]; then
+    for src_file in $(ls -1 $SOURCE_PATH/contrib/boost/boost/smart_ptr/detail/*);
+    do
+        dst_file=$src_file;
+        [ -n $BUILD_PATH ] && dst_file=$(echo $dst_file | sed --posix -E -e "s!^$BUILD_PATH!!")
+        [ -n $DESTDIR ] && dst_file=$(echo $dst_file | sed --posix -E -e "s!^$DESTDIR!!")
+        mkdir -p "$DST/$(echo $dst_file | sed --posix -E -e 's/\/[^/]*$/\//')";
+        cp "$src_file" "$DST/$dst_file";
+    done
+fi

dbms/CMakeLists.txt

@@ -55,7 +55,6 @@ add_headers_and_sources(dbms src/Storages)
 add_headers_and_sources(dbms src/Storages/Distributed)
 add_headers_and_sources(dbms src/Storages/MergeTree)
 add_headers_and_sources(dbms src/Client)
-add_headers_only(dbms src/Server)
 
 list (APPEND clickhouse_common_io_sources ${CONFIG_BUILD})
 list (APPEND clickhouse_common_io_headers ${CONFIG_VERSION} ${CONFIG_COMMON})
@@ -100,11 +99,7 @@ else ()
 endif ()
 
 if (USE_EMBEDDED_COMPILER)
-    llvm_map_components_to_libnames(REQUIRED_LLVM_LIBRARIES all)
-    if (TERMCAP_LIBRARY)
-        list(APPEND REQUIRED_LLVM_LIBRARIES ${TERMCAP_LIBRARY})
-    endif ()
-    list(APPEND REQUIRED_LLVM_LIBRARIES ${CMAKE_DL_LIBS})
+    llvm_libs_all(REQUIRED_LLVM_LIBRARIES)
 
     target_link_libraries (dbms ${REQUIRED_LLVM_LIBRARIES})
     target_include_directories (dbms BEFORE PUBLIC ${LLVM_INCLUDE_DIRS})
@@ -245,6 +240,8 @@ target_include_directories (clickhouse_common_io BEFORE PUBLIC ${DOUBLE_CONVERSI
 # also for copy_headers.sh:
 target_include_directories (clickhouse_common_io BEFORE PRIVATE ${COMMON_INCLUDE_DIR})
 
+add_subdirectory (programs)
+
 add_subdirectory (tests)
 
 if (ENABLE_TESTS)

dbms/cmake/version.cmake

@@ -1,7 +1,7 @@
 # This strings autochanged from release_lib.sh:
-set(VERSION_DESCRIBE v1.1.54382-testing)
-set(VERSION_REVISION 54382)
-set(VERSION_GITHASH fd9938cc463456513eba5dce06a0e75b43997d69)
+set(VERSION_DESCRIBE v1.1.54386-testing)
+set(VERSION_REVISION 54386)
+set(VERSION_GITHASH 9b285c91b001c35ab0b3b5a7352b51e095013b7d)
 # end of autochange
 
 set (VERSION_MAJOR 1)

dbms/programs/CMakeLists.txt

@@ -2,105 +2,45 @@
 # that contain multiple execution modes (client, server, etc.)
 # each of them is built and linked as a separate library, defined below.
 
-
 option (ENABLE_CLICKHOUSE_ALL "Enable all tools" ON)
 option (ENABLE_CLICKHOUSE_SERVER "Enable server" ${ENABLE_CLICKHOUSE_ALL})
 option (ENABLE_CLICKHOUSE_CLIENT "Enable client" ${ENABLE_CLICKHOUSE_ALL})
 option (ENABLE_CLICKHOUSE_LOCAL "Enable local" ${ENABLE_CLICKHOUSE_ALL})
 option (ENABLE_CLICKHOUSE_BENCHMARK "Enable benchmark" ${ENABLE_CLICKHOUSE_ALL})
 option (ENABLE_CLICKHOUSE_PERFORMANCE "Enable performance" ${ENABLE_CLICKHOUSE_ALL})
-option (ENABLE_CLICKHOUSE_TOOLS "Enable tools: compressor format extract-from-config-lib" ${ENABLE_CLICKHOUSE_ALL})
+option (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG "Enable extract-from-config" ${ENABLE_CLICKHOUSE_ALL})
+option (ENABLE_CLICKHOUSE_COMPRESSOR "Enable compressor" ${ENABLE_CLICKHOUSE_ALL})
 option (ENABLE_CLICKHOUSE_COPIER "Enable copier" ${ENABLE_CLICKHOUSE_ALL})
+option (ENABLE_CLICKHOUSE_FORMAT "Enable format" ${ENABLE_CLICKHOUSE_ALL})
 
 configure_file (config_tools.h.in ${CMAKE_CURRENT_BINARY_DIR}/config_tools.h)
 
-add_library (clickhouse-server-lib
-    HTTPHandler.cpp
-    InterserverIOHTTPHandler.cpp
-    MetricsTransmitter.cpp
-    NotFoundHandler.cpp
-    PingRequestHandler.cpp
-    ReplicasStatusHandler.cpp
-    RootRequestHandler.cpp
-    Server.cpp
-    StatusFile.cpp
-    TCPHandler.cpp
-    )
-
-target_link_libraries (clickhouse-server-lib clickhouse_common_io daemon clickhouse_storages_system clickhouse_functions clickhouse_aggregate_functions clickhouse_table_functions)
-target_include_directories (clickhouse-server-lib PUBLIC ${ClickHouse_SOURCE_DIR}/libs/libdaemon/include)
-
-add_library (clickhouse-local-lib LocalServer.cpp)
-target_link_libraries (clickhouse-local-lib clickhouse-server-lib clickhouse_functions clickhouse_aggregate_functions clickhouse_table_functions ${Boost_PROGRAM_OPTIONS_LIBRARY})
-
-add_library (clickhouse-extract-from-config-lib ${SPLIT_SHARED} ExtractFromConfig.cpp)
-target_link_libraries (clickhouse-extract-from-config-lib clickhouse_common_config clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
-
-add_library (clickhouse-client-lib Client.cpp)
-target_link_libraries (clickhouse-client-lib clickhouse_functions clickhouse_aggregate_functions ${LINE_EDITING_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY})
-target_include_directories (clickhouse-client-lib PRIVATE ${READLINE_INCLUDE_DIR})
-install (FILES clickhouse-client.xml DESTINATION ${CLICKHOUSE_ETC_DIR}/clickhouse-client COMPONENT clickhouse-client RENAME config.xml)
-
-add_library (clickhouse-benchmark-lib ${SPLIT_SHARED} Benchmark.cpp)
-target_link_libraries (clickhouse-benchmark-lib clickhouse-client-lib clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
-target_include_directories (clickhouse-benchmark-lib PRIVATE ${PCG_RANDOM_INCLUDE_DIR})
-
-add_library (clickhouse-performance-test-lib ${SPLIT_SHARED} PerformanceTest.cpp)
-target_link_libraries (clickhouse-performance-test-lib clickhouse_common_io dbms ${Boost_PROGRAM_OPTIONS_LIBRARY})
-target_include_directories (clickhouse-performance-test-lib PRIVATE ${PCG_RANDOM_INCLUDE_DIR})
-
-add_library (clickhouse-compressor-lib ${SPLIT_SHARED} Compressor.cpp)
-target_link_libraries (clickhouse-compressor-lib clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
-
-add_library (clickhouse-format-lib ${SPLIT_SHARED} Format.cpp)
-target_link_libraries (clickhouse-format-lib dbms clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
-
-add_library (clickhouse-copier-lib ClusterCopier.cpp)
-target_link_libraries (clickhouse-copier-lib clickhouse-server-lib clickhouse_functions clickhouse_aggregate_functions)
-
-if (USE_EMBEDDED_COMPILER)
-    link_directories (${LLVM_LIBRARY_DIRS})
-    add_subdirectory ("Compiler-${LLVM_VERSION}")
-endif ()
+add_subdirectory (clang)
+add_subdirectory (server)
+add_subdirectory (client)
+add_subdirectory (local)
+add_subdirectory (benchmark)
+add_subdirectory (performance-test)
+add_subdirectory (extract-from-config)
+add_subdirectory (compressor)
+add_subdirectory (copier)
+add_subdirectory (format)
 
 if (CLICKHOUSE_SPLIT_BINARY)
-    add_executable (clickhouse-server clickhouse-server.cpp)
-    target_link_libraries (clickhouse-server clickhouse-server-lib)
-    add_executable (clickhouse-client clickhouse-client.cpp)
-    target_link_libraries (clickhouse-client clickhouse-client-lib)
-    add_executable (clickhouse-local clickhouse-local.cpp)
-    target_link_libraries (clickhouse-local clickhouse-local-lib)
-    add_executable (clickhouse-benchmark clickhouse-benchmark.cpp)
-    target_link_libraries (clickhouse-benchmark clickhouse-benchmark-lib clickhouse_aggregate_functions)
-    add_executable (clickhouse-performance-test clickhouse-performance-test.cpp)
-    target_link_libraries (clickhouse-performance-test clickhouse-performance-test-lib dbms)
-    add_executable (clickhouse-extract-from-config clickhouse-extract-from-config.cpp)
-    target_link_libraries (clickhouse-extract-from-config clickhouse-extract-from-config-lib)
-    # Also in utils
-    add_executable (clickhouse-compressor clickhouse-compressor.cpp)
-    target_link_libraries (clickhouse-compressor clickhouse-compressor-lib)
-    add_executable (clickhouse-format clickhouse-format.cpp)
-    target_link_libraries (clickhouse-format clickhouse-format-lib)
-    add_executable (clickhouse-copier clickhouse-copier.cpp)
-    target_link_libraries (clickhouse-copier clickhouse-copier-lib)
-
     set (CLICKHOUSE_ALL_TARGETS clickhouse-server clickhouse-client clickhouse-local clickhouse-benchmark clickhouse-performance-test
             clickhouse-extract-from-config clickhouse-format clickhouse-copier)
 
     if (USE_EMBEDDED_COMPILER)
-        add_executable (clickhouse-clang clickhouse-clang.cpp)
-        target_link_libraries (clickhouse-clang clickhouse-compiler-lib)
-        add_executable (clickhouse-lld clickhouse-lld.cpp)
-        target_link_libraries (clickhouse-lld clickhouse-compiler-lib)
-        install (TARGETS clickhouse-clang clickhouse-lld RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-clang clickhouse-lld)
     endif ()
 
-    install (TARGETS clickhouse-server ${CLICKHOUSE_ALL_TARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-
     add_custom_target (clickhouse-bundle ALL DEPENDS ${CLICKHOUSE_ALL_TARGETS})
     add_custom_target (clickhouse ALL DEPENDS clickhouse-bundle)
 else ()
+    if (USE_EMBEDDED_COMPILER)
+        # before add_executable !
+        link_directories (${LLVM_LIBRARY_DIRS})
+    endif ()
     add_executable (clickhouse main.cpp)
     target_link_libraries (clickhouse clickhouse_common_io)
     target_include_directories (clickhouse BEFORE PRIVATE ${COMMON_INCLUDE_DIR})
@@ -124,16 +64,18 @@ else ()
     if (ENABLE_CLICKHOUSE_PERFORMANCE)
         target_link_libraries (clickhouse clickhouse-performance-test-lib)
     endif ()
-    if (ENABLE_CLICKHOUSE_TOOLS)
-    target_link_libraries (clickhouse
-        clickhouse-extract-from-config-lib
-        clickhouse-compressor-lib
-        clickhouse-format-lib
-    )
-    endif ()
     if (ENABLE_CLICKHOUSE_COPIER)
         target_link_libraries (clickhouse clickhouse-copier-lib)
     endif ()
+    if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
+        target_link_libraries (clickhouse clickhouse-extract-from-config-lib)
+    endif ()
+    if (ENABLE_CLICKHOUSE_COMPRESSOR)
+        target_link_libraries (clickhouse clickhouse-compressor-lib)
+    endif ()
+    if (ENABLE_CLICKHOUSE_FORMAT)
+        target_link_libraries (clickhouse clickhouse-format-lib)
+    endif ()
 
     set (CLICKHOUSE_BUNDLE)
     if (ENABLE_CLICKHOUSE_SERVER)
@@ -161,16 +103,20 @@ else ()
         install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-performance-test DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-performance-test)
     endif ()
-    if (ENABLE_CLICKHOUSE_TOOLS)
+    if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
         add_custom_target (clickhouse-extract-from-config ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-extract-from-config DEPENDS clickhouse)
+        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-extract-from-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        list(APPEND CLICKHOUSE_BUNDLE clickhouse-extract-from-config)
+    endif ()
+    if (ENABLE_CLICKHOUSE_COMPRESSOR)
         add_custom_target (clickhouse-compressor ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-compressor DEPENDS clickhouse)
+        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-compressor DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        list(APPEND CLICKHOUSE_BUNDLE clickhouse-compressor)
+    endif ()
+    if (ENABLE_CLICKHOUSE_FORMAT)
         add_custom_target (clickhouse-format ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-format DEPENDS clickhouse)
-        install (FILES
-           ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-extract-from-config
-           ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-compressor
-           ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-format
-           DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-extract-from-config clickhouse-compressor clickhouse-format)
+        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-format DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        list(APPEND CLICKHOUSE_BUNDLE clickhouse-format)
     endif ()
     if (ENABLE_CLICKHOUSE_COPIER)
         add_custom_target (clickhouse-copier ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-copier DEPENDS clickhouse)
@@ -190,12 +136,19 @@ else ()
        DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
 
     add_custom_target (clickhouse-bundle ALL DEPENDS ${CLICKHOUSE_BUNDLE})
+
 endif ()
 
-set (GLIBC_MAX_REQUIRED 2.4)
-add_test(NAME GLIBC_required_version COMMAND bash -c "readelf -s ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-server | grep '@GLIBC' | grep -oP 'GLIBC_[\\d\\.]+' | sort | uniq | sort -r | perl -lnE 'exit 1 if $_ gt q{GLIBC_${GLIBC_MAX_REQUIRED}}'")
+if (USE_EMBEDDED_COMPILER)
+    add_custom_target(copy-headers ALL env CLANG=${CMAKE_CURRENT_BINARY_DIR}/clickhouse-clang BUILD_PATH=${ClickHouse_BINARY_DIR} DESTDIR=${ClickHouse_SOURCE_DIR} ${ClickHouse_SOURCE_DIR}/copy_headers.sh ${ClickHouse_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/headers DEPENDS clickhouse-clang WORKING_DIRECTORY ${ClickHouse_SOURCE_DIR} SOURCES ${ClickHouse_SOURCE_DIR}/copy_headers.sh)
+    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/headers DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/clickhouse COMPONENT clickhouse)
 
-install (
-    FILES config.xml users.xml
-    DESTINATION  ${CLICKHOUSE_ETC_DIR}/clickhouse-server
-    COMPONENT clickhouse)
+    if (USE_INTERNAL_LLVM_LIBRARY)
+        set(CLANG_HEADERS_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm/clang/lib/Headers")
+        set(CLANG_HEADERS_DEST "${CMAKE_CURRENT_BINARY_DIR}/headers/usr/local/lib/clang/${LLVM_VERSION}/include") # original: ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/include
+        add_custom_target(copy-headers-clang ALL ${CMAKE_COMMAND} -E make_directory ${CLANG_HEADERS_DEST} && ${CMAKE_COMMAND} -E copy_if_different ${CLANG_HEADERS_DIR}/* ${CLANG_HEADERS_DEST} )
+        add_dependencies(copy-headers copy-headers-clang)
+    endif ()
+
+    add_dependencies(clickhouse-server copy-headers)
+endif ()

dbms/programs/benchmark/Benchmark.cpp

@@ -29,7 +29,7 @@
 #include <DataStreams/RemoteBlockInputStream.h>
 #include <Interpreters/Context.h>
 #include <Client/Connection.h>
-#include "InterruptListener.h"
+#include <Common/InterruptListener.h>
 
 
 /** A tool for evaluating ClickHouse performance.

dbms/programs/benchmark/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_library (clickhouse-benchmark-lib ${SPLIT_SHARED} Benchmark.cpp)
+target_link_libraries (clickhouse-benchmark-lib clickhouse-client-lib clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
+target_include_directories (clickhouse-benchmark-lib PRIVATE ${PCG_RANDOM_INCLUDE_DIR})
+
+if (CLICKHOUSE_SPLIT_BINARY)
+    add_executable (clickhouse-benchmark clickhouse-benchmark.cpp)
+    target_link_libraries (clickhouse-benchmark clickhouse-benchmark-lib clickhouse_aggregate_functions)
+endif ()

dbms/programs/clang/CMakeLists.txt

@@ -0,0 +1,15 @@
+if (USE_EMBEDDED_COMPILER)
+    add_subdirectory ("Compiler-${LLVM_VERSION}")
+endif ()
+
+if (CLICKHOUSE_SPLIT_BINARY)
+    if (USE_EMBEDDED_COMPILER)
+        link_directories (${LLVM_LIBRARY_DIRS})
+        add_executable (clickhouse-clang clickhouse-clang.cpp)
+        target_link_libraries (clickhouse-clang clickhouse-compiler-lib)
+        add_executable (clickhouse-lld clickhouse-lld.cpp)
+        target_link_libraries (clickhouse-lld clickhouse-compiler-lib)
+        install (TARGETS clickhouse-clang clickhouse-lld RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        set_target_properties(clickhouse-clang clickhouse-lld PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
+    endif ()
+endif ()

dbms/programs/clang/Compiler-5.0.0/CMakeLists.txt

@@ -8,12 +8,7 @@ add_library(clickhouse-compiler-lib
 
 target_compile_options(clickhouse-compiler-lib PRIVATE -fno-rtti -fno-exceptions -g0)
 
-llvm_map_components_to_libnames(REQUIRED_LLVM_LIBRARIES all)
-if (TERMCAP_LIBRARY)
-    list(APPEND REQUIRED_LLVM_LIBRARIES ${TERMCAP_LIBRARY})
-endif ()
-list(APPEND REQUIRED_LLVM_LIBRARIES ${CMAKE_DL_LIBS})
-
+llvm_libs_all(REQUIRED_LLVM_LIBRARIES)
 
 message(STATUS "Using LLVM ${LLVM_VERSION}: ${LLVM_INCLUDE_DIRS} : ${REQUIRED_LLVM_LIBRARIES}")
 

dbms/programs/clang/Compiler-6.0.0/CMakeLists.txt

@@ -8,11 +8,7 @@ add_library(clickhouse-compiler-lib
 
 target_compile_options(clickhouse-compiler-lib PRIVATE -fno-rtti -fno-exceptions -g0)
 
-llvm_map_components_to_libnames(REQUIRED_LLVM_LIBRARIES all)
-if (TERMCAP_LIBRARY)
-    list(APPEND REQUIRED_LLVM_LIBRARIES ${TERMCAP_LIBRARY})
-endif ()
-list(APPEND REQUIRED_LLVM_LIBRARIES ${CMAKE_DL_LIBS})
+llvm_libs_all(REQUIRED_LLVM_LIBRARIES)
 
 message(STATUS "Using LLVM ${LLVM_VERSION}: ${LLVM_INCLUDE_DIRS} : ${REQUIRED_LLVM_LIBRARIES}")
 

dbms/programs/clang/Compiler-7.0.0/CMakeLists.txt

@@ -8,12 +8,7 @@ add_library(clickhouse-compiler-lib
 
 target_compile_options(clickhouse-compiler-lib PRIVATE -fno-rtti -fno-exceptions -g0)
 
-llvm_map_components_to_libnames(REQUIRED_LLVM_LIBRARIES all)
-if (TERMCAP_LIBRARY)
-    list(APPEND REQUIRED_LLVM_LIBRARIES ${TERMCAP_LIBRARY})
-endif ()
-list(APPEND REQUIRED_LLVM_LIBRARIES ${CMAKE_DL_LIBS})
-
+llvm_libs_all(REQUIRED_LLVM_LIBRARIES)
 
 message(STATUS "Using LLVM ${LLVM_VERSION}: ${LLVM_INCLUDE_DIRS} : ${REQUIRED_LLVM_LIBRARIES}")
 

dbms/programs/client/CMakeLists.txt

@@ -0,0 +1,12 @@
+add_library (clickhouse-client-lib Client.cpp)
+target_link_libraries (clickhouse-client-lib clickhouse_functions clickhouse_aggregate_functions ${LINE_EDITING_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+target_include_directories (clickhouse-client-lib PRIVATE ${READLINE_INCLUDE_DIR})
+
+if (CLICKHOUSE_SPLIT_BINARY)
+    add_executable (clickhouse-client clickhouse-client.cpp)
+    set_target_properties(clickhouse-client PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
+    target_link_libraries (clickhouse-client clickhouse-client-lib)
+endif ()
+
+install (FILES clickhouse-client.xml DESTINATION ${CLICKHOUSE_ETC_DIR}/clickhouse-client COMPONENT clickhouse-client RENAME config.xml)
+

dbms/programs/client/Client.cpp

@@ -53,7 +53,7 @@
 #include <Client/Connection.h>
 #include <Client/Completion.h>
 #include <Client/QueryParts.h>
-#include "InterruptListener.h"
+#include <Common/InterruptListener.h>
 #include <Functions/registerFunctions.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 #include <ext/scope_guard.h>
@@ -1467,10 +1467,18 @@ public:
 
         ioctl(0, TIOCGWINSZ, &terminal_size);
 
+        unsigned line_length = boost::program_options::options_description::m_default_line_length;
+        unsigned min_description_length = line_length / 2;
+        if (!stdin_is_not_tty)
+        {
+            line_length = std::max(3U, static_cast<unsigned>(terminal_size.ws_col));
+            min_description_length = std::min(min_description_length, line_length - 2);
+        }
+
 #define DECLARE_SETTING(TYPE, NAME, DEFAULT, DESCRIPTION) (#NAME, boost::program_options::value<std::string> (), DESCRIPTION)
 
         /// Main commandline options related to client functionality and all parameters from Settings.
-        boost::program_options::options_description main_description("Main options", terminal_size.ws_col);
+        boost::program_options::options_description main_description("Main options", line_length, min_description_length);
         main_description.add_options()
             ("help", "produce help message")
             ("config-file,c", boost::program_options::value<std::string>(), "config-file path")

dbms/programs/compressor/CMakeLists.txt

@@ -0,0 +1,9 @@
+add_library (clickhouse-compressor-lib ${SPLIT_SHARED} Compressor.cpp)
+target_link_libraries (clickhouse-compressor-lib clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
+
+if (CLICKHOUSE_SPLIT_BINARY)
+    # Also in utils
+    add_executable (clickhouse-compressor clickhouse-compressor.cpp)
+    set_target_properties(clickhouse-compressor PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
+    target_link_libraries (clickhouse-compressor clickhouse-compressor-lib)
+endif ()

dbms/programs/config_tools.h.in

@@ -7,5 +7,7 @@
 #cmakedefine01 ENABLE_CLICKHOUSE_LOCAL
 #cmakedefine01 ENABLE_CLICKHOUSE_BENCHMARK
 #cmakedefine01 ENABLE_CLICKHOUSE_PERFORMANCE
-#cmakedefine01 ENABLE_CLICKHOUSE_TOOLS
 #cmakedefine01 ENABLE_CLICKHOUSE_COPIER
+#cmakedefine01 ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG
+#cmakedefine01 ENABLE_CLICKHOUSE_COMPRESSOR
+#cmakedefine01 ENABLE_CLICKHOUSE_FORMAT

dbms/programs/copier/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_library (clickhouse-copier-lib ClusterCopier.cpp)
+target_link_libraries (clickhouse-copier-lib clickhouse-server-lib clickhouse_functions clickhouse_aggregate_functions)
+
+if (CLICKHOUSE_SPLIT_BINARY)
+    add_executable (clickhouse-copier clickhouse-copier.cpp)
+    target_link_libraries (clickhouse-copier clickhouse-copier-lib)
+endif ()

dbms/programs/copier/ClusterCopier.cpp

@@ -31,6 +31,7 @@
 #include <Common/formatReadable.h>
 #include <Common/DNSResolver.h>
 #include <Common/escapeForFileName.h>
+#include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Client/Connection.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/Cluster.h>
@@ -64,7 +65,7 @@
 #include <Storages/registerStorages.h>
 #include <Storages/StorageDistributed.h>
 #include <Databases/DatabaseMemory.h>
-#include <Server/StatusFile.h>
+#include <Common/StatusFile.h>
 #include <daemon/OwnPatternFormatter.h>
 
 
@@ -794,7 +795,7 @@ public:
         }
 
         std::rethrow_exception(exception);
-    };
+    }
 
 
     void discoverShardPartitions(const TaskShardPtr & task_shard)
@@ -1695,8 +1696,7 @@ protected:
                     output = io_insert.out;
                 }
 
-                using ExistsFuture = std::future<zkutil::ExistsResponse>;
-                std::unique_ptr<ExistsFuture> future_is_dirty_checker;
+                std::future<zkutil::ExistsResponse> future_is_dirty_checker;
 
                 Stopwatch watch(CLOCK_MONOTONIC_COARSE);
                 constexpr size_t check_period_milliseconds = 500;
@@ -1707,25 +1707,14 @@ protected:
                     if (zookeeper->expired())
                         throw Exception("ZooKeeper session is expired, cancel INSERT SELECT", ErrorCodes::UNFINISHED);
 
-                    if (!future_is_dirty_checker)
-                        future_is_dirty_checker = std::make_unique<ExistsFuture>(zookeeper->asyncExists(is_dirty_flag_path));
+                    if (!future_is_dirty_checker.valid())
+                        future_is_dirty_checker = zookeeper->asyncExists(is_dirty_flag_path);
 
                     /// check_period_milliseconds should less than average insert time of single block
                     /// Otherwise, the insertion will slow a little bit
                     if (watch.elapsedMilliseconds() >= check_period_milliseconds)
                     {
-                        zkutil::ExistsResponse status;
-
-                        try
-                        {
-                            status = future_is_dirty_checker->get();
-                            future_is_dirty_checker.reset();
-                        }
-                        catch (const zkutil::KeeperException & e)
-                        {
-                            future_is_dirty_checker.reset();
-                            throw;
-                        }
+                        zkutil::ExistsResponse status = future_is_dirty_checker.get();
 
                         if (status.error != ZooKeeperImpl::ZooKeeper::ZNONODE)
                             throw Exception("Partition is dirty, cancel INSERT SELECT", ErrorCodes::UNFINISHED);
@@ -1747,7 +1736,7 @@ protected:
                 copyData(*input, *output, cancel_check, update_stats);
 
                 // Just in case
-                if (future_is_dirty_checker != nullptr)
+                if (future_is_dirty_checker.valid())
                     future_is_dirty_checker.get();
 
                 if (inject_fault)

dbms/programs/extract-from-config/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_library (clickhouse-extract-from-config-lib ${SPLIT_SHARED} ExtractFromConfig.cpp)
+target_link_libraries (clickhouse-extract-from-config-lib clickhouse_common_config clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
+
+if (CLICKHOUSE_SPLIT_BINARY)
+    add_executable (clickhouse-extract-from-config clickhouse-extract-from-config.cpp)
+    target_link_libraries (clickhouse-extract-from-config clickhouse-extract-from-config-lib)
+endif ()

dbms/programs/format/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_library (clickhouse-format-lib ${SPLIT_SHARED} Format.cpp)
+target_link_libraries (clickhouse-format-lib dbms clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
+if (CLICKHOUSE_SPLIT_BINARY)
+    add_executable (clickhouse-format clickhouse-format.cpp)
+    target_link_libraries (clickhouse-format clickhouse-format-lib)
+endif ()

dbms/programs/local/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_library (clickhouse-local-lib LocalServer.cpp)
+target_link_libraries (clickhouse-local-lib clickhouse-server-lib clickhouse_functions clickhouse_aggregate_functions clickhouse_table_functions ${Boost_PROGRAM_OPTIONS_LIBRARY})
+
+if (CLICKHOUSE_SPLIT_BINARY)
+    add_executable (clickhouse-local clickhouse-local.cpp)
+    set_target_properties(clickhouse-local PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
+    target_link_libraries (clickhouse-local clickhouse-local-lib)
+endif ()

dbms/programs/local/LocalServer.cpp

@@ -23,7 +23,7 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/IAST.h>
 #include <common/ErrorHandlers.h>
-#include "StatusFile.h"
+#include <Common/StatusFile.h>
 #include <Functions/registerFunctions.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 #include <TableFunctions/registerTableFunctions.h>
@@ -388,16 +388,23 @@ std::string LocalServer::getHelpFooter() const
 
 void LocalServer::init(int argc, char ** argv)
 {
+    namespace po = boost::program_options;
+
     /// Don't parse options with Poco library, we prefer neat boost::program_options
     stopOptionsProcessing();
 
-    winsize terminal_size{};
-    ioctl(0, TIOCGWINSZ, &terminal_size);
-
-    namespace po = boost::program_options;
+    unsigned line_length = po::options_description::m_default_line_length;
+    unsigned min_description_length = line_length / 2;
+    if (isatty(STDIN_FILENO))
+    {
+        winsize terminal_size{};
+        ioctl(0, TIOCGWINSZ, &terminal_size);
+        line_length = std::max(3U, static_cast<unsigned>(terminal_size.ws_col));
+        min_description_length = std::min(min_description_length, line_length - 2);
+    }
 
 #define DECLARE_SETTING(TYPE, NAME, DEFAULT, DESCRIPTION) (#NAME, po::value<std::string> (), DESCRIPTION)
-    po::options_description description("Main options", terminal_size.ws_col);
+    po::options_description description("Main options", line_length, min_description_length);
     description.add_options()
         ("help", "produce help message")
         ("config-file,c", po::value<std::string>(), "config-file path")

dbms/programs/main.cpp

@@ -11,10 +11,10 @@
 #endif
 
 #if ENABLE_CLICKHOUSE_SERVER
-#include "Server.h"
+#include "server/Server.h"
 #endif
 #if ENABLE_CLICKHOUSE_LOCAL
-#include "LocalServer.h"
+#include "local/LocalServer.h"
 #endif
 #include <Common/StringUtils/StringUtils.h>
 
@@ -34,9 +34,13 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv);
 #if ENABLE_CLICKHOUSE_PERFORMANCE
 int mainEntryClickHousePerformanceTest(int argc, char ** argv);
 #endif
-#if ENABLE_CLICKHOUSE_TOOLS
+#if ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG
 int mainEntryClickHouseExtractFromConfig(int argc, char ** argv);
+#endif
+#if ENABLE_CLICKHOUSE_COMPRESSOR
 int mainEntryClickHouseCompressor(int argc, char ** argv);
+#endif
+#if ENABLE_CLICKHOUSE_FORMAT
 int mainEntryClickHouseFormat(int argc, char ** argv);
 #endif
 #if ENABLE_CLICKHOUSE_COPIER
@@ -72,9 +76,13 @@ std::pair<const char *, MainFunc> clickhouse_applications[] =
 #if ENABLE_CLICKHOUSE_PERFORMANCE
     {"performance-test", mainEntryClickHousePerformanceTest},
 #endif
-#if ENABLE_CLICKHOUSE_TOOLS
+#if ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG
     {"extract-from-config", mainEntryClickHouseExtractFromConfig},
+#endif
+#if ENABLE_CLICKHOUSE_COMPRESSOR
     {"compressor", mainEntryClickHouseCompressor},
+#endif
+#if ENABLE_CLICKHOUSE_FORMAT
     {"format", mainEntryClickHouseFormat},
 #endif
 #if ENABLE_CLICKHOUSE_COPIER

dbms/programs/performance-test/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_library (clickhouse-performance-test-lib ${SPLIT_SHARED} PerformanceTest.cpp)
+target_link_libraries (clickhouse-performance-test-lib clickhouse_common_io dbms ${Boost_PROGRAM_OPTIONS_LIBRARY})
+target_include_directories (clickhouse-performance-test-lib PRIVATE ${PCG_RANDOM_INCLUDE_DIR})
+
+if (CLICKHOUSE_SPLIT_BINARY)
+    add_executable (clickhouse-performance-test clickhouse-performance-test.cpp)
+    target_link_libraries (clickhouse-performance-test clickhouse-performance-test-lib dbms)
+endif ()

dbms/programs/performance-test/PerformanceTest.cpp

@@ -29,7 +29,7 @@
 #include <Poco/SAX/InputSource.h>
 #include <Poco/Util/XMLConfiguration.h>
 #include <Poco/XML/XMLStream.h>
-#include "InterruptListener.h"
+#include <Common/InterruptListener.h>
 
 /** Tests launcher for ClickHouse.
   * The tool walks through given or default folder in order to find files with
@@ -63,7 +63,7 @@ private:
     size_t padding;
 
 public:
-    explicit JSONString(size_t padding_ = 1) : padding(padding_){};
+    explicit JSONString(size_t padding_ = 1) : padding(padding_) {}
 
     void set(const String key, String value, bool wrap = true)
     {
@@ -231,13 +231,13 @@ public:
         conditions_any_of.report(value, conditions_any_of.CONDITION); \
     }
 
-    DEFINE_REPORT_FUNC(reportTotalTime, total_time_ms);
-    DEFINE_REPORT_FUNC(reportRowsRead, rows_read);
-    DEFINE_REPORT_FUNC(reportBytesReadUncompressed, bytes_read_uncompressed);
-    DEFINE_REPORT_FUNC(reportIterations, iterations);
-    DEFINE_REPORT_FUNC(reportMinTimeNotChangingFor, min_time_not_changing_for_ms);
-    DEFINE_REPORT_FUNC(reportMaxSpeedNotChangingFor, max_speed_not_changing_for_ms);
-    DEFINE_REPORT_FUNC(reportAverageSpeedNotChangingFor, average_speed_not_changing_for_ms);
+    DEFINE_REPORT_FUNC(reportTotalTime, total_time_ms)
+    DEFINE_REPORT_FUNC(reportRowsRead, rows_read)
+    DEFINE_REPORT_FUNC(reportBytesReadUncompressed, bytes_read_uncompressed)
+    DEFINE_REPORT_FUNC(reportIterations, iterations)
+    DEFINE_REPORT_FUNC(reportMinTimeNotChangingFor, min_time_not_changing_for_ms)
+    DEFINE_REPORT_FUNC(reportMaxSpeedNotChangingFor, max_speed_not_changing_for_ms)
+    DEFINE_REPORT_FUNC(reportAverageSpeedNotChangingFor, average_speed_not_changing_for_ms)
 
 #undef REPORT
 

dbms/programs/server/CMakeLists.txt

@@ -0,0 +1,30 @@
+add_library (clickhouse-server-lib
+    HTTPHandler.cpp
+    InterserverIOHTTPHandler.cpp
+    MetricsTransmitter.cpp
+    NotFoundHandler.cpp
+    PingRequestHandler.cpp
+    ReplicasStatusHandler.cpp
+    RootRequestHandler.cpp
+    Server.cpp
+    TCPHandler.cpp
+    )
+
+target_link_libraries (clickhouse-server-lib clickhouse_common_io daemon clickhouse_storages_system clickhouse_functions clickhouse_aggregate_functions clickhouse_table_functions)
+target_include_directories (clickhouse-server-lib PUBLIC ${ClickHouse_SOURCE_DIR}/libs/libdaemon/include)
+
+if (CLICKHOUSE_SPLIT_BINARY)
+    add_executable (clickhouse-server clickhouse-server.cpp)
+    set_target_properties(clickhouse-server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
+    target_link_libraries (clickhouse-server clickhouse-server-lib)
+    install (TARGETS clickhouse-server ${CLICKHOUSE_ALL_TARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+endif ()
+
+
+set (GLIBC_MAX_REQUIRED 2.4)
+add_test(NAME GLIBC_required_version COMMAND bash -c "readelf -s ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-server | grep '@GLIBC' | grep -oP 'GLIBC_[\\d\\.]+' | sort | uniq | sort -r | perl -lnE 'exit 1 if $_ gt q{GLIBC_${GLIBC_MAX_REQUIRED}}'")
+
+install (
+    FILES config.xml users.xml
+    DESTINATION  ${CLICKHOUSE_ETC_DIR}/clickhouse-server
+    COMPONENT clickhouse)

dbms/programs/server/Server.cpp

@@ -36,7 +36,7 @@
 #include <Common/Config/ConfigReloader.h>
 #include "HTTPHandlerFactory.h"
 #include "MetricsTransmitter.h"
-#include "StatusFile.h"
+#include <Common/StatusFile.h>
 #include "TCPHandlerFactory.h"
 
 #if USE_POCO_NETSSL

dbms/scripts/gen_benchmark_data/README.md

@@ -0,0 +1 @@
+Hits table generator based on LSTM neural network trained on real hits. You need to have weights for model or train model on real hits to generate data.