summaryrefslogtreecommitdiff
path: root/contrib/pgstattuple/pgstatindex.c
diff options
context:
space:
mode:
authorTom Lane2007-07-15 23:46:20 +0000
committerTom Lane2007-07-15 23:46:20 +0000
commit93624bcda0dbd1befaba81299831b5f0e64ecdd6 (patch)
tree787b7fbe5245f6977699bb4e2033f57b4e709b4a /contrib/pgstattuple/pgstatindex.c
parent4608f359a61dbdd53c31c9241288cade3197552a (diff)
Fix CHECK_RELATION_BLOCK_RANGE macro, which was not merely producing
a warning but was outright wrong.
Diffstat (limited to 'contrib/pgstattuple/pgstatindex.c')
-rw-r--r--contrib/pgstattuple/pgstatindex.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c
index 6a64d3992a9..0c2c9a14484 100644
--- a/contrib/pgstattuple/pgstatindex.c
+++ b/contrib/pgstattuple/pgstatindex.c
@@ -48,12 +48,13 @@ extern Datum pg_relpages(PG_FUNCTION_ARGS);
#define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID)
#define CHECK_PAGE_OFFSET_RANGE(pg, offnum) { \
- if ( !(FirstOffsetNumber<=(offnum) && \
- (offnum)<=PageGetMaxOffsetNumber(pg)) ) \
+ if ( !(FirstOffsetNumber <= (offnum) && \
+ (offnum) <= PageGetMaxOffsetNumber(pg)) ) \
elog(ERROR, "page offset number out of range"); }
+/* note: BlockNumber is unsigned, hence can't be negative */
#define CHECK_RELATION_BLOCK_RANGE(rel, blkno) { \
- if ( (blkno)<0 && RelationGetNumberOfBlocks((rel))<=(blkno) ) \
+ if ( RelationGetNumberOfBlocks(rel) <= (BlockNumber) (blkno) ) \
elog(ERROR, "block number out of range"); }
/* ------------------------------------------------