Remove unneeded casts of BufferGetPage() result

BufferGetPage() already returns type Page, so casting it to Page
doesn't achieve anything.  A sizable number of call sites does this
casting; remove that.

This was already done inconsistently in the code in the first import
in 1996 (but didn't exist in the pre-1995 code), and it was then
apparently just copied around.

Author: Kirill Reshke <reshkekirill@gmail.com>
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Reviewed-by: Richard Guo <guofenglinux@gmail.com>
Reviewed-by: Álvaro Herrera <alvherre@kurilemu.de>
Reviewed-by: Peter Eisentraut <peter@eisentraut.org>
Discussion: https://www.postgresql.org/message-id/flat/CALdSSPgFhc5=vLqHdk-zCcnztC0zEY3EU_Q6a9vPEaw7FkE9Vw@mail.gmail.com

diff --git a/contrib/amcheck/verify_gin.c b/contrib/amcheck/verify_gin.c
index c615d950736f6e26e63bb708a2c3c69edef0c272..5c3eb4d0fd4f45de1e32e42fe2c7cdb9a11e5f94 100644 (file)
--- a/contrib/amcheck/verify_gin.c
+++ b/contrib/amcheck/verify_gin.c
@@ -174,7 +174,7 @@ gin_check_posting_tree_parent_keys_consistency(Relation rel, BlockNumber posting
                buffer = ReadBufferExtended(rel, MAIN_FORKNUM, stack->blkno,
                                                                        RBM_NORMAL, strategy);
                LockBuffer(buffer, GIN_SHARE);
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                Assert(GinPageIsData(page));
 
@@ -434,7 +434,7 @@ gin_check_parent_keys_consistency(Relation rel,
                buffer = ReadBufferExtended(rel, MAIN_FORKNUM, stack->blkno,
                                                                        RBM_NORMAL, strategy);
                LockBuffer(buffer, GIN_SHARE);
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
                maxoff = PageGetMaxOffsetNumber(page);
                rightlink = GinPageGetOpaque(page)->rightlink;
 

diff --git a/contrib/bloom/blvacuum.c b/contrib/bloom/blvacuum.c
index 86b15a75f6fb9d6b29fb2af417f932af4c16e5e2..9e5f0574fad2ee05c5097986bdc4a0301e4a7359 100644 (file)
--- a/contrib/bloom/blvacuum.c
+++ b/contrib/bloom/blvacuum.c
@@ -192,7 +192,7 @@ blvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
                buffer = ReadBufferExtended(index, MAIN_FORKNUM, blkno,
                                                                        RBM_NORMAL, info->strategy);
                LockBuffer(buffer, BUFFER_LOCK_SHARE);
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                if (PageIsNew(page) || BloomPageIsDeleted(page))
                {

diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c
index 4b9d76ec4e4dff2a7ea9ec07f7dacd4290869ef5..40823d54fcac08c6333b1dc5cfd035378b023efb 100644 (file)
--- a/contrib/pgstattuple/pgstatindex.c
+++ b/contrib/pgstattuple/pgstatindex.c
@@ -647,7 +647,7 @@ pgstathashindex(PG_FUNCTION_ARGS)
                buf = ReadBufferExtended(rel, MAIN_FORKNUM, blkno, RBM_NORMAL,
                                                                 bstrategy);
                LockBuffer(buf, BUFFER_LOCK_SHARE);
-               page = (Page) BufferGetPage(buf);
+               page = BufferGetPage(buf);
 
                if (PageIsNew(page))
                        stats.unused_pages++;

diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
index 0d9c2b0b6536944a7d9582c8562d262347ac8ab8..b5de68b7232d2a0d279a6c6a5e9ff57cdd153ab9 100644 (file)
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -378,7 +378,7 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)
                        buffer = ReadBufferExtended(rel, MAIN_FORKNUM, block,
                                                                                RBM_NORMAL, hscan->rs_strategy);
                        LockBuffer(buffer, BUFFER_LOCK_SHARE);
-                       stat.free_space += PageGetExactFreeSpace((Page) BufferGetPage(buffer));
+                       stat.free_space += PageGetExactFreeSpace(BufferGetPage(buffer));
                        UnlockReleaseBuffer(buffer);
                        block++;
                }
@@ -391,7 +391,7 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)
                buffer = ReadBufferExtended(rel, MAIN_FORKNUM, block,
                                                                        RBM_NORMAL, hscan->rs_strategy);
                LockBuffer(buffer, BUFFER_LOCK_SHARE);
-               stat.free_space += PageGetExactFreeSpace((Page) BufferGetPage(buffer));
+               stat.free_space += PageGetExactFreeSpace(BufferGetPage(buffer));
                UnlockReleaseBuffer(buffer);
                block++;
        }

