diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1997-03-18 18:41:37 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1997-03-18 18:41:37 +0000 |
| commit | d1463050658950afd25ef2457182a498b6b3a6b4 (patch) | |
| tree | 76ad055d2f01e42f7b3ec88f6ec5f788dee67143 /src/backend/access/nbtree/nbtree.c | |
| parent | c3d637ac3a79fa899cccada4c4ce185697245015 (diff) | |
| download | postgresql-d1463050658950afd25ef2457182a498b6b3a6b4.tar.gz | |
Patches for Vadim's multikey indexing...
Diffstat (limited to 'src/backend/access/nbtree/nbtree.c')
| -rw-r--r-- | src/backend/access/nbtree/nbtree.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 8317789a94..0fe6787c01 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.15 1997/02/22 10:04:14 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.16 1997/03/18 18:38:35 scrappy Exp $ * * NOTES * This file contains only the public interface routines. @@ -423,6 +423,7 @@ btrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey) /* reset the scan key */ so->numberOfKeys = scan->numberOfKeys; + so->numberOfFirstKeys = 0; so->qual_ok = 1; /* may be changed by _bt_orderkeys */ if (scan->numberOfKeys > 0) { memmove(scan->keyData, @@ -433,7 +434,9 @@ btrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey) so->numberOfKeys * sizeof(ScanKeyData)); /* order the keys in the qualification */ if (so->numberOfKeys > 1) - _bt_orderkeys(scan->relation, &so->numberOfKeys, so->keyData, &so->qual_ok); + _bt_orderkeys(scan->relation, so); + else + so->numberOfFirstKeys = 1; } /* finally, be sure that the scan exploits the tree order */ |