diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-05-20 23:51:44 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-05-20 23:51:44 +0000 |
| commit | 44fbe20d620d4f2e39aaa9896de4683e55b0d317 (patch) | |
| tree | 5717c7d32f5f7ef72318c70c641129176820a2d0 /src/backend/access/nbtree/nbtutils.c | |
| parent | c961474c96fd1fedc25896a1de9a98caeedfbe49 (diff) | |
| download | postgresql-44fbe20d620d4f2e39aaa9896de4683e55b0d317.tar.gz postgresql-44fbe20d620d4f2e39aaa9896de4683e55b0d317.zip | |
Restructure indexscan API (index_beginscan, index_getnext) per
yesterday's proposal to pghackers. Also remove unnecessary parameters
to heap_beginscan, heap_rescan. I modified pg_proc.h to reflect the
new numbers of parameters for the AM interface routines, but did not
force an initdb because nothing actually looks at those fields.
Diffstat (limited to 'src/backend/access/nbtree/nbtutils.c')
| -rw-r--r-- | src/backend/access/nbtree/nbtutils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index 55c4c323001..2f596eac111 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.47 2001/10/25 05:49:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.48 2002/05/20 23:51:41 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -195,7 +195,7 @@ _bt_orderkeys(Relation relation, BTScanOpaque so) { ScanKeyData xform[BTMaxStrategyNumber]; bool init[BTMaxStrategyNumber]; - uint16 numberOfKeys = so->numberOfKeys; + int numberOfKeys = so->numberOfKeys; ScanKey key; ScanKey cur; StrategyMap map; @@ -203,7 +203,7 @@ _bt_orderkeys(Relation relation, BTScanOpaque so) int i, j; AttrNumber attno; - uint16 new_numberOfKeys; + int new_numberOfKeys; bool allEqualSoFar; so->qual_ok = true; @@ -439,10 +439,10 @@ _bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, ScanDirection dir, bool *continuescan) { BTScanOpaque so = (BTScanOpaque) scan->opaque; - Size keysz = so->numberOfKeys; + int keysz = so->numberOfKeys; + int keysok; TupleDesc tupdesc; ScanKey key; - Size keysok; *continuescan = true; @@ -450,7 +450,7 @@ _bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, if (keysz == 0) return true; - tupdesc = RelationGetDescr(scan->relation); + tupdesc = RelationGetDescr(scan->indexRelation); key = so->keyData; keysok = 0; |