v21-0004-Use-XLogReadFromBuffers-in-more-places.patch
application/octet-stream
Filename: v21-0004-Use-XLogReadFromBuffers-in-more-places.patch
Type: application/octet-stream
Part: 3
Patch
Same data as JSON:
GET /api/v1/attachments/:id/patch
the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes.
API reference →
Format: format-patch
Series: patch v21-0004
Subject: Use XLogReadFromBuffers in more places
| File | + | − |
|---|---|---|
| src/backend/access/transam/xlogutils.c | 11 | 1 |
| src/backend/replication/walsender.c | 11 | 1 |
From 0a3f3ea0f849e0bef731efe4c66ed17745b44c8d Mon Sep 17 00:00:00 2001 From: Bharath Rupireddy <bharath.rupireddyforpostgres@gmail.com> Date: Sat, 27 Jan 2024 07:04:51 +0000 Subject: [PATCH v21] Use XLogReadFromBuffers in more places --- src/backend/access/transam/xlogutils.c | 12 +++++++++++- src/backend/replication/walsender.c | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index aa8667abd1..de526f7da7 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -894,6 +894,8 @@ read_local_xlog_page_guts(XLogReaderState *state, XLogRecPtr targetPagePtr, int count; WALReadError errinfo; TimeLineID currTLI; + Size nbytes; + Size rbytes; loc = targetPagePtr + reqLen; @@ -1006,12 +1008,20 @@ read_local_xlog_page_guts(XLogReaderState *state, XLogRecPtr targetPagePtr, count = read_upto - targetPagePtr; } + /* Read from WAL buffers, if available. */ + nbytes = XLOG_BLCKSZ; + rbytes = XLogReadFromBuffers(cur_page, targetPagePtr, + nbytes, currTLI); + cur_page += rbytes; + targetPagePtr += rbytes; + nbytes -= rbytes; + /* * Even though we just determined how much of the page can be validly read * as 'count', read the whole page anyway. It's guaranteed to be * zero-padded up to the page boundary if it's incomplete. */ - if (!WALRead(state, cur_page, targetPagePtr, XLOG_BLCKSZ, tli, + if (!WALRead(state, cur_page, targetPagePtr, nbytes, tli, &errinfo)) WALReadRaiseError(&errinfo); diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 7efe9ad010..4bc8d5e320 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -1059,6 +1059,8 @@ logical_read_xlog_page(XLogReaderState *state, XLogRecPtr targetPagePtr, int req WALReadError errinfo; XLogSegNo segno; TimeLineID currTLI; + Size nbytes; + Size rbytes; /* * Make sure we have enough WAL available before retrieving the current @@ -1095,11 +1097,19 @@ logical_read_xlog_page(XLogReaderState *state, XLogRecPtr targetPagePtr, int req else count = flushptr - targetPagePtr; /* part of the page available */ + /* Read from WAL buffers, if available. */ + nbytes = XLOG_BLCKSZ; + rbytes = XLogReadFromBuffers(cur_page, targetPagePtr, + nbytes, currTLI); + cur_page += rbytes; + targetPagePtr += rbytes; + nbytes -= rbytes; + /* now actually read the data, we know it's there */ if (!WALRead(state, cur_page, targetPagePtr, - XLOG_BLCKSZ, + nbytes, currTLI, /* Pass the current TLI because only * WalSndSegmentOpen controls whether new TLI * is needed. */ -- 2.34.1