database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-05 23:56:58 +03:00
Code

Use the correct PG_DETOAST_DATUM macro in BRIN

Browse Source 
Commit 6bcda4a721 replaced PG_DETOAST_DATUM with PG_DETOAST_DATUM_PACKED
in two BRIN output functions, for minmax-multi and bloom opclasses. But
this is incorrect - the code is accessing the data through structs that
already include a 4B header, so the detoast needs to match that. But the
PACKED macro may keep the 1B header, which means the struct fields will
point to incorrect data.

Backpatch-through: 16
Discussion: https://postgr.es/m/1df00a66-db5a-4e66-809a-99b386a06d86%40enterprisedb.com
This commit is contained in:
Tomas Vondra 2024-04-14 18:19:52 +02:00
parent ccd8f0fa1e
commit 8cea358b12
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/access/brin/brin_bloom.c
View File

@ -769,7 +769,7 @@ brin_bloom_summary_out(PG_FUNCTION_ARGS)
StringInfoData str; StringInfoData str;
/* detoast the data to get value with a full 4B header */ /* 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); initStringInfo(&str);
appendStringInfoChar(&str, '{'); appendStringInfoChar(&str, '{');

2
src/backend/access/brin/brin_minmax_multi.c
View File

@ -3015,7 +3015,7 @@ brin_minmax_multi_summary_out(PG_FUNCTION_ARGS)
* Detoast to get value with full 4B header (can't be stored in a toast * Detoast to get value with full 4B header (can't be stored in a toast
* table, but can use 1B header). * 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 */ /* lookup output func for the type */
getTypeOutputInfo(ranges->typid, &outfunc, &isvarlena); getTypeOutputInfo(ranges->typid, &outfunc, &isvarlena);