Merge branch 'master' into add_some_log_for_data_skew

CMakeLists.txt

@@ -107,8 +107,7 @@ 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]
-    # clang: warning: private field 'hash_salt' is not used [-Wunused-private-field]
-    set (COMMON_WARNING_FLAGS "${COMMON_WARNING_FLAGS} -Wno-unused-command-line-argument -Wno-unused-private-field")
+    set (COMMON_WARNING_FLAGS "${COMMON_WARNING_FLAGS} -Wno-unused-command-line-argument")
 endif ()
 
 if (ARCH_LINUX)

cmake/Modules/FindPoco.cmake

@@ -114,7 +114,7 @@ endif()
 
 # if installed directory structure, set full include dir
 if(Poco_INSTALLED)
-    set(Poco_INCLUDE_DIRS ${Poco_ROOT_DIR}/include/ CACHE PATH "The global include path for Poco")
+    set(Poco_INCLUDE_DIRS ${Poco_ROOT_DIR}/include/)
 endif()
 
 # append the default minimum components to the list to find

dbms/src/Common/CPUAffinityManager.cpp

@@ -338,4 +338,4 @@ void CPUAffinityManager::checkThreadCPUAffinity() const
     }
 }
 #endif
-} // namespace DB
+} // namespace DB

dbms/src/Common/CPUAffinityManager.h

@@ -114,8 +114,9 @@ class CPUAffinityManager
     cpu_set_t other_cpu_set;
 #endif
 
-    int query_cpu_percent;
-    int cpu_cores;
+    // unused except Linux
+    [[maybe_unused]] int query_cpu_percent;
+    [[maybe_unused]] int cpu_cores;
     std::vector<std::string> query_threads;
     Poco::Logger * log;
 
@@ -127,4 +128,4 @@ class CPUAffinityManager
     CPUAffinityManager(CPUAffinityManager &&) = delete;
     CPUAffinityManager & operator=(CPUAffinityManager &&) = delete;
 };
-} // namespace DB
+} // namespace DB

dbms/src/Common/Exception.h

@@ -161,4 +161,21 @@ std::enable_if_t<std::is_pointer_v<T>, T> exception_cast(std::exception_ptr e)
     }
 }
 
+#define RUNTIME_CHECK(condition, ExceptionType, ...) \
+    do                                               \
+    {                                                \
+        if (unlikely(!(condition)))                  \
+            throw ExceptionType(__VA_ARGS__);        \
+    } while (false)
+
+#define RUNTIME_ASSERT(condition, logger, fmt_str, ...)                                   \
+    do                                                                                    \
+    {                                                                                     \
+        if (unlikely(!(condition)))                                                       \
+        {                                                                                 \
+            LOG_FMT_FATAL((logger), "Assert {} fail! " fmt_str, #condition, __VA_ARGS__); \
+            std::terminate();                                                             \
+        }                                                                                 \
+    } while (false)
+
 } // namespace DB