Merge branch 'release-5.2' into cherry-pick-3681-to-release-5.2

.gitmodules

@@ -10,9 +10,6 @@
 [submodule "contrib/cctz"]
 	path = contrib/cctz
 	url = https://github.com/google/cctz.git
-[submodule "contrib/zlib-ng"]
-	path = contrib/zlib-ng
-	url = https://github.com/Dead2/zlib-ng.git
 [submodule "contrib/googletest"]
 	path = contrib/googletest
 	url = https://github.com/google/googletest.git
@@ -22,9 +19,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
 [submodule "contrib/boost"]
 	path = contrib/boost
 	url = https://github.com/pingcap/boost-extra.git
@@ -59,3 +53,23 @@
 [submodule "contrib/fmtlib"]
 	path = contrib/fmtlib
 	url = https://github.com/fmtlib/fmt.git
+[submodule "contrib/protobuf"]
+	path = contrib/protobuf
+	url = https://github.com/protocolbuffers/protobuf
+	branch = v3.8.0
+[submodule "contrib/abseil-cpp"]
+	path = contrib/abseil-cpp
+	url = https://github.com/abseil/abseil-cpp
+[submodule "contrib/grpc"]
+	path = contrib/grpc
+	url = https://github.com/grpc/grpc
+ 	branch = v1.26.0
+[submodule "contrib/boringssl"]
+	path = contrib/boringssl
+	url = https://github.com/google/boringssl
+[submodule "contrib/curl"]
+	path = contrib/curl
+	url = https://github.com/curl/curl
+[submodule "contrib/zlib-ng"]
+	path = contrib/zlib-ng
+	url = https://github.com/zlib-ng/zlib-ng

CMakeLists.txt

@@ -1,7 +1,7 @@
-project (ClickHouse)
+project (TiFlash)
 cmake_minimum_required (VERSION 2.8)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ClickHouse_SOURCE_DIR}/cmake/Modules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${TiFlash_SOURCE_DIR}/cmake/Modules/")
 set(CMAKE_MACOSX_RPATH 1)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -223,13 +223,6 @@ if (USE_INCLUDE_WHAT_YOU_USE)
     endif()
 endif ()
 
-# when installing to /usr - place configs to /etc but for /usr/local place to /usr/local/etc
-if (CMAKE_INSTALL_PREFIX STREQUAL "/usr")
-    set (CLICKHOUSE_ETC_DIR "/etc")
-else ()
-    set (CLICKHOUSE_ETC_DIR "${CMAKE_INSTALL_PREFIX}/etc")
-endif ()
-
 option (UNBUNDLED "Try find all libraries in system (if fail - use bundled from contrib/)" OFF)
 if (UNBUNDLED)
     set(NOT_UNBUNDLED 0)
@@ -241,6 +234,11 @@ if (UNBUNDLED OR NOT (ARCH_LINUX OR APPLE) OR ARCH_32)
     option (NO_WERROR "Disable -Werror compiler option" ON)
 endif ()
 
+if (PREBUILT_LIBS_ROOT)
+    list(PREPEND CMAKE_SYSTEM_PREFIX_PATH ${PREBUILT_LIBS_ROOT})
+    message(STATUS "Add ${PREBUILT_LIBS_ROOT} to cmake search path for pre-built libraries")
+endif()
+
 message (STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE} ; USE_STATIC_LIBRARIES=${USE_STATIC_LIBRARIES} MAKE_STATIC_LIBRARIES=${MAKE_STATIC_LIBRARIES} UNBUNDLED=${UNBUNDLED}")
 
 include(GNUInstallDirs)
@@ -255,7 +253,6 @@ include (cmake/lib_name.cmake)
 include (cmake/find_icu4c.cmake)
 include (cmake/find_boost.cmake)
 
-set (USE_INTERNAL_ZLIB_LIBRARY OFF CACHE BOOL "" FORCE)
 option (ENABLE_CPPUNIT "Enable CppUnit" OFF)
 
 include (cmake/find_zlib.cmake)
@@ -277,9 +274,11 @@ include (cmake/find_execinfo.cmake)
 include (cmake/find_readline_edit.cmake)
 include (cmake/find_re2.cmake)
 include (cmake/find_llvm.cmake)
+include (cmake/find_protobuf.cmake)
 include (cmake/find_grpc.cmake)
 include (cmake/find_kvproto.cmake)
 include (cmake/find_tipb.cmake)
+include (cmake/find_curl.cmake)
 include (cmake/find_prometheus.cmake)
 include (cmake/find_raftstore_proxy.cmake)
 
@@ -306,13 +305,16 @@ include (libs/libdaemon/cmake/find_unwind.cmake)
 
 include (cmake/print_flags.cmake)
 
-# Directory for Yandex specific files
-set (CLICKHOUSE_PRIVATE_DIR ${ClickHouse_SOURCE_DIR}/private/)
-if (EXISTS ${CLICKHOUSE_PRIVATE_DIR})
-    add_subdirectory (${CLICKHOUSE_PRIVATE_DIR})
+# Enable tests by default when build type is debug
+if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
+    set (ENABLE_TESTS_DEFAULT ON)
+else ()
+    set (ENABLE_TESTS_DEFAULT OFF)
 endif ()
+option (ENABLE_TESTS "Enables unit tests" ${ENABLE_TESTS_DEFAULT})
+
+add_subdirectory (contrib) # Should be done after option ENABLE_TESTS, cause we will disable tests under contrib/
 
-add_subdirectory (contrib)
 
 option (TEST_COVERAGE "Enables flags for test coverage" OFF)
 option (ENABLE_TESTS "Enables tests" ${NOT_MSVC})

cluster_manage/flash_tools.py

@@ -14,7 +14,6 @@ def __init__(self, file_path):
             self.http_port = self.conf_toml['http_port']
         else:
             self.http_port = self.conf_toml['https_port']
-        tmp_path = self.conf_toml['tmp_path']
 
         p = self.conf_toml['flash']
         service_addr = p['service_addr']
@@ -32,7 +31,7 @@ def __init__(self, file_path):
         self.cluster_refresh_interval = min(
             int(flash_cluster.get('refresh_interval', 20)), self.cluster_master_ttl)
         self.update_rule_interval = int(flash_cluster.get('update_rule_interval', 10))
-        self.log_path = flash_cluster.get('log', '{}/flash_cluster_manager.log'.format(tmp_path))
+        self.log_path = flash_cluster.get('log', '{}/flash_cluster_manager.log'.format(self.conf_toml.get('tmp_path', '/tmp')))
         self.max_time_out = self.cluster_master_ttl
 
         self.enable_tls = False