Commit56546f0

authored

Merge pull request#91 from RekGRpth/patch-2

Fix compatibility with pg18Upstream commitpostgres/postgres@525392d changed return type of ExecutorStart_hook API from void to bool.

2 parentsfbf8346 +637679b commit56546f0Copy full SHA for 56546f0

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
`@@ -76,7 +76,13 @@ static PlannedStmt pgws_planner_hook(Query parse,`
`76`	`76`	`constchar*query_string,`
`77`	`77`	`#endif`
`78`	`78`	`intcursorOptions,ParamListInfoboundParams);`
`79`		`-staticvoidpgws_ExecutorStart(QueryDesc*queryDesc,inteflags);`
	`79`	`+static`
	`80`	`+#ifPG_VERSION_NUM >=180000`
	`81`	`+bool`
	`82`	`+#else`
	`83`	`+void`
	`84`	`+#endif`
	`85`	`+pgws_ExecutorStart(QueryDesc*queryDesc,inteflags);`
`80`	`86`	`staticvoidpgws_ExecutorRun(QueryDesc*queryDesc,`
`81`	`87`	`ScanDirectiondirection,`
`82`	`88`	`uint64count`
`@@ -976,17 +982,22 @@ pgws_planner_hook(Query *parse,`
`976`	`982`	`/*`
`977`	`983`	`* ExecutorStart hook: save queryId for collector`
`978`	`984`	`*/`
`979`		`-staticvoid`
	`985`	`+static`
	`986`	`+#ifPG_VERSION_NUM >=180000`
	`987`	`+bool`
	`988`	`+#else`
	`989`	`+void`
	`990`	`+#endif`
`980`	`991`	`pgws_ExecutorStart(QueryDesc*queryDesc,inteflags)`
`981`	`992`	`{`
`982`	`993`	`inti=MyProc-ProcGlobal->allProcs;`
`983`	`994`
`984`	`995`	`if (pgws_enabled(nesting_level))`
`985`	`996`	`pgws_proc_queryids[i]=queryDesc->plannedstmt->queryId;`
`986`	`997`	`if (prev_ExecutorStart)`
`987`		`-prev_ExecutorStart(queryDesc,eflags);`
	`998`	`+returnprev_ExecutorStart(queryDesc,eflags);`
`988`	`999`	`else`
`989`		`-standard_ExecutorStart(queryDesc,eflags);`
	`1000`	`+returnstandard_ExecutorStart(queryDesc,eflags);`
`990`	`1001`	`}`
`991`	`1002`
`992`	`1003`	`staticvoid`

Comments

(0)