mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-06 15:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Properly check index mark/restore in ExecSupportsMarkRestore.

Browse Source 
Previously this code assumed that all IndexScan nodes supported
mark/restore, which is not true since it depends on optional index AM
support functions. This could lead to errors about missing support
functions in rare edge cases of mergejoins with no sort keys, where an
unordered non-btree index scan was placed on the inner path without a
protecting Materialize node. (Normally, the fact that merge join
requires ordered input would avoid this error.)

Backpatch all the way since this bug is ancient.

Per report from Eugen Konkov on irc.

Discussion: https://postgr.es/m/87o8jn50be.fsf@news-spur.riddles.org.uk
This commit is contained in:
Andrew Gierth 2020-11-24 20:58:32 +00:00
parent b0727ae99b
commit 660b89928d
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/executor/execAmi.c
View File

@ -417,6 +417,11 @@ ExecSupportsMarkRestore(Path *pathnode)
{ {
case T_IndexScan: case T_IndexScan:
case T_IndexOnlyScan: case T_IndexOnlyScan:
/*
* Not all index types support mark/restore.
*/
return castNode(IndexPath, pathnode)->indexinfo->amcanmarkpos;
case T_Material: case T_Material:
case T_Sort: case T_Sort:
return true; return true;

2
src/backend/optimizer/util/plancat.c
View File

@ -284,6 +284,8 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
info->amhasgettuple = (amroutine->amgettuple != NULL); info->amhasgettuple = (amroutine->amgettuple != NULL);
info->amhasgetbitmap = amroutine->amgetbitmap != NULL && info->amhasgetbitmap = amroutine->amgetbitmap != NULL &&
relation->rd_tableam->scan_bitmap_next_block != NULL; relation->rd_tableam->scan_bitmap_next_block != NULL;
info->amcanmarkpos = (amroutine->ammarkpos != NULL &&
amroutine->amrestrpos != NULL);
info->amcostestimate = amroutine->amcostestimate; info->amcostestimate = amroutine->amcostestimate;
Assert(info->amcostestimate != NULL); Assert(info->amcostestimate != NULL);

1
src/include/nodes/pathnodes.h
View File

@ -864,6 +864,7 @@ struct IndexOptInfo
bool amhasgettuple; /* does AM have amgettuple interface? */ bool amhasgettuple; /* does AM have amgettuple interface? */
bool amhasgetbitmap; /* does AM have amgetbitmap interface? */ bool amhasgetbitmap; /* does AM have amgetbitmap interface? */
bool amcanparallel; /* does AM support parallel scan? */ bool amcanparallel; /* does AM support parallel scan? */
bool amcanmarkpos; /* does AM support mark/restore? */
/* Rather than include amapi.h here, we declare amcostestimate like this */ /* Rather than include amapi.h here, we declare amcostestimate like this */
void (*amcostestimate) (); /* AM's cost estimator */ void (*amcostestimate) (); /* AM's cost estimator */
}; };