wuxiaojun
/
openGauss-server
forked from huawei/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

openGauss supports pg_stat_statements

This commit is contained in:
liang_-123 2021-01-09 16:52:07 +08:00
parent 5be05d820f
commit 78068122d9
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile.in
View File

@ -57,6 +57,7 @@ install:
$(MAKE) -C contrib/hstore $@ $(MAKE) -C contrib/hstore $@
$(MAKE) -C src/distribute/kernel/extension/packages $@ $(MAKE) -C src/distribute/kernel/extension/packages $@
$(MAKE) -C contrib/pagehack $@ $(MAKE) -C contrib/pagehack $@
$(MAKE) -C contrib/pg_stat_statements $@
$(MAKE) -C contrib/pg_xlogdump $@ $(MAKE) -C contrib/pg_xlogdump $@
$(MAKE) -C contrib/gsredistribute $@ $(MAKE) -C contrib/gsredistribute $@
$(MAKE) -C src/distribute/kernel/extension/dimsearch $@ $(MAKE) -C src/distribute/kernel/extension/dimsearch $@
@ -70,6 +71,7 @@ install:
$(MAKE) install_oracle_fdw $(MAKE) install_oracle_fdw
$(MAKE) install_pldebugger $(MAKE) install_pldebugger
$(MAKE) -C contrib/postgres_fdw $@ $(MAKE) -C contrib/postgres_fdw $@
$(MAKE) -C contrib/pg_stat_statements $@
$(MAKE) -C contrib/hstore $@ $(MAKE) -C contrib/hstore $@
$(MAKE) -C src/distribute/kernel/extension/packages $@ $(MAKE) -C src/distribute/kernel/extension/packages $@
$(MAKE) -C contrib/gsredistribute $@ $(MAKE) -C contrib/gsredistribute $@

3
contrib/pg_stat_statements/Makefile
View File

@ -17,3 +17,6 @@ top_builddir = ../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk include $(top_srcdir)/contrib/contrib-global.mk
endif endif
exclude_option=-fPIE
override CPPFLAGS := $(filter-out $(exclude_option),$(CPPFLAGS))

45
contrib/pg_stat_statements/pg_stat_statements.cpp
View File

