fix transaction parsing

Mikhail Rutman · Mikhail Rutman · commit 7ca0008cc25d · 2021-12-07T10:55:46.000Z
In the commit 04e72dd the code for reading sender_node_id and action type was removed. This commit fixes this issue.
diff --git a/src/pglogical_apply.c b/src/pglogical_apply.c
@@ -194,9 +194,10 @@ static void
 process_remote_begin(StringInfo s, MtmReceiverWorkerContext *rwctx)
 {
 	/* there is no need to send this, but since we do, check its sanity */
-#ifdef USE_ASSERT_CHECKING
 	int sender_node_id = pq_getmsgint(s, 4);
-#endif
+
+	(void) sender_node_id;		/* keep the compiler quiet when asserts are disabled*/
+
 	Assert(rwctx->sender_node_id == sender_node_id);
 	rwctx->origin_xid = pq_getmsgint64(s);
 	mtm_log(MtmApplyTrace, "processing begin of xid " XID_FMT, rwctx->origin_xid);
diff --git a/src/pglogical_receiver.c b/src/pglogical_receiver.c
@@ -318,12 +318,12 @@ MtmFilterTransaction(char *record, int size, Syncpoint *spvector,
 	}
 	else if (msgtype == 'M')
 	{
-#ifdef USE_ASSERT_CHECKING
 		char		action = pq_getmsgbyte(&s);
-#endif
 		int			messageSize;
 		char const *messageBody;
 
+		(void) action;		/* keep the compiler quiet when asserts are disabled*/
+
 		end_lsn = pq_getmsgint64(&s);
 		messageSize = pq_getmsgint(&s, 4);
 		messageBody = pq_getmsgbytes(&s, messageSize);

Original file line number	Diff line number	Diff line change
`@@ -318,12 +318,12 @@ MtmFilterTransaction(char record, int size, Syncpoint spvector,`
`318`	`318`	`}`
`319`	`319`	`else if (msgtype == 'M')`
`320`	`320`	`{`
`321`		`-#ifdef USE_ASSERT_CHECKING`
`322`	`321`	`char action = pq_getmsgbyte(&s);`
`323`		`-#endif`
`324`	`322`	`int messageSize;`
`325`	`323`	`char const *messageBody;`
`326`	`324`
	`325`	`+ (void) action; /* keep the compiler quiet when asserts are disabled*/`
	`326`	`+`
`327`	`327`	`end_lsn = pq_getmsgint64(&s);`
`328`	`328`	`messageSize = pq_getmsgint(&s, 4);`
`329`	`329`	`messageBody = pq_getmsgbytes(&s, messageSize);`