diff --git a/dbms/src/AggregateFunctions/AggregateFunctionSum.h b/dbms/src/AggregateFunctions/AggregateFunctionSum.h
index ffd50bd3ebe..e2866edd094 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionSum.h
@@ -278,10 +278,10 @@ struct AggregateFunctionSumKahanData
 };
 
 
-#define DEFAULT_DECIMAL_INFER                                                          \
-    static std::pair<PrecType, ScaleType> decimalInfer(PrecType prec, ScaleType scale) \
-    {                                                                                  \
-        return SumDecimalInferer::infer(prec, scale);                                  \
+#define DEFAULT_DECIMAL_INFER                                                           \
+    static std::tuple<PrecType, ScaleType> decimalInfer(PrecType prec, ScaleType scale) \
+    {                                                                                   \
+        return SumDecimalInferer::infer(prec, scale);                                   \
     }
 
 
@@ -294,7 +294,7 @@ struct NameSum
 struct NameSumWithOverFlow
 {
     static constexpr auto name = "sumWithOverflow";
-    static std::pair<PrecType, ScaleType> decimalInfer(PrecType prec, ScaleType scale)
+    static std::tuple<PrecType, ScaleType> decimalInfer(PrecType prec, ScaleType scale)
     {
         return {prec, scale};
     }
@@ -327,8 +327,8 @@ class AggregateFunctionSum final : public IAggregateFunctionDataHelper<Data, Agg
 
     String getName() const override { return Name::name; }
 
-    ScaleType result_scale;
-    PrecType result_prec;
+    ScaleType result_scale{};
+    PrecType result_prec{};
 
     AggregateFunctionSum() = default;
 
@@ -349,7 +349,7 @@ class AggregateFunctionSum final : public IAggregateFunctionDataHelper<Data, Agg
         }
     }
 
-    void create(AggregateDataPtr __restrict place) const override
+    void create(AggregateDataPtr __restrict place) const override // NOLINT(readability-non-const-parameter)
     {
         new (place) Data;
     }
diff --git a/dbms/src/Common/SyncPoint/SyncChannel.h b/dbms/src/Common/SyncPoint/SyncChannel.h
index dc4e2cce145..f6d78766eee 100644
--- a/dbms/src/Common/SyncPoint/SyncChannel.h
+++ b/dbms/src/Common/SyncPoint/SyncChannel.h
@@ -17,6 +17,7 @@
 #include <Common/SyncPoint/Ctl.h>
 #include <Common/nocopyable.h>
 
+#include <condition_variable>
 #include <mutex>
 
 namespace DB