Commit748e300

committed

Fix for AND/OR handling.

1 parent06b8c8a commit748e300Copy full SHA for 748e300

File tree

+26

-15

lines changed

+26

-15

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.34 1998/09/01 04:29:33 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.35 1998/09/21 15:41:26 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1293,8 +1293,13 @@ index_innerjoin(Query root, RelOptInfo rel, List *clausegroup_list,`
`1293`	`1293`	`length(clausegroup),`
`1294`	`1294`	`&temp_pages,`
`1295`	`1295`	`&temp_selec);`
	`1296`	`+`
`1296`	`1297`	`pathnode->path.pathtype=T_IndexScan;`
`1297`	`1298`	`pathnode->path.parent=rel;`
	`1299`	`+pathnode->path.p_ordering.ordtype=SORTOP_ORDER;`
	`1300`	`+pathnode->path.p_ordering.ord.sortop=index->ordering;`
	`1301`	`+pathnode->path.keys=NIL;/* not sure about this, bjm 1998/09/21 */`
	`1302`	`+`
`1298`	`1303`	`pathnode->indexid=index->relids;`
`1299`	`1304`	`pathnode->indexkeys=index->indexkeys;`
`1300`	`1305`	`pathnode->indexqual=clausegroup;`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.11 1998/09/01 04:29:41 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.12 1998/09/21 15:41:27 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -104,6 +104,15 @@ create_or_index_paths(Query *root,`
`104`	`104`
`105`	`105`	`pathnode->path.pathtype=T_IndexScan;`
`106`	`106`	`pathnode->path.parent=rel;`
	`107`	`+pathnode->path.p_ordering.ordtype=SORTOP_ORDER;`
	`108`	`+/*`
	`109`	`+ *This is an IndexScan, but it does index lookups based`
	`110`	`+ *on the order of the fields specified in the WHERE clause,`
	`111`	`+ *not in any order, so the sortop is NULL.`
	`112`	`+ */`
	`113`	`+pathnode->path.p_ordering.ord.sortop=NULL;`
	`114`	`+pathnode->path.keys=NIL;/* not sure about this, bjm 1998/09/21 */`
	`115`	`+`
`107`	`116`	`pathnode->indexqual=lcons(clausenode,NIL);`
`108`	`117`	`pathnode->indexid=indexids;`
`109`	`118`	`pathnode->path.path_cost=cost;`

Lines changed: 10 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.12 1998/09/01 04:30:08 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.13 1998/09/21 15:41:28 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -355,20 +355,17 @@ create_index_path(Query *root,`
`355`	`355`	`&npages,`
`356`	`356`	`&selec);`
`357`	`357`	`/* each clause gets an equal selectivity */`
`358`		`-clausesel=`
`359`		`-pow(selec,`
`360`		`-1.0 / (double)length(restriction_clauses));`
	`358`	`+clausesel=pow(selec,1.0 / (double)length(restriction_clauses));`
`361`	`359`
`362`	`360`	`pathnode->indexqual=restriction_clauses;`
`363`		`-pathnode->path.path_cost=`
`364`		`-cost_index(lfirsti(index->relids),`
`365`		`- (int)npages,`
`366`		`-selec,`
`367`		`-rel->pages,`
`368`		`-rel->tuples,`
`369`		`-index->pages,`
`370`		`-index->tuples,`
`371`		`- false);`
	`361`	`+pathnode->path.path_cost=cost_index(lfirsti(index->relids),`
	`362`	`+ (int)npages,`
	`363`	`+selec,`
	`364`	`+rel->pages,`
	`365`	`+rel->tuples,`
	`366`	`+index->pages,`
	`367`	`+index->tuples,`
	`368`	`+ false);`
`372`	`369`
`373`	`370`	`#if0`
`374`	`371`	`/* add in expensive functions cost! -- JMH, 7/7/92 */`

Comments

(0)