attach keyspace_id for tiflash cop/mpp requests

Signed-off-by: iosmanthus <[email protected]>
pingcap · Feb 20, 2023 · 264e1db · yongman · Feb 21, 2023 · 264e1db
1 parent 25a5843
commit 264e1db
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/contrib/client-c b/contrib/client-c
diff --git a/contrib/kvproto b/contrib/kvproto
diff --git a/dbms/src/Flash/Coprocessor/DAGStorageInterpreter.cpp b/dbms/src/Flash/Coprocessor/DAGStorageInterpreter.cpp
@@ -445,7 +445,7 @@ std::vector<pingcap::coprocessor::CopTask> DAGStorageInterpreter::buildCopTasks(
         std::multimap<std::string, std::string> meta_data;
         meta_data.emplace("is_remote_read", "true");
 
-        auto tasks = pingcap::coprocessor::buildCopTasks(bo, cluster, remote_request.key_ranges, req, store_type, &Poco::Logger::get("pingcap/coprocessor"), std::move(meta_data), [&] {
+        auto tasks = pingcap::coprocessor::buildCopTasks(bo, cluster, remote_request.key_ranges, req, store_type, dagContext().getKeyspaceID(), &Poco::Logger::get("pingcap/coprocessor"), std::move(meta_data), [&] {
             GET_METRIC(tiflash_coprocessor_request_count, type_remote_read_sent).Increment();
         });
         all_tasks.insert(all_tasks.end(), tasks.begin(), tasks.end());

diff --git a/dbms/src/Storages/GCManager.cpp b/dbms/src/Storages/GCManager.cpp
@@ -97,7 +97,9 @@ bool GCManager::work()
     }
     if (iter == storages.end())
         iter = storages.begin();
-    next_keyspace_table_id = iter->first;
+
+    if (iter != storages.end())
+        next_keyspace_table_id = iter->first;
     LOG_DEBUG(log, "End GC and next gc will start with keyspace {}, table id: {}", next_keyspace_table_id.first, next_keyspace_table_id.second);
     gc_check_stop_watch.restart();
     // Always return false

diff --git a/dbms/src/Storages/StorageDisaggregated.cpp b/dbms/src/Storages/StorageDisaggregated.cpp
@@ -116,6 +116,7 @@ StorageDisaggregated::RequestAndRegionIDs StorageDisaggregated::buildDispatchMPP
 {
     auto dispatch_req = std::make_shared<::mpp::DispatchTaskRequest>();
     ::mpp::TaskMeta * dispatch_req_meta = dispatch_req->mutable_meta();
+    dispatch_req_meta->set_keyspace_id(context.getDAGContext()->getKeyspaceID());
     dispatch_req_meta->set_start_ts(sender_target_mpp_task_id.query_id.start_ts);
     dispatch_req_meta->set_query_ts(sender_target_mpp_task_id.query_id.query_ts);
     dispatch_req_meta->set_local_query_id(sender_target_mpp_task_id.query_id.local_query_id);
+2 −0		include/pingcap/coprocessor/Client.h
+40 −8		src/coprocessor/Client.cc
+1 −0		src/test/coprocessor_test.cc
+1 −1		third_party/kvproto
+5 −3		pkg/kvrpcpb/kvrpcpb.pb.go
+1 −0		pkg/tracepb/tracepb.pb.go
+1,669 −0		pkg/tsopb/tsopb.pb.go
+2 −1		proto/pdpb.proto
+68 −0		proto/tsopb.proto
+22 −1		scripts/check.sh
+17,283 −0		scripts/proto.lock