Fix compiler warnings in multivariate MCV code

tvondra · tvondra · commit ad3107b97324 · 2019-03-30T18:43:16.000+01:00
Compiler warnings were observed on gcc 3.4.6 (on gaur).

The assert is unnecessary, as the indexes are uint16 and so always &gt;= 0.

Reported-by: Tom Lane
diff --git a/src/backend/statistics/mcv.c b/src/backend/statistics/mcv.c
@@ -740,7 +740,6 @@ statext_mcv_serialize(MCVList * mcvlist, VacAttrStats **stats)
 			ITEM_INDEXES(item)[dim] = (uint16) (value - values[dim]);
 
 			/* check the index is within expected bounds */
-			Assert(ITEM_INDEXES(item)[dim] >= 0);
 			Assert(ITEM_INDEXES(item)[dim] < info[dim].nvalues);
 		}
 
@@ -814,7 +813,7 @@ statext_mcv_deserialize(bytea *data)
 	 * header.
 	 */
 	if (VARSIZE_ANY_EXHDR(data) < offsetof(MCVList, items))
-		elog(ERROR, "invalid MCV size %ld (expected at least %zu)",
+		elog(ERROR, "invalid MCV size %zd (expected at least %zu)",
 			 VARSIZE_ANY_EXHDR(data), offsetof(MCVList, items));
 
 	/* read the MCV list header */
@@ -870,7 +869,7 @@ statext_mcv_deserialize(bytea *data)
 	 * to do this check first, before accessing the dimension info.
 	 */
 	if (VARSIZE_ANY_EXHDR(data) < expected_size)
-		elog(ERROR, "invalid MCV size %ld (expected %zu)",
+		elog(ERROR, "invalid MCV size %zd (expected %zu)",
 			 VARSIZE_ANY_EXHDR(data), expected_size);
 
 	/* Now it's safe to access the dimension info. */
@@ -896,7 +895,7 @@ statext_mcv_deserialize(bytea *data)
 	 * check on size.
 	 */
 	if (VARSIZE_ANY_EXHDR(data) != expected_size)
-		elog(ERROR, "invalid MCV size %ld (expected %zu)",
+		elog(ERROR, "invalid MCV size %zd (expected %zu)",
 			 VARSIZE_ANY_EXHDR(data), expected_size);
 
 	/*
