database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!1379 修复日志未记录SQL语句的持续时间的bug

Browse Source 
Merge pull request !1379 from Hemny/bug-I4FISK
This commit is contained in:
opengauss-bot
2022-02-23 12:55:34 +00:00
committed by Gitee
parent a647cf9e5a 7a5dbf29c6
commit f3c5aafca2
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gausskernel/process/tcop/postgres.cpp
View File

@ -1670,10 +1670,10 @@ void exec_simple_plan(PlannedStmt* plan)
*/
switch (check_log_duration(msec_str, was_logged)) {
case 1:
ereport(DEBUG1, (errmsg("duration: %s ms, debugid %ld, unique id %lu", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
ereport(LOG, (errmsg("duration: %s ms, debugid %ld, unique id %lu", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
break;
case 2:
ereport(DEBUG1,
ereport(LOG,
(errmsg("duration: %s ms, debug id %ld unique id %lu statement: %s", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id, "TODO: deparse plan"), // vam query_string),
errhidestmt(true)
// vam errdetail_execute(parsetree_list)
@ -2785,13 +2785,13 @@ static void exec_simple_query(const char* query_string, MessageType messageType,
*/
switch (check_log_duration(msec_str, was_logged)) {
case 1:
ereport(DEBUG1, (errmsg("duration: %s ms, queryid %ld, unique id %lu", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
ereport(LOG, (errmsg("duration: %s ms, queryid %ld, unique id %lu", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
break;
case 2: {
char* mask_string = NULL;
MASK_PASSWORD_START(mask_string, query_string);
ereport(DEBUG1,
ereport(LOG,
(errmsg("duration: %s ms queryid %ld unique id %ld statement: %s", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id,mask_string),
errhidestmt(true),
errdetail_execute(parsetree_list)));
@ -3625,13 +3625,13 @@ pass_parsing:
*/
switch (check_log_duration(msec_str, false)) {
case 1:
ereport(DEBUG1, (errmsg("duration: %s ms, queryid %ld unique id %ld", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
ereport(LOG, (errmsg("duration: %s ms, queryid %ld unique id %ld", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
break;
case 2: {
char* cur_mask_string = NULL;
MASK_PASSWORD_START(cur_mask_string, query_string);
ereport(DEBUG1, (errmsg(
ereport(LOG, (errmsg(
"duration: %s ms queryid %ld unique id %ld parse %s: %s", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id, *stmt_name ? stmt_name : "<unnamed>", cur_mask_string),
errhidestmt(true)));
MASK_PASSWORD_END(cur_mask_string, query_string);
@ -4788,13 +4788,13 @@ static void exec_bind_message(StringInfo input_message)
*/
switch (check_log_duration(msec_str, false)) {
case 1:
ereport(DEBUG1, (errmsg("duration: %s ms, queryid %ld, unique id %ld", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
ereport(LOG, (errmsg("duration: %s ms, queryid %ld, unique id %ld", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
break;
case 2: {
char* mask_string = NULL;
MASK_PASSWORD_START(mask_string, psrc->query_string);
ereport(DEBUG1,
ereport(LOG,
(errmsg("duration: %s ms queryid %ld unique id %ld bind %s%s%s: %s",
msec_str,
u_sess->debug_query_id,
@ -5053,13 +5053,13 @@ static void exec_execute_message(const char* portal_name, long max_rows)
*/
switch (check_log_duration(msec_str, was_logged)) {
case 1:
ereport(DEBUG1, (errmsg("duration: %s ms queryid %ld unique id %ld", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
ereport(LOG, (errmsg("duration: %s ms queryid %ld unique id %ld", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
break;
case 2: {
char* mask_string = NULL;
MASK_PASSWORD_START(mask_string, sourceText);
ereport(DEBUG1,
ereport(LOG,
(errmsg("duration: %s ms queryid %ld unique id %ld %s %s%s%s: %s",
msec_str,
u_sess->debug_query_id,
@ -11529,13 +11529,13 @@ static void exec_batch_bind_execute(StringInfo input_message)
*/
switch (check_log_duration(msec_str, false)) {
case 1:
ereport(DEBUG1, (errmsg("duration: %s ms, queryid %ld unique id %ld", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
ereport(LOG, (errmsg("duration: %s ms, queryid %ld unique id %ld", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
break;
case 2: {
char* mask_string = NULL;
MASK_PASSWORD_START(mask_string, psrc->query_string);
ereport(DEBUG1,
ereport(LOG,
(errmsg("duration: %s ms queryid %ld unique id %ld batch bind-execute %s%s%s: %s",
msec_str,
u_sess->debug_query_id,

4
src/gausskernel/runtime/executor/lightProxy.cpp
View File

@ -888,10 +888,10 @@ bool lightProxy::processMsg(int msgType, StringInfo msg)
char msec_str[32];
switch (check_log_duration(msec_str, false)) {
case 1:
ereport(DEBUG1, (errmsg("duration: %s ms, queryid %ld, unique id %lu", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
ereport(LOG, (errmsg("duration: %s ms, queryid %ld, unique id %lu", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id), errhidestmt(true)));
break;
case 2: {
ereport(DEBUG1,
ereport(LOG,
(errmsg("duration: %s ms queryid %ld unique id %ld", msec_str, u_sess->debug_query_id, u_sess->slow_query_cxt.slow_query.unique_sql_id),
errhidestmt(true)));
break;

4
src/gausskernel/runtime/opfusion/opfusion.cpp
View File

@ -520,12 +520,12 @@ void OpFusion::CheckLogDuration()
char msec_str[32];
switch (check_log_duration(msec_str, false)) {
case 1:
ereport(DEBUG1, (errmsg("duration: %s ms, queryid %lu, unique id %lu", msec_str, u_sess->debug_query_id,
ereport(LOG, (errmsg("duration: %s ms, queryid %lu, unique id %lu", msec_str, u_sess->debug_query_id,
u_sess->slow_query_cxt.slow_query.unique_sql_id),
errhidestmt(true)));
break;
case 2: {
ereport(DEBUG1, (errmsg("duration: %s ms queryid %lu unique id %lu", msec_str, u_sess->debug_query_id,
ereport(LOG, (errmsg("duration: %s ms queryid %lu unique id %lu", msec_str, u_sess->debug_query_id,
u_sess->slow_query_cxt.slow_query.unique_sql_id),
errhidestmt(true)));
break;