[flash-557]change branch of client-c (#275)

* change branch of client-c * add client-c * retry get safepoint * change for client-c * update submodule * Fix a clang flag * address comments * Remove questionable warning flags
pingcap · Oct 14, 2019 · 8fbd0f8 · 8fbd0f8
1 parent 9fa88a2
commit 8fbd0f8
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 31 deletions.
diff --git a/contrib/client-c b/contrib/client-c
diff --git a/dbms/src/DataStreams/AdditionalColumnsBlockOutputStream.h b/dbms/src/DataStreams/AdditionalColumnsBlockOutputStream.h
@@ -2,7 +2,7 @@
 
 #include <DataStreams/IBlockOutputStream.h>
 #include <Core/ColumnsWithTypeAndName.h>
-#include <pd/IClient.h>
+#include <pingcap/pd/IClient.h>
 
 namespace DB
 {

diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h
@@ -0,0 +1,33 @@
+#include <pingcap/pd/IClient.h>
+#include <pingcap/kv/Backoff.h>
+
+namespace DB
+{
+
+// TODO:: Implement Read Index Client;
+
+struct PDClientHelper
+{
+
+    static constexpr int get_safepoint_maxtime = 120000; // 120s. waiting pd recover.
+
+    static uint64_t getGCSafePointWithRetry(pingcap::pd::ClientPtr pd_client)
+    {
+        pingcap::kv::Backoffer bo(get_safepoint_maxtime);
+        for (;;)
+        {
+            try
+            {
+                auto safe_point = pd_client->getGCSafePoint();
+                return safe_point;
+            }
+            catch (pingcap::Exception & e)
+            {
+                bo.backoff(pingcap::kv::boPDRPC, e);
+            }
+        }
+    }
+};
+
+
+} // namespace DB
diff --git a/dbms/src/Storages/Transaction/Region.cpp b/dbms/src/Storages/Transaction/Region.cpp
@@ -3,7 +3,7 @@
 #include <Storages/Transaction/RaftCommandResult.h>
 #include <Storages/Transaction/Region.h>
 #include <Storages/Transaction/TiKVRange.h>
-#include <tikv/RegionClient.h>
+#include <pingcap/kv/RegionClient.h>
 #include <Storages/Transaction/RegionHelper.hpp>
 
 namespace DB

diff --git a/dbms/src/Storages/Transaction/RegionClientCreate.h b/dbms/src/Storages/Transaction/RegionClientCreate.h
@@ -4,7 +4,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <tikv/RegionClient.h>
+#include <pingcap/kv/RegionClient.h>
 #pragma GCC diagnostic pop
 
 namespace DB

diff --git a/dbms/src/Storages/Transaction/RegionMeta.cpp b/dbms/src/Storages/Transaction/RegionMeta.cpp
@@ -3,7 +3,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <tikv/Region.h>
+#include <pingcap/kv/Region.h>
 #pragma GCC diagnostic pop
 
 namespace DB

diff --git a/dbms/src/Storages/Transaction/SchemaGetter.cpp b/dbms/src/Storages/Transaction/SchemaGetter.cpp
@@ -1,6 +1,6 @@
 #include <Storages/Transaction/Codec.h>
 #include <Storages/Transaction/SchemaGetter.h>
-#include <tikv/Scanner.h>
+#include <pingcap/kv/Scanner.h>
 
 namespace DB
 {

diff --git a/dbms/src/Storages/Transaction/SchemaGetter.h b/dbms/src/Storages/Transaction/SchemaGetter.h
@@ -3,7 +3,7 @@
 #include <Storages/Transaction/TiDB.h>
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <tikv/Snapshot.h>
+#include <pingcap/kv/Snapshot.h>
 #pragma GCC diagnostic pop
 
 #include <common/logger_useful.h>

diff --git a/dbms/src/Storages/Transaction/TMTContext.cpp b/dbms/src/Storages/Transaction/TMTContext.cpp
@@ -5,7 +5,7 @@
 #include <Storages/Transaction/SchemaSyncer.h>
 #include <Storages/Transaction/TMTContext.h>
 #include <Storages/Transaction/TiDBSchemaSyncer.h>
-#include <pd/MockPDClient.h>
+#include <pingcap/pd/MockPDClient.h>
 
 namespace DB
 {
@@ -57,28 +57,14 @@ void TMTContext::setSchemaSyncer(SchemaSyncerPtr rhs)
     schema_syncer = rhs;
 }
 
-pingcap::pd::ClientPtr TMTContext::getPDClient() const
-{
-    std::lock_guard<std::mutex> lock(mutex);
-    return pd_client;
-}
-
-void TMTContext::setPDClient(pingcap::pd::ClientPtr rhs)
-{
-    std::lock_guard<std::mutex> lock(mutex);
-    pd_client = rhs;
-}
+pingcap::pd::ClientPtr TMTContext::getPDClient() const { return pd_client; }
 
 pingcap::kv::RegionClientPtr TMTContext::createRegionClient(pingcap::kv::RegionVerID region_version_id) const
 {
     std::lock_guard<std::mutex> lock(mutex);
     return pd_client->isMock() ? nullptr : std::make_shared<pingcap::kv::RegionClient>(region_cache, rpc_client, region_version_id);
 }
 
-pingcap::kv::RegionCachePtr TMTContext::getRegionCache() const { return region_cache; }
-
-pingcap::kv::RpcClientPtr TMTContext::getRpcClient() { return rpc_client; }
-
 const std::unordered_set<std::string> & TMTContext::getIgnoreDatabases() const { return ignore_databases; }
 
 } // namespace DB
diff --git a/dbms/src/Storages/Transaction/TMTContext.h b/dbms/src/Storages/Transaction/TMTContext.h
@@ -5,7 +5,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <tikv/RegionClient.h>
+#include <pingcap/kv/RegionClient.h>
 #pragma GCC diagnostic pop
 
 #include <unordered_set>
@@ -43,14 +43,9 @@ class TMTContext : private boost::noncopyable
     void setSchemaSyncer(SchemaSyncerPtr);
 
     pingcap::pd::ClientPtr getPDClient() const;
-    void setPDClient(pingcap::pd::ClientPtr);
 
     pingcap::kv::RegionClientPtr createRegionClient(pingcap::kv::RegionVerID region_version_id) const;
 
-    pingcap::kv::RegionCachePtr getRegionCache() const;
-
-    pingcap::kv::RpcClientPtr getRpcClient();
-
     void restore();
 
     const std::unordered_set<std::string> & getIgnoreDatabases() const;

diff --git a/dbms/src/Storages/Transaction/TiDBSchemaSyncer.h b/dbms/src/Storages/Transaction/TiDBSchemaSyncer.h
@@ -3,7 +3,7 @@
 #include <Debug/MockSchemaGetter.h>
 #include <Storages/Transaction/SchemaBuilder.h>
 #include <Storages/Transaction/TMTContext.h>
-#include <tikv/Snapshot.h>
+#include <pingcap/kv/Snapshot.h>
 
 namespace DB
 {

diff --git a/dbms/src/Storages/Transaction/applySnapshot.cpp b/dbms/src/Storages/Transaction/applySnapshot.cpp
@@ -6,6 +6,7 @@
 #include <Storages/Transaction/Region.h>
 #include <Storages/Transaction/RegionDataMover.h>
 #include <Storages/Transaction/TMTContext.h>
+#include <Storages/Transaction/PDTiKVClient.h>
 #include <Storages/Transaction/applySnapshot.h>
 
 namespace DB
@@ -39,7 +40,7 @@ bool applySnapshot(const KVStorePtr & kvstore, RegionPtr new_region, Context * c
     if (context)
     {
         auto & tmt = context->getTMTContext();
-        Timestamp safe_point = tmt.getPDClient()->getGCSafePoint();
+        Timestamp safe_point = PDClientHelper::getGCSafePointWithRetry(tmt.getPDClient());
 
         std::unordered_map<TableID, HandleMap> handle_maps;
+0 −2		.gitignore
+16 −8		include/pingcap/Exception.h
+0 −0		include/pingcap/Log.h
+3 −3		include/pingcap/kv/Backoff.h
+6 −5		include/pingcap/kv/Region.h
+10 −25		include/pingcap/kv/RegionClient.h
+2 −4		include/pingcap/kv/Rpc.h
+4 −4		include/pingcap/kv/Scanner.h
+1 −1		include/pingcap/kv/Snapshot.h
+3 −3		include/pingcap/kv/Util.h
+3 −4		include/pingcap/pd/Client.h
+0 −0		include/pingcap/pd/IClient.h
+1 −1		include/pingcap/pd/MockPDClient.h
+4 −4		src/CMakeLists.txt
+4 −3		src/kv/Backoff.cc
+33 −27		src/kv/Region.cc
+1 −1		src/kv/Rpc.cc
+4 −4		src/kv/Snapshot.cc
+10 −17		src/pd/Client.cc
+1 −1		src/test/MockTiKV.h
+3 −3		src/test/get_region_id_wrong_test.cc
+5 −4		src/test/get_store_id_wrong_2_test.cc
+4 −3		src/test/get_store_id_wrong_test.cc
+4 −3		src/test/grpc_error_test.cc
+3 −4		src/test/pd_test.cc
+4 −3		src/test/read_index_test.cc
+1 −0		third_party/kvproto