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/access/rtree/rtree.c | |
| parent | 31de2c9461dff3284ad61084c73eba093fa3f68e (diff) | |
| download | postgresql-7971539020a344dce3a8b3b9b93ff4f10e2f823a.tar.gz | |
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/access/rtree/rtree.c')
| -rw-r--r-- | src/backend/access/rtree/rtree.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c index f8ea84a6d0..c86fec6c3a 100644 --- a/src/backend/access/rtree/rtree.c +++ b/src/backend/access/rtree/rtree.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.25 1998/07/27 19:37:41 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.26 1998/08/19 02:01:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -86,7 +86,6 @@ rtbuild(Relation heap, PredInfo *predInfo) { HeapScanDesc scan; - Buffer buffer; AttrNumber i; HeapTuple htup; IndexTuple itup; @@ -95,6 +94,7 @@ rtbuild(Relation heap, InsertIndexResult res; Datum *d; bool *nulls; + Buffer buffer = InvalidBuffer; int nb, nh, ni; @@ -164,15 +164,14 @@ rtbuild(Relation heap, slot = NULL; } #endif /* OMIT_PARTIAL_INDEX */ - scan = heap_beginscan(heap, 0, SnapshotNow, 0, (ScanKey) NULL); - htup = heap_getnext(scan, 0, &buffer); /* count the tuples as we insert them */ nh = ni = 0; - for (; HeapTupleIsValid(htup); htup = heap_getnext(scan, 0, &buffer)) - { + scan = heap_beginscan(heap, 0, SnapshotNow, 0, (ScanKey) NULL); + while (HeapTupleIsValid(htup = heap_getnext(scan, 0))) + { nh++; /* @@ -234,8 +233,7 @@ rtbuild(Relation heap, attoff, attnum, finfo, - &attnull, - buffer); + &attnull); nulls[attoff] = (attnull ? 'n' : ' '); } @@ -278,8 +276,8 @@ rtbuild(Relation heap, * flushed. We close them to guarantee that they will be. */ - hrelid = heap->rd_id; - irelid = index->rd_id; + hrelid = RelationGetRelid(heap); + irelid = RelationGetRelid(index); heap_close(heap); index_close(index); |