Skip to content

Commit dded228

Browse files
peterepull[bot]
petere
authored and
pull[bot]
committed
Update types in smgr API
Change data buffer to void *, from char *, and add const where appropriate. This makes it match the File API (see also 2d4f1ba) and stdio. Discussion: https://www.postgresql.org/message-id/flat/11dda853-bb5b-59ba-a746-e168b1ce4bdb%40enterprisedb.com
1 parent b1def64 commit dded228

File tree

10 files changed

+27
-27
lines changed

10 files changed

+27
-27
lines changed

‎contrib/bloom/blinsert.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ blbuildempty(Relation index)
178178
*/
179179
PageSetChecksumInplace(metapage, BLOOM_METAPAGE_BLKNO);
180180
smgrwrite(RelationGetSmgr(index), INIT_FORKNUM, BLOOM_METAPAGE_BLKNO,
181-
(char *) metapage, true);
181+
metapage, true);
182182
log_newpage(&(RelationGetSmgr(index))->smgr_rlocator.locator, INIT_FORKNUM,
183183
BLOOM_METAPAGE_BLKNO, metapage, true);
184184

‎src/backend/access/heap/rewriteheap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ end_heap_rewrite(RewriteState state)
326326
PageSetChecksumInplace(state->rs_buffer, state->rs_blockno);
327327

328328
smgrextend(RelationGetSmgr(state->rs_new_rel), MAIN_FORKNUM,
329-
state->rs_blockno, (char *) state->rs_buffer, true);
329+
state->rs_blockno, state->rs_buffer, true);
330330
}
331331

332332
/*
@@ -692,7 +692,7 @@ raw_heap_insert(RewriteState state, HeapTuple tup)
692692
PageSetChecksumInplace(page, state->rs_blockno);
693693

694694
smgrextend(RelationGetSmgr(state->rs_new_rel), MAIN_FORKNUM,
695-
state->rs_blockno, (char *) page, true);
695+
state->rs_blockno, page, true);
696696

697697
state->rs_blockno++;
698698
state->rs_buffer_valid = false;

‎src/backend/access/nbtree/nbtree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ btbuildempty(Relation index)
165165
*/
166166
PageSetChecksumInplace(metapage, BTREE_METAPAGE);
167167
smgrwrite(RelationGetSmgr(index), INIT_FORKNUM, BTREE_METAPAGE,
168-
(char *) metapage, true);
168+
metapage, true);
169169
log_newpage(&RelationGetSmgr(index)->smgr_rlocator.locator, INIT_FORKNUM,
170170
BTREE_METAPAGE, metapage, true);
171171

‎src/backend/access/nbtree/nbtsort.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ _bt_blwritepage(BTWriteState *wstate, Page page, BlockNumber blkno)
664664
/* don't set checksum for all-zero page */
665665
smgrextend(RelationGetSmgr(wstate->index), MAIN_FORKNUM,
666666
wstate->btws_pages_written++,
667-
(char *) wstate->btws_zeropage,
667+
wstate->btws_zeropage,
668668
true);
669669
}
670670

@@ -678,14 +678,14 @@ _bt_blwritepage(BTWriteState *wstate, Page page, BlockNumber blkno)
678678
{
679679
/* extending the file... */
680680
smgrextend(RelationGetSmgr(wstate->index), MAIN_FORKNUM, blkno,
681-
(char *) page, true);
681+
page, true);
682682
wstate->btws_pages_written++;
683683
}
684684
else
685685
{
686686
/* overwriting a block we zero-filled before */
687687
smgrwrite(RelationGetSmgr(wstate->index), MAIN_FORKNUM, blkno,
688-
(char *) page, true);
688+
page, true);
689689
}
690690

691691
pfree(page);

‎src/backend/access/spgist/spginsert.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ spgbuildempty(Relation index)
170170
*/
171171
PageSetChecksumInplace(page, SPGIST_METAPAGE_BLKNO);
172172
smgrwrite(RelationGetSmgr(index), INIT_FORKNUM, SPGIST_METAPAGE_BLKNO,
173-
(char *) page, true);
173+
page, true);
174174
log_newpage(&(RelationGetSmgr(index))->smgr_rlocator.locator, INIT_FORKNUM,
175175
SPGIST_METAPAGE_BLKNO, page, true);
176176

