diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-08-19 02:04:17 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-08-19 02:04:17 +0000 |
| commit | 7971539020a344dce3a8b3b9b93ff4f10e2f823a (patch) | |
| tree | 8dca0af0d3ac8d431bff8c0dec793fe9733a1ee9 /src/backend/executor/nodeTee.c | |
| parent | 31de2c9461dff3284ad61084c73eba093fa3f68e (diff) | |
| download | postgresql-7971539020a344dce3a8b3b9b93ff4f10e2f823a.tar.gz postgresql-7971539020a344dce3a8b3b9b93ff4f10e2f823a.zip | |
heap_fetch requires buffer pointer, must be released; heap_getnext
no longer returns buffer pointer, can be gotten from scan;
descriptor; bootstrap can create multi-key indexes;
pg_procname index now is multi-key index; oidint2, oidint4, oidname
are gone (must be removed from regression tests); use System Cache
rather than sequential scan in many places; heap_modifytuple no
longer takes buffer parameter; remove unused buffer parameter in
a few other functions; oid8 is not index-able; remove some use of
single-character variable names; cleanup Buffer variables usage
and scan descriptor looping; cleaned up allocation and freeing of
tuples; 18k lines of diff;
Diffstat (limited to 'src/backend/executor/nodeTee.c')
| -rw-r--r-- | src/backend/executor/nodeTee.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/backend/executor/nodeTee.c b/src/backend/executor/nodeTee.c index c23c7d65d40..c7a0a99a277 100644 --- a/src/backend/executor/nodeTee.c +++ b/src/backend/executor/nodeTee.c @@ -15,7 +15,7 @@ * ExecEndTee * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.20 1998/08/06 05:12:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.21 1998/08/19 02:02:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -303,7 +303,6 @@ ExecTee(Tee *node, Plan *parent) HeapTuple heapTuple; Relation bufferRel; HeapScanDesc scanDesc; - Buffer buffer; estate = ((Plan *) node)->state; teeState = node->teestate; @@ -366,10 +365,7 @@ ExecTee(Tee *node, Plan *parent) HeapTuple throwAway; /* Buffer buffer; */ - throwAway = heap_getnext(scanDesc, - ScanDirectionIsBackward(dir), - /* &buffer */ - (Buffer *) NULL); + throwAway = heap_getnext(scanDesc,ScanDirectionIsBackward(dir)); } /* @@ -393,9 +389,7 @@ ExecTee(Tee *node, Plan *parent) scanDesc = (parent == node->leftParent) ? teeState->tee_leftScanDesc : teeState->tee_rightScanDesc; - heapTuple = heap_getnext(scanDesc, - ScanDirectionIsBackward(dir), - &buffer); + heapTuple = heap_getnext(scanDesc, ScanDirectionIsBackward(dir)); /* * Increase the pin count on the buffer page, because the tuple @@ -404,15 +398,15 @@ ExecTee(Tee *node, Plan *parent) * count on the next iteration. */ - if (buffer != InvalidBuffer) - IncrBufferRefCount(buffer); + if (scanDesc->rs_cbuf != InvalidBuffer) + IncrBufferRefCount(scanDesc->rs_cbuf); slot = teeState->cstate.cs_ResultTupleSlot; slot->ttc_tupleDescriptor = RelationGetTupleDescriptor(bufferRel); result = ExecStoreTuple(heapTuple, /* tuple to store */ slot, /* slot to store in */ - buffer, /* this tuple's buffer */ + scanDesc->rs_cbuf, /* this tuple's buffer */ false); /* don't free stuff from * heap_getnext */ |