From 0ef0aa0cb385c9cc920e630d0ecf0bb2323e0a35 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 30 Dec 2024 16:43:26 +0100 Subject: [PATCH 10/10] Remove unnecessary (char *) casts [xlog] Remove (char *) casts no longer needed after XLogRegisterData() and XLogRegisterBufData() argument type change. --- contrib/pg_visibility/pg_visibility.c | 2 +- src/backend/access/brin/brin.c | 2 +- src/backend/access/brin/brin_pageops.c | 12 ++--- src/backend/access/brin/brin_revmap.c | 4 +- src/backend/access/gin/ginbtree.c | 6 +-- src/backend/access/gin/gindatapage.c | 8 +-- src/backend/access/gin/ginentrypage.c | 4 +- src/backend/access/gin/ginfast.c | 6 +-- src/backend/access/gin/ginutil.c | 2 +- src/backend/access/gin/ginvacuum.c | 2 +- src/backend/access/gist/gistxlog.c | 22 ++++---- src/backend/access/hash/hash.c | 6 +-- src/backend/access/hash/hashinsert.c | 8 +-- src/backend/access/hash/hashovfl.c | 26 +++++----- src/backend/access/hash/hashpage.c | 16 +++--- src/backend/access/heap/heapam.c | 46 ++++++++-------- src/backend/access/heap/pruneheap.c | 22 ++++---- src/backend/access/heap/rewriteheap.c | 2 +- src/backend/access/nbtree/nbtdedup.c | 4 +- src/backend/access/nbtree/nbtinsert.c | 26 +++++----- src/backend/access/nbtree/nbtpage.c | 26 +++++----- src/backend/access/spgist/spgdoinsert.c | 36 ++++++------- src/backend/access/spgist/spgvacuum.c | 22 ++++---- src/backend/access/transam/clog.c | 4 +- src/backend/access/transam/commit_ts.c | 4 +- src/backend/access/transam/multixact.c | 8 +-- src/backend/access/transam/xact.c | 52 +++++++++---------- src/backend/access/transam/xlog.c | 18 +++---- src/backend/catalog/storage.c | 4 +- src/backend/commands/dbcommands.c | 14 ++--- src/backend/commands/sequence.c | 12 ++--- src/backend/commands/tablecmds.c | 4 +- src/backend/commands/tablespace.c | 6 +-- src/backend/replication/logical/message.c | 2 +- src/backend/replication/logical/origin.c | 4 +- src/backend/storage/ipc/standby.c | 12 ++--- src/backend/utils/cache/inval.c | 6 +-- src/backend/utils/cache/relmapper.c | 4 +- .../test_custom_rmgrs/test_custom_rmgrs.c | 4 +- 39 files changed, 234 insertions(+), 234 deletions(-) diff --git a/contrib/pg_visibility/pg_visibility.c b/contrib/pg_visibility/pg_visibility.c index c900cfcea40..7f268a18a74 100644 --- a/contrib/pg_visibility/pg_visibility.c +++ b/contrib/pg_visibility/pg_visibility.c @@ -424,7 +424,7 @@ pg_truncate_visibility_map(PG_FUNCTION_ARGS) xlrec.flags = SMGR_TRUNCATE_VM; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(xlrec)); + XLogRegisterData(&xlrec, sizeof(xlrec)); lsn = XLogInsert(RM_SMGR_ID, XLOG_SMGR_TRUNCATE | XLR_SPECIAL_REL_UPDATE); diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c index ccf824bbdb2..4265687afa4 100644 --- a/src/backend/access/brin/brin.c +++ b/src/backend/access/brin/brin.c @@ -1135,7 +1135,7 @@ brinbuild(Relation heap, Relation index, IndexInfo *indexInfo) xlrec.pagesPerRange = BrinGetPagesPerRange(index); XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfBrinCreateIdx); + XLogRegisterData(&xlrec, SizeOfBrinCreateIdx); XLogRegisterBuffer(0, meta, REGBUF_WILL_INIT | REGBUF_STANDARD); recptr = XLogInsert(RM_BRIN_ID, XLOG_BRIN_CREATE_INDEX); diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c index 4bff280a135..6d8dd1512d6 100644 --- a/src/backend/access/brin/brin_pageops.c +++ b/src/backend/access/brin/brin_pageops.c @@ -190,10 +190,10 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange, xlrec.offnum = oldoff; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfBrinSamepageUpdate); + XLogRegisterData(&xlrec, SizeOfBrinSamepageUpdate); XLogRegisterBuffer(0, oldbuf, REGBUF_STANDARD); - XLogRegisterBufData(0, (const char *) newtup, newsz); + XLogRegisterBufData(0, newtup, newsz); recptr = XLogInsert(RM_BRIN_ID, info); @@ -282,10 +282,10 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange, XLogBeginInsert(); /* new page */ - XLogRegisterData((char *) &xlrec, SizeOfBrinUpdate); + XLogRegisterData(&xlrec, SizeOfBrinUpdate); XLogRegisterBuffer(0, newbuf, REGBUF_STANDARD | (extended ? REGBUF_WILL_INIT : 0)); - XLogRegisterBufData(0, (const char *) newtup, newsz); + XLogRegisterBufData(0, newtup, newsz); /* revmap page */ XLogRegisterBuffer(1, revmapbuf, 0); @@ -435,10 +435,10 @@ brin_doinsert(Relation idxrel, BlockNumber pagesPerRange, xlrec.offnum = off; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfBrinInsert); + XLogRegisterData(&xlrec, SizeOfBrinInsert); XLogRegisterBuffer(0, *buffer, REGBUF_STANDARD | (extended ? REGBUF_WILL_INIT : 0)); - XLogRegisterBufData(0, (char *) tup, itemsz); + XLogRegisterBufData(0, tup, itemsz); XLogRegisterBuffer(1, revmapbuf, 0); diff --git a/src/backend/access/brin/brin_revmap.c b/src/backend/access/brin/brin_revmap.c index ea722d95ebc..4e380ecc710 100644 --- a/src/backend/access/brin/brin_revmap.c +++ b/src/backend/access/brin/brin_revmap.c @@ -416,7 +416,7 @@ brinRevmapDesummarizeRange(Relation idxrel, BlockNumber heapBlk) xlrec.regOffset = regOffset; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfBrinDesummarize); + XLogRegisterData(&xlrec, SizeOfBrinDesummarize); XLogRegisterBuffer(0, revmapBuf, 0); XLogRegisterBuffer(1, regBuf, REGBUF_STANDARD); recptr = XLogInsert(RM_BRIN_ID, XLOG_BRIN_DESUMMARIZE); @@ -627,7 +627,7 @@ revmap_physical_extend(BrinRevmap *revmap) xlrec.targetBlk = mapBlk; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfBrinRevmapExtend); + XLogRegisterData(&xlrec, SizeOfBrinRevmapExtend); XLogRegisterBuffer(0, revmap->rm_metaBuf, REGBUF_STANDARD); XLogRegisterBuffer(1, buf, REGBUF_WILL_INIT); diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c index 57741263abd..26a0bdc2063 100644 --- a/src/backend/access/gin/ginbtree.c +++ b/src/backend/access/gin/ginbtree.c @@ -423,7 +423,7 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack, xlrec.flags = xlflags; - XLogRegisterData((char *) &xlrec, sizeof(ginxlogInsert)); + XLogRegisterData(&xlrec, sizeof(ginxlogInsert)); /* * Log information about child if this was an insertion of a @@ -433,7 +433,7 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack, { BlockIdSet(&childblknos[0], BufferGetBlockNumber(childbuf)); BlockIdSet(&childblknos[1], GinPageGetOpaque(childpage)->rightlink); - XLogRegisterData((char *) childblknos, + XLogRegisterData(childblknos, sizeof(BlockIdData) * 2); } @@ -617,7 +617,7 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack, if (BufferIsValid(childbuf)) XLogRegisterBuffer(3, childbuf, REGBUF_STANDARD); - XLogRegisterData((char *) &data, sizeof(ginxlogSplit)); + XLogRegisterData(&data, sizeof(ginxlogSplit)); recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_SPLIT); diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c index 662626efd82..6c2c6194720 100644 --- a/src/backend/access/gin/gindatapage.c +++ b/src/backend/access/gin/gindatapage.c @@ -63,7 +63,7 @@ typedef struct * If we need WAL data representing the reconstructed leaf page, it's * stored here by computeLeafRecompressWALData. */ - char *walinfo; /* buffer start */ + void *walinfo; /* buffer start */ int walinfolen; /* and length */ } disassembledLeaf; @@ -1173,7 +1173,7 @@ dataExecPlaceToPageInternal(GinBtree btree, Buffer buf, GinBtreeStack *stack, data.newitem = *pitem; XLogRegisterBuffer(0, buf, REGBUF_STANDARD); - XLogRegisterBufData(0, (char *) &data, + XLogRegisterBufData(0, &data, sizeof(ginxlogInsertDataInternal)); } } @@ -1844,9 +1844,9 @@ createPostingTree(Relation index, ItemPointerData *items, uint32 nitems, data.size = rootsize; XLogBeginInsert(); - XLogRegisterData((char *) &data, sizeof(ginxlogCreatePostingTree)); + XLogRegisterData(&data, sizeof(ginxlogCreatePostingTree)); - XLogRegisterData((char *) GinDataLeafPageGetPostingList(page), + XLogRegisterData(GinDataLeafPageGetPostingList(page), rootsize); XLogRegisterBuffer(0, buffer, REGBUF_WILL_INIT); diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c index c668d809f60..ba6bbd562df 100644 --- a/src/backend/access/gin/ginentrypage.c +++ b/src/backend/access/gin/ginentrypage.c @@ -585,9 +585,9 @@ entryExecPlaceToPage(GinBtree btree, Buffer buf, GinBtreeStack *stack, data.offset = off; XLogRegisterBuffer(0, buf, REGBUF_STANDARD); - XLogRegisterBufData(0, (char *) &data, + XLogRegisterBufData(0, &data, offsetof(ginxlogInsertEntry, tuple)); - XLogRegisterBufData(0, (char *) insertData->entry, + XLogRegisterBufData(0, insertData->entry, IndexTupleSize(insertData->entry)); } } diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c index 4ab815fefe0..f4ed949b90b 100644 --- a/src/backend/access/gin/ginfast.c +++ b/src/backend/access/gin/ginfast.c @@ -122,7 +122,7 @@ writeListPage(Relation index, Buffer buffer, data.ntuples = ntuples; XLogBeginInsert(); - XLogRegisterData((char *) &data, sizeof(ginxlogInsertListPage)); + XLogRegisterData(&data, sizeof(ginxlogInsertListPage)); XLogRegisterBuffer(0, buffer, REGBUF_WILL_INIT); XLogRegisterBufData(0, workspace.data, size); @@ -431,7 +431,7 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector) memcpy(&data.metadata, metadata, sizeof(GinMetaPageData)); XLogRegisterBuffer(0, metabuffer, REGBUF_WILL_INIT | REGBUF_STANDARD); - XLogRegisterData((char *) &data, sizeof(ginxlogUpdateMeta)); + XLogRegisterData(&data, sizeof(ginxlogUpdateMeta)); recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_UPDATE_META_PAGE); PageSetLSN(metapage, recptr); @@ -646,7 +646,7 @@ shiftList(Relation index, Buffer metabuffer, BlockNumber newHead, memcpy(&data.metadata, metadata, sizeof(GinMetaPageData)); - XLogRegisterData((char *) &data, + XLogRegisterData(&data, sizeof(ginxlogDeleteListPages)); recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_DELETE_LISTPAGE); diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c index 2500d16b7bc..1f9e58c4f1f 100644 --- a/src/backend/access/gin/ginutil.c +++ b/src/backend/access/gin/ginutil.c @@ -689,7 +689,7 @@ ginUpdateStats(Relation index, const GinStatsData *stats, bool is_build) memcpy(&data.metadata, metadata, sizeof(GinMetaPageData)); XLogBeginInsert(); - XLogRegisterData((char *) &data, sizeof(ginxlogUpdateMeta)); + XLogRegisterData(&data, sizeof(ginxlogUpdateMeta)); XLogRegisterBuffer(0, metabuffer, REGBUF_WILL_INIT | REGBUF_STANDARD); recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_UPDATE_META_PAGE); diff --git a/src/backend/access/gin/ginvacuum.c b/src/backend/access/gin/ginvacuum.c index d98c54b7cf7..88d9b8dc13e 100644 --- a/src/backend/access/gin/ginvacuum.c +++ b/src/backend/access/gin/ginvacuum.c @@ -216,7 +216,7 @@ ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkn data.rightLink = GinPageGetOpaque(page)->rightlink; data.deleteXid = GinPageGetDeleteXid(page); - XLogRegisterData((char *) &data, sizeof(ginxlogDeletePage)); + XLogRegisterData(&data, sizeof(ginxlogDeletePage)); recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_DELETE_PAGE); PageSetLSN(page, recptr); diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index 9d54e64787a..b354e4ba5d1 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -528,14 +528,14 @@ gistXLogSplit(bool page_is_leaf, * of buffer or data registrations here, make sure you modify the * XLogEnsureRecordSpace() calls accordingly! */ - XLogRegisterData((char *) &xlrec, sizeof(gistxlogPageSplit)); + XLogRegisterData(&xlrec, sizeof(gistxlogPageSplit)); i = 1; for (ptr = dist; ptr; ptr = ptr->next) { XLogRegisterBuffer(i, ptr->buffer, REGBUF_WILL_INIT); - XLogRegisterBufData(i, (char *) &(ptr->block.num), sizeof(int)); - XLogRegisterBufData(i, (char *) ptr->list, ptr->lenlist); + XLogRegisterBufData(i, &(ptr->block.num), sizeof(int)); + XLogRegisterBufData(i, ptr->list, ptr->lenlist); i++; } @@ -559,7 +559,7 @@ gistXLogPageDelete(Buffer buffer, FullTransactionId xid, xlrec.downlinkOffset = downlinkOffset; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfGistxlogPageDelete); + XLogRegisterData(&xlrec, SizeOfGistxlogPageDelete); XLogRegisterBuffer(0, buffer, REGBUF_STANDARD); XLogRegisterBuffer(1, parentBuffer, REGBUF_STANDARD); @@ -583,7 +583,7 @@ gistXLogAssignLSN(void) */ XLogBeginInsert(); XLogSetRecordFlags(XLOG_MARK_UNIMPORTANT); - XLogRegisterData((char *) &dummy, sizeof(dummy)); + XLogRegisterData(&dummy, sizeof(dummy)); return XLogInsert(RM_GIST_ID, XLOG_GIST_ASSIGN_LSN); } @@ -609,7 +609,7 @@ gistXLogPageReuse(Relation rel, Relation heaprel, xlrec_reuse.snapshotConflictHorizon = deleteXid; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec_reuse, SizeOfGistxlogPageReuse); + XLogRegisterData(&xlrec_reuse, SizeOfGistxlogPageReuse); XLogInsert(RM_GIST_ID, XLOG_GIST_PAGE_REUSE); } @@ -639,14 +639,14 @@ gistXLogUpdate(Buffer buffer, xlrec.ntoinsert = ituplen; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(gistxlogPageUpdate)); + XLogRegisterData(&xlrec, sizeof(gistxlogPageUpdate)); XLogRegisterBuffer(0, buffer, REGBUF_STANDARD); - XLogRegisterBufData(0, (char *) todelete, sizeof(OffsetNumber) * ntodelete); + XLogRegisterBufData(0, todelete, sizeof(OffsetNumber) * ntodelete); /* new tuples */ for (i = 0; i < ituplen; i++) - XLogRegisterBufData(0, (char *) (itup[i]), IndexTupleSize(itup[i])); + XLogRegisterBufData(0, itup[i], IndexTupleSize(itup[i])); /* * Include a full page image of the child buf. (only necessary if a @@ -678,14 +678,14 @@ gistXLogDelete(Buffer buffer, OffsetNumber *todelete, int ntodelete, xlrec.ntodelete = ntodelete; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfGistxlogDelete); + XLogRegisterData(&xlrec, SizeOfGistxlogDelete); /* * We need the target-offsets array whether or not we store the whole * buffer, to allow us to find the snapshotConflictHorizon on a standby * server. */ - XLogRegisterData((char *) todelete, ntodelete * sizeof(OffsetNumber)); + XLogRegisterData(todelete, ntodelete * sizeof(OffsetNumber)); XLogRegisterBuffer(0, buffer, REGBUF_STANDARD); diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index 63b568e7f24..03cb8fbb70c 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -616,7 +616,7 @@ hashbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats, xlrec.ntuples = metap->hashm_ntuples; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHashUpdateMetaPage); + XLogRegisterData(&xlrec, SizeOfHashUpdateMetaPage); XLogRegisterBuffer(0, metabuf, REGBUF_STANDARD); @@ -823,7 +823,7 @@ hashbucketcleanup(Relation rel, Bucket cur_bucket, Buffer bucket_buf, xlrec.is_primary_bucket_page = (buf == bucket_buf); XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHashDelete); + XLogRegisterData(&xlrec, SizeOfHashDelete); /* * bucket buffer was not changed, but still needs to be @@ -838,7 +838,7 @@ hashbucketcleanup(Relation rel, Bucket cur_bucket, Buffer bucket_buf, } XLogRegisterBuffer(1, buf, REGBUF_STANDARD); - XLogRegisterBufData(1, (char *) deletable, + XLogRegisterBufData(1, deletable, ndeletable * sizeof(OffsetNumber)); recptr = XLogInsert(RM_HASH_ID, XLOG_HASH_DELETE); diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c index 87fab13900b..10de1580dc2 100644 --- a/src/backend/access/hash/hashinsert.c +++ b/src/backend/access/hash/hashinsert.c @@ -221,12 +221,12 @@ _hash_doinsert(Relation rel, IndexTuple itup, Relation heapRel, bool sorted) xlrec.offnum = itup_off; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHashInsert); + XLogRegisterData(&xlrec, SizeOfHashInsert); XLogRegisterBuffer(1, metabuf, REGBUF_STANDARD); XLogRegisterBuffer(0, buf, REGBUF_STANDARD); - XLogRegisterBufData(0, (char *) itup, IndexTupleSize(itup)); + XLogRegisterBufData(0, itup, IndexTupleSize(itup)); recptr = XLogInsert(RM_HASH_ID, XLOG_HASH_INSERT); @@ -436,14 +436,14 @@ _hash_vacuum_one_page(Relation rel, Relation hrel, Buffer metabuf, Buffer buf) XLogBeginInsert(); XLogRegisterBuffer(0, buf, REGBUF_STANDARD); - XLogRegisterData((char *) &xlrec, SizeOfHashVacuumOnePage); + XLogRegisterData(&xlrec, SizeOfHashVacuumOnePage); /* * We need the target-offsets array whether or not we store the * whole buffer, to allow us to find the snapshotConflictHorizon * on a standby server. */ - XLogRegisterData((char *) deletable, + XLogRegisterData(deletable, ndeletable * sizeof(OffsetNumber)); XLogRegisterBuffer(1, metabuf, REGBUF_STANDARD); diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c index 3fa2c5fe2ef..4f5fd3b2837 100644 --- a/src/backend/access/hash/hashovfl.c +++ b/src/backend/access/hash/hashovfl.c @@ -388,24 +388,24 @@ _hash_addovflpage(Relation rel, Buffer metabuf, Buffer buf, bool retain_pin) xlrec.bmsize = metap->hashm_bmsize; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHashAddOvflPage); + XLogRegisterData(&xlrec, SizeOfHashAddOvflPage); XLogRegisterBuffer(0, ovflbuf, REGBUF_WILL_INIT); - XLogRegisterBufData(0, (char *) &pageopaque->hasho_bucket, sizeof(Bucket)); + XLogRegisterBufData(0, &pageopaque->hasho_bucket, sizeof(Bucket)); XLogRegisterBuffer(1, buf, REGBUF_STANDARD); if (BufferIsValid(mapbuf)) { XLogRegisterBuffer(2, mapbuf, REGBUF_STANDARD); - XLogRegisterBufData(2, (char *) &bitmap_page_bit, sizeof(uint32)); + XLogRegisterBufData(2, &bitmap_page_bit, sizeof(uint32)); } if (BufferIsValid(newmapbuf)) XLogRegisterBuffer(3, newmapbuf, REGBUF_WILL_INIT); XLogRegisterBuffer(4, metabuf, REGBUF_STANDARD); - XLogRegisterBufData(4, (char *) &metap->hashm_firstfree, sizeof(uint32)); + XLogRegisterBufData(4, &metap->hashm_firstfree, sizeof(uint32)); recptr = XLogInsert(RM_HASH_ID, XLOG_HASH_ADD_OVFL_PAGE); @@ -656,7 +656,7 @@ _hash_freeovflpage(Relation rel, Buffer bucketbuf, Buffer ovflbuf, xlrec.is_prev_bucket_same_wrt = (wbuf == prevbuf); XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHashSqueezePage); + XLogRegisterData(&xlrec, SizeOfHashSqueezePage); /* * bucket buffer was not changed, but still needs to be registered to @@ -676,10 +676,10 @@ _hash_freeovflpage(Relation rel, Buffer bucketbuf, Buffer ovflbuf, /* Remember that wbuf is modified. */ mod_wbuf = true; - XLogRegisterBufData(1, (char *) itup_offsets, + XLogRegisterBufData(1, itup_offsets, nitups * sizeof(OffsetNumber)); for (i = 0; i < nitups; i++) - XLogRegisterBufData(1, (char *) itups[i], tups_size[i]); + XLogRegisterBufData(1, itups[i], tups_size[i]); } else if (xlrec.is_prim_bucket_same_wrt || xlrec.is_prev_bucket_same_wrt) { @@ -721,12 +721,12 @@ _hash_freeovflpage(Relation rel, Buffer bucketbuf, Buffer ovflbuf, XLogRegisterBuffer(4, nextbuf, REGBUF_STANDARD); XLogRegisterBuffer(5, mapbuf, REGBUF_STANDARD); - XLogRegisterBufData(5, (char *) &bitmapbit, sizeof(uint32)); + XLogRegisterBufData(5, &bitmapbit, sizeof(uint32)); if (update_metap) { XLogRegisterBuffer(6, metabuf, REGBUF_STANDARD); - XLogRegisterBufData(6, (char *) &metap->hashm_firstfree, sizeof(uint32)); + XLogRegisterBufData(6, &metap->hashm_firstfree, sizeof(uint32)); } recptr = XLogInsert(RM_HASH_ID, XLOG_HASH_SQUEEZE_PAGE); @@ -993,7 +993,7 @@ _hash_squeezebucket(Relation rel, xlrec.is_prim_bucket_same_wrt = (wbuf == bucket_buf); XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHashMovePageContents); + XLogRegisterData(&xlrec, SizeOfHashMovePageContents); /* * bucket buffer was not changed, but still needs to @@ -1008,13 +1008,13 @@ _hash_squeezebucket(Relation rel, } XLogRegisterBuffer(1, wbuf, REGBUF_STANDARD); - XLogRegisterBufData(1, (char *) itup_offsets, + XLogRegisterBufData(1, itup_offsets, nitups * sizeof(OffsetNumber)); for (i = 0; i < nitups; i++) - XLogRegisterBufData(1, (char *) itups[i], tups_size[i]); + XLogRegisterBufData(1, itups[i], tups_size[i]); XLogRegisterBuffer(2, rbuf, REGBUF_STANDARD); - XLogRegisterBufData(2, (char *) deletable, + XLogRegisterBufData(2, deletable, ndeletable * sizeof(OffsetNumber)); recptr = XLogInsert(RM_HASH_ID, XLOG_HASH_MOVE_PAGE_CONTENTS); diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c index 97efd4e14ab..b8e5bd005e5 100644 --- a/src/backend/access/hash/hashpage.c +++ b/src/backend/access/hash/hashpage.c @@ -394,7 +394,7 @@ _hash_init(Relation rel, double num_tuples, ForkNumber forkNum) xlrec.ffactor = metap->hashm_ffactor; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHashInitMetaPage); + XLogRegisterData(&xlrec, SizeOfHashInitMetaPage); XLogRegisterBuffer(0, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD); recptr = XLogInsert(RM_HASH_ID, XLOG_HASH_INIT_META_PAGE); @@ -468,7 +468,7 @@ _hash_init(Relation rel, double num_tuples, ForkNumber forkNum) xlrec.bmsize = metap->hashm_bmsize; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHashInitBitmapPage); + XLogRegisterData(&xlrec, SizeOfHashInitBitmapPage); XLogRegisterBuffer(0, bitmapbuf, REGBUF_WILL_INIT); /* @@ -916,21 +916,21 @@ _hash_expandtable(Relation rel, Buffer metabuf) if (metap_update_masks) { xlrec.flags |= XLH_SPLIT_META_UPDATE_MASKS; - XLogRegisterBufData(2, (char *) &metap->hashm_lowmask, sizeof(uint32)); - XLogRegisterBufData(2, (char *) &metap->hashm_highmask, sizeof(uint32)); + XLogRegisterBufData(2, &metap->hashm_lowmask, sizeof(uint32)); + XLogRegisterBufData(2, &metap->hashm_highmask, sizeof(uint32)); } if (metap_update_splitpoint) { xlrec.flags |= XLH_SPLIT_META_UPDATE_SPLITPOINT; - XLogRegisterBufData(2, (char *) &metap->hashm_ovflpoint, + XLogRegisterBufData(2, &metap->hashm_ovflpoint, sizeof(uint32)); XLogRegisterBufData(2, - (char *) &metap->hashm_spares[metap->hashm_ovflpoint], + &metap->hashm_spares[metap->hashm_ovflpoint], sizeof(uint32)); } - XLogRegisterData((char *) &xlrec, SizeOfHashSplitAllocPage); + XLogRegisterData(&xlrec, SizeOfHashSplitAllocPage); recptr = XLogInsert(RM_HASH_ID, XLOG_HASH_SPLIT_ALLOCATE_PAGE); @@ -1304,7 +1304,7 @@ _hash_splitbucket(Relation rel, XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHashSplitComplete); + XLogRegisterData(&xlrec, SizeOfHashSplitComplete); XLogRegisterBuffer(0, bucket_obuf, REGBUF_STANDARD); XLogRegisterBuffer(1, bucket_nbuf, REGBUF_STANDARD); diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index ea0a12b39af..6338a2f80d5 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -2133,7 +2133,7 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid, } XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHeapInsert); + XLogRegisterData(&xlrec, SizeOfHeapInsert); xlhdr.t_infomask2 = heaptup->t_data->t_infomask2; xlhdr.t_infomask = heaptup->t_data->t_infomask; @@ -2145,10 +2145,10 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid, * xl_heap_header in the xlog. */ XLogRegisterBuffer(0, buffer, REGBUF_STANDARD | bufflags); - XLogRegisterBufData(0, (char *) &xlhdr, SizeOfHeapHeader); + XLogRegisterBufData(0, &xlhdr, SizeOfHeapHeader); /* PG73FORMAT: write bitmap [+ padding] [+ oid] + data */ XLogRegisterBufData(0, - (char *) heaptup->t_data + SizeofHeapTupleHeader, + ((char *) heaptup->t_data) + SizeofHeapTupleHeader, heaptup->t_len - SizeofHeapTupleHeader); /* filtering by origin on a row level is much more efficient */ @@ -2542,7 +2542,7 @@ heap_multi_insert(Relation relation, TupleTableSlot **slots, int ntuples, bufflags |= REGBUF_KEEP_DATA; XLogBeginInsert(); - XLogRegisterData((char *) xlrec, tupledata - scratch.data); + XLogRegisterData(xlrec, tupledata - scratch.data); XLogRegisterBuffer(0, buffer, REGBUF_STANDARD | bufflags); XLogRegisterBufData(0, tupledata, totaldatalen); @@ -3032,7 +3032,7 @@ heap_delete(Relation relation, ItemPointer tid, } XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHeapDelete); + XLogRegisterData(&xlrec, SizeOfHeapDelete); XLogRegisterBuffer(0, buffer, REGBUF_STANDARD); @@ -3045,8 +3045,8 @@ heap_delete(Relation relation, ItemPointer tid, xlhdr.t_infomask = old_key_tuple->t_data->t_infomask; xlhdr.t_hoff = old_key_tuple->t_data->t_hoff; - XLogRegisterData((char *) &xlhdr, SizeOfHeapHeader); - XLogRegisterData((char *) old_key_tuple->t_data + XLogRegisterData(&xlhdr, SizeOfHeapHeader); + XLogRegisterData(((char *) old_key_tuple->t_data) + SizeofHeapTupleHeader, old_key_tuple->t_len - SizeofHeapTupleHeader); @@ -3811,7 +3811,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup, oldtup.t_data->t_infomask2); xlrec.flags = cleared_all_frozen ? XLH_LOCK_ALL_FROZEN_CLEARED : 0; - XLogRegisterData((char *) &xlrec, SizeOfHeapLock); + XLogRegisterData(&xlrec, SizeOfHeapLock); recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_LOCK); PageSetLSN(page, recptr); } @@ -5142,7 +5142,7 @@ heap_lock_tuple(Relation relation, HeapTuple tuple, xlrec.infobits_set = compute_infobits(new_infomask, tuple->t_data->t_infomask2); xlrec.flags = cleared_all_frozen ? XLH_LOCK_ALL_FROZEN_CLEARED : 0; - XLogRegisterData((char *) &xlrec, SizeOfHeapLock); + XLogRegisterData(&xlrec, SizeOfHeapLock); /* we don't decode row locks atm, so no need to log the origin */ @@ -5895,7 +5895,7 @@ heap_lock_updated_tuple_rec(Relation rel, ItemPointer tid, TransactionId xid, xlrec.flags = cleared_all_frozen ? XLH_LOCK_ALL_FROZEN_CLEARED : 0; - XLogRegisterData((char *) &xlrec, SizeOfHeapLockUpdated); + XLogRegisterData(&xlrec, SizeOfHeapLockUpdated); recptr = XLogInsert(RM_HEAP2_ID, XLOG_HEAP2_LOCK_UPDATED); @@ -6048,7 +6048,7 @@ heap_finish_speculative(Relation relation, ItemPointer tid) /* We want the same filtering on this as on a plain insert */ XLogSetRecordFlags(XLOG_INCLUDE_ORIGIN); - XLogRegisterData((char *) &xlrec, SizeOfHeapConfirm); + XLogRegisterData(&xlrec, SizeOfHeapConfirm); XLogRegisterBuffer(0, buffer, REGBUF_STANDARD); recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_CONFIRM); @@ -6193,7 +6193,7 @@ heap_abort_speculative(Relation relation, ItemPointer tid) xlrec.xmax = xid; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHeapDelete); + XLogRegisterData(&xlrec, SizeOfHeapDelete); XLogRegisterBuffer(0, buffer, REGBUF_STANDARD); /* No replica identity & replication origin logged */ @@ -6489,9 +6489,9 @@ heap_inplace_update_and_unlock(Relation relation, xlrec.nmsgs = nmsgs; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, MinSizeOfHeapInplace); + XLogRegisterData(&xlrec, MinSizeOfHeapInplace); if (nmsgs != 0) - XLogRegisterData((char *) invalMessages, + XLogRegisterData(invalMessages, nmsgs * sizeof(SharedInvalidationMessage)); /* register block matching what buffer will look like after changes */ @@ -8722,7 +8722,7 @@ log_heap_visible(Relation rel, Buffer heap_buffer, Buffer vm_buffer, if (RelationIsAccessibleInLogicalDecoding(rel)) xlrec.flags |= VISIBILITYMAP_XLOG_CATALOG_REL; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHeapVisible); + XLogRegisterData(&xlrec, SizeOfHeapVisible); XLogRegisterBuffer(0, vm_buffer, 0); @@ -8873,7 +8873,7 @@ log_heap_update(Relation reln, Buffer oldbuf, if (oldbuf != newbuf) XLogRegisterBuffer(1, oldbuf, REGBUF_STANDARD); - XLogRegisterData((char *) &xlrec, SizeOfHeapUpdate); + XLogRegisterData(&xlrec, SizeOfHeapUpdate); /* * Prepare WAL data for the new tuple. @@ -8884,15 +8884,15 @@ log_heap_update(Relation reln, Buffer oldbuf, { prefix_suffix[0] = prefixlen; prefix_suffix[1] = suffixlen; - XLogRegisterBufData(0, (char *) &prefix_suffix, sizeof(uint16) * 2); + XLogRegisterBufData(0, &prefix_suffix, sizeof(uint16) * 2); } else if (prefixlen > 0) { - XLogRegisterBufData(0, (char *) &prefixlen, sizeof(uint16)); + XLogRegisterBufData(0, &prefixlen, sizeof(uint16)); } else { - XLogRegisterBufData(0, (char *) &suffixlen, sizeof(uint16)); + XLogRegisterBufData(0, &suffixlen, sizeof(uint16)); } } @@ -8906,7 +8906,7 @@ log_heap_update(Relation reln, Buffer oldbuf, * * The 'data' doesn't include the common prefix or suffix. */ - XLogRegisterBufData(0, (char *) &xlhdr, SizeOfHeapHeader); + XLogRegisterBufData(0, &xlhdr, SizeOfHeapHeader); if (prefixlen == 0) { XLogRegisterBufData(0, @@ -8941,10 +8941,10 @@ log_heap_update(Relation reln, Buffer oldbuf, xlhdr_idx.t_infomask = old_key_tuple->t_data->t_infomask; xlhdr_idx.t_hoff = old_key_tuple->t_data->t_hoff; - XLogRegisterData((char *) &xlhdr_idx, SizeOfHeapHeader); + XLogRegisterData(&xlhdr_idx, SizeOfHeapHeader); /* PG73FORMAT: write bitmap [+ padding] [+ oid] + data */ - XLogRegisterData((char *) old_key_tuple->t_data + SizeofHeapTupleHeader, + XLogRegisterData(((char *) old_key_tuple->t_data) + SizeofHeapTupleHeader, old_key_tuple->t_len - SizeofHeapTupleHeader); } @@ -9021,7 +9021,7 @@ log_heap_new_cid(Relation relation, HeapTuple tup) * called us certainly did, but that's WAL-logged separately. */ XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHeapNewCid); + XLogRegisterData(&xlrec, SizeOfHeapNewCid); /* will be looked at irrespective of origin */ diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 5e2d2645dd2..a8025889be0 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -2093,9 +2093,9 @@ log_heap_prune_and_freeze(Relation relation, Buffer buffer, nplans = heap_log_freeze_plan(frozen, nfrozen, plans, frz_offsets); freeze_plans.nplans = nplans; - XLogRegisterBufData(0, (char *) &freeze_plans, + XLogRegisterBufData(0, &freeze_plans, offsetof(xlhp_freeze_plans, plans)); - XLogRegisterBufData(0, (char *) plans, + XLogRegisterBufData(0, plans, sizeof(xlhp_freeze_plan) * nplans); } if (nredirected > 0) @@ -2103,9 +2103,9 @@ log_heap_prune_and_freeze(Relation relation, Buffer buffer, xlrec.flags |= XLHP_HAS_REDIRECTIONS; redirect_items.ntargets = nredirected; - XLogRegisterBufData(0, (char *) &redirect_items, + XLogRegisterBufData(0, &redirect_items, offsetof(xlhp_prune_items, data)); - XLogRegisterBufData(0, (char *) redirected, + XLogRegisterBufData(0, redirected, sizeof(OffsetNumber[2]) * nredirected); } if (ndead > 0) @@ -2113,9 +2113,9 @@ log_heap_prune_and_freeze(Relation relation, Buffer buffer, xlrec.flags |= XLHP_HAS_DEAD_ITEMS; dead_items.ntargets = ndead; - XLogRegisterBufData(0, (char *) &dead_items, + XLogRegisterBufData(0, &dead_items, offsetof(xlhp_prune_items, data)); - XLogRegisterBufData(0, (char *) dead, + XLogRegisterBufData(0, dead, sizeof(OffsetNumber) * ndead); } if (nunused > 0) @@ -2123,13 +2123,13 @@ log_heap_prune_and_freeze(Relation relation, Buffer buffer, xlrec.flags |= XLHP_HAS_NOW_UNUSED_ITEMS; unused_items.ntargets = nunused; - XLogRegisterBufData(0, (char *) &unused_items, + XLogRegisterBufData(0, &unused_items, offsetof(xlhp_prune_items, data)); - XLogRegisterBufData(0, (char *) unused, + XLogRegisterBufData(0, unused, sizeof(OffsetNumber) * nunused); } if (nfrozen > 0) - XLogRegisterBufData(0, (char *) frz_offsets, + XLogRegisterBufData(0, frz_offsets, sizeof(OffsetNumber) * nfrozen); /* @@ -2147,9 +2147,9 @@ log_heap_prune_and_freeze(Relation relation, Buffer buffer, Assert(nredirected == 0 && ndead == 0); /* also, any items in 'unused' must've been LP_DEAD previously */ } - XLogRegisterData((char *) &xlrec, SizeOfHeapPrune); + XLogRegisterData(&xlrec, SizeOfHeapPrune); if (TransactionIdIsValid(conflict_xid)) - XLogRegisterData((char *) &conflict_xid, sizeof(TransactionId)); + XLogRegisterData(&conflict_xid, sizeof(TransactionId)); switch (reason) { diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index 05a1cb4f5e6..e6d2b5fced1 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -887,7 +887,7 @@ logical_heap_rewrite_flush_mappings(RewriteState state) src->off += len; XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), sizeof(xlrec)); + XLogRegisterData(&xlrec, sizeof(xlrec)); XLogRegisterData(waldata_start, len); /* write xlog record */ diff --git a/src/backend/access/nbtree/nbtdedup.c b/src/backend/access/nbtree/nbtdedup.c index 53363ee695a..cbe73675f86 100644 --- a/src/backend/access/nbtree/nbtdedup.c +++ b/src/backend/access/nbtree/nbtdedup.c @@ -252,14 +252,14 @@ _bt_dedup_pass(Relation rel, Buffer buf, IndexTuple newitem, Size newitemsz, XLogBeginInsert(); XLogRegisterBuffer(0, buf, REGBUF_STANDARD); - XLogRegisterData((char *) &xlrec_dedup, SizeOfBtreeDedup); + XLogRegisterData(&xlrec_dedup, SizeOfBtreeDedup); /* * The intervals array is not in the buffer, but pretend that it is. * When XLogInsert stores the whole buffer, the array need not be * stored too. */ - XLogRegisterBufData(0, (char *) state->intervals, + XLogRegisterBufData(0, state->intervals, state->nintervals * sizeof(BTDedupInterval)); recptr = XLogInsert(RM_BTREE_ID, XLOG_BTREE_DEDUP); diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 3eddbcf3a82..19ce79227b7 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -1320,7 +1320,7 @@ _bt_insertonpg(Relation rel, xlrec.offnum = newitemoff; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfBtreeInsert); + XLogRegisterData(&xlrec, SizeOfBtreeInsert); if (isleaf && postingoff == 0) { @@ -1358,7 +1358,7 @@ _bt_insertonpg(Relation rel, XLogRegisterBuffer(2, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD); - XLogRegisterBufData(2, (char *) &xlmeta, + XLogRegisterBufData(2, &xlmeta, sizeof(xl_btree_metadata)); } } @@ -1367,7 +1367,7 @@ _bt_insertonpg(Relation rel, if (postingoff == 0) { /* Just log itup from caller */ - XLogRegisterBufData(0, (char *) itup, IndexTupleSize(itup)); + XLogRegisterBufData(0, itup, IndexTupleSize(itup)); } else { @@ -1381,8 +1381,8 @@ _bt_insertonpg(Relation rel, */ upostingoff = postingoff; - XLogRegisterBufData(0, (char *) &upostingoff, sizeof(uint16)); - XLogRegisterBufData(0, (char *) origitup, + XLogRegisterBufData(0, &upostingoff, sizeof(uint16)); + XLogRegisterBufData(0, origitup, IndexTupleSize(origitup)); } @@ -1979,7 +1979,7 @@ _bt_split(Relation rel, Relation heaprel, BTScanInsert itup_key, Buffer buf, xlrec.postingoff = postingoff; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfBtreeSplit); + XLogRegisterData(&xlrec, SizeOfBtreeSplit); XLogRegisterBuffer(0, buf, REGBUF_STANDARD); XLogRegisterBuffer(1, rbuf, REGBUF_WILL_INIT); @@ -2017,13 +2017,13 @@ _bt_split(Relation rel, Relation heaprel, BTScanInsert itup_key, Buffer buf, * newitem-logged case). */ if (newitemonleft && xlrec.postingoff == 0) - XLogRegisterBufData(0, (char *) newitem, newitemsz); + XLogRegisterBufData(0, newitem, newitemsz); else if (xlrec.postingoff != 0) { Assert(isleaf); Assert(newitemonleft || firstrightoff == newitemoff); Assert(newitemsz == IndexTupleSize(orignewitem)); - XLogRegisterBufData(0, (char *) orignewitem, newitemsz); + XLogRegisterBufData(0, orignewitem, newitemsz); } /* Log the left page's new high key */ @@ -2033,7 +2033,7 @@ _bt_split(Relation rel, Relation heaprel, BTScanInsert itup_key, Buffer buf, itemid = PageGetItemId(origpage, P_HIKEY); lefthighkey = (IndexTuple) PageGetItem(origpage, itemid); } - XLogRegisterBufData(0, (char *) lefthighkey, + XLogRegisterBufData(0, lefthighkey, MAXALIGN(IndexTupleSize(lefthighkey))); /* @@ -2047,7 +2047,7 @@ _bt_split(Relation rel, Relation heaprel, BTScanInsert itup_key, Buffer buf, * _bt_restore_page(). */ XLogRegisterBufData(1, - (char *) rightpage + ((PageHeader) rightpage)->pd_upper, + ((char *) rightpage) + ((PageHeader) rightpage)->pd_upper, ((PageHeader) rightpage)->pd_special - ((PageHeader) rightpage)->pd_upper); xlinfo = newitemonleft ? XLOG_BTREE_SPLIT_L : XLOG_BTREE_SPLIT_R; @@ -2564,7 +2564,7 @@ _bt_newlevel(Relation rel, Relation heaprel, Buffer lbuf, Buffer rbuf) xlrec.level = metad->btm_level; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfBtreeNewroot); + XLogRegisterData(&xlrec, SizeOfBtreeNewroot); XLogRegisterBuffer(0, rootbuf, REGBUF_WILL_INIT); XLogRegisterBuffer(1, lbuf, REGBUF_STANDARD); @@ -2579,14 +2579,14 @@ _bt_newlevel(Relation rel, Relation heaprel, Buffer lbuf, Buffer rbuf) md.last_cleanup_num_delpages = metad->btm_last_cleanup_num_delpages; md.allequalimage = metad->btm_allequalimage; - XLogRegisterBufData(2, (char *) &md, sizeof(xl_btree_metadata)); + XLogRegisterBufData(2, &md, sizeof(xl_btree_metadata)); /* * Direct access to page is not good but faster - we should implement * some new func in page API. */ XLogRegisterBufData(0, - (char *) rootpage + ((PageHeader) rootpage)->pd_upper, + ((char *) rootpage) + ((PageHeader) rootpage)->pd_upper, ((PageHeader) rootpage)->pd_special - ((PageHeader) rootpage)->pd_upper); diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 5321e256b1a..c79dd38ee18 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -299,7 +299,7 @@ _bt_set_cleanup_info(Relation rel, BlockNumber num_delpages) md.last_cleanup_num_delpages = num_delpages; md.allequalimage = metad->btm_allequalimage; - XLogRegisterBufData(0, (char *) &md, sizeof(xl_btree_metadata)); + XLogRegisterBufData(0, &md, sizeof(xl_btree_metadata)); recptr = XLogInsert(RM_BTREE_ID, XLOG_BTREE_META_CLEANUP); @@ -488,12 +488,12 @@ _bt_getroot(Relation rel, Relation heaprel, int access) md.last_cleanup_num_delpages = 0; md.allequalimage = metad->btm_allequalimage; - XLogRegisterBufData(2, (char *) &md, sizeof(xl_btree_metadata)); + XLogRegisterBufData(2, &md, sizeof(xl_btree_metadata)); xlrec.rootblk = rootblkno; xlrec.level = 0; - XLogRegisterData((char *) &xlrec, SizeOfBtreeNewroot); + XLogRegisterData(&xlrec, SizeOfBtreeNewroot); recptr = XLogInsert(RM_BTREE_ID, XLOG_BTREE_NEWROOT); @@ -948,7 +948,7 @@ _bt_allocbuf(Relation rel, Relation heaprel) RelationIsAccessibleInLogicalDecoding(heaprel); XLogBeginInsert(); - XLogRegisterData((char *) &xlrec_reuse, SizeOfBtreeReusePage); + XLogRegisterData(&xlrec_reuse, SizeOfBtreeReusePage); XLogInsert(RM_BTREE_ID, XLOG_BTREE_REUSE_PAGE); } @@ -1234,15 +1234,15 @@ _bt_delitems_vacuum(Relation rel, Buffer buf, XLogBeginInsert(); XLogRegisterBuffer(0, buf, REGBUF_STANDARD); - XLogRegisterData((char *) &xlrec_vacuum, SizeOfBtreeVacuum); + XLogRegisterData(&xlrec_vacuum, SizeOfBtreeVacuum); if (ndeletable > 0) - XLogRegisterBufData(0, (char *) deletable, + XLogRegisterBufData(0, deletable, ndeletable * sizeof(OffsetNumber)); if (nupdatable > 0) { - XLogRegisterBufData(0, (char *) updatedoffsets, + XLogRegisterBufData(0, updatedoffsets, nupdatable * sizeof(OffsetNumber)); XLogRegisterBufData(0, updatedbuf, updatedbuflen); } @@ -1353,15 +1353,15 @@ _bt_delitems_delete(Relation rel, Buffer buf, XLogBeginInsert(); XLogRegisterBuffer(0, buf, REGBUF_STANDARD); - XLogRegisterData((char *) &xlrec_delete, SizeOfBtreeDelete); + XLogRegisterData(&xlrec_delete, SizeOfBtreeDelete); if (ndeletable > 0) - XLogRegisterBufData(0, (char *) deletable, + XLogRegisterBufData(0, deletable, ndeletable * sizeof(OffsetNumber)); if (nupdatable > 0) { - XLogRegisterBufData(0, (char *) updatedoffsets, + XLogRegisterBufData(0, updatedoffsets, nupdatable * sizeof(OffsetNumber)); XLogRegisterBufData(0, updatedbuf, updatedbuflen); } @@ -2269,7 +2269,7 @@ _bt_mark_page_halfdead(Relation rel, Relation heaprel, Buffer leafbuf, xlrec.leftblk = opaque->btpo_prev; xlrec.rightblk = opaque->btpo_next; - XLogRegisterData((char *) &xlrec, SizeOfBtreeMarkPageHalfDead); + XLogRegisterData(&xlrec, SizeOfBtreeMarkPageHalfDead); recptr = XLogInsert(RM_BTREE_ID, XLOG_BTREE_MARK_PAGE_HALFDEAD); @@ -2694,7 +2694,7 @@ _bt_unlink_halfdead_page(Relation rel, Buffer leafbuf, BlockNumber scanblkno, xlrec.leafrightsib = leafrightsib; xlrec.leaftopparent = leaftopparent; - XLogRegisterData((char *) &xlrec, SizeOfBtreeUnlinkPage); + XLogRegisterData(&xlrec, SizeOfBtreeUnlinkPage); if (BufferIsValid(metabuf)) { @@ -2709,7 +2709,7 @@ _bt_unlink_halfdead_page(Relation rel, Buffer leafbuf, BlockNumber scanblkno, xlmeta.last_cleanup_num_delpages = metad->btm_last_cleanup_num_delpages; xlmeta.allequalimage = metad->btm_allequalimage; - XLogRegisterBufData(4, (char *) &xlmeta, sizeof(xl_btree_metadata)); + XLogRegisterBufData(4, &xlmeta, sizeof(xl_btree_metadata)); xlinfo = XLOG_BTREE_UNLINK_PAGE_META; } else diff --git a/src/backend/access/spgist/spgdoinsert.c b/src/backend/access/spgist/spgdoinsert.c index 58c06ef2dc4..af6b27b2135 100644 --- a/src/backend/access/spgist/spgdoinsert.c +++ b/src/backend/access/spgist/spgdoinsert.c @@ -295,8 +295,8 @@ addLeafTuple(Relation index, SpGistState *state, SpGistLeafTuple leafTuple, int flags; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(xlrec)); - XLogRegisterData((char *) leafTuple, leafTuple->size); + XLogRegisterData(&xlrec, sizeof(xlrec)); + XLogRegisterData(leafTuple, leafTuple->size); flags = REGBUF_STANDARD; if (xlrec.newPage) @@ -532,12 +532,12 @@ moveLeafs(Relation index, SpGistState *state, xlrec.nodeI = parent->node; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfSpgxlogMoveLeafs); - XLogRegisterData((char *) toDelete, + XLogRegisterData(&xlrec, SizeOfSpgxlogMoveLeafs); + XLogRegisterData(toDelete, sizeof(OffsetNumber) * nDelete); - XLogRegisterData((char *) toInsert, + XLogRegisterData(toInsert, sizeof(OffsetNumber) * nInsert); - XLogRegisterData((char *) leafdata, leafptr - leafdata); + XLogRegisterData(leafdata, leafptr - leafdata); XLogRegisterBuffer(0, current->buffer, REGBUF_STANDARD); XLogRegisterBuffer(1, nbuf, REGBUF_STANDARD | (xlrec.newPage ? REGBUF_WILL_INIT : 0)); @@ -1365,15 +1365,15 @@ doPickSplit(Relation index, SpGistState *state, XLogBeginInsert(); xlrec.nInsert = nToInsert; - XLogRegisterData((char *) &xlrec, SizeOfSpgxlogPickSplit); + XLogRegisterData(&xlrec, SizeOfSpgxlogPickSplit); - XLogRegisterData((char *) toDelete, + XLogRegisterData(toDelete, sizeof(OffsetNumber) * xlrec.nDelete); - XLogRegisterData((char *) toInsert, + XLogRegisterData(toInsert, sizeof(OffsetNumber) * xlrec.nInsert); - XLogRegisterData((char *) leafPageSelect, + XLogRegisterData(leafPageSelect, sizeof(uint8) * xlrec.nInsert); - XLogRegisterData((char *) innerTuple, innerTuple->size); + XLogRegisterData(innerTuple, innerTuple->size); XLogRegisterData(leafdata, leafptr - leafdata); /* Old leaf page */ @@ -1559,8 +1559,8 @@ spgAddNodeAction(Relation index, SpGistState *state, XLogRecPtr recptr; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(xlrec)); - XLogRegisterData((char *) newInnerTuple, newInnerTuple->size); + XLogRegisterData(&xlrec, sizeof(xlrec)); + XLogRegisterData(newInnerTuple, newInnerTuple->size); XLogRegisterBuffer(0, current->buffer, REGBUF_STANDARD); @@ -1685,8 +1685,8 @@ spgAddNodeAction(Relation index, SpGistState *state, if (xlrec.parentBlk == 2) XLogRegisterBuffer(2, parent->buffer, REGBUF_STANDARD); - XLogRegisterData((char *) &xlrec, sizeof(xlrec)); - XLogRegisterData((char *) newInnerTuple, newInnerTuple->size); + XLogRegisterData(&xlrec, sizeof(xlrec)); + XLogRegisterData(newInnerTuple, newInnerTuple->size); recptr = XLogInsert(RM_SPGIST_ID, XLOG_SPGIST_ADD_NODE); @@ -1868,9 +1868,9 @@ spgSplitNodeAction(Relation index, SpGistState *state, XLogRecPtr recptr; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(xlrec)); - XLogRegisterData((char *) prefixTuple, prefixTuple->size); - XLogRegisterData((char *) postfixTuple, postfixTuple->size); + XLogRegisterData(&xlrec, sizeof(xlrec)); + XLogRegisterData(prefixTuple, prefixTuple->size); + XLogRegisterData(postfixTuple, postfixTuple->size); XLogRegisterBuffer(0, current->buffer, REGBUF_STANDARD); if (newBuffer != InvalidBuffer) diff --git a/src/backend/access/spgist/spgvacuum.c b/src/backend/access/spgist/spgvacuum.c index 894aefa19e1..5836f558b69 100644 --- a/src/backend/access/spgist/spgvacuum.c +++ b/src/backend/access/spgist/spgvacuum.c @@ -380,14 +380,14 @@ vacuumLeafPage(spgBulkDeleteState *bds, Relation index, Buffer buffer, STORE_STATE(&bds->spgstate, xlrec.stateSrc); - XLogRegisterData((char *) &xlrec, SizeOfSpgxlogVacuumLeaf); + XLogRegisterData(&xlrec, SizeOfSpgxlogVacuumLeaf); /* sizeof(xlrec) should be a multiple of sizeof(OffsetNumber) */ - XLogRegisterData((char *) toDead, sizeof(OffsetNumber) * xlrec.nDead); - XLogRegisterData((char *) toPlaceholder, sizeof(OffsetNumber) * xlrec.nPlaceholder); - XLogRegisterData((char *) moveSrc, sizeof(OffsetNumber) * xlrec.nMove); - XLogRegisterData((char *) moveDest, sizeof(OffsetNumber) * xlrec.nMove); - XLogRegisterData((char *) chainSrc, sizeof(OffsetNumber) * xlrec.nChain); - XLogRegisterData((char *) chainDest, sizeof(OffsetNumber) * xlrec.nChain); + XLogRegisterData(toDead, sizeof(OffsetNumber) * xlrec.nDead); + XLogRegisterData(toPlaceholder, sizeof(OffsetNumber) * xlrec.nPlaceholder); + XLogRegisterData(moveSrc, sizeof(OffsetNumber) * xlrec.nMove); + XLogRegisterData(moveDest, sizeof(OffsetNumber) * xlrec.nMove); + XLogRegisterData(chainSrc, sizeof(OffsetNumber) * xlrec.nChain); + XLogRegisterData(chainDest, sizeof(OffsetNumber) * xlrec.nChain); XLogRegisterBuffer(0, buffer, REGBUF_STANDARD); @@ -465,9 +465,9 @@ vacuumLeafRoot(spgBulkDeleteState *bds, Relation index, Buffer buffer) /* Prepare WAL record */ STORE_STATE(&bds->spgstate, xlrec.stateSrc); - XLogRegisterData((char *) &xlrec, SizeOfSpgxlogVacuumRoot); + XLogRegisterData(&xlrec, SizeOfSpgxlogVacuumRoot); /* sizeof(xlrec) should be a multiple of sizeof(OffsetNumber) */ - XLogRegisterData((char *) toDelete, + XLogRegisterData(toDelete, sizeof(OffsetNumber) * xlrec.nDelete); XLogRegisterBuffer(0, buffer, REGBUF_STANDARD); @@ -600,8 +600,8 @@ vacuumRedirectAndPlaceholder(Relation index, Relation heaprel, Buffer buffer) XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfSpgxlogVacuumRedirect); - XLogRegisterData((char *) itemToPlaceholder, + XLogRegisterData(&xlrec, SizeOfSpgxlogVacuumRedirect); + XLogRegisterData(itemToPlaceholder, sizeof(OffsetNumber) * xlrec.nToPlaceholder); XLogRegisterBuffer(0, buffer, REGBUF_STANDARD); diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index 0d556c00b8c..48f10bec91e 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -1074,7 +1074,7 @@ static void WriteZeroPageXlogRec(int64 pageno) { XLogBeginInsert(); - XLogRegisterData((char *) (&pageno), sizeof(pageno)); + XLogRegisterData(&pageno, sizeof(pageno)); (void) XLogInsert(RM_CLOG_ID, CLOG_ZEROPAGE); } @@ -1095,7 +1095,7 @@ WriteTruncateXlogRec(int64 pageno, TransactionId oldestXact, Oid oldestXactDb) xlrec.oldestXactDb = oldestXactDb; XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), sizeof(xl_clog_truncate)); + XLogRegisterData(&xlrec, sizeof(xl_clog_truncate)); recptr = XLogInsert(RM_CLOG_ID, CLOG_TRUNCATE); XLogFlush(recptr); } diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c index 95049acd0b5..113fae1437a 100644 --- a/src/backend/access/transam/commit_ts.c +++ b/src/backend/access/transam/commit_ts.c @@ -989,7 +989,7 @@ static void WriteZeroPageXlogRec(int64 pageno) { XLogBeginInsert(); - XLogRegisterData((char *) (&pageno), sizeof(pageno)); + XLogRegisterData(&pageno, sizeof(pageno)); (void) XLogInsert(RM_COMMIT_TS_ID, COMMIT_TS_ZEROPAGE); } @@ -1005,7 +1005,7 @@ WriteTruncateXlogRec(int64 pageno, TransactionId oldestXid) xlrec.oldestXid = oldestXid; XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), SizeOfCommitTsTruncate); + XLogRegisterData(&xlrec, SizeOfCommitTsTruncate); (void) XLogInsert(RM_COMMIT_TS_ID, COMMIT_TS_TRUNCATE); } diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index 27ccdf9500f..c1e2c42e1bb 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -886,8 +886,8 @@ MultiXactIdCreateFromMembers(int nmembers, MultiXactMember *members) * Not clear that it's worth the trouble though. */ XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), SizeOfMultiXactCreate); - XLogRegisterData((char *) members, nmembers * sizeof(MultiXactMember)); + XLogRegisterData(&xlrec, SizeOfMultiXactCreate); + XLogRegisterData(members, nmembers * sizeof(MultiXactMember)); (void) XLogInsert(RM_MULTIXACT_ID, XLOG_MULTIXACT_CREATE_ID); @@ -3355,7 +3355,7 @@ static void WriteMZeroPageXlogRec(int64 pageno, uint8 info) { XLogBeginInsert(); - XLogRegisterData((char *) (&pageno), sizeof(pageno)); + XLogRegisterData(&pageno, sizeof(pageno)); (void) XLogInsert(RM_MULTIXACT_ID, info); } @@ -3382,7 +3382,7 @@ WriteMTruncateXlogRec(Oid oldestMultiDB, xlrec.endTruncMemb = endTruncMemb; XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), SizeOfMultiXactTruncate); + XLogRegisterData(&xlrec, SizeOfMultiXactTruncate); recptr = XLogInsert(RM_MULTIXACT_ID, XLOG_MULTIXACT_TRUNCATE_ID); XLogFlush(recptr); } diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index d331ab90d78..1b4f21a88d3 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -770,8 +770,8 @@ AssignTransactionId(TransactionState s) xlrec.nsubxacts = nUnreportedXids; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, MinSizeOfXactAssignment); - XLogRegisterData((char *) unreportedXids, + XLogRegisterData(&xlrec, MinSizeOfXactAssignment); + XLogRegisterData(unreportedXids, nUnreportedXids * sizeof(TransactionId)); (void) XLogInsert(RM_XACT_ID, XLOG_XACT_ASSIGNMENT); @@ -5909,54 +5909,54 @@ XactLogCommitRecord(TimestampTz commit_time, XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), sizeof(xl_xact_commit)); + XLogRegisterData(&xlrec, sizeof(xl_xact_commit)); if (xl_xinfo.xinfo != 0) - XLogRegisterData((char *) (&xl_xinfo.xinfo), sizeof(xl_xinfo.xinfo)); + XLogRegisterData(&xl_xinfo.xinfo, sizeof(xl_xinfo.xinfo)); if (xl_xinfo.xinfo & XACT_XINFO_HAS_DBINFO) - XLogRegisterData((char *) (&xl_dbinfo), sizeof(xl_dbinfo)); + XLogRegisterData(&xl_dbinfo, sizeof(xl_dbinfo)); if (xl_xinfo.xinfo & XACT_XINFO_HAS_SUBXACTS) { - XLogRegisterData((char *) (&xl_subxacts), + XLogRegisterData(&xl_subxacts, MinSizeOfXactSubxacts); - XLogRegisterData((char *) subxacts, + XLogRegisterData(subxacts, nsubxacts * sizeof(TransactionId)); } if (xl_xinfo.xinfo & XACT_XINFO_HAS_RELFILELOCATORS) { - XLogRegisterData((char *) (&xl_relfilelocators), + XLogRegisterData(&xl_relfilelocators, MinSizeOfXactRelfileLocators); - XLogRegisterData((char *) rels, + XLogRegisterData(rels, nrels * sizeof(RelFileLocator)); } if (xl_xinfo.xinfo & XACT_XINFO_HAS_DROPPED_STATS) { - XLogRegisterData((char *) (&xl_dropped_stats), + XLogRegisterData(&xl_dropped_stats, MinSizeOfXactStatsItems); - XLogRegisterData((char *) droppedstats, + XLogRegisterData(droppedstats, ndroppedstats * sizeof(xl_xact_stats_item)); } if (xl_xinfo.xinfo & XACT_XINFO_HAS_INVALS) { - XLogRegisterData((char *) (&xl_invals), MinSizeOfXactInvals); - XLogRegisterData((char *) msgs, + XLogRegisterData(&xl_invals, MinSizeOfXactInvals); + XLogRegisterData(msgs, nmsgs * sizeof(SharedInvalidationMessage)); } if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE) { - XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase)); + XLogRegisterData(&xl_twophase, sizeof(xl_xact_twophase)); if (xl_xinfo.xinfo & XACT_XINFO_HAS_GID) XLogRegisterData(twophase_gid, strlen(twophase_gid) + 1); } if (xl_xinfo.xinfo & XACT_XINFO_HAS_ORIGIN) - XLogRegisterData((char *) (&xl_origin), sizeof(xl_xact_origin)); + XLogRegisterData(&xl_origin, sizeof(xl_xact_origin)); /* we allow filtering by xacts */ XLogSetRecordFlags(XLOG_INCLUDE_ORIGIN); @@ -6062,47 +6062,47 @@ XactLogAbortRecord(TimestampTz abort_time, XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), MinSizeOfXactAbort); + XLogRegisterData(&xlrec, MinSizeOfXactAbort); if (xl_xinfo.xinfo != 0) - XLogRegisterData((char *) (&xl_xinfo), sizeof(xl_xinfo)); + XLogRegisterData(&xl_xinfo, sizeof(xl_xinfo)); if (xl_xinfo.xinfo & XACT_XINFO_HAS_DBINFO) - XLogRegisterData((char *) (&xl_dbinfo), sizeof(xl_dbinfo)); + XLogRegisterData(&xl_dbinfo, sizeof(xl_dbinfo)); if (xl_xinfo.xinfo & XACT_XINFO_HAS_SUBXACTS) { - XLogRegisterData((char *) (&xl_subxacts), + XLogRegisterData(&xl_subxacts, MinSizeOfXactSubxacts); - XLogRegisterData((char *) subxacts, + XLogRegisterData(subxacts, nsubxacts * sizeof(TransactionId)); } if (xl_xinfo.xinfo & XACT_XINFO_HAS_RELFILELOCATORS) { - XLogRegisterData((char *) (&xl_relfilelocators), + XLogRegisterData(&xl_relfilelocators, MinSizeOfXactRelfileLocators); - XLogRegisterData((char *) rels, + XLogRegisterData(rels, nrels * sizeof(RelFileLocator)); } if (xl_xinfo.xinfo & XACT_XINFO_HAS_DROPPED_STATS) { - XLogRegisterData((char *) (&xl_dropped_stats), + XLogRegisterData(&xl_dropped_stats, MinSizeOfXactStatsItems); - XLogRegisterData((char *) droppedstats, + XLogRegisterData(droppedstats, ndroppedstats * sizeof(xl_xact_stats_item)); } if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE) { - XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase)); + XLogRegisterData(&xl_twophase, sizeof(xl_xact_twophase)); if (xl_xinfo.xinfo & XACT_XINFO_HAS_GID) XLogRegisterData(twophase_gid, strlen(twophase_gid) + 1); } if (xl_xinfo.xinfo & XACT_XINFO_HAS_ORIGIN) - XLogRegisterData((char *) (&xl_origin), sizeof(xl_xact_origin)); + XLogRegisterData(&xl_origin, sizeof(xl_xact_origin)); /* Include the replication origin */ XLogSetRecordFlags(XLOG_INCLUDE_ORIGIN); diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 124676b460a..d123882ffa1 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7078,7 +7078,7 @@ CreateCheckPoint(int flags) { /* Include WAL level in record for WAL summarizer's benefit. */ XLogBeginInsert(); - XLogRegisterData((char *) &wal_level, sizeof(wal_level)); + XLogRegisterData(&wal_level, sizeof(wal_level)); (void) XLogInsert(RM_XLOG_ID, XLOG_CHECKPOINT_REDO); /* @@ -7231,7 +7231,7 @@ CreateCheckPoint(int flags) * Now insert the checkpoint record into XLOG. */ XLogBeginInsert(); - XLogRegisterData((char *) (&checkPoint), sizeof(checkPoint)); + XLogRegisterData(&checkPoint, sizeof(checkPoint)); recptr = XLogInsert(RM_XLOG_ID, shutdown ? XLOG_CHECKPOINT_SHUTDOWN : XLOG_CHECKPOINT_ONLINE); @@ -7413,7 +7413,7 @@ CreateEndOfRecoveryRecord(void) START_CRIT_SECTION(); XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(xl_end_of_recovery)); + XLogRegisterData(&xlrec, sizeof(xl_end_of_recovery)); recptr = XLogInsert(RM_XLOG_ID, XLOG_END_OF_RECOVERY); XLogFlush(recptr); @@ -7506,7 +7506,7 @@ CreateOverwriteContrecordRecord(XLogRecPtr aborted_lsn, XLogRecPtr pagePtr, XLogBeginInsert(); xlrec.overwritten_lsn = aborted_lsn; xlrec.overwrite_time = GetCurrentTimestamp(); - XLogRegisterData((char *) &xlrec, sizeof(xl_overwrite_contrecord)); + XLogRegisterData(&xlrec, sizeof(xl_overwrite_contrecord)); recptr = XLogInsert(RM_XLOG_ID, XLOG_OVERWRITE_CONTRECORD); /* check that the record was inserted to the right place */ @@ -8044,7 +8044,7 @@ void XLogPutNextOid(Oid nextOid) { XLogBeginInsert(); - XLogRegisterData((char *) (&nextOid), sizeof(Oid)); + XLogRegisterData(&nextOid, sizeof(Oid)); (void) XLogInsert(RM_XLOG_ID, XLOG_NEXTOID); /* @@ -8105,7 +8105,7 @@ XLogRestorePoint(const char *rpName) strlcpy(xlrec.rp_name, rpName, MAXFNAMELEN); XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(xl_restore_point)); + XLogRegisterData(&xlrec, sizeof(xl_restore_point)); RecPtr = XLogInsert(RM_XLOG_ID, XLOG_RESTORE_POINT); @@ -8154,7 +8154,7 @@ XLogReportParameters(void) xlrec.track_commit_timestamp = track_commit_timestamp; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(xlrec)); + XLogRegisterData(&xlrec, sizeof(xlrec)); recptr = XLogInsert(RM_XLOG_ID, XLOG_PARAMETER_CHANGE); XLogFlush(recptr); @@ -8229,7 +8229,7 @@ UpdateFullPageWrites(void) if (XLogStandbyInfoActive() && !recoveryInProgress) { XLogBeginInsert(); - XLogRegisterData((char *) (&fullPageWrites), sizeof(bool)); + XLogRegisterData(&fullPageWrites, sizeof(bool)); XLogInsert(RM_XLOG_ID, XLOG_FPW_CHANGE); } @@ -9272,7 +9272,7 @@ do_pg_backup_stop(BackupState *state, bool waitforarchive) * Write the backup-end xlog record */ XLogBeginInsert(); - XLogRegisterData((char *) (&state->startpoint), + XLogRegisterData(&state->startpoint, sizeof(state->startpoint)); state->stoppoint = XLogInsert(RM_XLOG_ID, XLOG_BACKUP_END); diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c index eba0e716549..690b1dbc6ee 100644 --- a/src/backend/catalog/storage.c +++ b/src/backend/catalog/storage.c @@ -194,7 +194,7 @@ log_smgrcreate(const RelFileLocator *rlocator, ForkNumber forkNum) xlrec.forkNum = forkNum; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(xlrec)); + XLogRegisterData(&xlrec, sizeof(xlrec)); XLogInsert(RM_SMGR_ID, XLOG_SMGR_CREATE | XLR_SPECIAL_REL_UPDATE); } @@ -397,7 +397,7 @@ RelationTruncate(Relation rel, BlockNumber nblocks) xlrec.flags = SMGR_TRUNCATE_ALL; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(xlrec)); + XLogRegisterData(&xlrec, sizeof(xlrec)); lsn = XLogInsert(RM_SMGR_ID, XLOG_SMGR_TRUNCATE | XLR_SPECIAL_REL_UPDATE); diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 46310add459..1753b289074 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -529,7 +529,7 @@ CreateDirAndVersionFile(char *dbpath, Oid dbid, Oid tsid, bool isRedo) xlrec.tablespace_id = tsid; XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), + XLogRegisterData(&xlrec, sizeof(xl_dbase_create_wal_log_rec)); (void) XLogInsert(RM_DBASE_ID, XLOG_DBASE_CREATE_WAL_LOG); @@ -625,7 +625,7 @@ CreateDatabaseUsingFileCopy(Oid src_dboid, Oid dst_dboid, Oid src_tsid, xlrec.src_tablespace_id = srctablespace; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, + XLogRegisterData(&xlrec, sizeof(xl_dbase_create_file_copy_rec)); (void) XLogInsert(RM_DBASE_ID, @@ -2183,7 +2183,7 @@ movedb(const char *dbname, const char *tblspcname) xlrec.src_tablespace_id = src_tblspcoid; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, + XLogRegisterData(&xlrec, sizeof(xl_dbase_create_file_copy_rec)); (void) XLogInsert(RM_DBASE_ID, @@ -2279,8 +2279,8 @@ movedb(const char *dbname, const char *tblspcname) xlrec.ntablespaces = 1; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(xl_dbase_drop_rec)); - XLogRegisterData((char *) &src_tblspcoid, sizeof(Oid)); + XLogRegisterData(&xlrec, sizeof(xl_dbase_drop_rec)); + XLogRegisterData(&src_tblspcoid, sizeof(Oid)); (void) XLogInsert(RM_DBASE_ID, XLOG_DBASE_DROP | XLR_SPECIAL_REL_UPDATE); @@ -3037,8 +3037,8 @@ remove_dbtablespaces(Oid db_id) xlrec.ntablespaces = ntblspc; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, MinSizeOfDbaseDropRec); - XLogRegisterData((char *) tablespace_ids, ntblspc * sizeof(Oid)); + XLogRegisterData(&xlrec, MinSizeOfDbaseDropRec); + XLogRegisterData(tablespace_ids, ntblspc * sizeof(Oid)); (void) XLogInsert(RM_DBASE_ID, XLOG_DBASE_DROP | XLR_SPECIAL_REL_UPDATE); diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index b13ee2b745d..4b7c5113aab 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -415,8 +415,8 @@ fill_seq_fork_with_data(Relation rel, HeapTuple tuple, ForkNumber forkNum) xlrec.locator = rel->rd_locator; - XLogRegisterData((char *) &xlrec, sizeof(xl_seq_rec)); - XLogRegisterData((char *) tuple->t_data, tuple->t_len); + XLogRegisterData(&xlrec, sizeof(xl_seq_rec)); + XLogRegisterData(tuple->t_data, tuple->t_len); recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG); @@ -840,8 +840,8 @@ nextval_internal(Oid relid, bool check_permissions) xlrec.locator = seqrel->rd_locator; - XLogRegisterData((char *) &xlrec, sizeof(xl_seq_rec)); - XLogRegisterData((char *) seqdatatuple.t_data, seqdatatuple.t_len); + XLogRegisterData(&xlrec, sizeof(xl_seq_rec)); + XLogRegisterData(seqdatatuple.t_data, seqdatatuple.t_len); recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG); @@ -1026,8 +1026,8 @@ do_setval(Oid relid, int64 next, bool iscalled) XLogRegisterBuffer(0, buf, REGBUF_WILL_INIT); xlrec.locator = seqrel->rd_locator; - XLogRegisterData((char *) &xlrec, sizeof(xl_seq_rec)); - XLogRegisterData((char *) seqdatatuple.t_data, seqdatatuple.t_len); + XLogRegisterData(&xlrec, sizeof(xl_seq_rec)); + XLogRegisterData(seqdatatuple.t_data, seqdatatuple.t_len); recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG); diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 18f64db6e39..173aeedb68e 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -2283,8 +2283,8 @@ ExecuteTruncateGuts(List *explicit_rels, xlrec.flags |= XLH_TRUNCATE_RESTART_SEQS; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfHeapTruncate); - XLogRegisterData((char *) logrelids, list_length(relids_logged) * sizeof(Oid)); + XLogRegisterData(&xlrec, SizeOfHeapTruncate); + XLogRegisterData(logrelids, list_length(relids_logged) * sizeof(Oid)); XLogSetRecordFlags(XLOG_INCLUDE_ORIGIN); diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 4ac2763c7f3..a9005cc7212 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -363,9 +363,9 @@ CreateTableSpace(CreateTableSpaceStmt *stmt) xlrec.ts_id = tablespaceoid; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, + XLogRegisterData(&xlrec, offsetof(xl_tblspc_create_rec, ts_path)); - XLogRegisterData((char *) location, strlen(location) + 1); + XLogRegisterData(location, strlen(location) + 1); (void) XLogInsert(RM_TBLSPC_ID, XLOG_TBLSPC_CREATE); } @@ -533,7 +533,7 @@ DropTableSpace(DropTableSpaceStmt *stmt) xlrec.ts_id = tablespaceoid; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, sizeof(xl_tblspc_drop_rec)); + XLogRegisterData(&xlrec, sizeof(xl_tblspc_drop_rec)); (void) XLogInsert(RM_TBLSPC_ID, XLOG_TBLSPC_DROP); } diff --git a/src/backend/replication/logical/message.c b/src/backend/replication/logical/message.c index 0d6cf67c107..ebc8454bad9 100644 --- a/src/backend/replication/logical/message.c +++ b/src/backend/replication/logical/message.c @@ -62,7 +62,7 @@ LogLogicalMessage(const char *prefix, const char *message, size_t size, xlrec.message_size = size; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfLogicalMessage); + XLogRegisterData(&xlrec, SizeOfLogicalMessage); XLogRegisterData(prefix, xlrec.prefix_size); XLogRegisterData(message, size); diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c index 1b586cb1cf2..c3c1d7a2a51 100644 --- a/src/backend/replication/logical/origin.c +++ b/src/backend/replication/logical/origin.c @@ -391,7 +391,7 @@ replorigin_state_clear(RepOriginId roident, bool nowait) xlrec.node_id = roident; XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), sizeof(xlrec)); + XLogRegisterData(&xlrec, sizeof(xlrec)); XLogInsert(RM_REPLORIGIN_ID, XLOG_REPLORIGIN_DROP); } @@ -986,7 +986,7 @@ replorigin_advance(RepOriginId node, xlrec.force = go_backward; XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), sizeof(xlrec)); + XLogRegisterData(&xlrec, sizeof(xlrec)); XLogInsert(RM_REPLORIGIN_ID, XLOG_REPLORIGIN_SET); } diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c index 2039062554d..5acb4508f85 100644 --- a/src/backend/storage/ipc/standby.c +++ b/src/backend/storage/ipc/standby.c @@ -1353,11 +1353,11 @@ LogCurrentRunningXacts(RunningTransactions CurrRunningXacts) /* Header */ XLogBeginInsert(); XLogSetRecordFlags(XLOG_MARK_UNIMPORTANT); - XLogRegisterData((char *) (&xlrec), MinSizeOfXactRunningXacts); + XLogRegisterData(&xlrec, MinSizeOfXactRunningXacts); /* array of TransactionIds */ if (xlrec.xcnt > 0) - XLogRegisterData((char *) CurrRunningXacts->xids, + XLogRegisterData(CurrRunningXacts->xids, (xlrec.xcnt + xlrec.subxcnt) * sizeof(TransactionId)); recptr = XLogInsert(RM_STANDBY_ID, XLOG_RUNNING_XACTS); @@ -1405,8 +1405,8 @@ LogAccessExclusiveLocks(int nlocks, xl_standby_lock *locks) xlrec.nlocks = nlocks; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, offsetof(xl_standby_locks, locks)); - XLogRegisterData((char *) locks, nlocks * sizeof(xl_standby_lock)); + XLogRegisterData(&xlrec, offsetof(xl_standby_locks, locks)); + XLogRegisterData(locks, nlocks * sizeof(xl_standby_lock)); XLogSetRecordFlags(XLOG_MARK_UNIMPORTANT); (void) XLogInsert(RM_STANDBY_ID, XLOG_STANDBY_LOCK); @@ -1469,8 +1469,8 @@ LogStandbyInvalidations(int nmsgs, SharedInvalidationMessage *msgs, /* perform insertion */ XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), MinSizeOfInvalidations); - XLogRegisterData((char *) msgs, + XLogRegisterData(&xlrec, MinSizeOfInvalidations); + XLogRegisterData(msgs, nmsgs * sizeof(SharedInvalidationMessage)); XLogInsert(RM_STANDBY_ID, XLOG_INVALIDATIONS); } diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index 32cf28bb8bc..6aff1ec01d7 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -1813,12 +1813,12 @@ LogLogicalInvalidations(void) /* perform insertion */ XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), MinSizeOfXactInvals); + XLogRegisterData(&xlrec, MinSizeOfXactInvals); ProcessMessageSubGroupMulti(group, CatCacheMsgs, - XLogRegisterData((char *) msgs, + XLogRegisterData(msgs, n * sizeof(SharedInvalidationMessage))); ProcessMessageSubGroupMulti(group, RelCacheMsgs, - XLogRegisterData((char *) msgs, + XLogRegisterData(msgs, n * sizeof(SharedInvalidationMessage))); XLogInsert(RM_XACT_ID, XLOG_XACT_INVALIDATIONS); } diff --git a/src/backend/utils/cache/relmapper.c b/src/backend/utils/cache/relmapper.c index 30f968cd9cf..abf89f0776e 100644 --- a/src/backend/utils/cache/relmapper.c +++ b/src/backend/utils/cache/relmapper.c @@ -969,8 +969,8 @@ write_relmap_file(RelMapFile *newmap, bool write_wal, bool send_sinval, xlrec.nbytes = sizeof(RelMapFile); XLogBeginInsert(); - XLogRegisterData((char *) (&xlrec), MinSizeOfRelmapUpdate); - XLogRegisterData((char *) newmap, sizeof(RelMapFile)); + XLogRegisterData(&xlrec, MinSizeOfRelmapUpdate); + XLogRegisterData(newmap, sizeof(RelMapFile)); lsn = XLogInsert(RM_RELMAP_ID, XLOG_RELMAP_UPDATE); diff --git a/src/test/modules/test_custom_rmgrs/test_custom_rmgrs.c b/src/test/modules/test_custom_rmgrs/test_custom_rmgrs.c index b989a35f801..1a424ad55a8 100644 --- a/src/test/modules/test_custom_rmgrs/test_custom_rmgrs.c +++ b/src/test/modules/test_custom_rmgrs/test_custom_rmgrs.c @@ -128,8 +128,8 @@ test_custom_rmgrs_insert_wal_record(PG_FUNCTION_ARGS) xlrec.message_size = len; XLogBeginInsert(); - XLogRegisterData((char *) &xlrec, SizeOfTestCustomRmgrsMessage); - XLogRegisterData((char *) payload, len); + XLogRegisterData(&xlrec, SizeOfTestCustomRmgrsMessage); + XLogRegisterData(payload, len); /* Let's mark this record as unimportant, just in case. */ XLogSetRecordFlags(XLOG_MARK_UNIMPORTANT); -- 2.48.1