Fix bug in pairingheap_SpGistSearchItem_cmp()

akorotkov · akorotkov · commit 8728552b291b · 2019-09-25T01:52:55.000+03:00
Our item contains only so->numberOfNonNullOrderBys of distances. Reflect that in the loop upper bound. Discussion: https://postgr.es/m/53536807-784c-e029-6e92-6da802ab8d60%40postgrespro.ru Author: Nikita Glukhov Backpatch-through: 12
diff --git a/src/backend/access/spgist/spgscan.c b/src/backend/access/spgist/spgscan.c
@@ -56,7 +56,7 @@ pairingheap_SpGistSearchItem_cmp(const pairingheap_node *a,
 	else
 	{
 		/* Order according to distance comparison */
-		for (i = 0; i < so->numberOfOrderBys; i++)
+		for (i = 0; i < so->numberOfNonNullOrderBys; i++)
 		{
 			if (isnan(sa->distances[i]) && isnan(sb->distances[i]))
 				continue;		/* NaN == NaN */

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ pairingheap_SpGistSearchItem_cmp(const pairingheap_node *a,`
`56`	`56`	`else`
`57`	`57`	`{`
`58`	`58`	`/* Order according to distance comparison */`
`59`		`- for (i = 0; i < so->numberOfOrderBys; i++)`
	`59`	`+ for (i = 0; i < so->numberOfNonNullOrderBys; i++)`
`60`	`60`	`{`
`61`	`61`	`if (isnan(sa->distances[i]) && isnan(sb->distances[i]))`
`62`	`62`	`continue; /* NaN == NaN */`