database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-29 16:21:20 +03:00
Code

Make NULL tuple values always advance skip arrays.

Browse Source 
_bt_check_compare neglected to handle a case that can arise when the
scan's keys are temporarily treated as nonrequired, as an optimization:
whenever a NULL tuple value was encountered that had a skip array whose
current element wasn't already NULL, _bt_check_compare failed to advance
the array to the NULL element.  This allowed _bt_check_compare to fail
to return matching tuples containing a NULL value (though only with an
array column that came before a skip array column with NULLs, and only
during _bt_readpage calls that set pstate.forcenonrequired=true on a
page where the higher-order column also had to advance).

To fix, teach _bt_check_compare to handle this case just like any other
case where a skip array key is unsatisfied and must be advanced directly
(due to the key being considered a nonrequired key).

Oversight in commit 8a510275, which optimized nbtree search scan key
comparisons with skip arrays.

Author: Peter Geoghegan <pg@bowt.ie>
Reported-By: Mark Dilger <mark.dilger@enterprisedb.com>
Discussion: https://postgr.es/m/CAHgHdKtLFWZcjr87hMH0hYDHgcifu4Tj7iHz-xh8qsJREt5cqA@mail.gmail.com
This commit is contained in:
Peter Geoghegan 2025-04-28 12:11:08 -04:00
parent 0e13b13d26
commit b75fedcab7
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/access/nbtree/nbtutils.c
View File

@ -2920,6 +2920,17 @@ _bt_check_compare(IndexScanDesc scan, ScanDirection dir,
if (isNull)
{
/*
* Scalar scan key isn't satisfied by NULL tuple value.
*
* If we're treating scan keys as nonrequired, and key is for a
* skip array, then we must attempt to advance the array to NULL
* (if we're successful then the tuple might match the qual).
*/
if (unlikely(forcenonrequired && key->sk_flags & SK_BT_SKIP))
return _bt_advance_array_keys(scan, NULL, tuple, tupnatts,
tupdesc, *ikey, false);
if (key->sk_flags & SK_BT_NULLS_FIRST)
{
/*
@ -2958,7 +2969,7 @@ _bt_check_compare(IndexScanDesc scan, ScanDirection dir,
}
/*
* In any case, this indextuple doesn't match the qual.
* This indextuple doesn't match the qual.
*/
return false;
}