From 3d441d7f584182dfbc76c14591fe0c045679b66a Mon Sep 17 00:00:00 2001 From: Antonin Houska Date: Tue, 9 Jul 2019 11:54:15 +0200 Subject: [PATCH 1/5] Make XLogReaderInvalReadState static. This change is not necessary for the XLogRead() refactoring itself, but I noticed the problem while working on it. Not sure it's worth a separate CF entry. --- src/backend/access/transam/xlogreader.c | 4 ++-- src/include/access/xlogreader.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c index 41dae916b4..08bc9695c1 100644 --- a/src/backend/access/transam/xlogreader.c +++ b/src/backend/access/transam/xlogreader.c @@ -35,10 +35,10 @@ static bool ValidXLogRecordHeader(XLogReaderState *state, XLogRecPtr RecPtr, XLogRecPtr PrevRecPtr, XLogRecord *record, bool randAccess); static bool ValidXLogRecord(XLogReaderState *state, XLogRecord *record, XLogRecPtr recptr); +static void XLogReaderInvalReadState(XLogReaderState *state); static int ReadPageInternal(XLogReaderState *state, XLogRecPtr pageptr, int reqLen); static void report_invalid_record(XLogReaderState *state, const char *fmt,...) pg_attribute_printf(2, 3); - static void ResetDecoder(XLogReaderState *state); /* size of the buffer allocated for error message. */ @@ -620,7 +620,7 @@ err: /* * Invalidate the xlogreader's read state to force a re-read. */ -void +static void XLogReaderInvalReadState(XLogReaderState *state) { state->readSegNo = 0; diff --git a/src/include/access/xlogreader.h b/src/include/access/xlogreader.h index 04228e2a87..a3d3cc1e7b 100644 --- a/src/include/access/xlogreader.h +++ b/src/include/access/xlogreader.h @@ -212,13 +212,9 @@ extern struct XLogRecord *XLogReadRecord(XLogReaderState *state, extern bool XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr, char *phdr); -/* Invalidate read state */ -extern void XLogReaderInvalReadState(XLogReaderState *state); - #ifdef FRONTEND extern XLogRecPtr XLogFindNextRecord(XLogReaderState *state, XLogRecPtr RecPtr); #endif /* FRONTEND */ - /* Functions for decoding an XLogRecord */ extern bool DecodeXLogRecord(XLogReaderState *state, XLogRecord *record, -- 2.16.4