From 65c211694f31b248e0a5f5fcf499f82fad72574c Mon Sep 17 00:00:00 2001 From: Maxim Orlov Date: Thu, 21 Mar 2024 19:32:54 +0300 Subject: [PATCH v1] Refactor pg_resetwal/t/001_basic.pl Use constants instead of magic numbers Per Svetlana Derevyanko's suggestion. Author: Maxim Orlov --- src/bin/pg_resetwal/t/001_basic.pl | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/bin/pg_resetwal/t/001_basic.pl b/src/bin/pg_resetwal/t/001_basic.pl index 9829e48106..4cb1f5c374 100644 --- a/src/bin/pg_resetwal/t/001_basic.pl +++ b/src/bin/pg_resetwal/t/001_basic.pl @@ -205,8 +205,16 @@ push @cmd, '-c', sprintf("%d,%d", hex($files[0]) == 0 ? 3 : hex($files[0]), hex($files[-1])); +use constant SLRU_PAGES_PER_SEGMENT => 32; +use constant MXOFF_SIZE => 4; +use constant MXID_SIZE => 4; +use constant MULTIXACT_MEMBERS_PER_MEMBERGROUP => 4; +use constant MULTIXACT_FLAGBYTES_PER_GROUP => 4; +use constant MULTIXACT_MEMBERGROUP_SIZE => MXID_SIZE * MULTIXACT_MEMBERS_PER_MEMBERGROUP + MULTIXACT_FLAGBYTES_PER_GROUP; +use constant CLOG_XACTS_PER_BYTE => 4; + @files = get_slru_files('pg_multixact/offsets'); -$mult = 32 * $blcksz / 4; +$mult = SLRU_PAGES_PER_SEGMENT * $blcksz / MXOFF_SIZE; # -m argument is "new,old" push @cmd, '-m', sprintf("%d,%d", @@ -214,11 +222,11 @@ push @cmd, '-m', hex($files[0]) == 0 ? 1 : hex($files[0] * $mult)); @files = get_slru_files('pg_multixact/members'); -$mult = 32 * int($blcksz / 20) * 4; +$mult = SLRU_PAGES_PER_SEGMENT * int($blcksz / MULTIXACT_MEMBERGROUP_SIZE) * MXID_SIZE; push @cmd, '-O', (hex($files[-1]) + 1) * $mult; @files = get_slru_files('pg_xact'); -$mult = 32 * $blcksz * 4; +$mult = SLRU_PAGES_PER_SEGMENT * $blcksz * CLOG_XACTS_PER_BYTE; push @cmd, '-u', (hex($files[0]) == 0 ? 3 : hex($files[0]) * $mult), '-x', ((hex($files[-1]) + 1) * $mult); -- 2.44.0