Merge branch 'master' of github.com:yandex/ClickHouse

eab90633 · Alexey Milovidov · 915f84a2 · 7e139866 · eab90633 · eab90633
21 changed file
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,3 +31,6 @@
 [submodule "contrib/re2"]
 	path = contrib/re2
 	url = https://github.com/google/re2.git
+[submodule "contrib/ssl"]
+	path = contrib/ssl
+	url = https://github.com/ClickHouse-Extras/ssl.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,14 @@ set (CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Debug;Release;MinSizeRel;ASan;UBS

 include (cmake/arch.cmake)

-set (COMMON_WARNING_FLAGS "${COMMON_WARNING_FLAGS} -Wall")    # -Werror is also added inside directories with our own code.
-set (CXX_WARNING_FLAGS "${CXX_WARNING_FLAGS} -Wnon-virtual-dtor")
+if (NOT MSVC)
+    set (COMMON_WARNING_FLAGS "${COMMON_WARNING_FLAGS} -Wall")    # -Werror is also added inside directories with our own code.
+endif ()
+
+if (COMPILER_GCC OR COMPILER_CLANG)
+    set (CXX_WARNING_FLAGS "${CXX_WARNING_FLAGS} -Wnon-virtual-dtor")
+endif ()
+
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
    # clang: warning: argument unused during compilation: '-stdlib=libc++'
    # clang: warning: argument unused during compilation: '-specs=/usr/share/dpkg/no-pie-compile.specs' [-Wunused-command-line-argument]
@@ -50,7 +56,7 @@ if (ARCH_LINUX)
 endif ()

 option (TEST_COVERAGE "Enables flags for test coverage" OFF)
-option (ENABLE_TESTS "Enables tests" ON)
+option (ENABLE_TESTS "Enables tests" ${NOT_MSVC})

 option (USE_STATIC_LIBRARIES "Set to FALSE to use shared libraries" ON)
 option (MAKE_STATIC_LIBRARIES "Set to FALSE to make shared libraries" ${USE_STATIC_LIBRARIES})
