Skip to content

Commit a22445f

Browse files
alvherrealvherre
committed
Flip argument order in XLogSegNoOffsetToRecPtr
Commit fc49e24 added an input argument after the existing output argument. Flip those. Author: Álvaro Herrera <alvherre@alvh.no-ip.org> Reviewed-by: Andres Freund <andres@anarazel.de> Discussion: https://postgr.es/m/20180708182345.imdgovmkffgtihhk@alvherre.pgsql
1 parent 01783ac commit a22445f

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1971,7 +1971,7 @@ XLogBytePosToRecPtr(uint64 bytepos)
19711971
seg_offset += fullpages * XLOG_BLCKSZ + bytesleft + SizeOfXLogShortPHD;
19721972
}
19731973

1974-
XLogSegNoOffsetToRecPtr(fullsegs, seg_offset, result, wal_segment_size);
1974+
XLogSegNoOffsetToRecPtr(fullsegs, seg_offset, wal_segment_size, result);
19751975

19761976
return result;
19771977
}
@@ -2017,7 +2017,7 @@ XLogBytePosToEndRecPtr(uint64 bytepos)
20172017
seg_offset += fullpages * XLOG_BLCKSZ + bytesleft + SizeOfXLogShortPHD;
20182018
}
20192019

2020-
XLogSegNoOffsetToRecPtr(fullsegs, seg_offset, result, wal_segment_size);
2020+
XLogSegNoOffsetToRecPtr(fullsegs, seg_offset, wal_segment_size, result);
20212021

20222022
return result;
20232023
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr,
747747
XLByteToSeg(recptr, segno, state->wal_segment_size);
748748
offset = XLogSegmentOffset(recptr, state->wal_segment_size);
749749

750-
XLogSegNoOffsetToRecPtr(segno, offset, recaddr, state->wal_segment_size);
750+
XLogSegNoOffsetToRecPtr(segno, offset, state->wal_segment_size, recaddr);
751751

752752
if (hdr->xlp_magic != XLOG_PAGE_MAGIC)
753753
{

‎src/backend/replication/logical/reorderbuffer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2782,7 +2782,7 @@ ReorderBufferSerializedPath(char *path, ReplicationSlot *slot, TransactionId xid
27822782
{
27832783
XLogRecPtr recptr;
27842784

2785-
XLogSegNoOffsetToRecPtr(segno, 0, recptr, wal_segment_size);
2785+
XLogSegNoOffsetToRecPtr(segno, 0, wal_segment_size, recptr);
27862786

27872787
snprintf(path, MAXPGPATH, "pg_replslot/%s/xid-%u-lsn-%X-%X.snap",
27882788
NameStr(MyReplicationSlot->data.name),

‎src/bin/pg_basebackup/pg_receivewal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ FindStreamingStart(uint32 *tli)
352352
if (!high_ispartial)
353353
high_segno++;
354354

355-
XLogSegNoOffsetToRecPtr(high_segno, 0, high_ptr, WalSegSz);
355+
XLogSegNoOffsetToRecPtr(high_segno, 0, WalSegSz, high_ptr);
356356

357357
*tli = high_tli;
358358
return high_ptr;

‎src/bin/pg_resetwal/pg_resetwal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -933,8 +933,8 @@ RewriteControlFile(void)
933933
* Adjust fields as needed to force an empty XLOG starting at
934934
* newXlogSegNo.
935935
*/
936-
XLogSegNoOffsetToRecPtr(newXlogSegNo, SizeOfXLogLongPHD,
937-
ControlFile.checkPointCopy.redo, WalSegSz);
936+
XLogSegNoOffsetToRecPtr(newXlogSegNo, SizeOfXLogLongPHD, WalSegSz,
937+
ControlFile.checkPointCopy.redo);
938938
ControlFile.checkPointCopy.time = (pg_time_t) time(NULL);
939939

940940
ControlFile.state = DB_SHUTDOWNED;

‎src/bin/pg_rewind/parsexlog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
248248
XLogSegNo targetSegNo;
249249

250250
XLByteToSeg(targetPagePtr, targetSegNo, WalSegSz);
251-
XLogSegNoOffsetToRecPtr(targetSegNo + 1, 0, targetSegEnd, WalSegSz);
251+
XLogSegNoOffsetToRecPtr(targetSegNo + 1, 0, WalSegSz, targetSegEnd);
252252
targetPageOff = XLogSegmentOffset(targetPagePtr, WalSegSz);
253253

254254
/*

‎src/bin/pg_waldump/pg_waldump.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ main(int argc, char **argv)
10391039
XLogFromFileName(fname, &private.timeline, &segno, WalSegSz);
10401040

10411041
if (XLogRecPtrIsInvalid(private.startptr))
1042-
XLogSegNoOffsetToRecPtr(segno, 0, private.startptr, WalSegSz);
1042+
XLogSegNoOffsetToRecPtr(segno, 0, WalSegSz, private.startptr);
10431043
else if (!XLByteInSeg(private.startptr, segno, WalSegSz))
10441044
{
10451045
fprintf(stderr,
@@ -1053,7 +1053,7 @@ main(int argc, char **argv)
10531053

10541054
/* no second file specified, set end position */
10551055
if (!(optind + 1 < argc) && XLogRecPtrIsInvalid(private.endptr))
1056-
XLogSegNoOffsetToRecPtr(segno + 1, 0, private.endptr, WalSegSz);
1056+
XLogSegNoOffsetToRecPtr(segno + 1, 0, WalSegSz, private.endptr);
10571057

10581058
/* parse ENDSEG if passed */
10591059
if (optind + 1 < argc)
@@ -1076,8 +1076,8 @@ main(int argc, char **argv)
10761076
argv[optind + 1], argv[optind]);
10771077

10781078
if (XLogRecPtrIsInvalid(private.endptr))
1079-
XLogSegNoOffsetToRecPtr(endsegno + 1, 0, private.endptr,
1080-
WalSegSz);
1079+
XLogSegNoOffsetToRecPtr(endsegno + 1, 0, WalSegSz,
1080+
private.endptr);
10811081

10821082
/* set segno to endsegno for check of --end */
10831083
segno = endsegno;

‎src/include/access/xlog_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader;
101101
#define XLogSegmentsPerXLogId(wal_segsz_bytes) \
102102
(UINT64CONST(0x100000000) / (wal_segsz_bytes))
103103

104-
#define XLogSegNoOffsetToRecPtr(segno, offset, dest, wal_segsz_bytes) \
104+
#define XLogSegNoOffsetToRecPtr(segno, offset, wal_segsz_bytes, dest) \
105105
(dest) = (segno) * (wal_segsz_bytes) + (offset)
106106

107107
#define XLogSegmentOffset(xlogptr, wal_segsz_bytes) \

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy