Commit544a4ee

authored

Merge pull request#64 from postgrespro/PGPRO-7444

Fix build due to changes in PostgreSQL 16

2 parents1ff4426 +9526428 commit544a4eeCopy full SHA for 544a4ee

File tree

+18

-5

lines changed

+18

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ pgws_collector_main(Datum main_arg)`
`470`	`470`	`send_profile(profile_hash,mqh);`
`471`	`471`	`break;`
`472`	`472`	`default:`
`473`		`-AssertState(false);`
	`473`	`+Assert(false);`
`474`	`474`	`}`
`475`	`475`	`break;`
`476`	`476`	`caseSHM_MQ_DETACHED:`
`@@ -480,7 +480,7 @@ pgws_collector_main(Datum main_arg)`
`480`	`480`	`"detached")));`
`481`	`481`	`break;`
`482`	`482`	`default:`
`483`		`-AssertState(false);`
	`483`	`+Assert(false);`
`484`	`484`	`}`
`485`	`485`	`shm_mq_detach_compat(mqh,pgws_collector_mq);`
`486`	`486`	`}`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include"access/tupdesc.h"`
`16`	`16`	`#include"miscadmin.h"`
`17`	`17`	`#include"storage/shm_mq.h"`
	`18`	`+#include"utils/guc_tables.h"`
`18`	`19`
`19`	`20`	`staticinlineTupleDesc`
`20`	`21`	`CreateTemplateTupleDescCompat(intnattrs,boolhasoid)`
`@@ -65,4 +66,18 @@ InitPostgresCompat(const char *in_dbname, Oid dboid,`
`65`	`66`	`#endif`
`66`	`67`	`}`
`67`	`68`
	`69`	`+staticinlinevoid`
	`70`	`+get_guc_variables_compat(structconfig_generic**vars,intnum_vars)`
	`71`	`+{`
	`72`	`+Assert(vars!=NULL);`
	`73`	`+Assert(num_vars!=NULL);`
	`74`	`+`
	`75`	`+#ifPG_VERSION_NUM >=160000`
	`76`	`+*vars=get_guc_variables(num_vars);`
	`77`	`+#else`
	`78`	`+*vars=get_guc_variables();`
	`79`	`+*num_vars=GetNumConfigOptions();`
	`80`	`+#endif`
	`81`	`+}`
	`82`	`+`
`68`	`83`	`#endif`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -198,8 +198,7 @@ setup_gucs()`
`198`	`198`	`profile_pid_found= false,`
`199`	`199`	`profile_queries_found= false;`
`200`	`200`
`201`		`-guc_vars=get_guc_variables();`
`202`		`-numOpts=GetNumConfigOptions();`
	`201`	`+get_guc_variables_compat(&guc_vars,&numOpts);`
`203`	`202`
`204`	`203`	`for (i=0;i<numOpts;i++)`
`205`	`204`	`{`
`@@ -452,7 +451,6 @@ pg_wait_sampling_get_current(PG_FUNCTION_ARGS)`
`452`	`451`	`{`
`453`	`452`	`MemoryContextoldcontext;`
`454`	`453`	`TupleDesctupdesc;`
`455`		`-WaitCurrentContext*params;`
`456`	`454`
`457`	`455`	`funcctx=SRF_FIRSTCALL_INIT();`
`458`	`456`

Comments

(0)