rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent infinite insertion loops in spgdoinsert(). 

Formerly we just relied on operator classes that assert longValuesOK
to eventually shorten the leaf value enough to fit on an index page.
That fails since the introduction of INCLUDE-column support (commit
09c1c6ab4), because the INCLUDE columns might alone take up more
than a page, meaning no amount of leaf-datum compaction will get
the job done.  At least with spgtextproc.c, that leads to an infinite
loop, since spgtextproc.c won't throw an error for not being able
to shorten the leaf datum anymore.

To fix without breaking cases that would otherwise work, add logic
to spgdoinsert() to verify that the leaf tuple size is decreasing
after each "choose" step.  Some opclasses might not decrease the
size on every single cycle, and in any case, alignment roundoff
of the tuple size could obscure small gains.  Therefore, allow
up to 10 cycles without additional savings before throwing an
error.  (Perhaps this number will need adjustment, but it seems
quite generous right now.)

As long as we've developed this logic, let's back-patch it.
The back branches don't have INCLUDE columns to worry about, but
this seems like a good defense against possible bugs in operator
classes.  We already know that an infinite loop here is pretty
unpleasant, so having a defense seems to outweigh the risk of
breaking things.  (Note that spgtextproc.c is actually the only
known opclass with longValuesOK support, so that this is all moot
for known non-core opclasses anyway.)

Per report from Dilip Kumar.

Discussion: https://postgr.es/m/CAFiTN-uxP_soPhVG840tRMQTBmtA_f_Y8N51G7DKYYqDh7XN-A@mail.gmail.com
This commit is contained in:
Tom Lane 2021-05-14 15:07:34 -04:00
parent f4ee4082f5
commit d776045eb1
2 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/src/sgml/spgist.sgml
View File

@ -890,6 +890,18 @@ typedef struct spgLeafConsistentOut
fails to do that, the <acronym>SP-GiST</acronym> core resorts to
extraordinary measures described in <xref linkend="spgist-all-the-same"/>.
</para>
<para>
When <structfield>longValuesOK</structfield> is true, it is expected
that successive levels of the <acronym>SP-GiST</acronym> tree will
absorb more and more information into the prefixes and node labels of
the inner tuples, making the required leaf datum smaller and smaller,
so that eventually it will fit on a page.
To prevent bugs in operator classes from causing infinite insertion
loops, the <acronym>SP-GiST</acronym> core will raise an error if the
leaf datum does not become any smaller within ten cycles
of <function>choose</function> method calls.
</para>
</sect2>
<sect2 id="spgist-null-labels">

61
src/backend/access/spgist/spgdoinsert.c
View File

@ -669,7 +669,8 @@ checkAllTheSame(spgPickSplitIn *in, spgPickSplitOut *out, bool tooBig,
* will eventually terminate if lack of balance is the issue. If the tuple
* is too big, we assume that repeated picksplit operations will eventually
* make it small enough by repeated prefix-stripping. A broken opclass could
* make this an infinite loop, though.
* make this an infinite loop, though, so spgdoinsert() checks that the
* leaf datums get smaller each time.
*/
static bool
doPickSplit(Relation index, SpGistState *state,
@ -1895,6 +1896,8 @@ spgdoinsert(Relation index, SpGistState *state,
int level = 0;
Datum leafDatum;
int leafSize;
int bestLeafSize;
int numNoProgressCycles = 0;
SPPageDesc current,
parent;
FmgrInfo *procinfo = NULL;
@ -1944,7 +1947,7 @@ spgdoinsert(Relation index, SpGistState *state,
* Compute space needed for a leaf tuple containing the given datum.
*
* If it isn't gonna fit, and the opclass can't reduce the datum size by
* suffixing, bail out now rather than getting into an endless loop.
* suffixing, bail out now rather than doing a lot of useless work.
*/
if (!isnull)
leafSize = SGLTHDRSZ + sizeof(ItemIdData) +
@ -1952,7 +1955,8 @@ spgdoinsert(Relation index, SpGistState *state,
else
leafSize = SGDTSIZE + sizeof(ItemIdData);
if (leafSize > SPGIST_PAGE_CAPACITY && !state->config.longValuesOK)
if (leafSize > SPGIST_PAGE_CAPACITY &&
(isnull || !state->config.longValuesOK))
ereport(ERROR,
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
errmsg("index row size %zu exceeds maximum %zu for index \"%s\"",
@ -1960,6 +1964,7 @@ spgdoinsert(Relation index, SpGistState *state,
SPGIST_PAGE_CAPACITY - sizeof(ItemIdData),
RelationGetRelationName(index)),
errhint("Values larger than a buffer page cannot be indexed.")));
bestLeafSize = leafSize;
/* Initialize "current" to the appropriate root page */
current.blkno = isnull ? SPGIST_NULL_BLKNO : SPGIST_ROOT_BLKNO;
@ -2187,19 +2192,53 @@ spgdoinsert(Relation index, SpGistState *state,
SpGistGetTypeSize(&state->attLeafType, leafDatum);
}
/*
* Check new tuple size; fail if it can't fit, unless the
* opclass says it can handle the situation by suffixing.
*
* A buggy opclass might not ever make the leaf datum
* small enough, causing an infinite loop. To detect such
* a loop, check to see if we are making progress by
* reducing the leafSize in each pass. This is a bit
* tricky though. Because of alignment considerations,
* the total tuple size might not decrease on every pass.
* Also, there are edge cases where the choose method
* might seem to not make progress for a cycle or two.
* Somewhat arbitrarily, we allow up to 10 no-progress
* iterations before failing. (This limit should be more
* than MAXALIGN, to accommodate opclasses that trim one
* byte from the leaf datum per pass.)
*/
if (leafSize > SPGIST_PAGE_CAPACITY)
{
bool ok = false;
if (state->config.longValuesOK && !isnull)
{
if (leafSize < bestLeafSize)
{
ok = true;
bestLeafSize = leafSize;
numNoProgressCycles = 0;
}
else if (++numNoProgressCycles < 10)
ok = true;
}
if (!ok)
ereport(ERROR,
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
errmsg("index row size %zu exceeds maximum %zu for index \"%s\"",
leafSize - sizeof(ItemIdData),
SPGIST_PAGE_CAPACITY - sizeof(ItemIdData),
RelationGetRelationName(index)),
errhint("Values larger than a buffer page cannot be indexed.")));
}
/*
* Loop around and attempt to insert the new leafDatum at
* "current" (which might reference an existing child
* tuple, or might be invalid to force us to find a new
* page for the tuple).
*
* Note: if the opclass sets longValuesOK, we rely on the
* choose function to eventually shorten the leafDatum
* enough to fit on a page. We could add a test here to
* complain if the datum doesn't get visibly shorter each
* time, but that could get in the way of opclasses that
* "simplify" datums in a way that doesn't necessarily
* lead to physical shortening on every cycle.
*/
break;
case spgAddNode: