diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-01-01 23:03:10 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-01-01 23:03:10 +0000 |
| commit | 7839d35991f1c79a291e67635d5f4c5750c16e9b (patch) | |
| tree | 98f44976c68f2ac0b707f4efcc8f3949cdc9ac68 /src/backend/optimizer/plan/planagg.c | |
| parent | 29c4ad98293e3c5cb3fcdd413a3f4904efff8762 (diff) | |
| download | postgresql-7839d35991f1c79a291e67635d5f4c5750c16e9b.tar.gz postgresql-7839d35991f1c79a291e67635d5f4c5750c16e9b.zip | |
Add an "argisrow" field to NullTest nodes, following a plan made way back in
8.2beta but never carried out. This avoids repetitive tests of whether the
argument is of scalar or composite type. Also, be a bit more paranoid about
composite arguments in some places where we previously weren't checking.
Diffstat (limited to 'src/backend/optimizer/plan/planagg.c')
| -rw-r--r-- | src/backend/optimizer/plan/planagg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c index a32a06fc28d..aa841ccff56 100644 --- a/src/backend/optimizer/plan/planagg.c +++ b/src/backend/optimizer/plan/planagg.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.48 2010/01/01 21:53:49 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.49 2010/01/01 23:03:10 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -308,6 +308,9 @@ build_minmax_path(PlannerInfo *root, RelOptInfo *rel, MinMaxAggInfo *info) ntest = makeNode(NullTest); ntest->nulltesttype = IS_NOT_NULL; ntest->arg = copyObject(info->target); + ntest->argisrow = type_is_rowtype(exprType((Node *) ntest->arg)); + if (ntest->argisrow) + return false; /* punt on composites */ info->notnulltest = ntest; /* |