Commitf57a2f5

committed

Add csvlog output for the new query_id value

This also adjusts the printf format for query id used by log_line_prefix(%Q).Reported-by: Justin PryzbyDiscussion:https://postgr.es/m/20210408005402.GG24239@momjian.usAuthor: Julien Rouhaud, Bruce Momjian

1 parent5100010 commitf57a2f5Copy full SHA for f57a2f5

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7310,7 +7310,8 @@ log_line_prefix = '%m [%p] %q%u@%d/%a '`
`7310`	`7310`	`character count of the error position therein,`
`7311`	`7311`	`location of the error in the PostgreSQL source code`
`7312`	`7312`	`(if <varname>log_error_verbosity</varname> is set to <literal>verbose</literal>),`
`7313`		`- application name, backend type, and process ID of parallel group leader.`
	`7313`	`+ application name, backend type, process ID of parallel group leader,`
	`7314`	`+ and query id.`
`7314`	`7315`	`Here is a sample table definition for storing CSV-format log output:`
`7315`	`7316`
`7316`	`7317`	`<programlisting>`
`@@ -7341,6 +7342,7 @@ CREATE TABLE postgres_log`
`7341`	`7342`	`application_name text,`
`7342`	`7343`	`backend_type text,`
`7343`	`7344`	`leader_pid integer,`
	`7345`	`+ query_id bigint,`
`7344`	`7346`	`PRIMARY KEY (session_id, session_line_num)`
`7345`	`7347`	`);`
`7346`	`7348`	`</programlisting>`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,8 @@ CREATE FOREIGN TABLE pglog (`
`266`	`266`	`location text,`
`267`	`267`	`application_name text,`
`268`	`268`	`backend_type text,`
`269`		`- leader_pid integer`
	`269`	`+ leader_pid integer,`
	`270`	`+ query_id bigint`
`270`	`271`	`) SERVER pglog`
`271`	`272`	`OPTIONS ( filename 'log/pglog.csv', format 'csv' );`
`272`	`273`	`</programlisting>`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2716,11 +2716,11 @@ log_line_prefix(StringInfo buf, ErrorData *edata)`
`2716`	`2716`	`break;`
`2717`	`2717`	`case'Q':`
`2718`	`2718`	`if (padding!=0)`
`2719`		`-appendStringInfo(buf,"%*ld",padding,`
`2720`		`-pgstat_get_my_queryid());`
	`2719`	`+appendStringInfo(buf,"%*lld",padding,`
	`2720`	`+(long long)pgstat_get_my_queryid());`
`2721`	`2721`	`else`
`2722`		`-appendStringInfo(buf,"%ld",`
`2723`		`-pgstat_get_my_queryid());`
	`2722`	`+appendStringInfo(buf,"%lld",`
	`2723`	`+(long long)pgstat_get_my_queryid());`
`2724`	`2724`	`break;`
`2725`	`2725`	`default:`
`2726`	`2726`	`/* format error - ignore it */`
`@@ -2964,6 +2964,10 @@ write_csvlog(ErrorData *edata)`
`2964`	`2964`	`if (leader&&leader->pid!=MyProcPid)`
`2965`	`2965`	`appendStringInfo(&buf,"%d",leader->pid);`
`2966`	`2966`	`}`
	`2967`	`+appendStringInfoChar(&buf,',');`
	`2968`	`+`
	`2969`	`+/* query id */`
	`2970`	`+appendStringInfo(&buf,"%lld", (long long)pgstat_get_my_queryid());`
`2967`	`2971`
`2968`	`2972`	`appendStringInfoChar(&buf,'\n');`
`2969`	`2973`

Comments

(0)