Don't assume a subquery's output is unique if there's a SRF in its tlist.
While the x output of "select x from t group by x" can be presumed unique, this does not hold for "select x, generate_series(1,10) from t group by x", because we may expand the set-returning function after the grouping step. (Perhaps that should be re-thought; but considering all the other oddities involved with SRFs in targetlists, it seems unlikely we'll change it.) Put a check in query_is_distinct_for() so it's not fooled by such cases. Back-patch to all supported branches. David Rowley
This commit is contained in:
parent
e78791ea7c
commit
2e7469dc8b
@ -19,6 +19,7 @@
|
|||||||
#include "catalog/pg_operator.h"
|
#include "catalog/pg_operator.h"
|
||||||
#include "executor/executor.h"
|
#include "executor/executor.h"
|
||||||
#include "miscadmin.h"
|
#include "miscadmin.h"
|
||||||
|
#include "nodes/nodeFuncs.h"
|
||||||
#include "optimizer/clauses.h"
|
#include "optimizer/clauses.h"
|
||||||
#include "optimizer/cost.h"
|
#include "optimizer/cost.h"
|
||||||
#include "optimizer/pathnode.h"
|
#include "optimizer/pathnode.h"
|
||||||
@ -1093,6 +1094,17 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
|
|||||||
|
|
||||||
Assert(list_length(colnos) == list_length(opids));
|
Assert(list_length(colnos) == list_length(opids));
|
||||||
|
|
||||||
|
/*
|
||||||
|
* A set-returning function in the query's targetlist can result in
|
||||||
|
* returning duplicate rows, if the SRF is evaluated after the
|
||||||
|
* de-duplication step; so we play it safe and say "no" if there are any
|
||||||
|
* SRFs. (We could be certain that it's okay if SRFs appear only in the
|
||||||
|
* specified columns, since those must be evaluated before de-duplication;
|
||||||
|
* but it doesn't presently seem worth the complication to check that.)
|
||||||
|
*/
|
||||||
|
if (expression_returns_set((Node *) query->targetList))
|
||||||
|
return false;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* DISTINCT (including DISTINCT ON) guarantees uniqueness if all the
|
* DISTINCT (including DISTINCT ON) guarantees uniqueness if all the
|
||||||
* columns in the DISTINCT clause appear in colnos and operator semantics
|
* columns in the DISTINCT clause appear in colnos and operator semantics
|
||||||
|
@ -650,3 +650,15 @@ select * from int4_tbl where
|
|||||||
0
|
0
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Check for incorrect optimization when IN subquery contains a SRF
|
||||||
|
--
|
||||||
|
set enable_hashjoin to 0;
|
||||||
|
select * from int4_tbl o where (f1, f1) in
|
||||||
|
(select f1, generate_series(1,2) / 10 g from int4_tbl i group by f1);
|
||||||
|
f1
|
||||||
|
----
|
||||||
|
0
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
reset enable_hashjoin;
|
||||||
|
@ -396,3 +396,11 @@ where a.thousand = b.thousand
|
|||||||
select * from int4_tbl where
|
select * from int4_tbl where
|
||||||
(case when f1 in (select unique1 from tenk1 a) then f1 else null end) in
|
(case when f1 in (select unique1 from tenk1 a) then f1 else null end) in
|
||||||
(select ten from tenk1 b);
|
(select ten from tenk1 b);
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Check for incorrect optimization when IN subquery contains a SRF
|
||||||
|
--
|
||||||
|
set enable_hashjoin to 0;
|
||||||
|
select * from int4_tbl o where (f1, f1) in
|
||||||
|
(select f1, generate_series(1,2) / 10 g from int4_tbl i group by f1);
|
||||||
|
reset enable_hashjoin;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user