mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to constant-fold functions returning RECORD, since the optimizer

Browse Source 
isn't presently set up to pass them an expected tuple descriptor.  Bug has
been there since 7.3 but was just recently reported by Thomas Hallgren.
This commit is contained in:
Tom Lane 2005-04-14 21:44:09 +00:00
parent b79a718fac
commit 939712ee73
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/optimizer/util/clauses.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.194 2005/04/10 20:57:32 tgl Exp $ * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.195 2005/04/14 21:44:09 tgl Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -19,6 +19,7 @@
#include "postgres.h" #include "postgres.h"
#include "access/heapam.h"
#include "catalog/pg_aggregate.h" #include "catalog/pg_aggregate.h"
#include "catalog/pg_language.h" #include "catalog/pg_language.h"
#include "catalog/pg_operator.h" #include "catalog/pg_operator.h"
@ -2103,6 +2104,16 @@ evaluate_function(Oid funcid, Oid result_type, List *args,
if (funcform->proretset) if (funcform->proretset)
return NULL; return NULL;
/*
* Can't simplify if it returns RECORD, except in the case where it has
* OUT parameters, since it will be needing an expected tupdesc which we
* can't supply here.
*/
if (funcform->prorettype == RECORDOID &&
(heap_attisnull(func_tuple, Anum_pg_proc_proallargtypes) ||
heap_attisnull(func_tuple, Anum_pg_proc_proargmodes)))
return NULL;
/* /*
* Check for constant inputs and especially constant-NULL inputs. * Check for constant inputs and especially constant-NULL inputs.
*/ */