diff options
| author | Alexander Korotkov <akorotkov@postgresql.org> | 2019-09-08 21:13:40 +0300 |
|---|---|---|
| committer | Alexander Korotkov <akorotkov@postgresql.org> | 2019-09-08 21:17:37 +0300 |
| commit | e6af7b367cf46fc385307efcef5a1fece0e5fef3 (patch) | |
| tree | d9aee5bd1ad49e2492e240788f7688c5cfee7935 /src/include/access/gist_private.h | |
| parent | bc67f4189a7a3381db76dbfeafca463187bfe87a (diff) | |
| download | postgresql-e6af7b367cf46fc385307efcef5a1fece0e5fef3.tar.gz postgresql-e6af7b367cf46fc385307efcef5a1fece0e5fef3.zip | |
Fix handling of NULL distances in KNN-GiST
In order to implement NULL LAST semantic GiST previously assumed distance to
the NULL value to be Inf. However, our distance functions can return Inf and
NaN for non-null values. In such cases, NULL LAST semantic appears to be
broken. This commit fixes that by introducing separate array of null flags for
distances.
Backpatch to all supported versions.
Discussion: https://postgr.es/m/CAPpHfdsNvNdA0DBS%2BwMpFrgwT6C3-q50sFVGLSiuWnV3FqOJuQ%40mail.gmail.com
Author: Alexander Korotkov
Backpatch-through: 9.4
Diffstat (limited to 'src/include/access/gist_private.h')
| -rw-r--r-- | src/include/access/gist_private.h | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h index a85b6faf45f..1624d217621 100644 --- a/src/include/access/gist_private.h +++ b/src/include/access/gist_private.h @@ -138,13 +138,30 @@ typedef struct GISTSearchItem /* we must store parentlsn to detect whether a split occurred */ GISTSearchHeapItem heap; /* heap info, if heap tuple */ } data; - double distances[FLEXIBLE_ARRAY_MEMBER]; /* numberOfOrderBys - * entries */ + + /* + * This data structure is followed by arrays of distance values and + * distance null flags. Size of both arrays is + * IndexScanDesc->numberOfOrderBys. See macros below for accessing those + * arrays. + */ } GISTSearchItem; #define GISTSearchItemIsHeap(item) ((item).blkno == InvalidBlockNumber) -#define SizeOfGISTSearchItem(n_distances) (offsetof(GISTSearchItem, distances) + sizeof(double) * (n_distances)) +#define SizeOfGISTSearchItem(n_distances) (DOUBLEALIGN(sizeof(GISTSearchItem)) + \ + (sizeof(double) + sizeof(bool)) * (n_distances)) + +/* + * We actually don't need n_distances compute pointer to distance values. + * Nevertheless take n_distances as argument to have same arguments list for + * GISTSearchItemDistanceValues() and GISTSearchItemDistanceNulls(). + */ +#define GISTSearchItemDistanceValues(item, n_distances) \ + ((double *) ((Pointer) (item) + DOUBLEALIGN(sizeof(GISTSearchItem)))) + +#define GISTSearchItemDistanceNulls(item, n_distances) \ + ((bool *) ((Pointer) (item) + DOUBLEALIGN(sizeof(GISTSearchItem)) + sizeof(double) * (n_distances))) /* * GISTScanOpaqueData: private state for a scan of a GiST index @@ -160,7 +177,8 @@ typedef struct GISTScanOpaqueData bool firstCall; /* true until first gistgettuple call */ /* pre-allocated workspace arrays */ - double *distances; /* output area for gistindex_keytest */ + double *distanceValues; /* output area for gistindex_keytest */ + bool *distanceNulls; /* info about killed items if any (killedItems is NULL if never used) */ OffsetNumber *killedItems; /* offset numbers of killed items */ |