Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/kvproto
Submodule kvproto updated 66 files
+7 −0 .editorconfig
+6 −0 Makefile
+1 −1 OWNERS_ALIASES
+10 −0 README.md
+101 −101 include/eraftpb.proto
+33 −33 include/rustproto.proto
+553 −305 pkg/brpb/brpb.pb.go
+92 −92 pkg/cdcpb/cdcpb.pb.go
+3 −3 pkg/configpb/configpb.pb.go
+442 −94 pkg/coprocessor/coprocessor.pb.go
+145 −146 pkg/debugpb/debugpb.pb.go
+5 −5 pkg/disaggregated/disaggregated.pb.go
+9 −9 pkg/disk_usage/disk_usage.pb.go
+46 −46 pkg/enginepb/enginepb.pb.go
+82 −82 pkg/errorpb/errorpb.pb.go
+55 −55 pkg/import_kvpb/import_kvpb.pb.go
+147 −147 pkg/import_sstpb/import_sstpb.pb.go
+40 −39 pkg/keyspacepb/keyspacepb.pb.go
+508 −467 pkg/kvrpcpb/kvrpcpb.pb.go
+114 −60 pkg/mpp/mpp.pb.go
+873 −587 pkg/pdpb/pdpb.pb.go
+172 −172 pkg/raft_cmdpb/raft_cmdpb.pb.go
+144 −144 pkg/raft_serverpb/raft_serverpb.pb.go
+21 −21 pkg/routerpb/routerpb.pb.go
+94 −94 pkg/schedulingpb/schedulingpb.pb.go
+250 −177 pkg/tikvpb/tikvpb.pb.go
+59 −59 pkg/tsopb/tsopb.pb.go
+23 −25 proto/autoid.proto
+732 −726 proto/brpb.proto
+135 −137 proto/cdcpb.proto
+77 −81 proto/configpb.proto
+133 −114 proto/coprocessor.proto
+46 −47 proto/deadlock.proto
+179 −191 proto/debugpb.proto
+53 −53 proto/diagnosticspb.proto
+95 −97 proto/disaggregated.proto
+9 −10 proto/disk_usage.proto
+95 −97 proto/encryptionpb.proto
+47 −48 proto/enginepb.proto
+108 −111 proto/errorpb.proto
+5 −6 proto/gcpb.proto
+74 −83 proto/import_kvpb.proto
+318 −327 proto/import_sstpb.proto
+12 −14 proto/keyspacepb.proto
+1,162 −1,155 proto/kvrpcpb.proto
+26 −29 proto/logbackuppb.proto
+100 −102 proto/meta_storagepb.proto
+101 −103 proto/metapb.proto
+54 −56 proto/mpp.proto
+809 −801 proto/pdpb.proto
+215 −218 proto/raft_cmdpb.proto
+207 −209 proto/raft_serverpb.proto
+42 −42 proto/recoverdatapb.proto
+40 −40 proto/replication_modepb.proto
+48 −48 proto/resource_manager.proto
+27 −29 proto/resource_usage_agent.proto
+13 −15 proto/routerpb.proto
+138 −140 proto/schedulingpb.proto
+261 −254 proto/tikvpb.proto
+32 −33 proto/tracepb.proto
+73 −75 proto/tsopb.proto
+11 −1 scripts/check.sh
+207 −3 scripts/common.sh
+4 −5 scripts/generate_cpp.sh
+605 −512 scripts/proto.lock
+139 −0 scripts/proto_format.sh
3 changes: 2 additions & 1 deletion dbms/src/Flash/Coprocessor/DAGContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ DAGContext::DAGContext(tipb::DAGRequest & dag_request_, const mpp::TaskMeta & me
, resource_group_name(meta_.resource_group_name())
, connection_id(meta_.connection_id())
, connection_alias(meta_.connection_alias())
, sql_digest(meta_.sql_digest())
{
if (dag_request->has_div_precision_increment())
div_precision_increment = dag_request->div_precision_increment();
Expand Down Expand Up @@ -483,7 +484,7 @@ UInt64 DAGContext::getReadBytes() const
UInt64 read_bytes = 0;
for (const auto & [id, sc] : scan_context_map)
{
(void)id; // Disable unused variable warnning.
(void)id; // Disable unused variable warning.
read_bytes += sc->userReadBytes();
}
return read_bytes;
Expand Down
2 changes: 2 additions & 0 deletions dbms/src/Flash/Coprocessor/DAGContext.h
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ class DAGContext

UInt64 getConnectionID() const { return connection_id; }
const String & getConnectionAlias() const { return connection_alias; }
const String & getSQLDigest() const { return sql_digest; }

MPPReceiverSetPtr getMPPReceiverSet() const { return mpp_receiver_set; }

Expand Down Expand Up @@ -544,6 +545,7 @@ class DAGContext
UInt64 connection_id;
// It's the session alias between mysql client and tidb
String connection_alias;
String sql_digest;

String query_id_and_cte_id_for_sink;
std::unordered_map<size_t, String> query_id_and_cte_id_for_sources;
Expand Down
5 changes: 3 additions & 2 deletions dbms/src/Flash/FlashService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -495,11 +495,12 @@ grpc::Status FlashService::DispatchMPPTask(
const auto & resource_group = task_meta.resource_group_name();
LOG_INFO(
log,
"Handling mpp dispatch request, task: {}, resource_group: {}, conn_id: {}, conn_alias: {}",
"Handling mpp dispatch request, task: {}, resource_group: {}, conn_id: {}, conn_alias: {}, sql_digest: {}",
MPPTaskId(task_meta).toString(),
resource_group,
task_meta.connection_id(),
task_meta.connection_alias());
task_meta.connection_alias(),
task_meta.sql_digest());
auto check_result = checkGrpcContext(grpc_context);
if (!check_result.ok())
return check_result;
Expand Down
7 changes: 7 additions & 0 deletions dbms/src/Flash/Mpp/MPPTaskStatistics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ void MPPTaskStatistics::initializeExecutorDAG(DAGContext * dag_context_)

is_root = dag_context->isRootMPPTask();
sender_executor_id = root_executor.executor_id();
connection_id = dag_context->getConnectionID();
connection_alias = dag_context->getConnectionAlias();
sql_digest = dag_context->getSQLDigest();
executor_statistics_collector.initialize(dag_context);
}

Expand Down Expand Up @@ -110,6 +113,7 @@ void MPPTaskStatistics::logTracingJson()
/// don't use info log for initializing status since it does not contains too many information
status == INITIALIZING ? Poco::Message::PRIO_DEBUG : Poco::Message::PRIO_INFORMATION,
R"({{"query_tso":{},"task_id":{},"is_root":{},"sender_executor_id":"{}","executors":{},"host":"{}")"
R"(,"connection_id":{},"connection_alias":"{}","sql_digest":"{}")"
R"(,"task_init_timestamp":{},"task_start_timestamp":{},"task_end_timestamp":{})"
R"(,"compile_start_timestamp":{},"compile_end_timestamp":{})"
R"(,"read_wait_index_start_timestamp":{},"read_wait_index_end_timestamp":{})"
Expand All @@ -121,6 +125,9 @@ void MPPTaskStatistics::logTracingJson()
sender_executor_id,
executor_statistics_collector.profilesToJson(),
host,
connection_id,
connection_alias,
sql_digest,
toNanoseconds(task_init_timestamp),
toNanoseconds(task_start_timestamp),
toNanoseconds(task_end_timestamp),
Expand Down
3 changes: 3 additions & 0 deletions dbms/src/Flash/Mpp/MPPTaskStatistics.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ class MPPTaskStatistics
// executor dag
bool is_root = false;
String sender_executor_id;
UInt64 connection_id = 0;
String connection_alias;
String sql_digest;

// resource
RUConsumption ru_info{.cpu_ru = 0.0, .cpu_time_ns = 0, .read_ru = 0.0, .read_bytes = 0};
Expand Down