Cleanup perl code from unused variables and routines

michaelpq · michaelpq · commit 0c1aca461481 · 2024-07-02T09:47:16.000+09:00
This commit removes unused variables and routines from some perl code that have accumulated across the years. This touches the following areas: - Wait event generation script. - AdjustUpgrade.pm. - TAP perl code Author: Alexander Lakhin Reviewed-by: Dagfinn Ilmari Mannsåker Discussion: https://postgr.es/m/70b340bc-244a-589d-ef8b-d8aebb707a84@gmail.com
diff --git a/contrib/amcheck/t/001_verify_heapam.pl b/contrib/amcheck/t/001_verify_heapam.pl
@@ -9,7 +9,7 @@
 
 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
@@ -10,7 +10,7 @@
 
 use Test::More;
 
-my ($node, $result);
+my $node;
 
 #
 # Test set-up
diff --git 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 @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
@@ -26,7 +26,6 @@
 $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
@@ -81,7 +81,6 @@
 #
 # 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
@@ -12,10 +12,6 @@
 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
@@ -15,7 +15,6 @@
 	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
@@ -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
@@ -168,7 +168,6 @@
 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
@@ -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
@@ -10,10 +10,7 @@
 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');

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`use Test::More;`
`12`	`12`
`13`		`-my ($node, $result);`
	`13`	`+my $node;`
`14`	`14`
`15`	`15`	`#`
`16`	`16`	`# Test set-up`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@`
`81`	`81`	`#`
`82`	`82`	`# Test interaction of correctly specified filter file`
`83`	`83`	`#`
`84`		`-my ($cmd, $stdout, $stderr, $result);`
`85`	`84`
`86`	`85`	`# Empty filterfile`
`87`	`86`	`open $inputfile, '>', "$tempdir/inputfile.txt"`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`plan skip_all => 'OpenSSL not supported by this build';`
`16`	`16`	`}`
`17`	`17`
`18`		`-my $clearpass = "FooBaR1";`
`19`	`18`	`my $rot13pass = "SbbOnE1";`
`20`	`19`
`21`	`20`	`# see the Makefile for how the certificate and key have been generated`
Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,6 @@ sub _mash_view_qualifiers`
`534`	`534`	`{`
`535`	`535`	`my @thischunks = split /;/, $chunk, 2;`
`536`	`536`	`my $stmt = shift(@thischunks);`
`537`		`- my $ostmt = $stmt;`
`538`	`537`
`539`	`538`	`# now $stmt is just the body of the CREATE [MATERIALIZED] VIEW`
`540`	`539`	`$stmt =~ s/$qualifier\.//g;`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,6 @@`
`168`	`168`	`sub send_query_and_wait`
`169`	`169`	`{`
`170`	`170`	`my ($psql, $query, $untl) = @_;`
`171`		`- my $ret;`
`172`	`171`
`173`	`172`	`# send query`
`174`	`173`	`$$psql{stdin} .= $query;`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,6 @@ sub cause_eviction`
`205`	`205`	`sub send_query_and_wait`
`206`	`206`	`{`
`207`	`207`	`my ($psql, $query, $untl) = @_;`
`208`		`- my $ret;`
`209`	`208`
`210`	`209`	`# For each query we run, we'll restart the timeout. Otherwise the timeout`
`211`	`210`	`# would apply to the whole test script, and would need to be set very high`