mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-02 22:16:48 +02:00
Properly check index mark/restore in ExecSupportsMarkRestore.
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:
parent
57b5d8484c
commit
018e7d98dc
@ -413,6 +413,11 @@ ExecSupportsMarkRestore(Path *pathnode)
|
||||
{
|
||||
case T_IndexScan:
|
||||
case T_IndexOnlyScan:
|
||||
/*
|
||||
* Not all index types support mark/restore.
|
||||
*/
|
||||
return castNode(IndexPath, pathnode)->indexinfo->amcanmarkpos;
|
||||
|
||||
case T_Material:
|
||||
case T_Sort:
|
||||
return true;
|
||||
|
@ -275,6 +275,8 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
|
||||
info->amcanparallel = amroutine->amcanparallel;
|
||||
info->amhasgettuple = (amroutine->amgettuple != NULL);
|
||||
info->amhasgetbitmap = (amroutine->amgetbitmap != NULL);
|
||||
info->amcanmarkpos = (amroutine->ammarkpos != NULL &&
|
||||
amroutine->amrestrpos != NULL);
|
||||
info->amcostestimate = amroutine->amcostestimate;
|
||||
Assert(info->amcostestimate != NULL);
|
||||
|
||||
|
@ -809,6 +809,7 @@ typedef struct IndexOptInfo
|
||||
bool amhasgettuple; /* does AM have amgettuple interface? */
|
||||
bool amhasgetbitmap; /* does AM have amgetbitmap interface? */
|
||||
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 */
|
||||
void (*amcostestimate) (); /* AM's cost estimator */
|
||||
} IndexOptInfo;
|
||||
|
Loading…
Reference in New Issue
Block a user