Adjust perl style.

robertmhaas · robertmhaas · commit 7a1527c02c14 · 2021-03-12T14:55:40.000-05:00
Per buildfarm member crake.
diff --git a/src/bin/pg_amcheck/t/003_check.pl b/src/bin/pg_amcheck/t/003_check.pl
@@ -10,7 +10,7 @@
 # Returns the filesystem path for the named relation.
 #
 # Assumes the test node is running
-sub relation_filepath($$)
+sub relation_filepath
 {
 	my ($dbname, $relname) = @_;
 
@@ -24,7 +24,7 @@ ($$)
 # Returns the name of the toast relation associated with the named relation.
 #
 # Assumes the test node is running
-sub relation_toast($$)
+sub relation_toast
 {
 	my ($dbname, $relname) = @_;
 
@@ -34,15 +34,14 @@ ($$)
 			WHERE c.oid = '$relname'::regclass
 			  AND c.reltoastrelid != 0
 			));
-	return undef unless defined $rel;
 	return $rel;
 }
 
 # Adds the relation file for the given (dbname, relname) to the list
 # to be corrupted by means of overwriting junk in the first page.
 #
 # Assumes the test node is running.
-sub plan_to_corrupt_first_page($$)
+sub plan_to_corrupt_first_page
 {
 	my ($dbname, $relname) = @_;
 	my $relpath = relation_filepath($dbname, $relname);
@@ -53,7 +52,7 @@ ($$)
 # to be corrupted by means of removing the file..
 #
 # Assumes the test node is running
-sub plan_to_remove_relation_file($$)
+sub plan_to_remove_relation_file
 {
 	my ($dbname, $relname) = @_;
 	my $relpath = relation_filepath($dbname, $relname);
@@ -65,15 +64,15 @@ ($$)
 # corrupted by means of removing the file.
 #
 # Assumes the test node is running.
-sub plan_to_remove_toast_file($$)
+sub plan_to_remove_toast_file
 {
 	my ($dbname, $relname) = @_;
 	my $toastname = relation_toast($dbname, $relname);
 	plan_to_remove_relation_file($dbname, $toastname) if ($toastname);
 }
 
 # Corrupts the first page of the given file path
-sub corrupt_first_page($)
+sub corrupt_first_page
 {
 	my ($relpath) = @_;
 
diff --git a/src/bin/pg_amcheck/t/004_verify_heapam.pl b/src/bin/pg_amcheck/t/004_verify_heapam.pl
@@ -92,7 +92,7 @@
 # perl hash with named fields.  These fields exactly match the ones understood
 # by write_tuple(), below.  Returns a reference to this hash.
 #
-sub read_tuple ($$)
+sub read_tuple
 {
 	my ($fh, $offset) = @_;
 	my ($buffer, %tup);
@@ -145,7 +145,7 @@ ($$)
 # subset of fields modified.  The function does no error checking.  Use
 # cautiously.
 #
-sub write_tuple($$$)
+sub write_tuple
 {
 	my ($fh, $offset, $tup) = @_;
 	my $buffer = pack(HEAPTUPLE_PACK_CODE,

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`# Returns the filesystem path for the named relation.`
`11`	`11`	`#`
`12`	`12`	`# Assumes the test node is running`
`13`		`-sub relation_filepath($$)`
	`13`	`+sub relation_filepath`
`14`	`14`	`{`
`15`	`15`	`my ($dbname, $relname) = @_;`
`16`	`16`
`@@ -24,7 +24,7 @@ ($$)`
`24`	`24`	`# Returns the name of the toast relation associated with the named relation.`
`25`	`25`	`#`
`26`	`26`	`# Assumes the test node is running`
`27`		`-sub relation_toast($$)`
	`27`	`+sub relation_toast`
`28`	`28`	`{`
`29`	`29`	`my ($dbname, $relname) = @_;`
`30`	`30`
`@@ -34,15 +34,14 @@ ($$)`
`34`	`34`	`WHERE c.oid = '$relname'::regclass`
`35`	`35`	`AND c.reltoastrelid != 0`
`36`	`36`	`));`
`37`		`- return undef unless defined $rel;`
`38`	`37`	`return $rel;`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`# Adds the relation file for the given (dbname, relname) to the list`
`42`	`41`	`# to be corrupted by means of overwriting junk in the first page.`
`43`	`42`	`#`
`44`	`43`	`# Assumes the test node is running.`
`45`		`-sub plan_to_corrupt_first_page($$)`
	`44`	`+sub plan_to_corrupt_first_page`
`46`	`45`	`{`
`47`	`46`	`my ($dbname, $relname) = @_;`
`48`	`47`	`my $relpath = relation_filepath($dbname, $relname);`
`@@ -53,7 +52,7 @@ ($$)`
`53`	`52`	`# to be corrupted by means of removing the file..`
`54`	`53`	`#`
`55`	`54`	`# Assumes the test node is running`
`56`		`-sub plan_to_remove_relation_file($$)`
	`55`	`+sub plan_to_remove_relation_file`
`57`	`56`	`{`
`58`	`57`	`my ($dbname, $relname) = @_;`
`59`	`58`	`my $relpath = relation_filepath($dbname, $relname);`
`@@ -65,15 +64,15 @@ ($$)`
`65`	`64`	`# corrupted by means of removing the file.`
`66`	`65`	`#`
`67`	`66`	`# Assumes the test node is running.`
`68`		`-sub plan_to_remove_toast_file($$)`
	`67`	`+sub plan_to_remove_toast_file`
`69`	`68`	`{`
`70`	`69`	`my ($dbname, $relname) = @_;`
`71`	`70`	`my $toastname = relation_toast($dbname, $relname);`
`72`	`71`	`plan_to_remove_relation_file($dbname, $toastname) if ($toastname);`
`73`	`72`	`}`
`74`	`73`
`75`	`74`	`# Corrupts the first page of the given file path`
`76`		`-sub corrupt_first_page($)`
	`75`	`+sub corrupt_first_page`
`77`	`76`	`{`
`78`	`77`	`my ($relpath) = @_;`
`79`	`78`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@`
`92`	`92`	`# perl hash with named fields. These fields exactly match the ones understood`
`93`	`93`	`# by write_tuple(), below. Returns a reference to this hash.`
`94`	`94`	`#`
`95`		`-sub read_tuple ($$)`
	`95`	`+sub read_tuple`
`96`	`96`	`{`
`97`	`97`	`my ($fh, $offset) = @_;`
`98`	`98`	`my ($buffer, %tup);`
`@@ -145,7 +145,7 @@ ($$)`
`145`	`145`	`# subset of fields modified. The function does no error checking. Use`
`146`	`146`	`# cautiously.`
`147`	`147`	`#`
`148`		`-sub write_tuple($$$)`
	`148`	`+sub write_tuple`
`149`	`149`	`{`
`150`	`150`	`my ($fh, $offset, $tup) = @_;`
`151`	`151`	`my $buffer = pack(HEAPTUPLE_PACK_CODE,`