pgsql: Fix more confusion in SP-GiST.

From: Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Fix more confusion in SP-GiST.
Date: 2021-04-04 21:57:20
Views: Raw Message | Whole Thread | Download mbox | Resend email
Lists: pgsql-committers

Fix more confusion in SP-GiST.

spg_box_quad_leaf_consistent unconditionally returned the leaf
datum as leafValue, even though in its usage for poly_ops that
value is of completely the wrong type.

In versions before 12, that was harmless because the core code did
nothing with leafValue in non-index-only scans ... but since commit
2a6368343, if we were doing a KNN-style scan, spgNewHeapItem would
unconditionally try to copy the value using the wrong datatype
parameters. Said copying is a waste of time and space if we're not
going to return the data, but it accidentally failed to fail until
I fixed the datatype confusion in ac9099fc1.

Hence, change spgNewHeapItem to not copy the datum unless we're
actually going to return it later. This saves cycles and dodges
the question of whether lossy opclasses are returning the right
type. Also change spg_box_quad_leaf_consistent to not return
data that might be of the wrong type, as insurance against
somebody introducing a similar bug into the core code in future.

It seems like a good idea to back-patch these two changes into
v12 and v13, although I'm afraid to change spgNewHeapItem's
mistaken idea of which datatype to use in those branches.

Per buildfarm results from ac9099fc1.




Modified Files
src/backend/access/spgist/spgscan.c | 20 ++++++++++++++++----
src/backend/utils/adt/geo_spgist.c | 9 +++++++--
2 files changed, 23 insertions(+), 6 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Michael Paquier 2021-04-05 01:14:27 pgsql: Refactor all TAP test suites doing connection checks
Previous Message Tom Lane 2021-04-04 18:29:09 pgsql: Fix confusion in SP-GiST between attribute type and leaf storage