Accordance with core code changes after rebase

The branch of changes in Postgres 15 core for multimaster
was rebased after upstream updates. This commit brings
multimaster code into line with code of this rebased branche.

Author: Andrei Krichinin

src/dmq.c

@@ -1453,7 +1453,11 @@ dmq_receiver_loop(PG_FUNCTION_ARGS)
 		extra = dmq_receiver_start_hook(sender_name);
 
 	/* do not hold globalxmin. XXX: try to carefully release snaps */
+#if PG_VERSION_NUM < 150000
 	MyProc->xmin = InvalidTransactionId;
+#else
+	pg_atomic_write_u64(&MyProc->xmin, InvalidTransactionId);
+#endif
 
 	for (;;)
 	{

src/pglogical_config.c

@@ -24,7 +24,9 @@
 #include "nodes/makefuncs.h"
 
 #include "utils/builtins.h"
+#if PG_VERSION_NUM < 150000
 #include "utils/int8.h"
+#endif
 #include "utils/inval.h"
 #include "utils/varlena.h"
 #include "utils/lsyscache.h"
@@ -378,13 +380,26 @@ parse_param_bool(DefElem *elem)
 static uint32
 parse_param_uint32(DefElem *elem)
 {
+#if PG_VERSION_NUM < 150000
 	int64		res;
 
 	if (!scanint8(strVal(elem->arg), true, &res))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 MTM_ERRMSG("could not parse integer value \"%s\" for parameter \"%s\"",
 							strVal(elem->arg), elem->defname)));
+#else
+	unsigned long res;
+	char	   *endptr;
+
+	errno = 0;
+	res = strtoul(strVal(elem->arg), &endptr, 10);
+	if (errno != 0 || *endptr != '\0')
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 MTM_ERRMSG("could not parse integer value \"%s\" for parameter \"%s\"",
+							strVal(elem->arg), elem->defname)));
+#endif
 
 	if (res > PG_UINT32_MAX || res < 0)
 		ereport(ERROR,

src/pglogical_output.c

@@ -44,7 +44,9 @@
 #include "utils/builtins.h"
 #include "utils/catcache.h"
 #include "utils/guc.h"
+#if PG_VERSION_NUM < 150000
 #include "utils/int8.h"
+#endif
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"