Commitdd524f2

authored

Fix compatibility with pg18

Upstream commitpostgres/postgres@525392d changed return type of ExecutorStart_hook API from void to bool.

1 parente3b1e15 commitdd524f2Copy full SHA for dd524f2

File tree

+15

-4

lines changed

+15

-4

lines changed

Lines changed: 15 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,13 @@ static PlannedStmt pgws_planner_hook(Query parse,`
`73`	`73`	`constchar*query_string,`
`74`	`74`	`#endif`
`75`	`75`	`intcursorOptions,ParamListInfoboundParams);`
`76`		`-staticvoidpgws_ExecutorStart(QueryDesc*queryDesc,inteflags);`
	`76`	`+static`
	`77`	`+#ifPG_VERSION_NUM >=180000`
	`78`	`+bool`
	`79`	`+#else`
	`80`	`+void`
	`81`	`+#endif`
	`82`	`+pgws_ExecutorStart(QueryDesc*queryDesc,inteflags);`
`77`	`83`	`staticvoidpgws_ExecutorRun(QueryDesc*queryDesc,`
`78`	`84`	`ScanDirectiondirection,`
`79`	`85`	`uint64count`
`@@ -965,16 +971,21 @@ pgws_planner_hook(Query *parse,`
`965`	`971`	`/*`
`966`	`972`	`* ExecutorStart hook: save queryId for collector`
`967`	`973`	`*/`
`968`		`-staticvoid`
	`974`	`+static`
	`975`	`+#ifPG_VERSION_NUM >=180000`
	`976`	`+bool`
	`977`	`+#else`
	`978`	`+void`
	`979`	`+#endif`
`969`	`980`	`pgws_ExecutorStart(QueryDesc*queryDesc,inteflags)`
`970`	`981`	`{`
`971`	`982`	`inti=MyProc-ProcGlobal->allProcs;`
`972`	`983`	`if (pgws_enabled(nesting_level))`
`973`	`984`	`pgws_proc_queryids[i]=queryDesc->plannedstmt->queryId;`
`974`	`985`	`if (prev_ExecutorStart)`
`975`		`-prev_ExecutorStart(queryDesc,eflags);`
	`986`	`+returnprev_ExecutorStart(queryDesc,eflags);`
`976`	`987`	`else`
`977`		`-standard_ExecutorStart(queryDesc,eflags);`
	`988`	`+returnstandard_ExecutorStart(queryDesc,eflags);`
`978`	`989`	`}`
`979`	`990`
`980`	`991`	`staticvoid`

Comments

(0)