diff options
Diffstat (limited to 'src/backend/access/nbtree')
| -rw-r--r-- | src/backend/access/nbtree/nbtinsert.c | 8 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtsearch.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 463a0f00fe3..b891716a895 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.55 2000/02/18 06:32:33 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.56 2000/03/17 02:36:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -257,7 +257,7 @@ _bt_insertonpg(Relation rel, BlockNumber itup_blkno; OffsetNumber itup_off; OffsetNumber firstright = InvalidOffsetNumber; - int itemsz; + Size itemsz; bool do_split = false; bool keys_equal = false; @@ -279,7 +279,7 @@ _bt_insertonpg(Relation rel, * Note that at this point, itemsz doesn't include the ItemId. */ if (itemsz > (PageGetPageSize(page)-sizeof(PageHeaderData)-MAXALIGN(sizeof(BTPageOpaqueData)))/3 - sizeof(ItemIdData)) - elog(ERROR, "btree: index item size %d exceeds maximum %ld", + elog(ERROR, "btree: index item size %u exceeds maximum %lu", itemsz, (PageGetPageSize(page)-sizeof(PageHeaderData)-MAXALIGN(sizeof(BTPageOpaqueData)))/3 - sizeof(ItemIdData)); @@ -1374,7 +1374,7 @@ _bt_tuplecompare(Relation rel, tupDes = RelationGetDescr(rel); - for (i = 1; i <= keysz; i++) + for (i = 1; i <= (int) keysz; i++) { ScanKey entry = &scankey[i - 1]; Datum attrDatum1, diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 99a172e46d8..f36da9743f8 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.57 2000/02/18 06:32:39 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.58 2000/03/17 02:36:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -272,7 +272,7 @@ _bt_skeycmp(Relation rel, tupDes = RelationGetDescr(rel); - for (i = 1; i <= keysz; i++) + for (i = 1; i <= (int) keysz; i++) { ScanKey entry = &scankey[i - 1]; Datum attrDatum; @@ -658,7 +658,7 @@ _bt_next(IndexScanDesc scan, ScanDirection dir) } } while (keysok >= so->numberOfFirstKeys || - (keysok == -1 && ScanDirectionIsBackward(dir))); + (keysok == ((Size) -1) && ScanDirectionIsBackward(dir))); ItemPointerSetInvalid(current); so->btso_curbuf = InvalidBuffer; @@ -1026,7 +1026,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir) so->btso_curbuf = buf; return _bt_next(scan, dir); } - else if (keysok == -1 && ScanDirectionIsBackward(dir)) + else if (keysok == ((Size) -1) && ScanDirectionIsBackward(dir)) { so->btso_curbuf = buf; return _bt_next(scan, dir); @@ -1501,7 +1501,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir) so->btso_curbuf = buf; return _bt_next(scan, dir); } - else if (keysok == -1 && ScanDirectionIsBackward(dir)) + else if (keysok == ((Size) -1) && ScanDirectionIsBackward(dir)) { so->btso_curbuf = buf; return _bt_next(scan, dir); |