@@ -179,7 +179,7 @@ spgbuildempty(Relation index)
179179

180180
PageSetChecksumInplace(page, SPGIST_ROOT_BLKNO);
181181
smgrwrite(RelationGetSmgr(index), INIT_FORKNUM, SPGIST_ROOT_BLKNO,
182-
(char *) page, true);
182+
page, true);
183183
log_newpage(&(RelationGetSmgr(index))->smgr_rlocator.locator, INIT_FORKNUM,
184184
SPGIST_ROOT_BLKNO, page, true);
185185

@@ -188,7 +188,7 @@ spgbuildempty(Relation index)
188188

189189
PageSetChecksumInplace(page, SPGIST_NULL_BLKNO);
190190
smgrwrite(RelationGetSmgr(index), INIT_FORKNUM, SPGIST_NULL_BLKNO,
191-
(char *) page, true);
191+
page, true);
192192
log_newpage(&(RelationGetSmgr(index))->smgr_rlocator.locator, INIT_FORKNUM,
193193
SPGIST_NULL_BLKNO, page, true);
194194

‎src/backend/storage/buffer/bufmgr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
10031003
/* new buffers are zero-filled */
10041004
MemSet((char *) bufBlock, 0, BLCKSZ);
10051005
/* don't set checksum for all-zero page */
1006-
smgrextend(smgr, forkNum, blockNum, (char *) bufBlock, false);
1006+
smgrextend(smgr, forkNum, blockNum, bufBlock, false);
10071007

10081008
pgstat_count_io_op(io_object, io_context, IOOP_EXTEND);
10091009

@@ -1032,7 +1032,7 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
10321032
else
10331033
INSTR_TIME_SET_ZERO(io_start);
10341034

1035-
smgrread(smgr, forkNum, blockNum, (char *) bufBlock);
1035+
smgrread(smgr, forkNum, blockNum, bufBlock);
10361036

10371037
pgstat_count_io_op(io_object, io_context, IOOP_READ);
10381038

