Matching clauses to functional indices was broken, now fixed.

diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 3a30a8a7fdc32686a10b84e6579cc210cbba87aa..3722688a21b4aa908fbb7a78edde5a2de53c16c0 100644 (file)
--- 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 */