From 07739713893bb0f6be5853324e8897159cf2ad07 Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Sat, 13 Apr 2024 22:18:37 +0200 Subject: [PATCH v20240413 2/4] Use correct PG_DETOAST_DATUM macro in BRIN Commit 6bcda4a721 replaced PG_DETOAST_DATUM with PG_DETOAST_DATUM_PACKED in two places, in output function for minmax-multi and bloom. But this is incorrect - the structs backing both summaries include 4B header, so we need to detoast them fully. With _PACKED we may end up with 1B header, so the fields will be shifted and have incorrect values. Backpatch-through: 16 --- src/backend/access/brin/brin_bloom.c | 2 +- src/backend/access/brin/brin_minmax_multi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/access/brin/brin_bloom.c b/src/backend/access/brin/brin_bloom.c index 9e3bc567303..1c2437cef74 100644 --- a/src/backend/access/brin/brin_bloom.c +++ b/src/backend/access/brin/brin_bloom.c @@ -807,7 +807,7 @@ brin_bloom_summary_out(PG_FUNCTION_ARGS) StringInfoData str; /* detoast the data to get value with a full 4B header */ - filter = (BloomFilter *) PG_DETOAST_DATUM_PACKED(PG_GETARG_DATUM(0)); + filter = (BloomFilter *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0)); initStringInfo(&str); appendStringInfoChar(&str, '{'); diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c index c5962c00d64..e5d95de5d84 100644 --- a/src/backend/access/brin/brin_minmax_multi.c +++ b/src/backend/access/brin/brin_minmax_multi.c @@ -3023,7 +3023,7 @@ brin_minmax_multi_summary_out(PG_FUNCTION_ARGS) * Detoast to get value with full 4B header (can't be stored in a toast * table, but can use 1B header). */ - ranges = (SerializedRanges *) PG_DETOAST_DATUM_PACKED(PG_GETARG_DATUM(0)); + ranges = (SerializedRanges *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0)); /* lookup output func for the type */ getTypeOutputInfo(ranges->typid, &outfunc, &isvarlena); -- 2.44.0