Fix GiST buffering build to work when there are included columns.

tglsfdc · tglsfdc · commit 371668a8389d · 2020-10-12T18:01:34.000-04:00
gistRelocateBuildBuffersOnSplit did not get the memo about which attribute count to use. This could lead to a crash if there were included columns and buffering build was chosen. (Because there are random page-split decisions elsewhere in GiST index build, the crashes are not entirely deterministic.) Back-patch to v12 where GiST gained support for included columns. Pavel Borisov Discussion: https://postgr.es/m/CALT9ZEECCV5m7wvxg46PC-7x-EybUmnpupBGhSFMoAAay+r6HQ@mail.gmail.com
diff --git a/src/backend/access/gist/gistbuildbuffers.c b/src/backend/access/gist/gistbuildbuffers.c
@@ -666,7 +666,7 @@ gistRelocateBuildBuffersOnSplit(GISTBuildBuffers *gfbb, GISTSTATE *giststate,
 			zero_penalty = true;
 
 			/* Loop over index attributes. */
-			for (j = 0; j < r->rd_att->natts; j++)
+			for (j = 0; j < IndexRelationGetNumberOfKeyAttributes(r); j++)
 			{
 				float		usize;
 
@@ -692,7 +692,7 @@ gistRelocateBuildBuffersOnSplit(GISTBuildBuffers *gfbb, GISTSTATE *giststate,
 					which = i;
 					best_penalty[j] = usize;
 
-					if (j < r->rd_att->natts - 1)
+					if (j < IndexRelationGetNumberOfKeyAttributes(r) - 1)
 						best_penalty[j + 1] = -1;
 				}
 				else if (best_penalty[j] == usize)

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ gistRelocateBuildBuffersOnSplit(GISTBuildBuffers gfbb, GISTSTATE giststate,`
`666`	`666`	`zero_penalty = true;`
`667`	`667`
`668`	`668`	`/* Loop over index attributes. */`
`669`		`- for (j = 0; j < r->rd_att->natts; j++)`
	`669`	`+ for (j = 0; j < IndexRelationGetNumberOfKeyAttributes(r); j++)`
`670`	`670`	`{`
`671`	`671`	`float usize;`
`672`	`672`
`@@ -692,7 +692,7 @@ gistRelocateBuildBuffersOnSplit(GISTBuildBuffers gfbb, GISTSTATE giststate,`
`692`	`692`	`which = i;`
`693`	`693`	`best_penalty[j] = usize;`
`694`	`694`
`695`		`- if (j < r->rd_att->natts - 1)`
	`695`	`+ if (j < IndexRelationGetNumberOfKeyAttributes(r) - 1)`
`696`	`696`	`best_penalty[j + 1] = -1;`
`697`	`697`	`}`
`698`	`698`	`else if (best_penalty[j] == usize)`