On Tue, May 21, 2024 at 02:33:16PM +0900, Michael Paquier wrote: > Nice catches from both of you. The two ones in > generate-wait_event_types.pl are caused by me, actually. > > Not sure about the changes in the errcodes scripts, though. The > current state of thing can be also useful when it comes to debugging > the parsing, and it does not hurt to keep the parsing rules the same > across the board.
For now, I have staged for commit the attached, that handles most of the changes from Alexander (msvc could go for more cleanup?). I'll look at the changes from Dagfinn after that, including if perlcritic could be changed. I'll handle the first part when v18 opens up, as that's cosmetic. The incorrect comment in 024_add_drop_pub.pl has been fixed as of 53785d2a2aaa, as that was a separate issue. -- Michael
From 270e212e9f7524b96383387d62765185034fd59f Mon Sep 17 00:00:00 2001 From: Michael Paquier <mich...@paquier.xyz> Date: Fri, 24 May 2024 13:59:00 +0900 Subject: [PATCH] Cleanup perl code from unused variables and routines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit removes unused variables and routines from some perl code that have accumulated across the years. This concerns various areas: the script for wait events, AdjustUpgrade.pm and TAP code. Author: Alexander Lakhin Reviewed-by: Dagfinn Ilmari Mannsåker Discussion: https://postgr.es/m/70b340bc-244a-589d-ef8b-d8aebb707...@gmail.com --- .../utils/activity/generate-wait_event_types.pl | 2 -- src/bin/pg_dump/t/003_pg_dump_with_server.pl | 1 - src/bin/pg_dump/t/005_pg_dump_filterfile.pl | 1 - .../t/001_mutated_bindpasswd.pl | 4 ---- .../ssl_passphrase_callback/t/001_testfunc.pl | 1 - src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm | 1 - src/test/recovery/t/021_row_visibility.pl | 1 - src/test/recovery/t/032_relfilenode_reuse.pl | 1 - .../recovery/t/035_standby_logical_decoding.pl | 5 +---- contrib/amcheck/t/001_verify_heapam.pl | 15 +-------------- contrib/amcheck/t/002_cic.pl | 2 +- 11 files changed, 3 insertions(+), 31 deletions(-) diff --git a/src/backend/utils/activity/generate-wait_event_types.pl b/src/backend/utils/activity/generate-wait_event_types.pl index 42f36f405b..b2d61bd8ba 100644 --- a/src/backend/utils/activity/generate-wait_event_types.pl +++ b/src/backend/utils/activity/generate-wait_event_types.pl @@ -42,8 +42,6 @@ my @abi_compatibility_lines; my @lines; my $abi_compatibility = 0; my $section_name; -my $note; -my $note_name; # Remove comments and empty lines and add waitclassname based on the section while (<$wait_event_names>) diff --git a/src/bin/pg_dump/t/003_pg_dump_with_server.pl b/src/bin/pg_dump/t/003_pg_dump_with_server.pl index b5a1445550..3f549f44e7 100644 --- a/src/bin/pg_dump/t/003_pg_dump_with_server.pl +++ b/src/bin/pg_dump/t/003_pg_dump_with_server.pl @@ -26,7 +26,6 @@ $node->safe_psql('postgres', "CREATE SERVER s1 FOREIGN DATA WRAPPER dummy"); $node->safe_psql('postgres', "CREATE SERVER s2 FOREIGN DATA WRAPPER dummy"); $node->safe_psql('postgres', "CREATE FOREIGN TABLE t0 (a int) SERVER s0"); $node->safe_psql('postgres', "CREATE FOREIGN TABLE t1 (a int) SERVER s1"); -my ($cmd, $stdout, $stderr, $result); command_fails_like( [ "pg_dump", '-p', $port, '--include-foreign-data=s0', 'postgres' ], diff --git a/src/bin/pg_dump/t/005_pg_dump_filterfile.pl b/src/bin/pg_dump/t/005_pg_dump_filterfile.pl index a80e13a0d3..6025bb296c 100644 --- a/src/bin/pg_dump/t/005_pg_dump_filterfile.pl +++ b/src/bin/pg_dump/t/005_pg_dump_filterfile.pl @@ -81,7 +81,6 @@ $node->safe_psql('sourcedb', # # Test interaction of correctly specified filter file # -my ($cmd, $stdout, $stderr, $result); # Empty filterfile open $inputfile, '>', "$tempdir/inputfile.txt" diff --git a/src/test/modules/ldap_password_func/t/001_mutated_bindpasswd.pl b/src/test/modules/ldap_password_func/t/001_mutated_bindpasswd.pl index b990e7d101..82b1cb88e9 100644 --- a/src/test/modules/ldap_password_func/t/001_mutated_bindpasswd.pl +++ b/src/test/modules/ldap_password_func/t/001_mutated_bindpasswd.pl @@ -12,10 +12,6 @@ use Test::More; use lib "$FindBin::RealBin/../../../ldap"; use LdapServer; -my ($slapd, $ldap_bin_dir, $ldap_schema_dir); - -$ldap_bin_dir = undef; # usually in PATH - if ($ENV{with_ldap} ne 'yes') { plan skip_all => 'LDAP not supported by this build'; diff --git a/src/test/modules/ssl_passphrase_callback/t/001_testfunc.pl b/src/test/modules/ssl_passphrase_callback/t/001_testfunc.pl index 7a63539f39..f71d0ff3e0 100644 --- a/src/test/modules/ssl_passphrase_callback/t/001_testfunc.pl +++ b/src/test/modules/ssl_passphrase_callback/t/001_testfunc.pl @@ -15,7 +15,6 @@ unless (($ENV{with_ssl} || "") eq 'openssl') plan skip_all => 'OpenSSL not supported by this build'; } -my $clearpass = "FooBaR1"; my $rot13pass = "SbbOnE1"; # see the Makefile for how the certificate and key have been generated diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 3cec72d9d4..239c17aced 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -534,7 +534,6 @@ sub _mash_view_qualifiers { my @thischunks = split /;/, $chunk, 2; my $stmt = shift(@thischunks); - my $ostmt = $stmt; # now $stmt is just the body of the CREATE [MATERIALIZED] VIEW $stmt =~ s/$qualifier\.//g; diff --git a/src/test/recovery/t/021_row_visibility.pl b/src/test/recovery/t/021_row_visibility.pl index 255caffb19..d046137601 100644 --- a/src/test/recovery/t/021_row_visibility.pl +++ b/src/test/recovery/t/021_row_visibility.pl @@ -168,7 +168,6 @@ $node_standby->stop; sub send_query_and_wait { my ($psql, $query, $untl) = @_; - my $ret; # send query $$psql{stdin} .= $query; diff --git a/src/test/recovery/t/032_relfilenode_reuse.pl b/src/test/recovery/t/032_relfilenode_reuse.pl index 96a8104b80..d473cd167c 100644 --- a/src/test/recovery/t/032_relfilenode_reuse.pl +++ b/src/test/recovery/t/032_relfilenode_reuse.pl @@ -205,7 +205,6 @@ sub cause_eviction sub send_query_and_wait { my ($psql, $query, $untl) = @_; - my $ret; # For each query we run, we'll restart the timeout. Otherwise the timeout # would apply to the whole test script, and would need to be set very high diff --git a/src/test/recovery/t/035_standby_logical_decoding.pl b/src/test/recovery/t/035_standby_logical_decoding.pl index 4628f9fb80..4185b803b2 100644 --- a/src/test/recovery/t/035_standby_logical_decoding.pl +++ b/src/test/recovery/t/035_standby_logical_decoding.pl @@ -10,10 +10,7 @@ use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -my ($stdin, $stdout, $stderr, - $cascading_stdout, $cascading_stderr, $subscriber_stdin, - $subscriber_stdout, $subscriber_stderr, $ret, - $handle, $slot); +my ($stdout, $stderr, $cascading_stdout, $cascading_stderr, $handle); my $node_primary = PostgreSQL::Test::Cluster->new('primary'); my $node_standby = PostgreSQL::Test::Cluster->new('standby'); diff --git a/contrib/amcheck/t/001_verify_heapam.pl b/contrib/amcheck/t/001_verify_heapam.pl index 9de3148277..481e4dbe4f 100644 --- a/contrib/amcheck/t/001_verify_heapam.pl +++ b/contrib/amcheck/t/001_verify_heapam.pl @@ -9,7 +9,7 @@ use PostgreSQL::Test::Utils; use Test::More; -my ($node, $result); +my $node; # # Test set-up @@ -87,19 +87,6 @@ sub relation_filepath return "$pgdata/$rel"; } -# Returns the fully qualified name of the toast table for the named relation -sub get_toast_for -{ - my ($relname) = @_; - - return $node->safe_psql( - 'postgres', qq( - SELECT 'pg_toast.' || t.relname - FROM pg_catalog.pg_class c, pg_catalog.pg_class t - WHERE c.relname = '$relname' - AND c.reltoastrelid = t.oid)); -} - # (Re)create and populate a test table of the given name. sub fresh_test_table { diff --git a/contrib/amcheck/t/002_cic.pl b/contrib/amcheck/t/002_cic.pl index 53a3db9745..0207407ca0 100644 --- a/contrib/amcheck/t/002_cic.pl +++ b/contrib/amcheck/t/002_cic.pl @@ -10,7 +10,7 @@ use PostgreSQL::Test::Utils; use Test::More; -my ($node, $result); +my $node; # # Test set-up -- 2.43.0
signature.asc
Description: PGP signature
