summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2005-11-18 23:08:43 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2005-11-18 23:08:43 +0000
commite03c5e2d5a32bb01e4cb8eaee67d3b05819dc97b (patch)
treedc4e17a9ab0ecb8debfbcf4e39643ef66e793077 /src
parent48fabd257fef6f9798cef8b57bb300ab368b8055 (diff)
Fix performance issue in exprTypmod(): for a COALESCE expression, it
recursed twice on its first argument, leading to exponential time spent on a deep nest of COALESCEs ... such as a deeply nested FULL JOIN would produce. Per report from Matt Carter.
Diffstat (limited to 'src')
-rw-r--r--src/backend/parser/parse_expr.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 6c0c53d0748..2cfa43caf9a 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.163.2.3 2005/05/25 02:13:48 ishii Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.163.2.4 2005/11/18 23:08:43 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1425,8 +1425,12 @@ exprTypmod(Node *expr)
int32 typmod;
List *arg;
+ if (exprType((Node *) lfirst(cexpr->args)) != coalescetype)
+ return -1;
typmod = exprTypmod((Node *) lfirst(cexpr->args));
- foreach(arg, cexpr->args)
+ if (typmod < 0)
+ return -1; /* no point in trying harder */
+ foreach(arg, lnext(cexpr->args))
{
Node *e = (Node *) lfirst(arg);