Replace magic constants for seek() calls in perl scripts

A couple of tests have been using 0 as magic constant while SEEK_SET can
be used instead.  This makes the code easier to understand, and more
consistent with the changes done in 3c5b068.

Per discussion with Andrew Dunstan.

Discussion: https://postgr.es/m/YHrc24AgJQ6tQ1q0@paquier.xyz

diff --git a/contrib/amcheck/t/001_verify_heapam.pl b/contrib/amcheck/t/001_verify_heapam.pl
index 6050feb71215c0700147a5904dcd4ba5fe2a474f..bf47c2ed37315f153a556f3917f53240a970739d 100644 (file)
--- a/contrib/amcheck/t/001_verify_heapam.pl
+++ b/contrib/amcheck/t/001_verify_heapam.pl
@@ -4,6 +4,7 @@ use warnings;
 use PostgresNode;
 use TestLib;
 
+use Fcntl qw(:seek);
 use Test::More tests => 80;
 
 my ($node, $result);
@@ -124,7 +125,7 @@ sub corrupt_first_page
        # Corrupt some line pointers.  The values are chosen to hit the
        # various line-pointer-corruption checks in verify_heapam.c
        # on both little-endian and big-endian architectures.
-       seek($fh, 32, 0)
+       seek($fh, 32, SEEK_SET)
          or BAIL_OUT("seek failed: $!");
        syswrite(
                $fh,

diff --git a/src/bin/pg_amcheck/t/003_check.pl b/src/bin/pg_amcheck/t/003_check.pl
index 66dd14e498bf634ed2592012e846ab274a5ee195..2da9631da4a61d452ed1f43ec404fd06b6544c01 100644 (file)
--- a/src/bin/pg_amcheck/t/003_check.pl
+++ b/src/bin/pg_amcheck/t/003_check.pl
@@ -3,6 +3,8 @@ use warnings;
 
 use PostgresNode;
 use TestLib;
+
+use Fcntl qw(:seek);
 use Test::More tests => 63;
 
 my ($node, $port, %corrupt_page, %remove_relation);
@@ -84,7 +86,7 @@ sub corrupt_first_page
        # Corrupt some line pointers.  The values are chosen to hit the
        # various line-pointer-corruption checks in verify_heapam.c
        # on both little-endian and big-endian architectures.
-       seek($fh, 32, 0)
+       seek($fh, 32, SEEK_SET)
                or BAIL_OUT("seek failed: $!");
        syswrite(
                $fh,

diff --git a/src/bin/pg_amcheck/t/004_verify_heapam.pl b/src/bin/pg_amcheck/t/004_verify_heapam.pl
index 3c1277adf3e1cb39b6e2f3f520db5c0bf0ce6be5..b842f7bc6db0853674b17b82f59c13a83b31cca9 100644 (file)
--- a/src/bin/pg_amcheck/t/004_verify_heapam.pl
+++ b/src/bin/pg_amcheck/t/004_verify_heapam.pl
@@ -4,6 +4,7 @@ use warnings;
 use PostgresNode;
 use TestLib;
 
+use Fcntl qw(:seek);
 use Test::More;
 
 # This regression test demonstrates that the pg_amcheck binary correctly
@@ -95,7 +96,7 @@ sub read_tuple
 {
        my ($fh, $offset) = @_;
        my ($buffer, %tup);
-       seek($fh, $offset, 0)
+       seek($fh, $offset, SEEK_SET)
                or BAIL_OUT("seek failed: $!");
        defined(sysread($fh, $buffer, HEAPTUPLE_PACK_LENGTH))
                or BAIL_OUT("sysread failed: $!");
@@ -172,7 +173,7 @@ sub write_tuple
                                        $tup->{c_va_extinfo},
                                        $tup->{c_va_valueid},
                                        $tup->{c_va_toastrelid});
-       seek($fh, $offset, 0)
+       seek($fh, $offset, SEEK_SET)
                or BAIL_OUT("seek failed: $!");
        defined(syswrite($fh, $buffer, HEAPTUPLE_PACK_LENGTH))
                or BAIL_OUT("syswrite failed: $!");

diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
index 089c9cb851aa85187914253e22593910f66b6282..a9dfe88aaae83321456bede5f92ddbb16c8c5919 100644 (file)
--- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl
+++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
@@ -4,6 +4,7 @@ use Cwd;
 use Config;
 use File::Basename qw(basename dirname);
 use File::Path qw(rmtree);
+use Fcntl qw(:seek);
 use PostgresNode;
 use TestLib;
 use Test::More tests => 110;
@@ -555,7 +556,7 @@ my $block_size      = $node->safe_psql('postgres', 'SHOW block_size;');
 # induce corruption
 system_or_bail 'pg_ctl', '-D', $pgdata, 'stop';
 open $file, '+<', "$pgdata/$file_corrupt1";
-seek($file, $pageheader_size, 0);
+seek($file, $pageheader_size, SEEK_SET);
 syswrite($file, "\0\0\0\0\0\0\0\0\0");
 close $file;
 system_or_bail 'pg_ctl', '-D', $pgdata, 'start';
@@ -574,7 +575,7 @@ open $file, '+<', "$pgdata/$file_corrupt1";
 for my $i (1 .. 5)
 {
        my $offset = $pageheader_size + $i * $block_size;
-       seek($file, $offset, 0);
+       seek($file, $offset, SEEK_SET);
        syswrite($file, "\0\0\0\0\0\0\0\0\0");
 }
 close $file;
@@ -591,7 +592,7 @@ rmtree("$tempdir/backup_corrupt2");
 # induce corruption in a second file
 system_or_bail 'pg_ctl', '-D', $pgdata, 'stop';
 open $file, '+<', "$pgdata/$file_corrupt2";
-seek($file, $pageheader_size, 0);
+seek($file, $pageheader_size, SEEK_SET);
 syswrite($file, "\0\0\0\0\0\0\0\0\0");
 close $file;
 system_or_bail 'pg_ctl', '-D', $pgdata, 'start';

diff --git a/src/bin/pg_checksums/t/002_actions.pl b/src/bin/pg_checksums/t/002_actions.pl
index 8a81f36a067fdac7aa149c4ab7ed32d0c255b101..d52bbac5faa97c33a76fa3b66d82421f10c2ead4 100644 (file)
--- a/src/bin/pg_checksums/t/002_actions.pl
+++ b/src/bin/pg_checksums/t/002_actions.pl
@@ -5,6 +5,8 @@ use strict;
 use warnings;
 use PostgresNode;
 use TestLib;
+
+use Fcntl qw(:seek);
 use Test::More tests => 63;
 
 
@@ -50,7 +52,7 @@ sub check_relation_corruption
 
        # Time to create some corruption
        open my $file, '+<', "$pgdata/$file_corrupted";
-       seek($file, $pageheader_size, 0);
+       seek($file, $pageheader_size, SEEK_SET);
        syswrite($file, "\0\0\0\0\0\0\0\0\0");
        close $file;