Hi, On Mon, Apr 13, 2026 at 11:41:02AM +0200, Peter Eisentraut wrote: > On 09.04.26 13:28, Bertrand Drouvot wrote: > > > > This commit makes use of StaticAssertStmt() that has been deprecated in > > d50c86e74375. The attached, fixes it. > > I think the position of the static assertion is correct, because it refers > to the palloc0_array() that follows. Maybe the comment could be a bit > clearer, like "using palloc0_array requires GIN_CAT_NORM_KEY==0"?
Yeah that looks better to not lose the connection with palloc0_array() here. Done that way in the attached and adding new braces to avoid warning from -Wdeclaration-after-statement. Regards, -- Bertrand Drouvot PostgreSQL Contributors Team RDS Open Source Databases Amazon Web Services: https://aws.amazon.com
>From ebf2368d0620461c741d5fe5432f9856d0317848 Mon Sep 17 00:00:00 2001 From: Bertrand Drouvot <[email protected]> Date: Mon, 13 Apr 2026 10:29:11 +0000 Subject: [PATCH v2] gin: change remaining StaticAssertStmt() to StaticAssertDecl() d50c86e74375 added a comment mentioning that StaticAssertStmt is deprecated but 6f5ad00ab763 made use of it. Fixing by replacing the StaticAssertStmt() by StaticAssertDecl(). Adding a comment to make it clear that this is connected to palloc0_array(). Add new braces to avoid warning from -Wdeclaration-after-statement. Author: Bertrand Drouvot <[email protected]> Reviewed-by: Peter Eisentraut <[email protected]> Discussion: https://postgr.es/m/2a2f9cb0-f00d-413c-8517-4a3ad220d104%40eisentraut.org --- src/backend/access/gin/ginutil.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 100.0% src/backend/access/gin/ diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c index d3351fbe8a3..76d162075a9 100644 --- a/src/backend/access/gin/ginutil.c +++ b/src/backend/access/gin/ginutil.c @@ -534,8 +534,11 @@ ginExtractEntries(GinState *ginstate, OffsetNumber attnum, /* * Create GinNullCategory representation. */ - StaticAssertStmt(GIN_CAT_NORM_KEY == 0, "Assuming GIN_CAT_NORM_KEY=0"); - categories = palloc0_array(GinNullCategory, nentries + (hasNull ? 1 : 0)); + { + /* Using palloc0_array requires GIN_CAT_NORM_KEY==0 */ + StaticAssertDecl(GIN_CAT_NORM_KEY == 0, "Assuming GIN_CAT_NORM_KEY=0"); + categories = palloc0_array(GinNullCategory, nentries + (hasNull ? 1 : 0)); + } /* Put back a NULL entry, if there were any */ if (hasNull) -- 2.34.1
