diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-01-15 19:00:16 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-01-15 19:00:16 +0000 |
| commit | 763ff8aef848d71da079049890786edffc3302d6 (patch) | |
| tree | a1aed2a633c409071dd6d724b6db2bc7bf4fcb75 /src/backend/rewrite/locks.c | |
| parent | f22d8e6668e36a5855c35b04cc21a4d1593298d9 (diff) | |
| download | postgresql-763ff8aef848d71da079049890786edffc3302d6.tar.gz postgresql-763ff8aef848d71da079049890786edffc3302d6.zip | |
Remove Query->qry_aggs and qry_numaggs and replace with Query->hasAggs.
Pass List* of Aggregs into executor, and create needed array there.
No longer need to double-processs Aggregs with second copy in Query.
Fix crash when doing:
select sum(x+1) from test where 1 > 0;
Diffstat (limited to 'src/backend/rewrite/locks.c')
| -rw-r--r-- | src/backend/rewrite/locks.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c index 70dc37080e2..b0557b042e1 100644 --- a/src/backend/rewrite/locks.c +++ b/src/backend/rewrite/locks.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.6 1998/01/04 04:31:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.7 1998/01/15 19:00:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,7 +95,6 @@ thisLockWasTriggered(int varno, AttrNumber attnum, Query *parsetree) { - int i; if (nodeThisLockWasTriggered(parsetree->qual, varno, attnum)) return true; @@ -103,10 +102,6 @@ thisLockWasTriggered(int varno, if (nodeThisLockWasTriggered((Node *) parsetree->targetList, varno, attnum)) return true; - for(i=0; i < parsetree->qry_numAgg; i++) - if (nodeThisLockWasTriggered(parsetree->qry_aggs[i]->target, - varno, attnum)) - return true; return false; } |