From 83d3626b1f43cb507755d27e914e6788c17cd8ac Mon Sep 17 00:00:00 2001 From: "Vadim B. Mikheev" Date: Fri, 31 Jul 1998 15:10:40 +0000 Subject: [PATCH] Matching clauses to functional indices was broken, now fixed. --- src/backend/optimizer/path/indxpath.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 3a30a8a7fd..3722688a21 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.18 1998/07/27 19:37:58 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.19 1998/07/31 15:10:40 vadim Exp $ * *------------------------------------------------------------------------- */ @@ -405,10 +405,10 @@ group_clauses_by_indexkey(RelOptInfo *rel, int curIndxKey; Oid curClass; - if (clauseinfo_list == NIL) + if (clauseinfo_list == NIL || indexkeys[0] == 0) return NIL; - while (!DoneMatchingIndexKeys(indexkeys, index)) + do { List *tempgroup = NIL; @@ -438,7 +438,7 @@ group_clauses_by_indexkey(RelOptInfo *rel, indexkeys++; classes++; - } + } while (!DoneMatchingIndexKeys(indexkeys, index)); /* clausegroup holds all matched clauses ordered by indexkeys */ @@ -469,10 +469,10 @@ group_clauses_by_ikey_for_joins(RelOptInfo *rel, Oid curClass; bool jfound = false; - if (join_cinfo_list == NIL) + if (join_cinfo_list == NIL || indexkeys[0] == 0) return NIL; - while (!DoneMatchingIndexKeys(indexkeys, index)) + do { List *tempgroup = NIL; @@ -518,7 +518,7 @@ group_clauses_by_ikey_for_joins(RelOptInfo *rel, indexkeys++; classes++; - } + } while (!DoneMatchingIndexKeys(indexkeys, index)); /* clausegroup holds all matched clauses ordered by indexkeys */