From 123440cf8b9244f42c721ed67ebc95b474551470 Mon Sep 17 00:00:00 2001
From: hongyunyan <649330952@qq.com>
Date: Tue, 14 Jun 2022 12:06:33 +0800
Subject: [PATCH 1/2] Remove the log with high frequency and not useful enough
 (#5141)

ref pingcap/tiflash#5140
---
 dbms/src/Storages/tests/gtest_filter_parser.cpp | 2 +-
 dbms/src/TiDB/Schema/SchemaBuilder-internal.h   | 2 +-
 dbms/src/TiDB/Schema/SchemaBuilder.cpp          | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dbms/src/Storages/tests/gtest_filter_parser.cpp b/dbms/src/Storages/tests/gtest_filter_parser.cpp
index 8820c05d2da..3a554fcf4b6 100644
--- a/dbms/src/Storages/tests/gtest_filter_parser.cpp
+++ b/dbms/src/Storages/tests/gtest_filter_parser.cpp
@@ -98,7 +98,7 @@ DM::RSOperatorPtr FilterParserTest::generateRsOperator(const String table_info_j
     DM::ColumnDefines columns_to_read;
     {
         NamesAndTypes source_columns;
-        std::tie(source_columns, std::ignore) = parseColumnsFromTableInfo(table_info, log->getLog());
+        std::tie(source_columns, std::ignore) = parseColumnsFromTableInfo(table_info);
         dag_query = std::make_unique<DAGQueryInfo>(
             conditions,
             DAGPreparedSets(),
diff --git a/dbms/src/TiDB/Schema/SchemaBuilder-internal.h b/dbms/src/TiDB/Schema/SchemaBuilder-internal.h
index a331205ce8c..94edcbea204 100644
--- a/dbms/src/TiDB/Schema/SchemaBuilder-internal.h
+++ b/dbms/src/TiDB/Schema/SchemaBuilder-internal.h
@@ -35,7 +35,7 @@ struct TableInfo;
 }
 namespace DB
 {
-std::tuple<NamesAndTypes, Strings> parseColumnsFromTableInfo(const TiDB::TableInfo & table_info, Poco::Logger * log);
+std::tuple<NamesAndTypes, Strings> parseColumnsFromTableInfo(const TiDB::TableInfo & table_info);
 
 constexpr char tmpNamePrefix[] = "_tiflash_tmp_";
 
diff --git a/dbms/src/TiDB/Schema/SchemaBuilder.cpp b/dbms/src/TiDB/Schema/SchemaBuilder.cpp
index 99e540e6c95..f532ac231e2 100644
--- a/dbms/src/TiDB/Schema/SchemaBuilder.cpp
+++ b/dbms/src/TiDB/Schema/SchemaBuilder.cpp
@@ -963,13 +963,12 @@ void SchemaBuilder<Getter, NameMapper>::applyDropSchema(const String & db_name)
 }
 
 std::tuple<NamesAndTypes, Strings>
-parseColumnsFromTableInfo(const TiDB::TableInfo & table_info, Poco::Logger * log)
+parseColumnsFromTableInfo(const TiDB::TableInfo & table_info)
 {
     NamesAndTypes columns;
     std::vector<String> primary_keys;
     for (const auto & column : table_info.columns)
     {
-        LOG_FMT_DEBUG(log, "Analyzing column: {}, type: {}", column.name, static_cast<int>(column.tp));
         DataTypePtr type = getDataTypeByColumnInfo(column);
         columns.emplace_back(column.name, type);
         if (column.hasPriKeyFlag())
@@ -999,7 +998,7 @@ String createTableStmt(
     Poco::Logger * log)
 {
     LOG_FMT_DEBUG(log, "Analyzing table info : {}", table_info.serialize());
-    auto [columns, pks] = parseColumnsFromTableInfo(table_info, log);
+    auto [columns, pks] = parseColumnsFromTableInfo(table_info);
 
     String stmt;
     WriteBufferFromString stmt_buf(stmt);

From 4b3a2ce5a691ea4a3aa400d9ef157484b638982c Mon Sep 17 00:00:00 2001
From: shuke <37901441+shuke987@users.noreply.github.com>
Date: Tue, 14 Jun 2022 12:48:33 +0800
Subject: [PATCH 2/2] modify cached_gc_safe_point to atomic to prevent more
 request to PD (#5079)

ref pingcap/tiflash#4928
---
 dbms/src/Storages/Transaction/PDTiKVClient.cpp | 4 ++--
 dbms/src/Storages/Transaction/PDTiKVClient.h   | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.cpp b/dbms/src/Storages/Transaction/PDTiKVClient.cpp
index 5a4b751fd9c..a06f1a3ae64 100644
--- a/dbms/src/Storages/Transaction/PDTiKVClient.cpp
+++ b/dbms/src/Storages/Transaction/PDTiKVClient.cpp
@@ -22,7 +22,7 @@ namespace ErrorCodes
 extern const int LOGICAL_ERROR;
 }
 
-Timestamp PDClientHelper::cached_gc_safe_point = 0;
-std::chrono::time_point<std::chrono::system_clock> PDClientHelper::safe_point_last_update_time;
+std::atomic<Timestamp> PDClientHelper::cached_gc_safe_point = 0;
+std::atomic<std::chrono::time_point<std::chrono::system_clock>> PDClientHelper::safe_point_last_update_time;
 
 } // namespace DB
diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h
index 4986c28f4ac..e5801cc7fae 100644
--- a/dbms/src/Storages/Transaction/PDTiKVClient.h
+++ b/dbms/src/Storages/Transaction/PDTiKVClient.h
@@ -29,6 +29,8 @@
 #include <Storages/Transaction/Types.h>
 #include <common/logger_useful.h>
 
+#include <atomic>
+
 // We define a shared ptr here, because TMTContext / SchemaSyncer / IndexReader all need to
 // `share` the resource of cluster.
 using KVClusterPtr = std::shared_ptr<pingcap::kv::Cluster>;
@@ -49,7 +51,7 @@ struct PDClientHelper
         {
             // In case we cost too much to update safe point from PD.
             std::chrono::time_point<std::chrono::system_clock> now = std::chrono::system_clock::now();
-            const auto duration = std::chrono::duration_cast<std::chrono::seconds>(now - safe_point_last_update_time);
+            const auto duration = std::chrono::duration_cast<std::chrono::seconds>(now - safe_point_last_update_time.load());
             const auto min_interval = std::max(Int64(1), safe_point_update_interval_seconds); // at least one second
             if (duration.count() < min_interval)
                 return cached_gc_safe_point;
@@ -73,8 +75,8 @@ struct PDClientHelper
     }
 
 private:
-    static Timestamp cached_gc_safe_point;
-    static std::chrono::time_point<std::chrono::system_clock> safe_point_last_update_time;
+    static std::atomic<Timestamp> cached_gc_safe_point;
+    static std::atomic<std::chrono::time_point<std::chrono::system_clock>> safe_point_last_update_time;
 };