external
/
pg_stat_monitor
mirror of https://github.com/percona/pg_stat_monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SQL regression fixed

PG-588
Hamid Akhtar 2023-02-14 13:51:13 +05:00
parent e3fc69049c
commit aa4da14a04
2 changed files with 25 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
pg_stat_monitor.c
View File

@ -187,12 +187,12 @@ char *unpack_sql_state(int sql_state);
!IsA(n, DeallocateStmt)) !IsA(n, DeallocateStmt))
static pgssEntry *pgsm_create_hash_entry(uint64 bucket_id, uint64 queryid, PlanInfo *plan_info); static pgssEntry *pgsm_create_hash_entry(MemoryContext context, uint64 bucket_id, uint64 queryid, PlanInfo *plan_info);
static void pgsm_add_to_list(pgssEntry *entry, char *query_text, int query_len, bool should_dup); static void pgsm_add_to_list(pgssEntry *entry, char *query_text, int query_len, bool should_dup);
static pgssEntry* pgsm_get_entry_for_query(uint64 queryid, const char* query_text, int query_len, bool create); static pgssEntry* pgsm_get_entry_for_query(uint64 queryid, const char* query_text, int query_len, bool create);
static void pgsm_print_entrys_list(void); static void pgsm_print_entrys_list(void);
static void pgsm_cleanup_callback(void *arg); static void pgsm_cleanup_callback(void *arg);
static void pgsm_store_error(uint64 queryid, const char *query, ErrorData *edata); static void pgsm_store_error(const char *query, ErrorData *edata);
static void pgsm_update_entry(pgssEntry *entry, static void pgsm_update_entry(pgssEntry *entry,
const char *query, const char *query,
@ -516,7 +516,7 @@ pgsm_post_parse_analyze_internal(ParseState *pstate, Query *query, JumbleState *
* The correct bucket value will be needed then to search the hash table, or create * The correct bucket value will be needed then to search the hash table, or create
* the appropriate entry. * the appropriate entry.
*/ */
entry = pgsm_create_hash_entry(0, query->queryId, NULL); entry = pgsm_create_hash_entry(MessageContext, 0, query->queryId, NULL);
/* Update other member that are not counters, so that we don't have to worry about these. */ /* Update other member that are not counters, so that we don't have to worry about these. */
entry->pgsm_query_id = pgss_hash_string(norm_query ? norm_query : query_text, norm_query_len); entry->pgsm_query_id = pgss_hash_string(norm_query ? norm_query : query_text, norm_query_len);
@ -1144,7 +1144,7 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
BufferUsageAccumDiff(&bufusage, &pgBufferUsage, &bufusage_start); BufferUsageAccumDiff(&bufusage, &pgBufferUsage, &bufusage_start);
/* Create an entry for this query */ /* Create an entry for this query */
entry = pgsm_create_hash_entry(0, queryId, NULL); entry = pgsm_create_hash_entry(MessageContext, 0, queryId, NULL);
location = pstmt->stmt_location; location = pstmt->stmt_location;
query_len = pstmt->stmt_len; query_len = pstmt->stmt_len;
@ -1559,44 +1559,27 @@ pgsm_update_entry(pgssEntry *entry,
} }
static void static void
pgsm_store_error(uint64 queryid, pgsm_store_error(const char *query, ErrorData *edata)
const char *query,
ErrorData *edata)
{ {
pgssEntry *entry; pgssEntry *entry;
ErrorInfo error_info; uint64 queryid = 0;
int len = strlen(query);
error_info.elevel = edata->elevel; if (!query || len == 0)
snprintf(error_info.message, ERROR_MESSAGE_LEN, "%s", edata->message); return;
snprintf(error_info.sqlcode, SQLCODE_LEN, "%s", unpack_sql_state(edata->sqlerrcode));
// entry = pgsm_create_hash_entry(0, queryid, NULL); len = strlen(query);
entry = pgsm_get_entry_for_query(queryid, query, strlen(query), false);
// pgsm_add_to_list(entry, (char *)query, strlen(query), true); queryid = pgss_hash_string(query, len);
if (entry)
{
pgsm_update_entry(entry, /* entry */
query, /* query */
NULL, /* PlanInfo */
NULL, /* SysInfo */
&error_info, /* ErrorInfo */
0, /* total_time */
0, /* rows */
NULL, /* bufusage */
NULL, /* walusage */
NULL, /* jitusage */
false, /* reset */
PGSM_ERROR); /* kind */
pgsm_store(entry); entry = pgsm_create_hash_entry(ErrorContext, 0, queryid, NULL);
} entry->query_text.query_pointer = pnstrdup(query, len);
// if (exec_nested_level == 0)
// { entry->counters.error.elevel = edata->elevel;
// // elog(NOTICE,"%s Deleting ALL [%d]",__FUNCTION__,list_length(lentries)); snprintf(entry->counters.error.message, ERROR_MESSAGE_LEN, "%s", edata->message);
// list_free(lentries); snprintf(entry->counters.error.sqlcode, SQLCODE_LEN, "%s", unpack_sql_state(edata->sqlerrcode));
// lentries = NULL;
// } pgsm_store(entry);
} }
static void static void
@ -1650,7 +1633,7 @@ pgsm_get_entry_for_query(uint64 queryid, const char* query_text, int query_len,
* The correct bucket value will be needed then to search the hash table, or create * The correct bucket value will be needed then to search the hash table, or create
* the appropriate entry. * the appropriate entry.
*/ */
entry = pgsm_create_hash_entry(0, queryid, NULL); entry = pgsm_create_hash_entry(MessageContext, 0, queryid, NULL);
/* Update other member that are not counters, so that we don't have to worry about these. */ /* Update other member that are not counters, so that we don't have to worry about these. */
entry->pgsm_query_id = pgss_hash_string(query_text, query_len); entry->pgsm_query_id = pgss_hash_string(query_text, query_len);
@ -1698,7 +1681,7 @@ pgsm_cleanup_callback(void *arg)
* The bucket_id may not be known at this stage. So pass any value that you may wish. * The bucket_id may not be known at this stage. So pass any value that you may wish.
*/ */
static pgssEntry * static pgssEntry *
pgsm_create_hash_entry(uint64 bucket_id, uint64 queryid, PlanInfo *plan_info) pgsm_create_hash_entry(MemoryContext context, uint64 bucket_id, uint64 queryid, PlanInfo *plan_info)
{ {
pgssEntry *entry; pgssEntry *entry;
int sec_ctx; int sec_ctx;
@ -1709,7 +1692,7 @@ pgsm_create_hash_entry(uint64 bucket_id, uint64 queryid, PlanInfo *plan_info)
MemoryContext oldctx; MemoryContext oldctx;
/* Create an entry in the TopMemoryContext */ /* Create an entry in the TopMemoryContext */
oldctx = MemoryContextSwitchTo(MessageContext); oldctx = MemoryContextSwitchTo(context);
entry = palloc0(sizeof(pgssEntry)); entry = palloc0(sizeof(pgssEntry));
MemoryContextSwitchTo(oldctx); MemoryContextSwitchTo(oldctx);
@ -3416,16 +3399,9 @@ pgsm_emit_log_hook(ErrorData *edata)
if (MyProc == NULL) if (MyProc == NULL)
goto exit; goto exit;
if (PGSM_ERROR_CAPTURE_ENABLED && if (PGSM_ERROR_CAPTURE_ENABLED && edata->elevel >= WARNING)
(edata->elevel == ERROR || edata->elevel == WARNING || edata->elevel == INFO || edata->elevel == DEBUG1))
{ {
uint64 queryid = 0; pgsm_store_error(debug_query_string ? debug_query_string : "",
if (debug_query_string)
queryid = pgss_hash_string(debug_query_string, strlen(debug_query_string));
pgsm_store_error(queryid,
debug_query_string ? debug_query_string : "",
edata); edata);
} }
exit: exit:

2
regression/sql/error.sql
View File

@ -9,6 +9,6 @@ BEGIN
RAISE WARNING 'warning message'; RAISE WARNING 'warning message';
END $$; END $$;
SELECT queryid, query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel; SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel;
SELECT pg_stat_monitor_reset(); SELECT pg_stat_monitor_reset();
DROP EXTENSION pg_stat_monitor; DROP EXTENSION pg_stat_monitor;