fixed gcc-11 compilation warnings without configure flag --enable-cassert

Mikhail Rutman · Mikhail Rutman · commit 04e72dd9e67d · 2021-11-29T17:42:21.000+07:00
diff --git a/src/dmq.c b/src/dmq.c
@@ -953,17 +953,15 @@ shm_mq_available(shm_mq_handle *mqh)
 	uint64		rb;
 	uint64		wb;
 	uint64		used;
-	Size		ringsize;
 
 	my_shm_mq *mq = (void *) shm_mq_get_queue(mqh);
 
 	/* Compute number of ring buffer bytes used and available. */
 	rb = pg_atomic_read_u64(&mq->mq_bytes_read);
 	wb = pg_atomic_read_u64(&mq->mq_bytes_written);
-	ringsize = mq->mq_ring_size;
 	used = wb - rb;
 	Assert(wb >= rb);
-	Assert(used <= ringsize);
+	Assert(used <= mq->mq_ring_size);
 	return mq->mq_ring_size - used;
 }
 
diff --git a/src/pglogical_apply.c b/src/pglogical_apply.c
@@ -194,7 +194,9 @@ 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
 	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,7 +318,9 @@ 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;
 
@@ -342,8 +344,11 @@ MtmFilterTransaction(char *record, int size, Syncpoint *spvector,
 			origin_lsn = InvalidXLogRecPtr;
 		}
 	}
-	else
-		Assert(false);
+	else {
+		ereport(ERROR,
+				(errmsg("invalid message type: %c", msgtype)));
+	}
+
 	tx_lsn = origin_node == rctx->w.sender_node_id ? end_lsn : origin_lsn;
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,9 @@ MtmFilterTransaction(char record, int size, Syncpoint spvector,`
`318`	`318`	`}`
`319`	`319`	`else if (msgtype == 'M')`
`320`	`320`	`{`
	`321`	`+#ifdef USE_ASSERT_CHECKING`
`321`	`322`	`char action = pq_getmsgbyte(&s);`
	`323`	`+#endif`
`322`	`324`	`int messageSize;`
`323`	`325`	`char const *messageBody;`
`324`	`326`
`@@ -342,8 +344,11 @@ MtmFilterTransaction(char record, int size, Syncpoint spvector,`
`342`	`344`	`origin_lsn = InvalidXLogRecPtr;`
`343`	`345`	`}`
`344`	`346`	`}`
`345`		`- else`
`346`		`- Assert(false);`
	`347`	`+ else {`
	`348`	`+ ereport(ERROR,`
	`349`	`+ (errmsg("invalid message type: %c", msgtype)));`
	`350`	`+ }`
	`351`	`+`
`347`	`352`	`tx_lsn = origin_node == rctx->w.sender_node_id ? end_lsn : origin_lsn;`
`348`	`353`
`349`	`354`	`/*`