Skip to content

Commit 33cdede

Browse files
committed
Flash: add MPP plan digest
Signed-off-by: JaySon-Huang <tshent@qq.com>
1 parent f8a051b commit 33cdede

5 files changed

Lines changed: 11 additions & 3 deletions

File tree

dbms/src/Flash/Coprocessor/DAGContext.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ DAGContext::DAGContext(tipb::DAGRequest & dag_request_, const mpp::TaskMeta & me
105105
, connection_id(meta_.connection_id())
106106
, connection_alias(meta_.connection_alias())
107107
, sql_digest(meta_.sql_digest())
108+
, plan_digest(meta_.plan_digest)
108109
{
109110
if (dag_request->has_div_precision_increment())
110111
div_precision_increment = dag_request->div_precision_increment();

dbms/src/Flash/Coprocessor/DAGContext.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ class DAGContext
362362
UInt64 getConnectionID() const { return connection_id; }
363363
const String & getConnectionAlias() const { return connection_alias; }
364364
const String & getSQLDigest() const { return sql_digest; }
365+
const String & getPlanDigest() const { return plan_digest; }
365366

366367
MPPReceiverSetPtr getMPPReceiverSet() const { return mpp_receiver_set; }
367368

@@ -546,6 +547,7 @@ class DAGContext
546547
// It's the session alias between mysql client and tidb
547548
String connection_alias;
548549
String sql_digest;
550+
String plan_digest;
549551

550552
String query_id_and_cte_id_for_sink;
551553
std::unordered_map<size_t, String> query_id_and_cte_id_for_sources;

dbms/src/Flash/FlashService.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,12 +495,14 @@ grpc::Status FlashService::DispatchMPPTask(
495495
const auto & resource_group = task_meta.resource_group_name();
496496
LOG_INFO(
497497
log,
498-
"Handling mpp dispatch request, task: {}, resource_group: {}, conn_id: {}, conn_alias: {}, sql_digest: {}",
498+
"Handling mpp dispatch request, task: {}, resource_group: {}, conn_id: {}, conn_alias: {}, "
499+
"sql_digest: {}, plan_digest: {}",
499500
MPPTaskId(task_meta).toString(),
500501
resource_group,
501502
task_meta.connection_id(),
502503
task_meta.connection_alias(),
503-
task_meta.sql_digest());
504+
task_meta.sql_digest(),
505+
task_meta.plan_digest());
504506
auto check_result = checkGrpcContext(grpc_context);
505507
if (!check_result.ok())
506508
return check_result;

dbms/src/Flash/Mpp/MPPTaskStatistics.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ void MPPTaskStatistics::initializeExecutorDAG(DAGContext * dag_context_)
8080
connection_id = dag_context->getConnectionID();
8181
connection_alias = dag_context->getConnectionAlias();
8282
sql_digest = dag_context->getSQLDigest();
83+
plan_digest = dag_context->getPlanDigest();
8384
executor_statistics_collector.initialize(dag_context);
8485
}
8586

@@ -113,7 +114,7 @@ void MPPTaskStatistics::logTracingJson()
113114
/// don't use info log for initializing status since it does not contains too many information
114115
status == INITIALIZING ? Poco::Message::PRIO_DEBUG : Poco::Message::PRIO_INFORMATION,
115116
R"({{"query_tso":{},"task_id":{},"is_root":{},"sender_executor_id":"{}","executors":{},"host":"{}")"
116-
R"(,"connection_id":{},"connection_alias":"{}","sql_digest":"{}")"
117+
R"(,"connection_id":{},"connection_alias":"{}","sql_digest":"{}","plan_digest":"{}")"
117118
R"(,"task_init_timestamp":{},"task_start_timestamp":{},"task_end_timestamp":{})"
118119
R"(,"compile_start_timestamp":{},"compile_end_timestamp":{})"
119120
R"(,"read_wait_index_start_timestamp":{},"read_wait_index_end_timestamp":{})"
@@ -128,6 +129,7 @@ void MPPTaskStatistics::logTracingJson()
128129
connection_id,
129130
connection_alias,
130131
sql_digest,
132+
plan_digest,
131133
toNanoseconds(task_init_timestamp),
132134
toNanoseconds(task_start_timestamp),
133135
toNanoseconds(task_end_timestamp),

dbms/src/Flash/Mpp/MPPTaskStatistics.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ class MPPTaskStatistics
9292
UInt64 connection_id = 0;
9393
String connection_alias;
9494
String sql_digest;
95+
String plan_digest;
9596

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

0 commit comments

Comments
 (0)