From fec0283e4b8ea5b692c82a2abeca782b64e3d5ad Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Thu, 18 Jan 2018 21:04:18 +0900 Subject: [PATCH 2/2] Fix check_index_only for the case of duplicate keycolumn If there is an index that have multiple keys on the same attribute but using different operator class, only the last key on the same attribute affects the availability of the attribute. This causes failure of rechecking index tuples. An attribute should be considered as unavailable if any key on it cannot return the attribute. --- src/backend/optimizer/path/indxpath.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 7fc7080..2fede1d 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -1866,6 +1866,7 @@ check_index_only(RelOptInfo *rel, IndexOptInfo *index) bool result; Bitmapset *attrs_used = NULL; Bitmapset *index_canreturn_attrs = NULL; + Bitmapset *index_cannotreturn_attrs = NULL; ListCell *lc; int i; @@ -1905,7 +1906,8 @@ check_index_only(RelOptInfo *rel, IndexOptInfo *index) /* * Construct a bitmapset of columns that the index can return back in an - * index-only scan. + * index-only scan. We must have a value for all occurances of the same + * attribute since it can be used for rechecking. */ for (i = 0; i < index->ncolumns; i++) { @@ -1922,11 +1924,19 @@ check_index_only(RelOptInfo *rel, IndexOptInfo *index) index_canreturn_attrs = bms_add_member(index_canreturn_attrs, attno - FirstLowInvalidHeapAttributeNumber); + else + index_cannotreturn_attrs = + bms_add_member(index_cannotreturn_attrs, + attno - FirstLowInvalidHeapAttributeNumber); } + index_canreturn_attrs = bms_del_members(index_canreturn_attrs, + index_cannotreturn_attrs); + /* Do we have all the necessary attributes? */ result = bms_is_subset(attrs_used, index_canreturn_attrs); + bms_free(attrs_used); bms_free(index_canreturn_attrs); -- 2.9.2