Fix build due to changes in PostgreSQL 16

Marina Polyakova · Marina Polyakova · commit fb3eb361798f · 2022-11-21T17:38:20.000+03:00
See the commit 3057465acfbea2f3dd7a914a1478064022c6eecd (Replace the sorted
array of GUC variables with a hash table.) in PostgreSQL 16.
diff --git a/compat.h b/compat.h
@@ -15,6 +15,7 @@
 #include "access/tupdesc.h"
 #include "miscadmin.h"
 #include "storage/shm_mq.h"
+#include "utils/guc_tables.h"
 
 static inline TupleDesc
 CreateTemplateTupleDescCompat(int nattrs, bool hasoid)
@@ -65,4 +66,18 @@ InitPostgresCompat(const char *in_dbname, Oid dboid,
 #endif
 }
 
+static inline void
+get_guc_variables_compat(struct config_generic ***vars, int *num_vars)
+{
+	Assert(vars != NULL);
+	Assert(num_vars != NULL);
+
+#if PG_VERSION_NUM >= 160000
+	*vars = get_guc_variables(num_vars);
+#else
+	*vars = get_guc_variables();
+	*num_vars = GetNumConfigOptions();
+#endif
+}
+
 #endif
diff --git a/pg_wait_sampling.c b/pg_wait_sampling.c
@@ -198,8 +198,7 @@ setup_gucs()
 				profile_pid_found = false,
 				profile_queries_found = false;
 
-	guc_vars = get_guc_variables();
-	numOpts = GetNumConfigOptions();
+	get_guc_variables_compat(&guc_vars, &numOpts);
 
 	for (i = 0; i < numOpts; i++)
 	{

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`	`{`