‎src/backend/storage/smgr/md.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ mdunlinkfork(RelFileLocatorBackend rlocator, ForkNumber forknum, bool isRedo)
447447
*/
448448
void
449449
mdextend(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
450-
char *buffer, bool skipFsync)
450+
const void *buffer, bool skipFsync)
451451
{
452452
off_t seekpos;
453453
int nbytes;
@@ -669,7 +669,7 @@ mdwriteback(SMgrRelation reln, ForkNumber forknum,
669669
*/
670670
void
671671
mdread(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
672-
char *buffer)
672+
void *buffer)
673673
{
674674
off_t seekpos;
675675
int nbytes;
@@ -734,7 +734,7 @@ mdread(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
734734
*/
735735
void
736736
mdwrite(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
737-
char *buffer, bool skipFsync)
737+
const void *buffer, bool skipFsync)
738738
{
739739
off_t seekpos;
740740
int nbytes;

‎src/backend/storage/smgr/smgr.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ typedef struct f_smgr
4949
void (*smgr_unlink) (RelFileLocatorBackend rlocator, ForkNumber forknum,
5050
bool isRedo);
5151
void (*smgr_extend) (SMgrRelation reln, ForkNumber forknum,
52-
BlockNumber blocknum, char *buffer, bool skipFsync);
52+
BlockNumber blocknum, const void *buffer, bool skipFsync);
5353
bool (*smgr_prefetch) (SMgrRelation reln, ForkNumber forknum,
5454
BlockNumber blocknum);
5555
void (*smgr_read) (SMgrRelation reln, ForkNumber forknum,
56-
BlockNumber blocknum, char *buffer);
56+
BlockNumber blocknum, void *buffer);
5757
void (*smgr_write) (SMgrRelation reln, ForkNumber forknum,
58-
BlockNumber blocknum, char *buffer, bool skipFsync);
58+
BlockNumber blocknum, const void *buffer, bool skipFsync);
5959
void (*smgr_writeback) (SMgrRelation reln, ForkNumber forknum,
6060
BlockNumber blocknum, BlockNumber nblocks);
6161
BlockNumber (*smgr_nblocks) (SMgrRelation reln, ForkNumber forknum);
@@ -491,7 +491,7 @@ smgrdounlinkall(SMgrRelation *rels, int nrels, bool isRedo)
491491
*/
492492
void
493493
smgrextend(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
494-
char *buffer, bool skipFsync)
494+
const void *buffer, bool skipFsync)
495495
{
496496
smgrsw[reln->smgr_which].smgr_extend(reln, forknum, blocknum,
497497
buffer, skipFsync);
@@ -530,7 +530,7 @@ smgrprefetch(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum)
530530
*/
531531
void
532532
smgrread(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
533-
char *buffer)
533+
void *buffer)
534534
{
535535
smgrsw[reln->smgr_which].smgr_read(reln, forknum, blocknum, buffer);
536536
}
@@ -552,7 +552,7 @@ smgrread(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
552552
*/
553553
void
554554
smgrwrite(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
555-
char *buffer, bool skipFsync)
555+
const void *buffer, bool skipFsync)
556556
{
557557
smgrsw[reln->smgr_which].smgr_write(reln, forknum, blocknum,
558558
buffer, skipFsync);

‎src/include/storage/md.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ extern void mdcreate(SMgrRelation reln, ForkNumber forknum, bool isRedo);
2727
extern bool mdexists(SMgrRelation reln, ForkNumber forknum);
2828
extern void mdunlink(RelFileLocatorBackend rlocator, ForkNumber forknum, bool isRedo);
2929
extern void mdextend(SMgrRelation reln, ForkNumber forknum,
30-
BlockNumber blocknum, char *buffer, bool skipFsync);
30+
BlockNumber blocknum, const void *buffer, bool skipFsync);
3131
extern bool mdprefetch(SMgrRelation reln, ForkNumber forknum,
3232
BlockNumber blocknum);
3333
extern void mdread(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
34-
char *buffer);
34+
void *buffer);
3535
extern void mdwrite(SMgrRelation reln, ForkNumber forknum,
36-
BlockNumber blocknum, char *buffer, bool skipFsync);
36+
BlockNumber blocknum, const void *buffer, bool skipFsync);
3737
extern void mdwriteback(SMgrRelation reln, ForkNumber forknum,
3838
BlockNumber blocknum, BlockNumber nblocks);
3939
extern BlockNumber mdnblocks(SMgrRelation reln, ForkNumber forknum);

‎src/include/storage/smgr.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ extern void smgrcreate(SMgrRelation reln, ForkNumber forknum, bool isRedo);
9191
extern void smgrdosyncall(SMgrRelation *rels, int nrels);
9292
extern void smgrdounlinkall(SMgrRelation *rels, int nrels, bool isRedo);
9393
extern void smgrextend(SMgrRelation reln, ForkNumber forknum,
94-
BlockNumber blocknum, char *buffer, bool skipFsync);
94+
BlockNumber blocknum, const void *buffer, bool skipFsync);
9595
extern bool smgrprefetch(SMgrRelation reln, ForkNumber forknum,
9696
BlockNumber blocknum);
9797
extern void smgrread(SMgrRelation reln, ForkNumber forknum,
98-
BlockNumber blocknum, char *buffer);
98+
BlockNumber blocknum, void *buffer);
9999
extern void smgrwrite(SMgrRelation reln, ForkNumber forknum,
100-
BlockNumber blocknum, char *buffer, bool skipFsync);
100+
BlockNumber blocknum, const void *buffer, bool skipFsync);
101101
extern void smgrwriteback(SMgrRelation reln, ForkNumber forknum,
102102
BlockNumber blocknum, BlockNumber nblocks);
103103
extern BlockNumber smgrnblocks(SMgrRelation reln, ForkNumber forknum);

0 commit comments

Comments
 (0)