diff options
Diffstat (limited to 'src/backend/optimizer/path')
| -rw-r--r-- | src/backend/optimizer/path/indxpath.c | 23 | ||||
| -rw-r--r-- | src/backend/optimizer/path/pathkeys.c | 68 |
2 files changed, 21 insertions, 70 deletions
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 7090a7e0c0..9ab146a1f7 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -199,14 +199,15 @@ create_index_paths(PlannerInfo *root, RelOptInfo *rel) true, NULL, SAOP_FORBID, ST_ANYSCAN); /* - * Submit all the ones that can form plain IndexScan plans to add_path. (A - * plain IndexPath always represents a plain IndexScan plan; however some - * of the indexes might support only bitmap scans, and those we mustn't - * submit to add_path here.) Also, pick out the ones that might be useful - * as bitmap scans. For that, we must discard indexes that don't support - * bitmap scans, and we also are only interested in paths that have some - * selectivity; we should discard anything that was generated solely for - * ordering purposes. + * Submit all the ones that can form plain IndexScan plans to add_path. + * (A plain IndexPath might represent either a plain IndexScan or an + * IndexOnlyScan, but for our purposes here the distinction does not + * matter. However, some of the indexes might support only bitmap scans, + * and those we mustn't submit to add_path here.) Also, pick out the ones + * that might be useful as bitmap scans. For that, we must discard + * indexes that don't support bitmap scans, and we also are only + * interested in paths that have some selectivity; we should discard + * anything that was generated solely for ordering purposes. */ bitindexpaths = NIL; foreach(l, indexpaths) @@ -1107,11 +1108,9 @@ check_index_only(RelOptInfo *rel, IndexOptInfo *index) /* * For the moment, we just ignore index expressions. It might be nice - * to do something with them, later. We also ignore index columns - * that are system columns (such as OID), because the virtual-tuple - * coding used by IndexStoreHeapTuple() can't deal with them. + * to do something with them, later. */ - if (attno <= 0) + if (attno == 0) continue; index_attrs = diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c index e5228a81c6..d32fbba237 100644 --- a/src/backend/optimizer/path/pathkeys.c +++ b/src/backend/optimizer/path/pathkeys.c @@ -25,7 +25,6 @@ #include "optimizer/pathnode.h" #include "optimizer/paths.h" #include "optimizer/tlist.h" -#include "parser/parsetree.h" #include "utils/lsyscache.h" @@ -35,8 +34,6 @@ static PathKey *make_canonical_pathkey(PlannerInfo *root, EquivalenceClass *eclass, Oid opfamily, int strategy, bool nulls_first); static bool pathkey_is_redundant(PathKey *new_pathkey, List *pathkeys); -static Var *find_indexkey_var(PlannerInfo *root, RelOptInfo *rel, - AttrNumber varattno); static bool right_merge_direction(PlannerInfo *root, PathKey *pathkey); @@ -504,21 +501,24 @@ build_index_pathkeys(PlannerInfo *root, ScanDirection scandir) { List *retval = NIL; - ListCell *indexprs_item; + ListCell *lc; int i; if (index->sortopfamily == NULL) return NIL; /* non-orderable index */ - indexprs_item = list_head(index->indexprs); - for (i = 0; i < index->ncolumns; i++) + i = 0; + foreach(lc, index->indextlist) { + TargetEntry *indextle = (TargetEntry *) lfirst(lc); + Expr *indexkey; bool reverse_sort; bool nulls_first; - int ikey; - Expr *indexkey; PathKey *cpathkey; + /* We assume we don't need to make a copy of the tlist item */ + indexkey = indextle->expr; + if (ScanDirectionIsBackward(scandir)) { reverse_sort = !index->reverse_sort[i]; @@ -530,21 +530,6 @@ build_index_pathkeys(PlannerInfo *root, nulls_first = index->nulls_first[i]; } - ikey = index->indexkeys[i]; - if (ikey != 0) - { - /* simple index column */ - indexkey = (Expr *) find_indexkey_var(root, index->rel, ikey); - } - else - { - /* expression --- assume we need not copy it */ - if (indexprs_item == NULL) - elog(ERROR, "wrong number of index expressions"); - indexkey = (Expr *) lfirst(indexprs_item); - indexprs_item = lnext(indexprs_item); - } - /* OK, try to make a canonical pathkey for this sort key */ cpathkey = make_pathkey_from_sortinfo(root, indexkey, @@ -568,44 +553,11 @@ build_index_pathkeys(PlannerInfo *root, /* Add to list unless redundant */ if (!pathkey_is_redundant(cpathkey, retval)) retval = lappend(retval, cpathkey); - } - return retval; -} - -/* - * Find or make a Var node for the specified attribute of the rel. - * - * We first look for the var in the rel's target list, because that's - * easy and fast. But the var might not be there (this should normally - * only happen for vars that are used in WHERE restriction clauses, - * but not in join clauses or in the SELECT target list). In that case, - * gin up a Var node the hard way. - */ -static Var * -find_indexkey_var(PlannerInfo *root, RelOptInfo *rel, AttrNumber varattno) -{ - ListCell *temp; - Index relid; - Oid reloid, - vartypeid, - varcollid; - int32 type_mod; - - foreach(temp, rel->reltargetlist) - { - Var *var = (Var *) lfirst(temp); - - if (IsA(var, Var) && - var->varattno == varattno) - return var; + i++; } - relid = rel->relid; - reloid = getrelid(relid, root->parse->rtable); - get_atttypetypmodcoll(reloid, varattno, &vartypeid, &type_mod, &varcollid); - - return makeVar(relid, varattno, vartypeid, type_mod, varcollid, 0); + return retval; } /* |