update client-c to support choosing non pending peer when dispatch ta…

…sk (#7574) close #7301
pingcap · May 31, 2023 · d0f481c · d0f481c
1 parent 8dcb558
commit d0f481c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/contrib/client-c b/contrib/client-c
diff --git a/contrib/kvproto b/contrib/kvproto
diff --git a/dbms/src/Storages/StorageDisaggregatedRemote.cpp b/dbms/src/Storages/StorageDisaggregatedRemote.cpp
@@ -61,28 +61,6 @@
 #include <atomic>
 #include <numeric>
 
-namespace pingcap::kv
-{
-// The rpc trait
-template <>
-struct RpcTypeTraits<disaggregated::EstablishDisaggTaskRequest>
-{
-    using RequestType = disaggregated::EstablishDisaggTaskRequest;
-    using ResultType = disaggregated::EstablishDisaggTaskResponse;
-
-    static const char * err_msg() { return "EstablishDisaggTask Failed"; } // NOLINT(readability-identifier-naming)
-
-    static ::grpc::Status doRPCCall(
-        grpc::ClientContext * context,
-        std::shared_ptr<KvConnClient> client,
-        const RequestType & req,
-        ResultType * res)
-    {
-        return client->stub->EstablishDisaggTask(context, req, res);
-    }
-};
-} // namespace pingcap::kv
-
 namespace DB
 {
 

diff --git a/dbms/src/Storages/Transaction/FastAddPeer.cpp b/dbms/src/Storages/Transaction/FastAddPeer.cpp
@@ -128,7 +128,8 @@ FastAddPeerRes genFastAddPeerRes(FastAddPeerStatus status, std::string && apply_
 std::vector<StoreID> getCandidateStoreIDsForRegion(TMTContext & tmt_context, UInt64 region_id, UInt64 current_store_id)
 {
     auto pd_client = tmt_context.getPDClient();
-    auto [region, _] = pd_client->getRegionByID(region_id);
+    auto resp = pd_client->getRegionByID(region_id);
+    const auto & region = resp.region();
     std::vector<StoreID> store_ids;
     store_ids.reserve(region.peers_size());
     for (const auto & peer : region.peers())
+1 −1		ci/Dockerfile
+9 −6		cmake/Modules/FindgRPC.cmake
+13 −1		include/pingcap/kv/RegionCache.h
+2 −0		include/pingcap/kv/internal/type_traits.h
+4 −2		include/pingcap/pd/Client.h
+9 −6		include/pingcap/pd/CodecClient.h
+5 −4		include/pingcap/pd/IClient.h
+4 −2		include/pingcap/pd/MockPDClient.h
+11 −1		src/coprocessor/Client.cc
+23 −7		src/kv/RegionCache.cc
+27 −9		src/pd/Client.cc
+1 −1		third_party/kvproto
+9 −9		go.mod
+33 −17		go.sum
+672 −207		pkg/brpb/brpb.pb.go
+813 −107		pkg/debugpb/debugpb.pb.go
+404 −83		pkg/disaggregated/disaggregated.pb.go
+1,415 −542		pkg/kvrpcpb/kvrpcpb.pb.go
+14,493 −10,901		pkg/pdpb/pdpb.pb.go
+172 −172		pkg/raft_cmdpb/raft_cmdpb.pb.go
+354 −145		pkg/raft_serverpb/raft_serverpb.pb.go
+876 −96		pkg/resource_manager/resource_manager.pb.go
+192 −153		pkg/tikvpb/tikvpb.pb.go
+1 −0		pkg/tracepb/tracepb.pb.go
+2,538 −668		pkg/tsopb/tsopb.pb.go
+29 −2		proto/brpb.proto
+16 −0		proto/debugpb.proto
+6 −0		proto/disaggregated.proto
+40 −2		proto/kvrpcpb.proto
+103 −1		proto/pdpb.proto
+5 −0		proto/raft_cmdpb.proto
+11 −2		proto/raft_serverpb.proto
+29 −0		proto/resource_manager.proto
+2 −0		proto/tikvpb.proto
+48 −0		proto/tsopb.proto
+969 −91		scripts/proto.lock