From e8583126833a53f4eebe28a8de45d128f01ff664 Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Mon, 20 Mar 2023 09:51:50 +0100 Subject: Fix netmask handling in inet_minmax_multi_ops When calculating distance in brin_minmax_multi_distance_inet(), the netmask was applied incorrectly. This results in (seemingly) incorrect ordering of values, triggering an assert. For builds without asserts this is mostly harmless - we may merge other ranges, possibly resulting in slightly less efficient index. But it's still correct and the greedy algorithm doesn't guarantee optimality anyway. Backpatch to 14, where minmax-multi indexes were introduced. Reported by Dmitry Dolgov, investigation and fix by me. Reported-by: Dmitry Dolgov Backpatch-through: 14 Discussion: https://postgr.es/m/17774-c6f3e36dd4471e67@postgresql.org --- src/backend/access/brin/brin_minmax_multi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/backend') diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c index 0ace6035beb..cdf78cdeccc 100644 --- a/src/backend/access/brin/brin_minmax_multi.c +++ b/src/backend/access/brin/brin_minmax_multi.c @@ -2364,14 +2364,14 @@ brin_minmax_multi_distance_inet(PG_FUNCTION_ARGS) unsigned char mask; int nbits; - nbits = lena - (i * 8); + nbits = Max(0, lena - (i * 8)); if (nbits < 8) { mask = (0xFF << (8 - nbits)); addra[i] = (addra[i] & mask); } - nbits = lenb - (i * 8); + nbits = Max(0, lenb - (i * 8)); if (nbits < 8) { mask = (0xFF << (8 - nbits)); -- cgit v1.2.3