Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit443a8e4

Browse files
committed
Add some more use of Page/PageData rather than char *
Discussion:https://www.postgresql.org/message-id/flat/692ee0da-49da-4d32-8dca-da224cc2800e@eisentraut.org
1 parent4f4a1d8 commit443a8e4

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

‎src/backend/access/transam/xloginsert.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ typedef struct
7272
RelFileLocatorrlocator;/* identifies the relation and block */
7373
ForkNumberforkno;
7474
BlockNumberblock;
75-
constchar*page;/* page content */
75+
constPageData*page;/* page content */
7676
uint32rdata_len;/* total length of data in rdata chain */
7777
XLogRecData*rdata_head;/* head of the chain of data registered with
7878
* this block */
@@ -138,8 +138,8 @@ static XLogRecData *XLogRecordAssemble(RmgrId rmid, uint8 info,
138138
XLogRecPtrRedoRecPtr,booldoPageWrites,
139139
XLogRecPtr*fpw_lsn,int*num_fpi,
140140
bool*topxid_included);
141-
staticboolXLogCompressBackupBlock(constchar*page,uint16hole_offset,
142-
uint16hole_length,char*dest,uint16*dlen);
141+
staticboolXLogCompressBackupBlock(constPageData*page,uint16hole_offset,
142+
uint16hole_length,void*dest,uint16*dlen);
143143

144144
/*
145145
* Begin constructing a WAL record. This must be called before the
@@ -307,7 +307,7 @@ XLogRegisterBuffer(uint8 block_id, Buffer buffer, uint8 flags)
307307
*/
308308
void
309309
XLogRegisterBlock(uint8block_id,RelFileLocator*rlocator,ForkNumberforknum,
310-
BlockNumberblknum,constchar*page,uint8flags)
310+
BlockNumberblknum,constPageData*page,uint8flags)
311311
{
312312
registered_buffer*regbuf;
313313

@@ -648,7 +648,7 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,
648648

649649
if (include_image)
650650
{
651-
constchar*page=regbuf->page;
651+
constPageData*page=regbuf->page;
652652
uint16compressed_len=0;
653653

654654
/*
@@ -941,13 +941,13 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,
941941
* the length of compressed block image.
942942
*/
943943
staticbool
944-
XLogCompressBackupBlock(constchar*page,uint16hole_offset,uint16hole_length,
945-
char*dest,uint16*dlen)
944+
XLogCompressBackupBlock(constPageData*page,uint16hole_offset,uint16hole_length,
945+
void*dest,uint16*dlen)
946946
{
947947
int32orig_len=BLCKSZ-hole_length;
948948
int32len=-1;
949949
int32extra_bytes=0;
950-
constchar*source;
950+
constvoid*source;
951951
PGAlignedBlocktmp;
952952

953953
if (hole_length!=0)

‎src/include/access/xloginsert.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include"access/xlogdefs.h"
1616
#include"storage/block.h"
1717
#include"storage/buf.h"
18+
#include"storage/bufpage.h"
1819
#include"storage/relfilelocator.h"
1920
#include"utils/relcache.h"
2021

@@ -47,16 +48,16 @@ extern void XLogEnsureRecordSpace(int max_block_id, int ndatas);
4748
externvoidXLogRegisterData(constchar*data,uint32len);
4849
externvoidXLogRegisterBuffer(uint8block_id,Bufferbuffer,uint8flags);
4950
externvoidXLogRegisterBlock(uint8block_id,RelFileLocator*rlocator,
50-
ForkNumberforknum,BlockNumberblknum,constchar*page,
51+
ForkNumberforknum,BlockNumberblknum,constPageData*page,
5152
uint8flags);
5253
externvoidXLogRegisterBufData(uint8block_id,constchar*data,uint32len);
5354
externvoidXLogResetInsertion(void);
5455
externboolXLogCheckBufferNeedsBackup(Bufferbuffer);
5556

5657
externXLogRecPtrlog_newpage(RelFileLocator*rlocator,ForkNumberforknum,
57-
BlockNumberblkno,char*page,boolpage_std);
58+
BlockNumberblkno,Pagepage,boolpage_std);
5859
externvoidlog_newpages(RelFileLocator*rlocator,ForkNumberforknum,intnum_pages,
59-
BlockNumber*blknos,char**pages,boolpage_std);
60+
BlockNumber*blknos,Page*pages,boolpage_std);
6061
externXLogRecPtrlog_newpage_buffer(Bufferbuffer,boolpage_std);
6162
externvoidlog_newpage_range(Relationrel,ForkNumberforknum,
6263
BlockNumberstartblk,BlockNumberendblk,boolpage_std);

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp