diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-10-12 18:01:34 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-10-12 18:01:34 -0400 |
| commit | 12945874ebd661b1748d2258d28f96adb473486b (patch) | |
| tree | 74fa9aa1733e29a9cb7939b86fab5b36c040b6ce /src/backend/access/gist/gistbuildbuffers.c | |
| parent | f35c117700122cca2229b9a20a30d12a2ace7bfd (diff) | |
| download | postgresql-12945874ebd661b1748d2258d28f96adb473486b.tar.gz postgresql-12945874ebd661b1748d2258d28f96adb473486b.zip | |
Fix GiST buffering build to work when there are included columns.
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
Diffstat (limited to 'src/backend/access/gist/gistbuildbuffers.c')
| -rw-r--r-- | src/backend/access/gist/gistbuildbuffers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/access/gist/gistbuildbuffers.c b/src/backend/access/gist/gistbuildbuffers.c index 092f1d11b89..83da53aa3a7 100644 --- 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) |