NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit1e85fa2

committed

patternsel() was improperly stripping RelabelType from the derived

expressions it constructed, causing scalarineqsel to become confusedif the underlying variable was of a domain type. Per report fromKevin Grittner.

1 parent7148de1 commit1e85fa2Copy full SHA for 1e85fa2

File tree

1 file changed

+10

-8

lines changed

src/backend/utils/adt
- selfuncs.c

1 file changed

+10

-8

lines changed

`‎src/backend/utils/adt/selfuncs.c`

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.178 2005/04/25 01:30:14 tgl Exp $`
	`18`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.179 2005/06/01 17:05:11 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -163,7 +163,7 @@ static void examine_variable(Query root, Node node, int varRelid,`
`163`	`163`	`staticdoubleget_variable_numdistinct(VariableStatData*vardata);`
`164`	`164`	`staticboolget_variable_maximum(Queryroot,VariableStatDatavardata,`
`165`	`165`	`Oidsortop,Datum*max);`
`166`		`-staticSelectivityprefix_selectivity(Queryroot,VariableStatDatavardata,`
	`166`	`+staticSelectivityprefix_selectivity(Queryroot,Nodevariable,`
`167`	`167`	`Oidopclass,Const*prefix);`
`168`	`168`	`staticSelectivitypattern_selectivity(Const*patt,Pattern_Typeptype);`
`169`	`169`	`staticDatumstring_to_datum(constchar*str,Oiddatatype);`
`@@ -812,6 +812,7 @@ patternsel(PG_FUNCTION_ARGS, Pattern_Type ptype)`
`812`	`812`	`Listargs= (List)PG_GETARG_POINTER(2);`
`813`	`813`	`intvarRelid=PG_GETARG_INT32(3);`
`814`	`814`	`VariableStatDatavardata;`
	`815`	`+Node*variable;`
`815`	`816`	`Node*other;`
`816`	`817`	`boolvaronleft;`
`817`	`818`	`Datumconstval;`
`@@ -836,6 +837,7 @@ patternsel(PG_FUNCTION_ARGS, Pattern_Type ptype)`
`836`	`837`	`ReleaseVariableStats(vardata);`
`837`	`838`	`returnDEFAULT_MATCH_SEL;`
`838`	`839`	`}`
	`840`	`+variable= (Node*)linitial(args);`
`839`	`841`
`840`	`842`	`/*`
`841`	`843`	`* If the constant is NULL, assume operator is strict and return zero,`
`@@ -939,7 +941,7 @@ patternsel(PG_FUNCTION_ARGS, Pattern_Type ptype)`
`939`	`941`
`940`	`942`	`if (eqopr==InvalidOid)`
`941`	`943`	`elog(ERROR,"no = operator for opclass %u",opclass);`
`942`		`-eqargs=list_make2(vardata.var,prefix);`
	`944`	`+eqargs=list_make2(variable,prefix);`
`943`	`945`	`result=DatumGetFloat8(DirectFunctionCall4(eqsel,`
`944`	`946`	`PointerGetDatum(root),`
`945`	`947`	`ObjectIdGetDatum(eqopr),`
`@@ -958,7 +960,7 @@ patternsel(PG_FUNCTION_ARGS, Pattern_Type ptype)`
`958`	`960`	`Selectivityselec;`
`959`	`961`
`960`	`962`	`if (pstatus==Pattern_Prefix_Partial)`
`961`		`-prefixsel=prefix_selectivity(root,&vardata,opclass,prefix);`
	`963`	`+prefixsel=prefix_selectivity(root,variable,opclass,prefix);`
`962`	`964`	`else`
`963`	`965`	`prefixsel=1.0;`
`964`	`966`	`restsel=pattern_selectivity(rest,ptype);`
`@@ -3694,7 +3696,7 @@ pattern_fixed_prefix(Const *patt, Pattern_Type ptype,`
`3694`	`3696`	`* more useful to use the upper-bound code than not.`
`3695`	`3697`	`*/`
`3696`	`3698`	`staticSelectivity`
`3697`		`-prefix_selectivity(Queryroot,VariableStatDatavardata,`
	`3699`	`+prefix_selectivity(Queryroot,Nodevariable,`
`3698`	`3700`	`Oidopclass,Const*prefixcon)`
`3699`	`3701`	`{`
`3700`	`3702`	`Selectivityprefixsel;`
`@@ -3706,7 +3708,7 @@ prefix_selectivity(Query root, VariableStatData vardata,`
`3706`	`3708`	`BTGreaterEqualStrategyNumber);`
`3707`	`3709`	`if (cmpopr==InvalidOid)`
`3708`	`3710`	`elog(ERROR,"no >= operator for opclass %u",opclass);`
`3709`		`-cmpargs=list_make2(vardata->var,prefixcon);`
	`3711`	`+cmpargs=list_make2(variable,prefixcon);`
`3710`	`3712`	`/* Assume scalargtsel is appropriate for all supported types */`
`3711`	`3713`	`prefixsel=DatumGetFloat8(DirectFunctionCall4(scalargtsel,`
`3712`	`3714`	`PointerGetDatum(root),`
`@@ -3728,7 +3730,7 @@ prefix_selectivity(Query root, VariableStatData vardata,`
`3728`	`3730`	`BTLessStrategyNumber);`
`3729`	`3731`	`if (cmpopr==InvalidOid)`
`3730`	`3732`	`elog(ERROR,"no < operator for opclass %u",opclass);`
`3731`		`-cmpargs=list_make2(vardata->var,greaterstrcon);`
	`3733`	`+cmpargs=list_make2(variable,greaterstrcon);`
`3732`	`3734`	`/* Assume scalarltsel is appropriate for all supported types */`
`3733`	`3735`	`topsel=DatumGetFloat8(DirectFunctionCall4(scalarltsel,`
`3734`	`3736`	`PointerGetDatum(root),`
`@@ -3743,7 +3745,7 @@ prefix_selectivity(Query root, VariableStatData vardata,`
`3743`	`3745`	`prefixsel=topsel+prefixsel-1.0;`
`3744`	`3746`
`3745`	`3747`	`/* Adjust for double-exclusion of NULLs */`
`3746`		`-prefixsel+=nulltestsel(root,IS_NULL,vardata->var,0);`
	`3748`	`+prefixsel+=nulltestsel(root,IS_NULL,variable,0);`
`3747`	`3749`
`3748`	`3750`	`/*`
`3749`	`3751`	`* A zero or slightly negative prefixsel should be converted into`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1e85fa2

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/selfuncs.c`

0 commit comments