@@ -222,7 +228,7 @@ message (STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE

 include(GNUInstallDirs)

-include (cmake/find_openssl.cmake)
+include (cmake/find_ssl.cmake)
 if (NOT OPENSSL_FOUND)
    message (FATAL_ERROR "Need openssl for build. debian tip: sudo apt install libssl-dev")
 endif ()

--- a/cmake/arch.cmake
+++ b/cmake/arch.cmake
@@ -17,3 +17,13 @@ endif ()
 if (CMAKE_SYSTEM MATCHES "FreeBSD")
    set (ARCH_FREEBSD 1)
 endif ()
+
+if (NOT MSVC)
+    set (NOT_MSVC 1)
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set (COMPILER_GCC 1)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    set (COMPILER_CLANG 1)
+endif ()
--- a/cmake/find_capnp.cmake
+++ b/cmake/find_capnp.cmake
-option (ENABLE_CAPNP "Enable Cap'n Proto" ON)
+option (ENABLE_CAPNP "Enable Cap'n Proto" ${NOT_MSVC})

 if (ENABLE_CAPNP)


--- a/cmake/find_openssl.cmake
+++ b/cmake/find_openssl.cmake
-set (OPENSSL_USE_STATIC_LIBS ${USE_STATIC_LIBRARIES})
-if (APPLE)
-    set (OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
-    # https://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=2232
-    if (USE_STATIC_LIBRARIES)
-        message(WARNING "Disable USE_STATIC_LIBRARIES if you have linking problems with OpenSSL on MacOS")
-    endif ()
-endif ()
-find_package (OpenSSL)
-if (NOT OPENSSL_FOUND)
-    # Try to find manually.
-    set (OPENSSL_INCLUDE_PATHS "/usr/local/opt/openssl/include")
-    set (OPENSSL_PATHS "/usr/local/opt/openssl/lib")
-    find_path (OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h PATHS ${OPENSSL_INCLUDE_PATHS})
-    find_library (OPENSSL_SSL_LIBRARY ssl PATHS ${OPENSSL_PATHS})
-    find_library (OPENSSL_CRYPTO_LIBRARY crypto PATHS ${OPENSSL_PATHS})
-    if (OPENSSL_SSL_LIBRARY AND OPENSSL_CRYPTO_LIBRARY AND OPENSSL_INCLUDE_DIR)
-        set (OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
-        set (OPENSSL_FOUND 1)
-    endif ()
-endif ()
-
-message (STATUS "Using openssl=${OPENSSL_FOUND}: ${OPENSSL_INCLUDE_DIR} : ${OPENSSL_LIBRARIES}")
--- a/cmake/find_poco.cmake
+++ b/cmake/find_poco.cmake
@@ -57,8 +57,8 @@ elseif (NOT MISSING_INTERNAL_POCO_LIBRARY)

    if (USE_STATIC_LIBRARIES AND USE_INTERNAL_ZLIB_LIBRARY)
        list (APPEND Poco_INCLUDE_DIRS
-            "${ClickHouse_SOURCE_DIR}/contrib/zlib-ng/"
-            "${ClickHouse_BINARY_DIR}/contrib/zlib-ng/"
+            "${ClickHouse_SOURCE_DIR}/contrib/${INTERNAL_ZLIB_NAME}/"
+            "${ClickHouse_BINARY_DIR}/contrib/${INTERNAL_ZLIB_NAME}/"
        )
    endif ()


--- a/cmake/find_rdkafka.cmake
+++ b/cmake/find_rdkafka.cmake
-option (ENABLE_RDKAFKA "Enable kafka" ON)
+option (ENABLE_RDKAFKA "Enable kafka" ${NOT_MSVC})

 if (ENABLE_RDKAFKA)


--- a/cmake/find_ssl.cmake
+++ b/cmake/find_ssl.cmake
+option (USE_INTERNAL_SSL_LIBRARY "Set to FALSE to use system *ssl library instead of bundled" ${MSVC})
+
+set (OPENSSL_USE_STATIC_LIBS ${USE_STATIC_LIBRARIES})
+
+if (NOT USE_INTERNAL_SSL_LIBRARY)
+    if (APPLE)
+        set (OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
+        # https://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=2232
+        if (USE_STATIC_LIBRARIES)
+            message(WARNING "Disable USE_STATIC_LIBRARIES if you have linking problems with OpenSSL on MacOS")
+        endif ()
+    endif ()
+    find_package (OpenSSL)
+
+    if (NOT OPENSSL_FOUND)
+        # Try to find manually.
+        set (OPENSSL_INCLUDE_PATHS "/usr/local/opt/openssl/include")
+        set (OPENSSL_PATHS "/usr/local/opt/openssl/lib")
+        find_path (OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h PATHS ${OPENSSL_INCLUDE_PATHS})
+        find_library (OPENSSL_SSL_LIBRARY ssl PATHS ${OPENSSL_PATHS})
+        find_library (OPENSSL_CRYPTO_LIBRARY crypto PATHS ${OPENSSL_PATHS})
+        if (OPENSSL_SSL_LIBRARY AND OPENSSL_CRYPTO_LIBRARY AND OPENSSL_INCLUDE_DIR)
+            set (OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+            set (OPENSSL_FOUND 1)
+        endif ()
+    endif ()
+endif ()
+
+if (NOT OPENSSL_FOUND)
+    set (USE_INTERNAL_SSL_LIBRARY 1)
+    set (OPENSSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/ssl")
+    set (OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include")
+    if (NOT USE_STATIC_LIBRARIES AND TARGET crypto-shared AND TARGET ssl-shared)
+        set (OPENSSL_CRYPTO_LIBRARY crypto-shared)
+        set (OPENSSL_SSL_LIBRARY ssl-shared)
+    else ()
+        set (OPENSSL_CRYPTO_LIBRARY crypto)
+        set (OPENSSL_SSL_LIBRARY ssl)
+    endif ()
+    set (OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+    set (OPENSSL_FOUND 1)
+endif ()
+
+message (STATUS "Using ssl=${OPENSSL_FOUND}: ${OPENSSL_INCLUDE_DIR} : ${OPENSSL_LIBRARIES}")
--- a/cmake/find_zlib.cmake
+++ b/cmake/find_zlib.cmake
@@ -5,6 +5,15 @@ if (NOT USE_INTERNAL_ZLIB_LIBRARY)
 endif ()

 if (NOT ZLIB_FOUND)
+    if (NOT MSVC)
+        set (INTERNAL_ZLIB_NAME "zlib-ng")
+    else ()
+        set (INTERNAL_ZLIB_NAME "zlib")
+        if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/${INTERNAL_ZLIB_NAME}")
+            message (WARNING "Will use standard zlib, please clone manually:\n git clone https://github.com/madler/zlib.git ${ClickHouse_SOURCE_DIR}/contrib/${INTERNAL_ZLIB_NAME}")
+        endif ()
+    endif ()
+
    set (USE_INTERNAL_ZLIB_LIBRARY 1)
    set (ZLIB_COMPAT 1) # for zlib-ng, also enables WITH_GZFILEOP
    set (WITH_NATIVE_INSTRUCTIONS ${ARCHNATIVE})
@@ -15,7 +24,7 @@ if (NOT ZLIB_FOUND)
        set(WITH_NEON 1 CACHE INTERNAL "")
        set(WITH_ACLE 1 CACHE INTERNAL "")
    endif ()
-    set (ZLIB_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/zlib-ng" "${ClickHouse_BINARY_DIR}/contrib/zlib-ng") # generated zconf.h
+    set (ZLIB_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/${INTERNAL_ZLIB_NAME}" "${ClickHouse_BINARY_DIR}/contrib/${INTERNAL_ZLIB_NAME}") # generated zconf.h
    set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR}) # for poco
    set (ZLIB_FOUND 1) # for poco
    if (USE_STATIC_LIBRARIES)

--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-old-style-cast")
+if (NOT MSVC)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-old-style-cast")
+endif ()

 if (USE_INTERNAL_BOOST_LIBRARY)
    add_subdirectory (libboost)
@@ -48,7 +50,7 @@ if (USE_INTERNAL_UNWIND_LIBRARY)
 endif ()

 if (USE_INTERNAL_ZLIB_LIBRARY)
-    add_subdirectory (zlib-ng)
+    add_subdirectory (${INTERNAL_ZLIB_NAME})
    # todo: make pull to Dead2/zlib-ng and remove:
    # We should use same defines when including zlib.h as used when zlib compiled
    target_compile_definitions (zlib PUBLIC ZLIB_COMPAT WITH_GZFILEOP)
@@ -81,12 +83,33 @@ if (NOT ARCH_ARM)
    add_subdirectory (libcpuid)
 endif ()

+if (USE_INTERNAL_SSL_LIBRARY)
+    if (NOT MAKE_STATIC_LIBRARIES)
+        set (BUILD_SHARED 1)
+    endif ()
+    set (USE_SHARED ${USE_STATIC_LIBRARIES})
+    add_subdirectory (ssl)
+    target_include_directories(${OPENSSL_CRYPTO_LIBRARY} PUBLIC ${OPENSSL_INCLUDE_DIR})
+    target_include_directories(${OPENSSL_SSL_LIBRARY} PUBLIC ${OPENSSL_INCLUDE_DIR})
+endif ()
+
 if (USE_INTERNAL_RDKAFKA_LIBRARY)
    set (RDKAFKA_BUILD_EXAMPLES OFF CACHE INTERNAL "")
    set (RDKAFKA_BUILD_TESTS OFF CACHE INTERNAL "")
-    set (RDKAFKA_BUILD_STATIC ON CACHE INTERNAL "")
+    set (RDKAFKA_BUILD_STATIC ${MAKE_STATIC_LIBRARIES} CACHE INTERNAL "")
    mark_as_advanced (ZLIB_INCLUDE_DIR)
+
+    if (USE_INTERNAL_SSL_LIBRARY)
+        add_library(bundled-ssl ALIAS ${OPENSSL_SSL_LIBRARY})
+        set (WITH_BUNDLED_SSL 1)
+    endif ()
+
    add_subdirectory (librdkafka)
+
+    if (USE_INTERNAL_SSL_LIBRARY)
+        target_include_directories(rdkafka PRIVATE BEFORE ${OPENSSL_INCLUDE_DIR})
+    endif ()
+    target_include_directories(rdkafka PRIVATE BEFORE ${ZLIB_INCLUDE_DIR})
 endif ()

 if (USE_INTERNAL_CAPNP_LIBRARY)
@@ -104,17 +127,23 @@ endif ()


 if (USE_INTERNAL_POCO_LIBRARY)
+    set (ALLOW_DUPLICATE_CUSTOM_TARGETS 1)
    set (save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
    set (save_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
    set (_save ${ENABLE_TESTS})
    set (ENABLE_TESTS 0)
    set (CMAKE_DISABLE_FIND_PACKAGE_ZLIB 1)
+    if (USE_INTERNAL_SSL_LIBRARY)
+        set (DISABLE_INTERNAL_OPENSSL 1)
+        set (ENABLE_NETSSL 0) # TODO!
+        set (ENABLE_CRYPTO 0) # TODO!
+    endif ()
    add_subdirectory (poco)
    unset (CMAKE_DISABLE_FIND_PACKAGE_ZLIB)
    set (ENABLE_TESTS ${_save})
    set (CMAKE_CXX_FLAGS ${save_CMAKE_CXX_FLAGS})
    set (CMAKE_C_FLAGS ${save_CMAKE_C_FLAGS})
-    if (OPENSSL_FOUND)
+    if (OPENSSL_FOUND AND TARGET Crypto)
        # Bug in poco https://github.com/pocoproject/poco/pull/2100 found on macos
        target_include_directories(Crypto PUBLIC ${OPENSSL_INCLUDE_DIR})
    endif ()

--- a/contrib/libboost/CMakeLists.txt
+++ b/contrib/libboost/CMakeLists.txt
-add_definitions(-Wno-unused-variable)
-add_definitions(-Wno-deprecated-declarations)
+if (NOT MSVC)
+    add_definitions(-Wno-unused-variable -Wno-deprecated-declarations)
+endif ()

 add_library(boost_program_options_internal
 boost_1_65_0/libs/program_options/src/cmdline.cpp

--- a/poco @ cf1ad2e9
+++ b/poco @ cf1ad2e9
-Subproject commit 3d885f5380f24b4b91d8d4cf18c8cbc083d3ef8d
+Subproject commit cf1ad2e9a30ee9161772dc7bc9bf6e165cc51768
--- a/ssl @ 6fbe1c6f
+++ b/ssl @ 6fbe1c6f
+Subproject commit 6fbe1c6f404193989c5f6a63115d80fbe34ce2a3
--- a/dbms/CMakeLists.txt
+++ b/dbms/CMakeLists.txt
@@ -18,7 +18,9 @@ get_property (BUILD_INCLUDE_DIRECTORIES DIRECTORY ${ClickHouse_SOURCE_DIR} PROPE
 string (TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/Common/config_build.cpp.in ${CONFIG_BUILD})

-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+if (NOT MSVC)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+endif ()

 if (NOT NO_WERROR)
    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")

--- a/dbms/src/Interpreters/Cluster.cpp
+++ b/dbms/src/Interpreters/Cluster.cpp
@@ -10,7 +10,6 @@
 #include <IO/ReadHelpers.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Util/Application.h>
-#include <openssl/sha.h>

 namespace DB
 {

--- a/dbms/src/Storages/StorageMaterializedView.cpp
+++ b/dbms/src/Storages/StorageMaterializedView.cpp
@@ -44,9 +44,14 @@ static void extractDependentTable(const ASTSelectQuery & query, String & select_
        select_database_name = typeid_cast<const ASTIdentifier &>(*query_database).name;
        select_table_name = ast_id->name;
    }
-    else if (auto ast_select = typeid_cast<const ASTSelectQuery *>(query_table.get()))
+    else if (auto ast_select = typeid_cast<const ASTSelectWithUnionQuery *>(query_table.get()))
    {
-        extractDependentTable(*ast_select, select_database_name, select_table_name);
+        if (ast_select->list_of_selects->children.size() != 1)
+            throw Exception("UNION is not supported for MATERIALIZED VIEW", ErrorCodes::INCORRECT_QUERY);
+
+        auto inner_query = ast_select->list_of_selects->children.at(0);
+
+        extractDependentTable(typeid_cast<const ASTSelectQuery &>(*inner_query), select_database_name, select_table_name);
    }
    else
        throw Exception("Logical error while creating StorageMaterializedView."

--- a/dbms/tests/queries/0_stateless/00595_insert_into_view.reference
+++ b/dbms/tests/queries/0_stateless/00595_insert_into_view.reference
+1
+test_string
--- a/dbms/tests/queries/0_stateless/00595_insert_into_view.sh
+++ b/dbms/tests/queries/0_stateless/00595_insert_into_view.sh
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+. $CURDIR/../shell_config.sh
+
+exception_pattern="Code: 48.*Method write is not supported by storage View"
+
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test.test;"
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test.test_view;"
+
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE test.test (s String) ENGINE = Log;"
+${CLICKHOUSE_CLIENT} --query "CREATE VIEW test.test_view AS SELECT * FROM test.test;"
+
+echo `${CLICKHOUSE_CLIENT} --query "INSERT INTO test.test_view VALUES('test_string');" 2>&1 | grep -c "$exception_pattern"`
+${CLICKHOUSE_CLIENT} --query "INSERT INTO test.test VALUES('test_string');"
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM test.test;"
+
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test.test;"
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test.test_view;"
--- a/debian/clickhouse-server-base.postinst
+++ b/debian/clickhouse-server-base.postinst
@@ -6,6 +6,7 @@ CLICKHOUSE_GROUP=${CLICKHOUSE_USER}
 CLICKHOUSE_DATADIR=/var/lib/clickhouse
 CLICKHOUSE_LOGDIR=/var/log/clickhouse-server

+test -f /etc/default/clickhouse && . /etc/default/clickhouse

 if [ "$1" = configure ]; then
    if [ -x "/bin/systemctl" ] && [ -f /etc/systemd/system/clickhouse-server.service ] && [ -d /run/systemd/system ]; then

--- a/debian/clickhouse-server.cron.d
+++ b/debian/clickhouse-server.cron.d
-#*/10 * * * * root (which service > /dev/null && (service clickhouse-server condstart || true)) || /etc/init.d/clickhouse-server condstart 1>/dev/null 2>&1
+#*/10 * * * * root (which service > /dev/null 2>&1 && (service clickhouse-server condstart || true)) || /etc/init.d/clickhouse-server condstart > /dev/null 2>&1
--- a/debian/clickhouse-server.init
+++ b/debian/clickhouse-server.init
@@ -14,6 +14,7 @@ CLICKHOUSE_GROUP=${CLICKHOUSE_USER}
 SHELL=/bin/bash
 PROGRAM=clickhouse-server
 GENERIC_PROGRAM=clickhouse
+EXTRACT_FROM_CONFIG=${GENERIC_PROGRAM}-extract-from-config
 SYSCONFDIR=/etc/$PROGRAM
 CLICKHOUSE_LOGDIR=/var/log/clickhouse-server
 CLICKHOUSE_LOGDIR_USER=root
@@ -87,8 +88,8 @@ die()
 # Check that configuration file is Ok.
 check_config()
 {
-    if [ -x "$BINDIR/$GENERIC_PROGRAM" ]; then
-        su -s $SHELL ${CLICKHOUSE_USER} -c "$BINDIR/$GENERIC_PROGRAM extract-from-config --config-file=\"$CLICKHOUSE_CONFIG\" --key=path" >/dev/null || die "Configuration file ${CLICKHOUSE_CONFIG} doesn't parse successfully. Won't restart server. You may use forcerestart if you are sure.";
+    if [ -x "$BINDIR/$EXTRACT_FROM_CONFIG" ]; then
+        su -s $SHELL ${CLICKHOUSE_USER} -c "$BINDIR/$EXTRACT_FROM_CONFIG --config-file=\"$CLICKHOUSE_CONFIG\" --key=path" >/dev/null || die "Configuration file ${CLICKHOUSE_CONFIG} doesn't parse successfully. Won't restart server. You may use forcerestart if you are sure.";
    fi
 }

@@ -99,8 +100,8 @@ initdb()
        su -s /bin/sh ${CLICKHOUSE_USER} -c "test -w ${SYSCONFDIR}" || chown ${CLICKHOUSE_USER}:${CLICKHOUSE_GROUP} ${SYSCONFDIR}
    fi

-    if [ -x "$BINDIR/$GENERIC_PROGRAM" ]; then
-        CLICKHOUSE_DATADIR_FROM_CONFIG=$(su -s $SHELL ${CLICKHOUSE_USER} -c "$BINDIR/$GENERIC_PROGRAM extract-from-config --config-file=\"$CLICKHOUSE_CONFIG\" --key=path")
+    if [ -x "$BINDIR/$EXTRACT_FROM_CONFIG" ]; then
+        CLICKHOUSE_DATADIR_FROM_CONFIG=$(su -s $SHELL ${CLICKHOUSE_USER} -c "$BINDIR/$EXTRACT_FROM_CONFIG --config-file=\"$CLICKHOUSE_CONFIG\" --key=path")
        if [ "(" "$?" -ne "0" ")" -o "(" -z "${CLICKHOUSE_DATADIR_FROM_CONFIG}" ")" ]; then
            die "Cannot obtain value of path from config file: ${CLICKHOUSE_CONFIG}";
        fi
@@ -231,22 +232,34 @@ forcerestart()
    start
 }

+use_cron()
+{
+    # 1. running systemd
+    if [ -x "/bin/systemctl" ] && [ -f /etc/systemd/system/clickhouse-server.service ] && [ -d /run/systemd/system ]; then
+        return 1
+    fi
+    # 2. disabled by config
+    if [ -z "$CLICKHOUSE_CRONFILE" ]; then
+        return 2
+    fi
+    return 0
+}

 enable_cron()
 {
-    [ ! -z "$CLICKHOUSE_CRONFILE" ] && sed -i 's/^#*//' "$CLICKHOUSE_CRONFILE"
+    use_cron && sed -i 's/^#*//' "$CLICKHOUSE_CRONFILE"
 }


 disable_cron()
 {
-    [ ! -z "$CLICKHOUSE_CRONFILE" ] && sed -i 's/^#*/#/' "$CLICKHOUSE_CRONFILE"
+    use_cron && sed -i 's/^#*/#/' "$CLICKHOUSE_CRONFILE"
 }


 is_cron_disabled()
 {
-    [ -z "$CLICKHOUSE_CRONFILE" ] && return 0
+    use_cron || return 0

    # Assumes that either no lines are commented or all lines are commented.
    # Also please note, that currently cron file for ClickHouse has only one line (but some time ago there was more).