diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-13 19:46:01 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-13 19:46:01 +0000 |
| commit | 3a4f7dde16ad81b2319b9a4924a6023710a2fefd (patch) | |
| tree | 248cf66fd94d40072b5ba8bb8e5437a6ea8399e5 /src/backend/executor/nodeHash.c | |
| parent | 77b7a740f95250af7d78f69e9c906c3e53f32e7b (diff) | |
| download | postgresql-3a4f7dde16ad81b2319b9a4924a6023710a2fefd.tar.gz postgresql-3a4f7dde16ad81b2319b9a4924a6023710a2fefd.zip | |
Phase 3 of read-only-plans project: ExecInitExpr now builds expression
execution state trees, and ExecEvalExpr takes an expression state tree
not an expression plan tree. The plan tree is now read-only as far as
the executor is concerned. Next step is to begin actually exploiting
this property.
Diffstat (limited to 'src/backend/executor/nodeHash.c')
| -rw-r--r-- | src/backend/executor/nodeHash.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index 9448ee466a8..45ba826317d 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.69 2002/12/05 15:50:33 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.70 2002/12/13 19:45:52 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -76,7 +76,7 @@ ExecHash(HashState *node) /* * set expression context */ - hashkeys = ((Hash *) node->ps.plan)->hashkeys; + hashkeys = node->hashkeys; econtext = node->ps.ps_ExprContext; /* @@ -138,10 +138,10 @@ ExecInitHash(Hash *node, EState *estate) * initialize child expressions */ hashstate->ps.targetlist = (List *) - ExecInitExpr((Node *) node->plan.targetlist, + ExecInitExpr((Expr *) node->plan.targetlist, (PlanState *) hashstate); hashstate->ps.qual = (List *) - ExecInitExpr((Node *) node->plan.qual, + ExecInitExpr((Expr *) node->plan.qual, (PlanState *) hashstate); /* @@ -554,7 +554,8 @@ ExecHashGetBucket(HashJoinTable hashtable, /* * Get the join attribute value of the tuple */ - keyval = ExecEvalExpr(lfirst(hk), econtext, &isNull, NULL); + keyval = ExecEvalExpr((ExprState *) lfirst(hk), + econtext, &isNull, NULL); /* * Compute the hash function |