pgsql: Use macros from xlog_internal.h for WAL segment logic in pg_rese

From: Michael Paquier <michael(at)paquier(dot)xyz>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Use macros from xlog_internal.h for WAL segment logic in pg_rese
Date: 2022-10-05 05:14:24
Message-ID: E1ofwjf-000xf1-Vq@gemulon.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-committers

Use macros from xlog_internal.h for WAL segment logic in pg_resetwal

When scanning for the end of WAL, pg_resetwal has been maintaining its
own internal logic to calculate segment numbers and to parse a WAL
segment name for its timeline and segment number. The code claimed for
example that XLogFromFileName() cannot be used because it lacks the
possibility of specifying a WAL segment size, which is not the case
since fc49e24, that has made the WAL segment size configurable at
initialization time, extending this routine to do so.

Similarly, this switches one segment number calculation to use
XLByteToSeg() rather than the same logic present in xlog_internal.h.
While on it, switch to TimeLineID in pg_resetwal.c for TLI numbers
parsed from segment names, to be more consistent with
XLogFromFileName(). The maths are exactly the same, but the code gets
simplified.

Author: Bharath Rupireddy
Reviewed-by: Kyotaro Horiguchi
Discussion: https://postgr.es/m/CALj2ACX+E_jnwqH_jmjhNG8BczJTNRTOLpw8K1CB1OcB48MJ8w@mail.gmail.com

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/9a30e154b35e5bab9df7964785bca707ef74aec8

Modified Files
--------------
src/bin/pg_resetwal/pg_resetwal.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Michael Paquier 2022-10-05 05:28:52 pgsql: Remove definition of JUMBLE_SIZE from queryjumble.h
Previous Message Michael Paquier 2022-10-05 02:46:33 pgsql: Add a few new patterns to the tab completion of psql