From 7ee15c05d2fbe7a9dde07867aead93583fbd14ce Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas <heikki.linnakangas@iki.fi> Date: Mon, 2 May 2016 10:07:49 +0300 Subject: [PATCH] Remove unused macros. CHECK_PAGE_OFFSET_RANGE() has been unused forever. CHECK_RELATION_BLOCK_RANGE() has been unused in pgstatindex.c ever since bt_page_stats() and bt_page_items() functions were moved from pgstattuple to pageinspect module. It still exists in pageinspect/btreefuncs.c. Daniel Gustafsson --- contrib/pageinspect/btreefuncs.c | 5 ----- contrib/pgstattuple/pgstatindex.c | 10 ---------- 2 files changed, 15 deletions(-) diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c index bc34af9b3c7..0f36d9d825e 100644 --- a/contrib/pageinspect/btreefuncs.c +++ b/contrib/pageinspect/btreefuncs.c @@ -46,11 +46,6 @@ PG_FUNCTION_INFO_V1(bt_page_stats); #define IS_INDEX(r) ((r)->rd_rel->relkind == RELKIND_INDEX) #define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID) -#define CHECK_PAGE_OFFSET_RANGE(pg, offnum) { \ - 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 ( RelationGetNumberOfBlocks(rel) <= (BlockNumber) (blkno) ) \ diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c index 37cb67afc59..bb954ef7119 100644 --- a/contrib/pgstattuple/pgstatindex.c +++ b/contrib/pgstattuple/pgstatindex.c @@ -46,16 +46,6 @@ PG_FUNCTION_INFO_V1(pg_relpages); #define IS_INDEX(r) ((r)->rd_rel->relkind == RELKIND_INDEX) #define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID) -#define CHECK_PAGE_OFFSET_RANGE(pg, offnum) { \ - 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 ( RelationGetNumberOfBlocks(rel) <= (BlockNumber) (blkno) ) \ - elog(ERROR, "block number out of range"); } - /* ------------------------------------------------ * A structure for a whole btree index statistics * used by pgstatindex(). -- GitLab