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

!5835 修复慢SQL信息收集不全的缺陷

Browse Source 
Merge pull request !5835 from TinyBag/statement
This commit is contained in:
opengauss_bot
2024-09-26 07:40:41 +00:00
committed by Gitee
parent adbadf33f5 1bea679797
commit 388887a352
6 changed files with 130 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gausskernel/cbb/instruments/statement/instr_statement.cpp
View File

@ -2309,7 +2309,8 @@ void instr_stmt_report_query_plan(QueryDesc *queryDesc)
StatementStatContext *ssctx = (StatementStatContext *)u_sess->statement_cxt.curStatementMetrics;
if (queryDesc == NULL || ssctx == NULL || ssctx->level > STMT_TRACK_L2
|| (ssctx->plan_size != 0 && !u_sess->unique_sql_cxt.is_open_cursor)
|| (u_sess->statement_cxt.executer_run_level > 1 && !IS_UNIQUE_SQL_TRACK_ALL)) {
|| (u_sess->statement_cxt.executer_run_level > 1 && !IS_UNIQUE_SQL_TRACK_ALL)
|| queryDesc->for_simplify_func) {
return;
}
/* when getting plan directly from CN, the plan is partial, deparse plan will be failed,

2
src/gausskernel/process/tcop/pquery.cpp
View File

@ -106,6 +106,7 @@ QueryDesc* CreateQueryDesc(PlannedStmt* plannedstmt, const char* sourceText, Sna
qd->planstate = NULL;
qd->totaltime = NULL;
qd->executed = false;
qd->for_simplify_func = false;
#ifdef ENABLE_MOT
if (motJitContext != nullptr && JitExec::IsJitContextValid(motJitContext)) {
qd->mot_jit_context = motJitContext;
@ -141,6 +142,7 @@ QueryDesc* CreateUtilityQueryDesc(
qd->planstate = NULL;
qd->totaltime = NULL;
qd->executed = false;
qd->for_simplify_func = false;
#ifdef ENABLE_MOT
qd->mot_jit_context = nullptr;
#endif

2
src/gausskernel/runtime/executor/functions.cpp
View File

@ -798,6 +798,8 @@ static void postquel_start(execution_state* es, SQLFunctionCachePtr fcache)
es->qd = CreateUtilityQueryDesc(es->stmt, fcache->src, GetActiveSnapshot(), dest, fcache->paramLI);
}
es->qd->for_simplify_func = true;
/* Utility commands don't need Executor. */
if (es->qd->utilitystmt == NULL) {
/*

1
src/include/executor/exec/execdesc.h
View File

@ -57,6 +57,7 @@ typedef struct QueryDesc {
/* This is always set NULL by the core system, but plugins can change it */
struct Instrumentation* totaltime; /* total time spent in ExecutorRun */
bool executed; /* if the query already executed */
bool for_simplify_func; /* if the query is for simplify function, skip reporting query plan */
#ifdef ENABLE_MOT
JitExec::MotJitContext* mot_jit_context; /* MOT JIT context required for executing LLVM jitted code */
#endif

77
src/test/regress/expected/function.out
View File

@ -2130,3 +2130,80 @@ CONTEXT: referenced column: turn_on
SQL statement "select dbe_pldebugger.turn_on(funcoid)"
PL/pgSQL function inline_code_block line 7 at SQL statement
drop function test_debug1;
\c postgres
alter system set enable_stmt_track=on;
set log_min_duration_statement=0;
set track_stmt_stat_level='L1,L1';
alter system set instr_unique_sql_count = 10000;
delete from dbe_perf.statement_history;
CREATE TABLE stmt_hist_t1 ( first_name text, last_name text, job_id int, department_id int,d1 bigint ) ;
create index stmt_hist_t1_i1 on stmt_hist_t1 (job_id) ;
create index stmt_hist_t1_i2 on stmt_hist_t1 (department_id) ;
insert into stmt_hist_t1 (first_name,last_name,job_id,department_id) values('Alice', 'Adams', 2, 1 );
insert into stmt_hist_t1 (first_name,last_name,job_id,department_id) values('Beatrice', 'Brand', 3, 1);
CREATE TABLE stmt_hist_t2 ( job_title text, job_id int) ;
insert into stmt_hist_t2 values( 'Job1', 1 );
insert into stmt_hist_t2 values( 'Job2', 2 );
insert into stmt_hist_t2 values( 'Job3', 3 );
analyze stmt_hist_t1;
analyze stmt_hist_t2;
CREATE FUNCTION func_add_sql() RETURNS integer
AS 'select 3;'
LANGUAGE SQL
IMMUTABLE
RETURNS NULL ON NULL INPUT;
explain (verbose, costs off) select func_add_sql() from stmt_hist_t2 join stmt_hist_t1 on stmt_hist_t2.job_id = stmt_hist_t1.job_id where stmt_hist_t1.job_id not in (select department_id from stmt_hist_t1 );
QUERY PLAN
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Nested Loop
Output: 3
Join Filter: (public.stmt_hist_t1.job_id = stmt_hist_t2.job_id)
-> Nested Loop Anti Join
Output: public.stmt_hist_t1.job_id
Join Filter: ((public.stmt_hist_t1.job_id = public.stmt_hist_t1.department_id) OR (public.stmt_hist_t1.job_id IS NULL) OR (public.stmt_hist_t1.department_id IS NULL))
-> Seq Scan on public.stmt_hist_t1
Output: public.stmt_hist_t1.first_name, public.stmt_hist_t1.last_name, public.stmt_hist_t1.job_id, public.stmt_hist_t1.department_id, public.stmt_hist_t1.d1
-> Materialize
Output: public.stmt_hist_t1.department_id
-> Seq Scan on public.stmt_hist_t1
Output: public.stmt_hist_t1.department_id
-> Seq Scan on public.stmt_hist_t2
Output: stmt_hist_t2.job_title, stmt_hist_t2.job_id
(14 rows)
select func_add_sql() from stmt_hist_t2 join stmt_hist_t1 on stmt_hist_t2.job_id = stmt_hist_t1.job_id where stmt_hist_t1.job_id not in (select department_id from stmt_hist_t1 );
func_add_sql
--------------
3
3
(2 rows)
call pg_sleep(1);
pg_sleep
----------
(1 row)
select query_plan from dbe_perf.statement_history where query ilike '%select func_add_sql() from stmt_hist_t2 join stmt_hist_t1 on stmt_hist_t2.job_id = stmt_hist_t1.job_id where stmt_hist_t1.job_id not in (select department_id from stmt_hist_t1 );%';
query_plan
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Datanode Name: datanode1 +
Nested Loop (cost=0.00..3.16 rows=1 width=0) +
Join Filter: (public.stmt_hist_t1.job_id = stmt_hist_t2.job_id) +
-> Nested Loop Anti Join (cost=0.00..2.10 rows=1 width=4) +
Join Filter: ((public.stmt_hist_t1.job_id = public.stmt_hist_t1.department_id) OR (public.stmt_hist_t1.job_id IS NULL) OR (public.stmt_hist_t1.department_id IS NULL))+
-> Seq Scan on stmt_hist_t1 (cost=0.00..1.02 rows=2 width=4) +
-> Materialize (cost=0.00..1.03 rows=2 width=4) +
-> Seq Scan on stmt_hist_t1 (cost=0.00..1.02 rows=2 width=4) +
-> Seq Scan on stmt_hist_t2 (cost=0.00..1.03 rows=3 width=4) +
+
(1 row)
drop table stmt_hist_t1, stmt_hist_t2 cascade;
drop function func_add_sql;
alter system set enable_stmt_track=off;
reset log_min_duration_statement;
reset track_stmt_stat_level;
alter system set instr_unique_sql_count = 100;
\c regression

47
src/test/regress/sql/function.sql
View File

@ -1153,4 +1153,49 @@ begin
end;
$$;
drop function test_debug1;
drop function test_debug1;
\c postgres
alter system set enable_stmt_track=on;
set log_min_duration_statement=0;
set track_stmt_stat_level='L1,L1';
alter system set instr_unique_sql_count = 10000;
delete from dbe_perf.statement_history;
CREATE TABLE stmt_hist_t1 ( first_name text, last_name text, job_id int, department_id int,d1 bigint ) ;
create index stmt_hist_t1_i1 on stmt_hist_t1 (job_id) ;
create index stmt_hist_t1_i2 on stmt_hist_t1 (department_id) ;
insert into stmt_hist_t1 (first_name,last_name,job_id,department_id) values('Alice', 'Adams', 2, 1 );
insert into stmt_hist_t1 (first_name,last_name,job_id,department_id) values('Beatrice', 'Brand', 3, 1);
CREATE TABLE stmt_hist_t2 ( job_title text, job_id int) ;
insert into stmt_hist_t2 values( 'Job1', 1 );
insert into stmt_hist_t2 values( 'Job2', 2 );
insert into stmt_hist_t2 values( 'Job3', 3 );
analyze stmt_hist_t1;
analyze stmt_hist_t2;
CREATE FUNCTION func_add_sql() RETURNS integer
AS 'select 3;'
LANGUAGE SQL
IMMUTABLE
RETURNS NULL ON NULL INPUT;
explain (verbose, costs off) select func_add_sql() from stmt_hist_t2 join stmt_hist_t1 on stmt_hist_t2.job_id = stmt_hist_t1.job_id where stmt_hist_t1.job_id not in (select department_id from stmt_hist_t1 );
select func_add_sql() from stmt_hist_t2 join stmt_hist_t1 on stmt_hist_t2.job_id = stmt_hist_t1.job_id where stmt_hist_t1.job_id not in (select department_id from stmt_hist_t1 );
call pg_sleep(1);
select query_plan from dbe_perf.statement_history where query ilike '%select func_add_sql() from stmt_hist_t2 join stmt_hist_t1 on stmt_hist_t2.job_id = stmt_hist_t1.job_id where stmt_hist_t1.job_id not in (select department_id from stmt_hist_t1 );%';
drop table stmt_hist_t1, stmt_hist_t2 cascade;
drop function func_add_sql;
alter system set enable_stmt_track=off;
reset log_min_duration_statement;
reset track_stmt_stat_level;
alter system set instr_unique_sql_count = 100;
\c regression