diff --git a/src/backend/access/brin/brin_xlog.c b/src/backend/access/brin/brin_xlog.c
index 85db2f0fd5acea9bc096f4d86b472a1a9a7ea321..55348140fad3b028b6e127ca3277f25b4e417642 100644 (file)
--- a/src/backend/access/brin/brin_xlog.c
+++ b/src/backend/access/brin/brin_xlog.c
@@ -31,7 +31,7 @@ brin_xlog_createidx(XLogReaderState *record)
        /* create the index' metapage */
        buf = XLogInitBufferForRedo(record, 0);
        Assert(BufferIsValid(buf));
-       page = (Page) BufferGetPage(buf);
+       page = BufferGetPage(buf);
        brin_metapage_init(page, xlrec->pagesPerRange, xlrec->version);
        PageSetLSN(page, lsn);
        MarkBufferDirty(buf);
@@ -82,7 +82,7 @@ brin_xlog_insert_update(XLogReaderState *record,
 
                Assert(tuple->bt_blkno == xlrec->heapBlk);
 
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
                offnum = xlrec->offnum;
                if (PageGetMaxOffsetNumber(page) + 1 < offnum)
                        elog(PANIC, "brin_xlog_insert_update: invalid max offset number");
@@ -104,7 +104,7 @@ brin_xlog_insert_update(XLogReaderState *record,
                ItemPointerData tid;
 
                ItemPointerSet(&tid, regpgno, xlrec->offnum);
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                brinSetHeapBlockItemptr(buffer, xlrec->pagesPerRange, xlrec->heapBlk,
                                                                tid);
@@ -146,7 +146,7 @@ brin_xlog_update(XLogReaderState *record)
                Page            page;
                OffsetNumber offnum;
 
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                offnum = xlrec->oldOffnum;
 
@@ -185,7 +185,7 @@ brin_xlog_samepage_update(XLogReaderState *record)
 
                brintuple = (BrinTuple *) XLogRecGetBlockData(record, 0, &tuplen);
 
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                offnum = xlrec->offnum;
 
@@ -254,7 +254,7 @@ brin_xlog_revmap_extend(XLogReaderState *record)
         */
 
        buf = XLogInitBufferForRedo(record, 1);
-       page = (Page) BufferGetPage(buf);
+       page = BufferGetPage(buf);
        brin_page_init(page, BRIN_PAGETYPE_REVMAP);
 
        PageSetLSN(page, lsn);

diff --git a/src/backend/access/gin/ginvacuum.c b/src/backend/access/gin/ginvacuum.c
index fbbe3a6dd7046690bd0fefd2076a08f12f263ed3..2d833d6d618753d19a0253d5ed5c84a240557e81 100644 (file)
--- a/src/backend/access/gin/ginvacuum.c
+++ b/src/backend/access/gin/ginvacuum.c
@@ -753,7 +753,7 @@ ginvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
                buffer = ReadBufferExtended(index, MAIN_FORKNUM, blkno,
                                                                        RBM_NORMAL, info->strategy);
                LockBuffer(buffer, GIN_SHARE);
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                if (GinPageIsRecyclable(page))
                {

diff --git a/src/backend/access/gin/ginxlog.c b/src/backend/access/gin/ginxlog.c
index 55a1ec09776ba35fbbcc306d01df332ab05c20ab..4478e92820494349195268a921826abaaf1872a1 100644 (file)
--- a/src/backend/access/gin/ginxlog.c
+++ b/src/backend/access/gin/ginxlog.c
@@ -30,7 +30,7 @@ ginRedoClearIncompleteSplit(XLogReaderState *record, uint8 block_id)
 
        if (XLogReadBufferForRedo(record, block_id, &buffer) == BLK_NEEDS_REDO)
        {
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
                GinPageGetOpaque(page)->flags &= ~GIN_INCOMPLETE_SPLIT;
 
                PageSetLSN(page, lsn);
@@ -50,7 +50,7 @@ ginRedoCreatePTree(XLogReaderState *record)
        Page            page;
 
        buffer = XLogInitBufferForRedo(record, 0);
-       page = (Page) BufferGetPage(buffer);
+       page = BufferGetPage(buffer);
 
        GinInitBuffer(buffer, GIN_DATA | GIN_LEAF | GIN_COMPRESSED);
 

diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 7b24380c97801bee7595d033136043d17e7d90ad..a96796d5c7da9a0589c50f3c637ab7719cb17714 100644 (file)
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -696,7 +696,7 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace,
                        gistcheckpage(state.r, stack->buffer);
                }
 
-               stack->page = (Page) BufferGetPage(stack->buffer);
+               stack->page = BufferGetPage(stack->buffer);
                stack->lsn = xlocked ?
                        PageGetLSN(stack->page) : BufferGetLSNAtomic(stack->buffer);
                Assert(!RelationNeedsWAL(state.r) || !XLogRecPtrIsInvalid(stack->lsn));
@@ -783,7 +783,7 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace,
                                        LockBuffer(stack->buffer, GIST_UNLOCK);
                                        LockBuffer(stack->buffer, GIST_EXCLUSIVE);
                                        xlocked = true;
-                                       stack->page = (Page) BufferGetPage(stack->buffer);
+                                       stack->page = BufferGetPage(stack->buffer);
 
                                        if (PageGetLSN(stack->page) != stack->lsn)
                                        {
@@ -847,7 +847,7 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace,
                                LockBuffer(stack->buffer, GIST_UNLOCK);
                                LockBuffer(stack->buffer, GIST_EXCLUSIVE);
                                xlocked = true;
-                               stack->page = (Page) BufferGetPage(stack->buffer);
+                               stack->page = BufferGetPage(stack->buffer);
                                stack->lsn = PageGetLSN(stack->page);
 
                                if (stack->blkno == GIST_ROOT_BLKNO)
@@ -938,7 +938,7 @@ gistFindPath(Relation r, BlockNumber child, OffsetNumber *downlinkoffnum)
                buffer = ReadBuffer(r, top->blkno);
                LockBuffer(buffer, GIST_SHARE);
                gistcheckpage(r, buffer);
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                if (GistPageIsLeaf(page))
                {
@@ -1033,7 +1033,7 @@ gistFindCorrectParent(Relation r, GISTInsertStack *child, bool is_build)
        GISTInsertStack *ptr;
 
        gistcheckpage(r, parent->buffer);
-       parent->page = (Page) BufferGetPage(parent->buffer);
+       parent->page = BufferGetPage(parent->buffer);
        maxoff = PageGetMaxOffsetNumber(parent->page);
 
        /* Check if the downlink is still where it was before */
@@ -1098,7 +1098,7 @@ gistFindCorrectParent(Relation r, GISTInsertStack *child, bool is_build)
                parent->buffer = ReadBuffer(r, parent->blkno);
                LockBuffer(parent->buffer, GIST_EXCLUSIVE);
                gistcheckpage(r, parent->buffer);
-               parent->page = (Page) BufferGetPage(parent->buffer);
+               parent->page = BufferGetPage(parent->buffer);
        }
 
        /*
@@ -1121,7 +1121,7 @@ gistFindCorrectParent(Relation r, GISTInsertStack *child, bool is_build)
        while (ptr)
        {
                ptr->buffer = ReadBuffer(r, ptr->blkno);
-               ptr->page = (Page) BufferGetPage(ptr->buffer);
+               ptr->page = BufferGetPage(ptr->buffer);
                ptr = ptr->parent;
        }
 

diff --git a/src/backend/access/gist/gistbuild.c b/src/backend/access/gist/gistbuild.c
index 9e707167d984b8be5a664100335b50bfe94264d0..9b2ec9815f17ed81d2ae91aec4f958426c5c5eed 100644 (file)
--- a/src/backend/access/gist/gistbuild.c
+++ b/src/backend/access/gist/gistbuild.c
@@ -969,7 +969,7 @@ gistProcessItup(GISTBuildState *buildstate, IndexTuple itup,
                buffer = ReadBuffer(indexrel, blkno);
                LockBuffer(buffer, GIST_EXCLUSIVE);
 
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
                childoffnum = gistchoose(indexrel, page, itup, giststate);
                iid = PageGetItemId(page, childoffnum);
                idxtuple = (IndexTuple) PageGetItem(page, iid);
@@ -1448,7 +1448,7 @@ gistGetMaxLevel(Relation index)
                 * pro forma.
                 */
                LockBuffer(buffer, GIST_SHARE);
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                if (GistPageIsLeaf(page))
                {

diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c
index dca236b6e57359b85bbe1554315ffcfbd1174d5d..b925eda2b9b42affee7d02906405ff1e49ab85e3 100644 (file)
--- a/src/backend/access/gist/gistvacuum.c
+++ b/src/backend/access/gist/gistvacuum.c
@@ -330,7 +330,7 @@ restart:
         * exclusive lock.
         */
        LockBuffer(buffer, GIST_EXCLUSIVE);
-       page = (Page) BufferGetPage(buffer);
+       page = BufferGetPage(buffer);
 
        if (gistPageRecyclable(page))
        {
@@ -528,7 +528,7 @@ gistvacuum_delete_empty_pages(IndexVacuumInfo *info, GistVacState *vstate)
                                                                        RBM_NORMAL, info->strategy);
 
                LockBuffer(buffer, GIST_SHARE);
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                if (PageIsNew(page) || GistPageIsDeleted(page) || GistPageIsLeaf(page))
                {

diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c
index b354e4ba5d1b7ffae41d83c56da94745dd0be8fb..42fee1f0764fa7b33aa99f8b94ef08242b8b9e3b 100644 (file)
--- a/src/backend/access/gist/gistxlog.c
+++ b/src/backend/access/gist/gistxlog.c
@@ -83,7 +83,7 @@ gistRedoPageUpdateRecord(XLogReaderState *record)
 
                data = begin = XLogRecGetBlockData(record, 0, &datalen);
 
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                if (xldata->ntodelete == 1 && xldata->ntoinsert == 1)
                {
@@ -201,7 +201,7 @@ gistRedoDeleteRecord(XLogReaderState *record)
 
        if (XLogReadBufferForRedo(record, 0, &buffer) == BLK_NEEDS_REDO)
        {
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                PageIndexMultiDelete(page, toDelete, xldata->ntodelete);
 
@@ -280,7 +280,7 @@ gistRedoPageSplitRecord(XLogReaderState *record)
                }
 
                buffer = XLogInitBufferForRedo(record, i + 1);
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
                data = XLogRecGetBlockData(record, i + 1, &datalen);
 
                tuples = decodePageSplitRecord(data, datalen, &num);
@@ -348,7 +348,7 @@ gistRedoPageDelete(XLogReaderState *record)
 
        if (XLogReadBufferForRedo(record, 0, &leafBuffer) == BLK_NEEDS_REDO)
        {
-               Page            page = (Page) BufferGetPage(leafBuffer);
+               Page            page = BufferGetPage(leafBuffer);
 
                GistPageSetDeleted(page, xldata->deleteXid);
 
@@ -358,7 +358,7 @@ gistRedoPageDelete(XLogReaderState *record)
 
        if (XLogReadBufferForRedo(record, 1, &parentBuffer) == BLK_NEEDS_REDO)
        {
-               Page            page = (Page) BufferGetPage(parentBuffer);
+               Page            page = BufferGetPage(parentBuffer);
 
                PageIndexTupleDelete(page, xldata->downlinkOffset);
 

diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c
index 8d97067fe54036906c2a5c8a4ee474268ba71ea0..d963a0c370292423dad71203feccc28fc0c3bfd2 100644 (file)
--- a/src/backend/access/hash/hash_xlog.c
+++ b/src/backend/access/hash/hash_xlog.c
@@ -38,7 +38,7 @@ hash_xlog_init_meta_page(XLogReaderState *record)
        Assert(BufferIsValid(metabuf));
        _hash_init_metabuffer(metabuf, xlrec->num_tuples, xlrec->procid,
                                                  xlrec->ffactor, true);
-       page = (Page) BufferGetPage(metabuf);
+       page = BufferGetPage(metabuf);
        PageSetLSN(page, lsn);
        MarkBufferDirty(metabuf);
 
@@ -235,7 +235,7 @@ hash_xlog_add_ovfl_page(XLogReaderState *record)
 
                if (XLogReadBufferForRedo(record, 2, &mapbuffer) == BLK_NEEDS_REDO)
                {
-                       Page            mappage = (Page) BufferGetPage(mapbuffer);
+                       Page            mappage = BufferGetPage(mapbuffer);
                        uint32     *freep = NULL;
                        uint32     *bitmap_page_bit;
 
@@ -538,7 +538,7 @@ hash_xlog_move_page_contents(XLogReaderState *record)
 
                data = begin = XLogRecGetBlockData(record, 1, &datalen);
 
-               writepage = (Page) BufferGetPage(writebuf);
+               writepage = BufferGetPage(writebuf);
 
                if (xldata->ntups > 0)
                {
@@ -584,7 +584,7 @@ hash_xlog_move_page_contents(XLogReaderState *record)
 
                ptr = XLogRecGetBlockData(record, 2, &len);
 
-               page = (Page) BufferGetPage(deletebuf);
+               page = BufferGetPage(deletebuf);
 
                if (len > 0)
                {
@@ -670,7 +670,7 @@ hash_xlog_squeeze_page(XLogReaderState *record)
 
                data = begin = XLogRecGetBlockData(record, 1, &datalen);
 
-               writepage = (Page) BufferGetPage(writebuf);
+               writepage = BufferGetPage(writebuf);
 
                if (xldata->ntups > 0)
                {
@@ -807,7 +807,7 @@ hash_xlog_squeeze_page(XLogReaderState *record)
        /* replay the record for bitmap page */
        if (XLogReadBufferForRedo(record, 5, &mapbuf) == BLK_NEEDS_REDO)
        {
-               Page            mappage = (Page) BufferGetPage(mapbuf);
+               Page            mappage = BufferGetPage(mapbuf);
                uint32     *freep = NULL;
                char       *data;
                uint32     *bitmap_page_bit;
@@ -895,7 +895,7 @@ hash_xlog_delete(XLogReaderState *record)
 
                ptr = XLogRecGetBlockData(record, 1, &len);
 
-               page = (Page) BufferGetPage(deletebuf);
+               page = BufferGetPage(deletebuf);
 
                if (len > 0)
                {
@@ -946,7 +946,7 @@ hash_xlog_split_cleanup(XLogReaderState *record)
        {
                HashPageOpaque bucket_opaque;
 
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                bucket_opaque = HashPageGetOpaque(page);
                bucket_opaque->hasho_flag &= ~LH_BUCKET_NEEDS_SPLIT_CLEANUP;
@@ -1029,7 +1029,7 @@ hash_xlog_vacuum_one_page(XLogReaderState *record)
 
        if (action == BLK_NEEDS_REDO)
        {
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                PageIndexMultiDelete(page, toDelete, xldata->ntuples);
 

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 7491cc3cb93bcab370311968505656a01c86c4e0..e3e7307ef5f7953c6a16077d08799e97267c1a27 100644 (file)
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -6099,7 +6099,7 @@ heap_finish_speculative(Relation relation, ItemPointer tid)
 
        buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(tid));
        LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
-       page = (Page) BufferGetPage(buffer);
+       page = BufferGetPage(buffer);
 
        offnum = ItemPointerGetOffsetNumber(tid);
        if (PageGetMaxOffsetNumber(page) >= offnum)

diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
index cb4bc35c93ed4d28d74c9db9fa1c4da2b17386ee..bcbac844bb66962236c1a6bc8b7f11d11db37815 100644 (file)
--- a/src/backend/access/heap/heapam_handler.c
+++ b/src/backend/access/heap/heapam_handler.c
@@ -2280,7 +2280,7 @@ heapam_scan_sample_next_tuple(TableScanDesc scan, SampleScanState *scanstate,
        if (!pagemode)
                LockBuffer(hscan->rs_cbuf, BUFFER_LOCK_SHARE);
 
-       page = (Page) BufferGetPage(hscan->rs_cbuf);
+       page = BufferGetPage(hscan->rs_cbuf);
        all_visible = PageIsAllVisible(page) &&
                !scan->rs_snapshot->takenDuringRecovery;
        maxoffset = PageGetMaxOffsetNumber(page);

diff --git a/src/backend/access/heap/heapam_xlog.c b/src/backend/access/heap/heapam_xlog.c
index eb4bd3d6ae3a3cd4281a1e4c03326b4b2403c37e..5d48f071f53a74b87b8e500fe5f929c2d6bd6431 100644 (file)
--- a/src/backend/access/heap/heapam_xlog.c
+++ b/src/backend/access/heap/heapam_xlog.c
@@ -78,7 +78,7 @@ heap_xlog_prune_freeze(XLogReaderState *record)
                                                                                   &buffer);
        if (action == BLK_NEEDS_REDO)
        {
-               Page            page = (Page) BufferGetPage(buffer);
+               Page            page = BufferGetPage(buffer);
                OffsetNumber *redirected;
                OffsetNumber *nowdead;
                OffsetNumber *nowunused;
@@ -599,7 +599,7 @@ heap_xlog_multi_insert(XLogReaderState *record)
                tupdata = XLogRecGetBlockData(record, 0, &len);
                endptr = tupdata + len;
 
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                for (i = 0; i < xlrec->ntuples; i++)
                {
@@ -801,7 +801,7 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
        else if (XLogRecGetInfo(record) & XLOG_HEAP_INIT_PAGE)
        {
                nbuffer = XLogInitBufferForRedo(record, 0);
-               page = (Page) BufferGetPage(nbuffer);
+               page = BufferGetPage(nbuffer);
                PageInit(page, BufferGetPageSize(nbuffer), 0);
                newaction = BLK_NEEDS_REDO;
        }
@@ -1027,7 +1027,7 @@ heap_xlog_lock(XLogReaderState *record)
 
        if (XLogReadBufferForRedo(record, 0, &buffer) == BLK_NEEDS_REDO)
        {
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                offnum = xlrec->offnum;
                if (PageGetMaxOffsetNumber(page) >= offnum)

diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
index a8025889be0883747086146b6b88bbf798f0385b..7ebd22f00a37045b0eafa70c49f4eb79dece5846 100644 (file)
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@ -1563,7 +1563,7 @@ heap_page_prune_execute(Buffer buffer, bool lp_truncate_only,
                                                OffsetNumber *nowdead, int ndead,
                                                OffsetNumber *nowunused, int nunused)
 {
-       Page            page = (Page) BufferGetPage(buffer);
+       Page            page = BufferGetPage(buffer);
        OffsetNumber *offnum;
        HeapTupleHeader htup PG_USED_FOR_ASSERTS_ONLY;
 

diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c
index 8f918e00af7edc7b1a9964d046ff32c1251231e9..953ad4a48439913acd19c05aa97203d3966f9fa6 100644 (file)
--- a/src/backend/access/heap/visibilitymap.c
+++ b/src/backend/access/heap/visibilitymap.c
@@ -259,7 +259,7 @@ visibilitymap_set(Relation rel, BlockNumber heapBlk, Buffer heapBuf,
 #endif
 
        Assert(InRecovery || XLogRecPtrIsInvalid(recptr));
-       Assert(InRecovery || PageIsAllVisible((Page) BufferGetPage(heapBuf)));
+       Assert(InRecovery || PageIsAllVisible(BufferGetPage(heapBuf)));
        Assert((flags & VISIBILITYMAP_VALID_BITS) == flags);
 
        /* Must never set all_frozen bit without also setting all_visible bit */

diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index d31dd56732d2f3a7e32e1f63dc85c06c6855892a..69ea668bb0d923474fcf925e992f27b430e17ff6 100644 (file)
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -143,7 +143,7 @@ _bt_clear_incomplete_split(XLogReaderState *record, uint8 block_id)
 
        if (XLogReadBufferForRedo(record, block_id, &buf) == BLK_NEEDS_REDO)
        {
-               Page            page = (Page) BufferGetPage(buf);
+               Page            page = BufferGetPage(buf);
                BTPageOpaque pageop = BTPageGetOpaque(page);
 
                Assert(P_INCOMPLETE_SPLIT(pageop));
@@ -287,7 +287,7 @@ btree_xlog_split(bool newitemonleft, XLogReaderState *record)
        /* Reconstruct right (new) sibling page from scratch */
        rbuf = XLogInitBufferForRedo(record, 1);
        datapos = XLogRecGetBlockData(record, 1, &datalen);
-       rpage = (Page) BufferGetPage(rbuf);
+       rpage = BufferGetPage(rbuf);
 
        _bt_pageinit(rpage, BufferGetPageSize(rbuf));
        ropaque = BTPageGetOpaque(rpage);
@@ -314,7 +314,7 @@ btree_xlog_split(bool newitemonleft, XLogReaderState *record)
                 * checking possible.  See also _bt_restore_page(), which does the
                 * same for the right page.
                 */
-               Page            origpage = (Page) BufferGetPage(buf);
+               Page            origpage = BufferGetPage(buf);
                BTPageOpaque oopaque = BTPageGetOpaque(origpage);
                OffsetNumber off;
                IndexTuple      newitem = NULL,
@@ -439,7 +439,7 @@ btree_xlog_split(bool newitemonleft, XLogReaderState *record)
 
                if (XLogReadBufferForRedo(record, 2, &sbuf) == BLK_NEEDS_REDO)
                {
-                       Page            spage = (Page) BufferGetPage(sbuf);
+                       Page            spage = BufferGetPage(sbuf);
                        BTPageOpaque spageop = BTPageGetOpaque(spage);
 
                        spageop->btpo_prev = rightpagenumber;
@@ -470,7 +470,7 @@ btree_xlog_dedup(XLogReaderState *record)
        if (XLogReadBufferForRedo(record, 0, &buf) == BLK_NEEDS_REDO)
        {
                char       *ptr = XLogRecGetBlockData(record, 0, NULL);
-               Page            page = (Page) BufferGetPage(buf);
+               Page            page = BufferGetPage(buf);
                BTPageOpaque opaque = BTPageGetOpaque(page);
                OffsetNumber offnum,
                                        minoff,
@@ -614,7 +614,7 @@ btree_xlog_vacuum(XLogReaderState *record)
        {
                char       *ptr = XLogRecGetBlockData(record, 0, NULL);
 
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                if (xlrec->nupdated > 0)
                {
@@ -680,7 +680,7 @@ btree_xlog_delete(XLogReaderState *record)
        {
                char       *ptr = XLogRecGetBlockData(record, 0, NULL);
 
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                if (xlrec->nupdated > 0)
                {
@@ -740,7 +740,7 @@ btree_xlog_mark_page_halfdead(uint8 info, XLogReaderState *record)
                OffsetNumber nextoffset;
                BlockNumber rightsib;
 
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
                pageop = BTPageGetOpaque(page);
 
                poffset = xlrec->poffset;
@@ -769,7 +769,7 @@ btree_xlog_mark_page_halfdead(uint8 info, XLogReaderState *record)
 
        /* Rewrite the leaf page as a halfdead page */
        buffer = XLogInitBufferForRedo(record, 0);
-       page = (Page) BufferGetPage(buffer);
+       page = BufferGetPage(buffer);
 
        _bt_pageinit(page, BufferGetPageSize(buffer));
        pageop = BTPageGetOpaque(page);
@@ -836,7 +836,7 @@ btree_xlog_unlink_page(uint8 info, XLogReaderState *record)
        {
                if (XLogReadBufferForRedo(record, 1, &leftbuf) == BLK_NEEDS_REDO)
                {
-                       page = (Page) BufferGetPage(leftbuf);
+                       page = BufferGetPage(leftbuf);
                        pageop = BTPageGetOpaque(page);
                        pageop->btpo_next = rightsib;
 
@@ -849,7 +849,7 @@ btree_xlog_unlink_page(uint8 info, XLogReaderState *record)
 
        /* Rewrite target page as empty deleted page */
        target = XLogInitBufferForRedo(record, 0);
-       page = (Page) BufferGetPage(target);
+       page = BufferGetPage(target);
 
        _bt_pageinit(page, BufferGetPageSize(target));
        pageop = BTPageGetOpaque(page);
@@ -868,7 +868,7 @@ btree_xlog_unlink_page(uint8 info, XLogReaderState *record)
        /* Fix left-link of right sibling */
        if (XLogReadBufferForRedo(record, 2, &rightbuf) == BLK_NEEDS_REDO)
        {
-               page = (Page) BufferGetPage(rightbuf);
+               page = BufferGetPage(rightbuf);
                pageop = BTPageGetOpaque(page);
                pageop->btpo_prev = leftsib;
 
@@ -907,7 +907,7 @@ btree_xlog_unlink_page(uint8 info, XLogReaderState *record)
                Assert(!isleaf);
 
                leafbuf = XLogInitBufferForRedo(record, 3);
-               page = (Page) BufferGetPage(leafbuf);
+               page = BufferGetPage(leafbuf);
 
                _bt_pageinit(page, BufferGetPageSize(leafbuf));
                pageop = BTPageGetOpaque(page);
@@ -949,7 +949,7 @@ btree_xlog_newroot(XLogReaderState *record)
        Size            len;
 
        buffer = XLogInitBufferForRedo(record, 0);
-       page = (Page) BufferGetPage(buffer);
+       page = BufferGetPage(buffer);
 
        _bt_pageinit(page, BufferGetPageSize(buffer));
        pageop = BTPageGetOpaque(page);

diff --git a/src/backend/access/spgist/spgvacuum.c b/src/backend/access/spgist/spgvacuum.c
index 2678f7ab7829aac0b3df6bb866fbaa2873abd033..8f8a1ad7796aaeeca067f3c9a1ac8665ee01efff 100644 (file)
--- a/src/backend/access/spgist/spgvacuum.c
+++ b/src/backend/access/spgist/spgvacuum.c
@@ -626,7 +626,7 @@ spgvacuumpage(spgBulkDeleteState *bds, Buffer buffer)
        Page            page;
 
        LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
-       page = (Page) BufferGetPage(buffer);
+       page = BufferGetPage(buffer);
 
        if (PageIsNew(page))
        {
@@ -707,7 +707,7 @@ spgprocesspending(spgBulkDeleteState *bds)
                buffer = ReadBufferExtended(index, MAIN_FORKNUM, blkno,
                                                                        RBM_NORMAL, bds->info->strategy);
                LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
-               page = (Page) BufferGetPage(buffer);
+               page = BufferGetPage(buffer);
 
                if (PageIsNew(page) || SpGistPageIsDeleted(page))
                {

diff --git a/src/backend/access/spgist/spgxlog.c b/src/backend/access/spgist/spgxlog.c
index b7986e6f7131e88709f38ee3d42c5611d62e1902..d4620c915d0cc9998407d9eb140c2352cf8791c4 100644 (file)
--- a/src/backend/access/spgist/spgxlog.c
+++ b/src/backend/access/spgist/spgxlog.c
@@ -576,7 +576,7 @@ spgRedoPickSplit(XLogReaderState *record)
        {
                /* just re-init the source page */
                srcBuffer = XLogInitBufferForRedo(record, 0);
-               srcPage = (Page) BufferGetPage(srcBuffer);
+               srcPage = BufferGetPage(srcBuffer);
 
                SpGistInitBuffer(srcBuffer,
                                                 SPGIST_LEAF | (xldata->storesNulls ? SPGIST_NULLS : 0));
@@ -629,7 +629,7 @@ spgRedoPickSplit(XLogReaderState *record)
        {
                /* just re-init the dest page */
                destBuffer = XLogInitBufferForRedo(record, 1);
-               destPage = (Page) BufferGetPage(destBuffer);
+               destPage = BufferGetPage(destBuffer);
 
                SpGistInitBuffer(destBuffer,
                                                 SPGIST_LEAF | (xldata->storesNulls ? SPGIST_NULLS : 0));
@@ -642,7 +642,7 @@ spgRedoPickSplit(XLogReaderState *record)
                 * full-page-image case, but for safety let's hold it till later.
                 */
                if (XLogReadBufferForRedo(record, 1, &destBuffer) == BLK_NEEDS_REDO)
-                       destPage = (Page) BufferGetPage(destBuffer);
+                       destPage = BufferGetPage(destBuffer);
                else
                        destPage = NULL;        /* don't do any page updates */
        }

diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c
index 27ea52fdfee66d66871e421c9cc3a294c49a3b0e..38176d9688e4cabed78cfe85e3f862c805065f90 100644 (file)
--- a/src/backend/access/transam/xlogutils.c
+++ b/src/backend/access/transam/xlogutils.c
@@ -523,7 +523,7 @@ recent_buffer_fast_path:
        if (mode == RBM_NORMAL)
        {
                /* check that page has been initialized */
-               Page            page = (Page) BufferGetPage(buffer);
+               Page            page = BufferGetPage(buffer);
 
                /*
                 * We assume that PageIsNew is safe without a lock. During recovery,

diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index a3c8cff97b03b0af8ad820559c1ce4b47e271f6b..636d3c3ec737b4c9e4640c9555e6af330d2a6c9b 100644 (file)
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -1920,7 +1920,7 @@ seq_redo(XLogReaderState *record)
                elog(PANIC, "seq_redo: unknown op code %u", info);
 
        buffer = XLogInitBufferForRedo(record, 0);
-       page = (Page) BufferGetPage(buffer);
+       page = BufferGetPage(buffer);
 
        /*
         * We always reinit the page.  However, since this WAL record type is also