diff options
| author | Tom Lane | 2009-04-19 19:46:33 +0000 |
|---|---|---|
| committer | Tom Lane | 2009-04-19 19:46:33 +0000 |
| commit | 1d97c19a0f748e94b9582dcbaec33ad74be062f9 (patch) | |
| tree | dc701c3e1de608b76284d5ac34e7566c4b7a8b56 /src/include/optimizer/var.h | |
| parent | 3a624e9200bbd8b88d7724e1448fe530f32e2c3c (diff) | |
Fix estimate_num_groups() to not fail on PlaceHolderVars, per report from
Stefan Kaltenbrunner. The most reasonable behavior (at least for the near
term) seems to be to ignore the PlaceHolderVar and examine its argument
instead. In support of this, change the API of pull_var_clause() to allow
callers to request recursion into PlaceHolderVars. Currently
estimate_num_groups() is the only customer for that behavior, but where
there's one there may be others.
Diffstat (limited to 'src/include/optimizer/var.h')
| -rw-r--r-- | src/include/optimizer/var.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h index 83b181932e5..5d19572e0d9 100644 --- a/src/include/optimizer/var.h +++ b/src/include/optimizer/var.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/var.h,v 1.40 2009/01/01 17:24:00 momjian Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/var.h,v 1.41 2009/04/19 19:46:33 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -16,6 +16,12 @@ #include "nodes/relation.h" +typedef enum +{ + PVC_REJECT_PLACEHOLDERS, /* throw error if PlaceHolderVar found */ + PVC_INCLUDE_PLACEHOLDERS, /* include PlaceHolderVars in output list */ + PVC_RECURSE_PLACEHOLDERS /* recurse into PlaceHolderVar argument */ +} PVCPlaceHolderBehavior; extern Relids pull_varnos(Node *node); extern void pull_varattnos(Node *node, Bitmapset **varattnos); @@ -24,7 +30,7 @@ extern bool contain_vars_of_level(Node *node, int levelsup); extern int locate_var_of_level(Node *node, int levelsup); extern int locate_var_of_relation(Node *node, int relid, int levelsup); extern int find_minimum_var_level(Node *node); -extern List *pull_var_clause(Node *node, bool includePlaceHolderVars); +extern List *pull_var_clause(Node *node, PVCPlaceHolderBehavior behavior); extern Node *flatten_join_alias_vars(PlannerInfo *root, Node *node); #endif /* VAR_H */ |