diff options
| -rw-r--r-- | src/backend/optimizer/path/indxpath.c | 23 | ||||
| -rw-r--r-- | src/backend/utils/adt/selfuncs.c | 7 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 2d5a09b1b45..e0933fc24d0 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -253,7 +253,7 @@ create_index_paths(PlannerInfo *root, RelOptInfo *rel) IndexOptInfo *index = (IndexOptInfo *) lfirst(lc); /* Protect limited-size array in IndexClauseSets */ - Assert(index->ncolumns <= INDEX_MAX_KEYS); + Assert(index->nkeycolumns <= INDEX_MAX_KEYS); /* * Ignore partial indexes that do not match the query. @@ -468,7 +468,7 @@ consider_index_join_clauses(PlannerInfo *root, RelOptInfo *rel, * relation itself is also included in the relids set. considered_relids * lists all relids sets we've already tried. */ - for (indexcol = 0; indexcol < index->ncolumns; indexcol++) + for (indexcol = 0; indexcol < index->nkeycolumns; indexcol++) { /* Consider each applicable simple join clause */ considered_clauses += list_length(jclauseset->indexclauses[indexcol]); @@ -623,7 +623,7 @@ get_join_index_paths(PlannerInfo *root, RelOptInfo *rel, /* Identify indexclauses usable with this relids set */ MemSet(&clauseset, 0, sizeof(clauseset)); - for (indexcol = 0; indexcol < index->ncolumns; indexcol++) + for (indexcol = 0; indexcol < index->nkeycolumns; indexcol++) { ListCell *lc; @@ -920,7 +920,7 @@ build_index_paths(PlannerInfo *root, RelOptInfo *rel, index_clauses = NIL; found_lower_saop_clause = false; outer_relids = bms_copy(rel->lateral_relids); - for (indexcol = 0; indexcol < index->ncolumns; indexcol++) + for (indexcol = 0; indexcol < index->nkeycolumns; indexcol++) { ListCell *lc; @@ -3237,11 +3237,12 @@ match_pathkeys_to_index(IndexOptInfo *index, List *pathkeys, /* * We allow any column of the index to match each pathkey; they * don't have to match left-to-right as you might expect. This is - * correct for GiST, which is the sole existing AM supporting - * amcanorderbyop. We might need different logic in future for - * other implementations. + * correct for GiST, and it doesn't matter for SP-GiST because + * that doesn't handle multiple columns anyway, and no other + * existing AMs support amcanorderbyop. We might need different + * logic in future for other implementations. */ - for (indexcol = 0; indexcol < index->ncolumns; indexcol++) + for (indexcol = 0; indexcol < index->nkeycolumns; indexcol++) { Expr *expr; @@ -3672,7 +3673,7 @@ relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel, * Try to find each index column in the lists of conditions. This is * O(N^2) or worse, but we expect all the lists to be short. */ - for (c = 0; c < ind->ncolumns; c++) + for (c = 0; c < ind->nkeycolumns; c++) { bool matched = false; ListCell *lc; @@ -3747,8 +3748,8 @@ relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel, break; /* no match; this index doesn't help us */ } - /* Matched all columns of this index? */ - if (c == ind->ncolumns) + /* Matched all key columns of this index? */ + if (c == ind->nkeycolumns) return true; } diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 1ef6faecd1e..b9f99fa050b 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -4869,6 +4869,10 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid, * it to expressional index columns, in hopes of finding some * statistics. * + * Note that we consider all index columns including INCLUDE columns, + * since there could be stats for such columns. But the test for + * uniqueness needs to be warier. + * * XXX it's conceivable that there are multiple matches with different * index opfamilies; if so, we need to pick one that matches the * operator we are estimating for. FIXME later. @@ -4904,6 +4908,7 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid, */ if (index->unique && index->nkeycolumns == 1 && + pos == 0 && (index->indpred == NIL || index->predOK)) vardata->isunique = true; @@ -7242,7 +7247,7 @@ btcostestimate(PlannerInfo *root, IndexPath *path, double loop_count, if (index->reverse_sort[0]) varCorrelation = -varCorrelation; - if (index->ncolumns > 1) + if (index->nkeycolumns > 1) costs.indexCorrelation = varCorrelation * 0.75; else costs.indexCorrelation = varCorrelation; |