upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-04-04 08:45:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix nocachegetattr() so it again supports deforming cstrings

Browse source 
c456e3911 added various optimizations to the tuple deformation routines.
One optimization assumed that heap tuples would never contain cstrings.
That optimization also made its way into nocachegetattr(), which isn't
correct as ROW() types get formed into HeapTuples by ExecEvalRow() and
those can contain cstring Datums.  nocachegetattr() gets used to extract
Datums from those tuples.

Here we remove the pg_assume(), which was there to instruct the compiler
to omit the attlen == -2 related code in att_addlength_pointer().

Author: David Rowley <dgrowleyml@gmail.com>
Reported-by: Alexander Lakhin <exclusion@gmail.com>
Discussion: https://postgr.es/m/80aeac57-8f50-4732-a5b4-c2373c3f8149@gmail.com
This commit is contained in:
David Rowley 2026-04-02 14:11:17 +13:00
parent 82c0cb4e67
commit 331d829e62
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/backend/access/common/heaptuple.c
View file

@ -589,14 +589,6 @@ nocachegetattr(HeapTuple tup,
cattr = TupleDescCompactAttr(tupleDesc, i);
attlen = cattr->attlen;
/*
* cstrings don't exist in heap tuples. Use pg_assume to instruct
* the compiler not to emit the cstring-related code in
* att_addlength_pointer().
*/
pg_assume(attlen > 0 || attlen == -1);
off = att_pointer_alignby(off,
cattr->attalignby,
attlen,
@ -613,10 +605,6 @@ nocachegetattr(HeapTuple tup,
cattr = TupleDescCompactAttr(tupleDesc, i);
attlen = cattr->attlen;
/* As above, heaptuples have no cstrings */
pg_assume(attlen > 0 || attlen == -1);
off = att_pointer_alignby(off, cattr->attalignby, attlen,
tp + off);
off = att_addlength_pointer(off, attlen, tp + off);