diff options
Diffstat (limited to 'src/backend/access/hash')
-rw-r--r-- | src/backend/access/hash/hash.c | 6 | ||||
-rw-r--r-- | src/backend/access/hash/hashinsert.c | 8 | ||||
-rw-r--r-- | src/backend/access/hash/hashovfl.c | 26 | ||||
-rw-r--r-- | src/backend/access/hash/hashpage.c | 16 |
4 files changed, 28 insertions, 28 deletions
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index 4167b33e683..02ec1126a4c 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -616,7 +616,7 @@ loop_top: 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 @@ restart_insert: 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 @@ found: 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 @@ readpage: 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 @@ readpage: } 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 @@ restart_expand: 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); |