@ -135,7 +135,7 @@ typedef struct pgssEntry {
* Global shared state * Global shared state
*/ */
typedef struct pgssSharedState { typedef struct pgssSharedState {
LWLockId lock; /* protects hashtable search/modification */ LWLock* lock; /* protects hashtable search/modification */
int query_size; /* max query length in bytes */ int query_size; /* max query length in bytes */
double cur_median_usage; /* current median usage in hashtable */ double cur_median_usage; /* current median usage in hashtable */
} pgssSharedState; } pgssSharedState;
@ -172,20 +172,20 @@ typedef struct pgssJumbleState {
/*---- Local variables ----*/ /*---- Local variables ----*/
/* Current nesting depth of ExecutorRun+ProcessUtility calls */ /* Current nesting depth of ExecutorRun+ProcessUtility calls */
static int nested_level = 0; static THR_LOCAL int nested_level = 0;
/* Saved hook values in case of unload */ /* Saved hook values in case of unload */
static shmem_startup_hook_type prev_shmem_startup_hook = NULL; static THR_LOCAL shmem_startup_hook_type prev_shmem_startup_hook = NULL;
static post_parse_analyze_hook_type prev_post_parse_analyze_hook = NULL; static THR_LOCAL post_parse_analyze_hook_type prev_post_parse_analyze_hook = NULL;
static ExecutorStart_hook_type prev_ExecutorStart = NULL; static THR_LOCAL ExecutorStart_hook_type prev_ExecutorStart = NULL;
static ExecutorRun_hook_type prev_ExecutorRun = NULL; static THR_LOCAL ExecutorRun_hook_type prev_ExecutorRun = NULL;
static ExecutorFinish_hook_type prev_ExecutorFinish = NULL; static THR_LOCAL ExecutorFinish_hook_type prev_ExecutorFinish = NULL;
static ExecutorEnd_hook_type prev_ExecutorEnd = NULL; static THR_LOCAL ExecutorEnd_hook_type prev_ExecutorEnd = NULL;
static ProcessUtility_hook_type prev_ProcessUtility = NULL; static THR_LOCAL ProcessUtility_hook_type prev_ProcessUtility = NULL;
/* Links to shared memory state */ /* Links to shared memory state */
static pgssSharedState* pgss = NULL; static THR_LOCAL pgssSharedState* pgss = NULL;
static HTAB* pgss_hash = NULL; static THR_LOCAL HTAB* pgss_hash = NULL;
/*---- GUC variables ----*/ /*---- GUC variables ----*/
@ -210,8 +210,8 @@ static bool pgss_save; /* whether to save stats across shutdown */
void _PG_init(void); void _PG_init(void);
void _PG_fini(void); void _PG_fini(void);
Datum pg_stat_statements_reset(PG_FUNCTION_ARGS); extern "C" Datum pg_stat_statements_reset(PG_FUNCTION_ARGS);
Datum pg_stat_statements(PG_FUNCTION_ARGS); extern "C" Datum pg_stat_statements(PG_FUNCTION_ARGS);
PG_FUNCTION_INFO_V1(pg_stat_statements_reset); PG_FUNCTION_INFO_V1(pg_stat_statements_reset);
PG_FUNCTION_INFO_V1(pg_stat_statements); PG_FUNCTION_INFO_V1(pg_stat_statements);
@ -260,7 +260,7 @@ void _PG_init(void)
* module isn't active. The functions must protect themselves against * module isn't active. The functions must protect themselves against
* being called then, however.) * being called then, however.)
*/ */
if (!process_shared_preload_libraries_in_progress) if (!u_sess->misc_cxt.process_shared_preload_libraries_in_progress)
return; return;
/* /*
@ -389,7 +389,7 @@ static void pgss_shmem_startup(void)
if (!found) { if (!found) {
/* First time through ... */ /* First time through ... */
pgss->lock = LWLockAssign(); pgss->lock = LWLockAssign(LWTRANCHE_BUFFER_CONTENT);
pgss->query_size = g_instance.attr.attr_common.pgstat_track_activity_query_size; pgss->query_size = g_instance.attr.attr_common.pgstat_track_activity_query_size;
pgss->cur_median_usage = ASSUMED_MEDIAN_INIT; pgss->cur_median_usage = ASSUMED_MEDIAN_INIT;
} }
@ -456,7 +456,7 @@ static void pgss_shmem_startup(void)
buffer_size = temp.query_len + 1; buffer_size = temp.query_len + 1;
} }
if (fread(buffer, 1, temp.query_len, file) != temp.query_len) if (fread(buffer, 1, temp.query_len, file) != (size_t)temp.query_len)
goto error; goto error;
buffer[temp.query_len] = '\0'; buffer[temp.query_len] = '\0';
@ -536,7 +536,7 @@ static void pgss_shmem_shutdown(int code, Datum arg)
while ((entry = (pgssEntry*)hash_seq_search(&hash_seq)) != NULL) { while ((entry = (pgssEntry*)hash_seq_search(&hash_seq)) != NULL) {
int len = entry->query_len; int len = entry->query_len;
if (fwrite(entry, offsetof(pgssEntry, mutex), 1, file) != 1 || fwrite(entry->query, 1, len, file) != len) if (fwrite(entry, offsetof(pgssEntry, mutex), 1, file) != 1 || fwrite(entry->query, 1, len, file) != (size_t)len)
goto error; goto error;
} }
@ -748,8 +748,8 @@ static void pgss_ProcessUtility(Node* parsetree, const char* queryString, ParamL
BufferUsage bufusage_start, bufusage; BufferUsage bufusage_start, bufusage;
uint32 queryId; uint32 queryId;
bufusage_start = u_sess->instr_cxt.pg_buffer_usage->INSTR_TIME_SET_CURRENT(start); bufusage_start = *(u_sess->instr_cxt.pg_buffer_usage);
INSTR_TIME_SET_CURRENT(start);
nested_level++; nested_level++;
PG_TRY(); PG_TRY();
{ {
@ -1661,6 +1661,12 @@ static void JumbleExpr(pgssJumbleState* jstate, Node* node)
JumbleExpr(jstate, (Node*)lfirst(temp)); JumbleExpr(jstate, (Node*)lfirst(temp));
} }
break; break;
case T_IntList:
foreach(temp, (List *) node)
{
APP_JUMB(lfirst_int(temp));
}
break;
case T_SortGroupClause: { case T_SortGroupClause: {
SortGroupClause* sgc = (SortGroupClause*)node; SortGroupClause* sgc = (SortGroupClause*)node;
@ -1674,6 +1680,7 @@ static void JumbleExpr(pgssJumbleState* jstate, Node* node)
JumbleExpr(jstate, (Node*)gsnode->content); JumbleExpr(jstate, (Node*)gsnode->content);
} }
break;
case T_WindowClause: { case T_WindowClause: {
WindowClause* wc = (WindowClause*)node; WindowClause* wc = (WindowClause*)node;