77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.22 1999/03/0813:35:50 momjian Exp $
10+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.23 1999/03/0814:01:55 momjian Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
3333
3434static void
3535best_or_subclause_indices (Query * root ,RelOptInfo * rel ,List * subclauses ,
36- List * indices ,List * examined_indexids ,Cost subcost ,List * selectivities ,
37- List * * indexids ,Cost * cost ,List * * selecs );
36+ List * indices ,List * * indexids ,Cost * cost ,Cost * selec );
3837static void best_or_subclause_index (Query * root ,RelOptInfo * rel ,Expr * subclause ,
3938List * indices ,int * indexid ,Cost * cost ,Cost * selec );
4039
@@ -87,20 +86,17 @@ create_or_index_paths(Query *root,
8786if (index_flag )
8887{/* used to be a lisp every function */
8988IndexPath * pathnode = makeNode (IndexPath );
90- List * indexids ;
89+ List * indexids = NIL ;
9190Cost cost ;
92- List * selecs ;
91+ Cost selec ;
9392
9493best_or_subclause_indices (root ,
9594rel ,
9695clausenode -> clause -> args ,
9796clausenode -> indexids ,
98- NIL ,
99- (Cost )0 ,
100- NIL ,
10197& indexids ,
10298& cost ,
103- & selecs );
99+ & selec );
104100
105101pathnode -> path .pathtype = T_IndexScan ;
106102pathnode -> path .parent = rel ;
@@ -132,7 +128,7 @@ create_or_index_paths(Query *root,
132128((Path * )pathnode )-> path_cost += xfunc_get_path_cost ((Path )pathnode );
133129}
134130#endif
135- clausenode -> selectivity = (Cost )floatVal ( lfirst ( selecs )) ;
131+ clausenode -> selectivity = (Cost )selec ;
136132t_list = lappend (t_list ,pathnode );
137133}
138134}
@@ -154,8 +150,7 @@ create_or_index_paths(Query *root,
154150 * 'examined_indexids' is a list of those index ids to be used with
155151 *subclauses that have already been examined
156152 * 'subcost' is the cost of using the indices in 'examined_indexids'
157- * 'selectivities' is a list of the selectivities of subclauses that
158- *have already been examined
153+ * 'selec' is a list of all subclauses that have already been examined
159154 *
160155 * Returns a list of the indexids, cost, and selectivities of each
161156 * subclause, e.g., ((i1 i2 i3) cost (s1 s2 s3)), where 'i' is an OID,
@@ -166,15 +161,15 @@ best_or_subclause_indices(Query *root,
166161RelOptInfo * rel ,
167162List * subclauses ,
168163List * indices ,
169- List * examined_indexids ,
170- Cost subcost ,
171- List * selectivities ,
172164List * * indexids ,/* return value */
173- Cost * cost ,/* return value */
174- List * * selecs ) /* return value */
165+ Cost * cost ,/* return value */
166+ Cost * selec ) /* return value */
175167{
176- List * slist ;
168+ List * slist ;
177169
170+ * selec = (Cost )0.0 ;
171+ * cost = (Cost )0.0 ;
172+
178173foreach (slist ,subclauses )
179174{
180175int best_indexid ;
@@ -184,17 +179,15 @@ best_or_subclause_indices(Query *root,
184179best_or_subclause_index (root ,rel ,lfirst (slist ),lfirst (indices ),
185180& best_indexid ,& best_cost ,& best_selec );
186181
187- examined_indexids = lappendi (examined_indexids ,best_indexid );
188- subcost += best_cost ;
189- selectivities = lappend (selectivities ,makeFloat (best_selec ));
182+ * indexids = lappendi (* indexids ,best_indexid );
183+ * cost += best_cost ;
184+ * selec += best_selec ;
185+ if (* selec > (Cost )1.0 )
186+ * selec = (Cost )1.0 ;
190187
191188indices = lnext (indices );
192189}
193190
194- * indexids = examined_indexids ;
195- * cost = subcost ;
196- * selecs = selectivities ;
197-
198191return ;
199192}
200193