Commita3f1c36

committed

Quite limited support for subselects in clausesel.c.

Get rid of #ifdef INDEXSCAN_PATCH in indxpath.c.

1 parentdc892fd commita3f1c36Copy full SHA for a3f1c36

File tree

+12

-15

lines changed

+12

-15

lines changed

Lines changed: 11 additions & 4 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/path/clausesel.c,v 1.4 1997/09/08 21:44:47 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.5 1998/02/13 03:29:36 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -273,12 +273,19 @@ compute_selec(Query root, List clauses, List *or_selectivities)`
`273`	`273`	`/* this isn't an Oper, it's a Func!! */`
`274`	`274`
`275`	`275`	`/*`
`276`		`- *This is not an operator, so we guess at the selectivity.`
`277`		`- * THIS IS A HACK TO GET V4 OUT THE DOOR. FUNCS SHOULD BE*ABLE`
`278`		`- * TO HAVE SELECTIVITIES THEMSELVES. * -- JMH 7/9/92`
	`276`	`+ * This is not an operator, so we guess at the selectivity.`
	`277`	`+ * THIS IS A HACK TO GET V4 OUT THE DOOR. FUNCS SHOULD BE ABLE`
	`278`	`+ * TO HAVE SELECTIVITIES THEMSELVES. -- JMH 7/9/92`
`279`	`279`	`*/`
`280`	`280`	`s1=0.1;`
`281`	`281`	`}`
	`282`	`+elseif (is_subplan ((Node*)clause))`
	`283`	`+{`
	`284`	`+/*`
	`285`	`+ * Just for the moment! FIX ME!- vadim 02/04/98`
	`286`	`+ */`
	`287`	`+s1=1.0;`
	`288`	`+}`
`282`	`289`	`elseif (NumRelids((Node*)clause)==1)`
`283`	`290`	`{`
`284`	`291`

Lines changed: 1 addition & 11 deletions

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.12 1997/11/20 23:21:47 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.13 1998/02/13 03:29:39 vadim Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -614,13 +614,8 @@ match_clause_to_indexkey(Rel *rel,`
`614`	`614`	`/*`
`615`	`615`	`* Check for standard s-argable clause`
`616`	`616`	`*/`
`617`		`-#ifdefINDEXSCAN_PATCH`
`618`		`-/* Handle also function parameters. DZ - 27-8-1996 */`
`619`	`617`	`if ((rightop&&IsA(rightop,Const))\|\|`
`620`	`618`	`(rightop&&IsA(rightop,Param)))`
`621`		`-#else`
`622`		`-if (rightop&&IsA(rightop,Const))`
`623`		`-#endif`
`624`	`619`	`{`
`625`	`620`	`restrict_op= ((Oper) ((Expr)clause)->oper)->opno;`
`626`	`621`	`isIndexable=`
`@@ -634,13 +629,8 @@ match_clause_to_indexkey(Rel *rel,`
`634`	`629`	`/*`
`635`	`630`	`* Must try to commute the clause to standard s-arg format.`
`636`	`631`	`*/`
`637`		`-#ifdefINDEXSCAN_PATCH`
`638`		`-/* ...And here... - vadim 01/22/97 */`
`639`	`632`	`elseif ((leftop&&IsA(leftop,Const))\|\|`
`640`	`633`	`(leftop&&IsA(leftop,Param)))`
`641`		`-#else`
`642`		`-elseif (leftop&&IsA(leftop,Const))`
`643`		`-#endif`
`644`	`634`	`{`
`645`	`635`	`restrict_op=`
`646`	`636`	`get_commutator(((Oper) ((Expr)clause)->oper)->opno);`

Comments

(0)