Commit03bb2cf

committed

Fix compability with 9.6

1 parent2bcb2b5 commit03bb2cfCopy full SHA for 03bb2cf

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ View "public.pg_wait_sampling_current"`
`6`	`6`	`pid \| integer \|`
`7`	`7`	`event_type \| text \|`
`8`	`8`	`event \| text \|`
	`9`	`+ queryid \| bigint \|`
`9`	`10`
`10`	`11`	`\d pg_wait_sampling_history`
`11`	`12`	`View "public.pg_wait_sampling_history"`
`@@ -15,6 +16,7 @@ View "public.pg_wait_sampling_current"`
`15`	`16`	`ts \| timestamp with time zone \|`
`16`	`17`	`event_type \| text \|`
`17`	`18`	`event \| text \|`
	`19`	`+ queryid \| bigint \|`
`18`	`20`
`19`	`21`	`\d pg_wait_sampling_profile`
`20`	`22`	`View "public.pg_wait_sampling_profile"`
`@@ -23,6 +25,7 @@ View "public.pg_wait_sampling_profile"`
`23`	`25`	`pid \| integer \|`
`24`	`26`	`event_type \| text \|`
`25`	`27`	`event \| text \|`
	`28`	`+ queryid \| bigint \|`
`26`	`29`	`count \| bigint \|`
`27`	`30`
`28`	`31`	`DROP EXTENSION pg_wait_sampling;`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -775,14 +775,20 @@ pgws_planner_hook(Query *parse, int cursorOptions,`
`775`	`775`	`if (MyProc)`
`776`	`776`	`{`
`777`	`777`	`inti=MyProc-ProcGlobal->allProcs;`
	`778`	`+#ifPG_VERSION_NUM >=110000`
`778`	`779`	`/*`
`779`	`780`	`* since we depend on queryId we need to check that its size`
`780`	`781`	`* is uint64 as we coded in pg_wait_sampling`
`781`	`782`	`*/`
`782`	`783`	`StaticAssertExpr(sizeof(parse->queryId)==sizeof(uint64),`
`783`	`784`	`"queryId size is not uint64");`
`784`		`-if (proc_queryids[i]==UINT64CONST(0))`
	`785`	`+#else`
	`786`	`+StaticAssertExpr(sizeof(parse->queryId)==sizeof(uint32),`
	`787`	`+"queryId size is not uint32");`
	`788`	`+#endif`
	`789`	`+if (!proc_queryids[i])`
`785`	`790`	`proc_queryids[i]=parse->queryId;`
	`791`	`+`
`786`	`792`	`}`
`787`	`793`
`788`	`794`	`/* Invoke original hook if needed */`

Comments

(0)