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/executor | |
| 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/executor')
| -rw-r--r-- | src/backend/executor/execQual.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index a5604537515..8f025cfba5e 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.257 2009/12/29 17:40:59 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.258 2010/01/01 23:03:09 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -3475,7 +3475,7 @@ ExecEvalNullTest(NullTestState *nstate, if (isDone && *isDone == ExprEndResult) return result; /* nothing to check */ - if (nstate->argisrow && !(*isNull)) + if (ntest->argisrow && !(*isNull)) { HeapTupleHeader tuple; Oid tupType; @@ -4704,7 +4704,6 @@ ExecInitExpr(Expr *node, PlanState *parent) nstate->xprstate.evalfunc = (ExprStateEvalFunc) ExecEvalNullTest; nstate->arg = ExecInitExpr(ntest->arg, parent); - nstate->argisrow = type_is_rowtype(exprType((Node *) ntest->arg)); nstate->argdesc = NULL; state = (ExprState *) nstate; } |