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

Commit0ef0b67

Browse files
committed
Change the signature of rm_desc so that it's passed a XLogRecord.
Just feels more natural, and is more consistent with rm_redo.
1 parentf3fdd25 commit0ef0b67

37 files changed

+82
-69
lines changed

‎contrib/pg_xlogdump/pg_xlogdump.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ XLogDumpDisplayRecord(XLogDumpConfig *config, XLogRecPtr ReadRecPtr, XLogRecord
351351
!!(XLR_BKP_BLOCK(3)&record->xl_info));
352352

353353
/* the desc routine will printf the description directly to stdout */
354-
desc->rm_desc(NULL,record->xl_info,XLogRecGetData(record));
354+
desc->rm_desc(NULL,record);
355355

356356
putchar('\n');
357357

‎contrib/pg_xlogdump/rmgrdesc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
typedefstructRmgrDescData
1414
{
1515
constchar*rm_name;
16-
void(*rm_desc) (StringInfobuf,uint8xl_info,char*rec);
16+
void(*rm_desc) (StringInfobuf,XLogRecord*record);
1717
}RmgrDescData;
1818

1919
externconstRmgrDescDataRmgrDescTable[];

‎src/backend/access/rmgrdesc/clogdesc.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818

1919

2020
void
21-
clog_desc(StringInfobuf,uint8xl_info,char*rec)
21+
clog_desc(StringInfobuf,XLogRecord*record)
2222
{
23-
uint8info=xl_info& ~XLR_INFO_MASK;
23+
char*rec=XLogRecGetData(record);
24+
uint8info=record->xl_info& ~XLR_INFO_MASK;
2425

2526
if (info==CLOG_ZEROPAGE)
2627
{

‎src/backend/access/rmgrdesc/dbasedesc.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919

2020

2121
void
22-
dbase_desc(StringInfobuf,uint8xl_info,char*rec)
22+
dbase_desc(StringInfobuf,XLogRecord*record)
2323
{
24-
uint8info=xl_info& ~XLR_INFO_MASK;
24+
char*rec=XLogRecGetData(record);
25+
uint8info=record->xl_info& ~XLR_INFO_MASK;
2526

2627
if (info==XLOG_DBASE_CREATE)
2728
{

‎src/backend/access/rmgrdesc/gindesc.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,10 @@ desc_recompress_leaf(StringInfo buf, ginxlogRecompressDataLeaf *insertData)
7777
}
7878

7979
void
80-
gin_desc(StringInfobuf,uint8xl_info,char*rec)
80+
gin_desc(StringInfobuf,XLogRecord*record)
8181
{
82-
uint8info=xl_info& ~XLR_INFO_MASK;
82+
char*rec=XLogRecGetData(record);
83+
uint8info=record->xl_info& ~XLR_INFO_MASK;
8384

8485
switch (info)
8586
{
@@ -121,7 +122,7 @@ gin_desc(StringInfo buf, uint8 xl_info, char *rec)
121122
ginxlogRecompressDataLeaf*insertData=
122123
(ginxlogRecompressDataLeaf*)payload;
123124

124-
if (xl_info&XLR_BKP_BLOCK(0))
125+
if (record->xl_info&XLR_BKP_BLOCK(0))
125126
appendStringInfo(buf," (full page image)");
126127
else
127128
desc_recompress_leaf(buf,insertData);
@@ -159,7 +160,7 @@ gin_desc(StringInfo buf, uint8 xl_info, char *rec)
159160

160161
appendStringInfoString(buf,"Vacuum data leaf page, ");
161162
desc_node(buf,xlrec->node,xlrec->blkno);
162-
if (xl_info&XLR_BKP_BLOCK(0))
163+
if (record->xl_info&XLR_BKP_BLOCK(0))
163164
appendStringInfo(buf," (full page image)");
164165
else
165166
desc_recompress_leaf(buf,&xlrec->data);

‎src/backend/access/rmgrdesc/gistdesc.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ out_gistxlogPageSplit(StringInfo buf, gistxlogPageSplit *xlrec)
4242
}
4343

4444
void
45-
gist_desc(StringInfobuf,uint8xl_info,char*rec)
45+
gist_desc(StringInfobuf,XLogRecord*record)
4646
{
47-
uint8info=xl_info& ~XLR_INFO_MASK;
47+
char*rec=XLogRecGetData(record);
48+
uint8info=record->xl_info& ~XLR_INFO_MASK;
4849

4950
switch (info)
5051
{

‎src/backend/access/rmgrdesc/hashdesc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
#include"access/hash.h"
1818

1919
void
20-
hash_desc(StringInfobuf,uint8xl_info,char*rec)
20+
hash_desc(StringInfobuf,XLogRecord*record)
2121
{
2222
}

‎src/backend/access/rmgrdesc/heapdesc.c‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,17 @@ out_infobits(StringInfo buf, uint8 infobits)
4141
}
4242

4343
void
44-
heap_desc(StringInfobuf,uint8xl_info,char*rec)
44+
heap_desc(StringInfobuf,XLogRecord*record)
4545
{
46-
uint8info=xl_info& ~XLR_INFO_MASK;
46+
char*rec=XLogRecGetData(record);
47+
uint8info=record->xl_info& ~XLR_INFO_MASK;
4748

4849
info &=XLOG_HEAP_OPMASK;
4950
if (info==XLOG_HEAP_INSERT)
5051
{
5152
xl_heap_insert*xlrec= (xl_heap_insert*)rec;
5253

53-
if (xl_info&XLOG_HEAP_INIT_PAGE)
54+
if (record->xl_info&XLOG_HEAP_INIT_PAGE)
5455
appendStringInfoString(buf,"insert(init): ");
5556
else
5657
appendStringInfoString(buf,"insert: ");
@@ -69,7 +70,7 @@ heap_desc(StringInfo buf, uint8 xl_info, char *rec)
6970
{
7071
xl_heap_update*xlrec= (xl_heap_update*)rec;
7172

72-
if (xl_info&XLOG_HEAP_INIT_PAGE)
73+
if (record->xl_info&XLOG_HEAP_INIT_PAGE)
7374
appendStringInfoString(buf,"update(init): ");
7475
else
7576
appendStringInfoString(buf,"update: ");
@@ -85,7 +86,7 @@ heap_desc(StringInfo buf, uint8 xl_info, char *rec)
8586
{
8687
xl_heap_update*xlrec= (xl_heap_update*)rec;
8788

88-
if (xl_info&XLOG_HEAP_INIT_PAGE)/* can this case happen? */
89+
if (record->xl_info&XLOG_HEAP_INIT_PAGE)/* can this case happen? */
8990
appendStringInfoString(buf,"hot_update(init): ");
9091
else
9192
appendStringInfoString(buf,"hot_update: ");
@@ -126,9 +127,10 @@ heap_desc(StringInfo buf, uint8 xl_info, char *rec)
126127
appendStringInfoString(buf,"UNKNOWN");
127128
}
128129
void
129-
heap2_desc(StringInfobuf,uint8xl_info,char*rec)
130+
heap2_desc(StringInfobuf,XLogRecord*record)
130131
{
131-
uint8info=xl_info& ~XLR_INFO_MASK;
132+
char*rec=XLogRecGetData(record);
133+
uint8info=record->xl_info& ~XLR_INFO_MASK;
132134

133135
info &=XLOG_HEAP_OPMASK;
134136
if (info==XLOG_HEAP2_CLEAN)
@@ -172,7 +174,7 @@ heap2_desc(StringInfo buf, uint8 xl_info, char *rec)
172174
{
173175
xl_heap_multi_insert*xlrec= (xl_heap_multi_insert*)rec;
174176

175-
if (xl_info&XLOG_HEAP_INIT_PAGE)
177+
if (record->xl_info&XLOG_HEAP_INIT_PAGE)
176178
appendStringInfoString(buf,"multi-insert (init): ");
177179
else
178180
appendStringInfoString(buf,"multi-insert: ");

‎src/backend/access/rmgrdesc/mxactdesc.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ out_member(StringInfo buf, MultiXactMember *member)
4747
}
4848

4949
void
50-
multixact_desc(StringInfobuf,uint8xl_info,char*rec)
50+
multixact_desc(StringInfobuf,XLogRecord*record)
5151
{
52-
uint8info=xl_info& ~XLR_INFO_MASK;
52+
char*rec=XLogRecGetData(record);
53+
uint8info=record->xl_info& ~XLR_INFO_MASK;
5354

5455
if (info==XLOG_MULTIXACT_ZERO_OFF_PAGE)
5556
{

‎src/backend/access/rmgrdesc/nbtdesc.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ out_target(StringInfo buf, xl_btreetid *target)
2626
}
2727

2828
void
29-
btree_desc(StringInfobuf,uint8xl_info,char*rec)
29+
btree_desc(StringInfobuf,XLogRecord*record)
3030
{
31-
uint8info=xl_info& ~XLR_INFO_MASK;
31+
char*rec=XLogRecGetData(record);
32+
uint8info=record->xl_info& ~XLR_INFO_MASK;
3233

3334
switch (info)
3435
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp