From a5dc37866add6552834ec5af6a0053f521fbcc62 Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Fri, 5 Jul 2019 18:06:02 +0200 Subject: [PATCH] Remove unused variable in statext_mcv_serialize() The itemlen variable used to be referenced in multiple places, but since reworking the serialization code it's used only in one assert. Fixed by removing the variable and calling the macro from the assert directly. Backpatch to 12, where this code was introduced. Reported-by: Jeff Janes Discussion: https://postgr.es/m/CAMkU=1zc_ovH9NZd_9ovuiEWkF9yX06URUDdXCmgDydf-bqB5A@mail.gmail.com --- src/backend/statistics/mcv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/backend/statistics/mcv.c b/src/backend/statistics/mcv.c index 136ebddc46..913a72ff67 100644 --- a/src/backend/statistics/mcv.c +++ b/src/backend/statistics/mcv.c @@ -911,10 +911,9 @@ statext_mcv_serialize(MCVList *mcvlist, VacAttrStats **stats) for (i = 0; i < mcvlist->nitems; i++) { MCVItem *mcvitem = &mcvlist->items[i]; - int itemlen = ITEM_SIZE(dim); /* don't write beyond the allocated space */ - Assert(ptr <= (endptr - itemlen)); + Assert(ptr <= (endptr - ITEM_SIZE(dim))); /* copy NULL and frequency flags into the serialized MCV */ memcpy(ptr, mcvitem->isnull, sizeof(bool) * ndims);