This is an automated email from the ASF dual-hosted git repository.

kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 6f9e39e4093 [chore](log) Print correct queryId & instance  (#25532)
6f9e39e4093 is described below

commit 6f9e39e40930a90d67e2574fa89832f905dbc210
Author: zhiqiang <[email protected]>
AuthorDate: Sat Oct 21 11:42:59 2023 -0500

    [chore](log) Print correct queryId & instance  (#25532)
---
 be/src/pipeline/pipeline_fragment_context.cpp |  4 ++--
 be/src/runtime/fragment_mgr.cpp               |  4 ++--
 be/src/runtime/plan_fragment_executor.cpp     | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/be/src/pipeline/pipeline_fragment_context.cpp 
b/be/src/pipeline/pipeline_fragment_context.cpp
index f18f437ba47..cd529ee835d 100644
--- a/be/src/pipeline/pipeline_fragment_context.cpp
+++ b/be/src/pipeline/pipeline_fragment_context.cpp
@@ -211,8 +211,8 @@ Status PipelineFragmentContext::prepare(const 
doris::TPipelineFragmentParams& re
     }
 
     LOG_INFO("PipelineFragmentContext::prepare")
-            .tag("query_id", _query_id)
-            .tag("instance_id", local_params.fragment_instance_id)
+            .tag("query_id", print_id(_query_id))
+            .tag("instance_id", print_id(local_params.fragment_instance_id))
             .tag("backend_num", local_params.backend_num)
             .tag("pthread_id", (uintptr_t)pthread_self());
 
diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp
index 409a32a128d..9f38e91ff15 100644
--- a/be/src/runtime/fragment_mgr.cpp
+++ b/be/src/runtime/fragment_mgr.cpp
@@ -526,8 +526,8 @@ void 
FragmentMgr::_exec_actual(std::shared_ptr<FragmentExecState> exec_state,
 #endif
 
     LOG_INFO(func_name)
-            .tag("query_id", exec_state->query_id())
-            .tag("instance_id", exec_state->fragment_instance_id())
+            .tag("query_id", print_id(exec_state->query_id()))
+            .tag("instance_id", print_id(exec_state->fragment_instance_id()))
             .tag("pthread_id", (uintptr_t)pthread_self());
 
     Status st = exec_state->execute();
diff --git a/be/src/runtime/plan_fragment_executor.cpp 
b/be/src/runtime/plan_fragment_executor.cpp
index 77d15938303..de6f5f55810 100644
--- a/be/src/runtime/plan_fragment_executor.cpp
+++ b/be/src/runtime/plan_fragment_executor.cpp
@@ -113,8 +113,8 @@ Status PlanFragmentExecutor::prepare(const 
TExecPlanFragmentParams& request,
     _query_id = params.query_id;
 
     LOG_INFO("PlanFragmentExecutor::prepare")
-            .tag("query_id", _query_id)
-            .tag("instance_id", params.fragment_instance_id)
+            .tag("query_id", print_id(_query_id))
+            .tag("instance_id", print_id(params.fragment_instance_id))
             .tag("backend_num", request.backend_num)
             .tag("pthread_id", (uintptr_t)pthread_self());
     // VLOG_CRITICAL << "request:\n" << 
apache::thrift::ThriftDebugString(request);
@@ -249,8 +249,8 @@ Status PlanFragmentExecutor::prepare(const 
TExecPlanFragmentParams& request,
 Status PlanFragmentExecutor::open() {
     int64_t mem_limit = _runtime_state->query_mem_tracker()->limit();
     LOG_INFO("PlanFragmentExecutor::open")
-            .tag("query_id", _query_id)
-            .tag("instance_id", _runtime_state->fragment_instance_id())
+            .tag("query_id", print_id(_query_id))
+            .tag("instance_id", 
print_id(_runtime_state->fragment_instance_id()))
             .tag("mem_limit", PrettyPrinter::print(mem_limit, TUnit::BYTES));
 
     // we need to start the profile-reporting thread before calling Open(), 
since it
@@ -488,7 +488,7 @@ void PlanFragmentExecutor::stop_report_thread() {
 
 void PlanFragmentExecutor::cancel(const PPlanFragmentCancelReason& reason, 
const std::string& msg) {
     LOG_INFO("PlanFragmentExecutor::cancel")
-            .tag("query_id", _query_id)
+            .tag("query_id", print_id(_query_id))
             .tag("instance_id", _runtime_state->fragment_instance_id())
             .tag("reason", reason)
             .tag("error message", msg);


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to