Post-PG 10 beta1 pgperltidy run

Author: bmomjian

contrib/intarray/bench/bench.pl

@@ -92,7 +92,8 @@
 
 if ($opt{e})
 {
-	my @plan = map { "$_->[0]\n" } @{$dbi->selectall_arrayref("explain $sql")};
+	my @plan =
+	  map { "$_->[0]\n" } @{ $dbi->selectall_arrayref("explain $sql") };
 	print @plan;
 }
 

src/backend/catalog/Catalog.pm

@@ -80,10 +80,11 @@ sub Catalogs
 			{
 				$catalog{natts} = $1;
 			}
-			elsif (/^DATA\(insert(\s+OID\s+=\s+(\d+))?\s+\(\s*(.*)\s*\)\s*\)$/)
+			elsif (
+				/^DATA\(insert(\s+OID\s+=\s+(\d+))?\s+\(\s*(.*)\s*\)\s*\)$/)
 			{
-				check_natts($filename, $catalog{natts}, $3,
-							$input_file, $input_line_number);
+				check_natts($filename, $catalog{natts}, $3, $input_file,
+					$input_line_number);
 
 				push @{ $catalog{data} }, { oid => $2, bki_values => $3 };
 			}
@@ -256,14 +257,15 @@ sub check_natts
 {
 	my ($catname, $natts, $bki_val, $file, $line) = @_;
 
-	die "Could not find definition for Natts_${catname} before start of DATA() in $file\n"
-		unless defined $natts;
+	die
+"Could not find definition for Natts_${catname} before start of DATA() in $file\n"
+	  unless defined $natts;
 
 	my $nfields = scalar(SplitDataLine($bki_val));
 
 	die sprintf
-		"Wrong number of attributes in DATA() entry at %s:%d (expected %d but got %d)\n",
-		$file, $line, $natts, $nfields
+"Wrong number of attributes in DATA() entry at %s:%d (expected %d but got %d)\n",
+	  $file, $line, $natts, $nfields
 	  unless $natts == $nfields;
 }
 

src/backend/catalog/genbki.pl

@@ -163,11 +163,13 @@
 
 			# Split line into tokens without interpreting their meaning.
 			my %bki_values;
-			@bki_values{@attnames} = Catalog::SplitDataLine($row->{bki_values});
+			@bki_values{@attnames} =
+			  Catalog::SplitDataLine($row->{bki_values});
 
 			# Perform required substitutions on fields
 			foreach my $att (keys %bki_values)
 			{
+
 				# Substitute constant values we acquired above.
 				# (It's intentional that this can apply to parts of a field).
 				$bki_values{$att} =~ s/\bPGUID\b/$BOOTSTRAP_SUPERUSERID/g;
@@ -178,23 +180,23 @@
 				# just do nothing (regprocin will complain).
 				if ($bki_attr{$att}->{type} eq 'regproc')
 				{
-					my $procoid = $regprocoids{$bki_values{$att}};
+					my $procoid = $regprocoids{ $bki_values{$att} };
 					$bki_values{$att} = $procoid
-						if defined($procoid) && $procoid ne 'MULTIPLE';
+					  if defined($procoid) && $procoid ne 'MULTIPLE';
 				}
 			}
 
 			# Save pg_proc oids for use in later regproc substitutions.
 			# This relies on the order we process the files in!
 			if ($catname eq 'pg_proc')
 			{
-				if (defined($regprocoids{$bki_values{proname}}))
+				if (defined($regprocoids{ $bki_values{proname} }))
 				{
-					$regprocoids{$bki_values{proname}} = 'MULTIPLE';
+					$regprocoids{ $bki_values{proname} } = 'MULTIPLE';
 				}
 				else
 				{
-					$regprocoids{$bki_values{proname}} = $row->{oid};
+					$regprocoids{ $bki_values{proname} } = $row->{oid};
 				}
 			}
 
@@ -211,7 +213,7 @@
 			printf $bki "insert %s( %s )\n", $oid,
 			  join(' ', @bki_values{@attnames});
 
-			# Write comments to postgres.description and postgres.shdescription
+		   # Write comments to postgres.description and postgres.shdescription
 			if (defined $row->{descr})
 			{
 				printf $descr "%s\t%s\t0\t%s\n", $row->{oid}, $catname,
@@ -459,7 +461,8 @@ sub bki_insert
 	my $row        = shift;
 	my @attnames   = @_;
 	my $oid        = $row->{oid} ? "OID = $row->{oid} " : '';
-	my $bki_values = join ' ', map { $_ eq '' ? '""' : $_ } map $row->{$_}, @attnames;
+	my $bki_values = join ' ', map { $_ eq '' ? '""' : $_ } map $row->{$_},
+	  @attnames;
 	printf $bki "insert %s( %s )\n", $oid, $bki_values;
 }
 
@@ -474,9 +477,9 @@ sub emit_schemapg_row
 	$row->{attidentity} ||= '\0';
 
 	# Supply appropriate quoting for these fields.
-	$row->{attname}    = q|{"| . $row->{attname} . q|"}|;
-	$row->{attstorage} = q|'| . $row->{attstorage} . q|'|;
-	$row->{attalign}   = q|'| . $row->{attalign} . q|'|;
+	$row->{attname}     = q|{"| . $row->{attname} . q|"}|;
+	$row->{attstorage}  = q|'| . $row->{attstorage} . q|'|;
+	$row->{attalign}    = q|'| . $row->{attalign} . q|'|;
 	$row->{attidentity} = q|'| . $row->{attidentity} . q|'|;
 
 	# We don't emit initializers for the variable length fields at all.

src/backend/parser/check_keywords.pl

@@ -149,7 +149,8 @@ sub error
 
 # Now read in kwlist.h
 
-open(my $kwlist, '<', $kwlist_filename) || die("Could not open : $kwlist_filename");
+open(my $kwlist, '<', $kwlist_filename)
+  || die("Could not open : $kwlist_filename");
 
 my $prevkwstring = '';
 my $bare_kwname;

src/backend/utils/Gen_fmgrtab.pl

@@ -58,6 +58,7 @@
 my $data = $catalogs->{pg_proc}->{data};
 foreach my $row (@$data)
 {
+
 	# Split line into tokens without interpreting their meaning.
 	my %bki_values;
 	@bki_values{@attnames} = Catalog::SplitDataLine($row->{bki_values});
@@ -75,14 +76,17 @@
 }
 
 # Emit headers for both files
-my $tmpext   = ".tmp$$";
-my $oidsfile = $output_path . 'fmgroids.h';
+my $tmpext     = ".tmp$$";
+my $oidsfile   = $output_path . 'fmgroids.h';
 my $protosfile = $output_path . 'fmgrprotos.h';
-my $tabfile  = $output_path . 'fmgrtab.c';
+my $tabfile    = $output_path . 'fmgrtab.c';
 
-open my $ofh, '>', $oidsfile . $tmpext or die "Could not open $oidsfile$tmpext: $!";
-open my $pfh, '>', $protosfile . $tmpext or die "Could not open $protosfile$tmpext: $!";
-open my $tfh, '>', $tabfile . $tmpext  or die "Could not open $tabfile$tmpext: $!";
+open my $ofh, '>', $oidsfile . $tmpext
+  or die "Could not open $oidsfile$tmpext: $!";
+open my $pfh, '>', $protosfile . $tmpext
+  or die "Could not open $protosfile$tmpext: $!";
+open my $tfh, '>', $tabfile . $tmpext
+  or die "Could not open $tabfile$tmpext: $!";
 
 print $ofh
 qq|/*-------------------------------------------------------------------------
@@ -218,9 +222,9 @@
 close($tfh);
 
 # Finally, rename the completed files into place.
-Catalog::RenameTempFile($oidsfile, $tmpext);
+Catalog::RenameTempFile($oidsfile,   $tmpext);
 Catalog::RenameTempFile($protosfile, $tmpext);
-Catalog::RenameTempFile($tabfile,  $tmpext);
+Catalog::RenameTempFile($tabfile,    $tmpext);
 
 sub usage
 {

src/backend/utils/mb/Unicode/UCS_to_BIG5.pl

@@ -35,9 +35,10 @@
 # Load CP950.TXT
 my $cp950txt = &read_source("CP950.TXT");
 
-foreach my $i (@$cp950txt) {
+foreach my $i (@$cp950txt)
+{
 	my $code = $i->{code};
-	my $ucs = $i->{ucs};
+	my $ucs  = $i->{ucs};
 
 	# Pick only the ETEN extended characters in the range 0xf9d6 - 0xf9dc
 	# from CP950.TXT
@@ -46,22 +47,24 @@
 		&& $code >= 0xf9d6
 		&& $code <= 0xf9dc)
 	{
-		push @$all, {code => $code,
-					 ucs => $ucs,
-					 comment => $i->{comment},
-					 direction => BOTH,
-					 f => $i->{f},
-					 l => $i->{l} };
+		push @$all,
+		  { code      => $code,
+			ucs       => $ucs,
+			comment   => $i->{comment},
+			direction => BOTH,
+			f         => $i->{f},
+			l         => $i->{l} };
 	}
 }
 
-foreach my $i (@$all) {
+foreach my $i (@$all)
+{
 	my $code = $i->{code};
-	my $ucs = $i->{ucs};
+	my $ucs  = $i->{ucs};
 
-	# BIG5.TXT maps several BIG5 characters to U+FFFD. The UTF-8 to BIG5 mapping can
-	# contain only one of them. XXX: Doesn't really make sense to include any of them,
-	# but for historical reasons, we map the first one of them.
+# BIG5.TXT maps several BIG5 characters to U+FFFD. The UTF-8 to BIG5 mapping can
+# contain only one of them. XXX: Doesn't really make sense to include any of them,
+# but for historical reasons, we map the first one of them.
 	if ($i->{ucs} == 0xFFFD && $i->{code} != 0xA15A)
 	{
 		$i->{direction} = TO_UNICODE;

src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl

@@ -38,8 +38,10 @@
 	# a lot of extra characters on top of the GB2312 character set that
 	# EUC_CN encodes. Filter out those extra characters.
 	next if (($code & 0xFF) < 0xA1);
-	next if (!($code >= 0xA100 && $code <= 0xA9FF ||
-			   $code >= 0xB000 && $code <= 0xF7FF));
+	next
+	  if (
+		!(     $code >= 0xA100 && $code <= 0xA9FF
+			|| $code >= 0xB000 && $code <= 0xF7FF));
 
 	next if ($code >= 0xA2A1 && $code <= 0xA2B0);
 	next if ($code >= 0xA2E3 && $code <= 0xA2E4);
@@ -67,13 +69,12 @@
 		$ucs = 0x2015;
 	}
 
-	push @mapping, {
-		ucs => $ucs,
-		code => $code,
+	push @mapping,
+	  { ucs       => $ucs,
+		code      => $code,
 		direction => BOTH,
-		f => $in_file,
-		l => $.
-	};
+		f         => $in_file,
+		l         => $. };
 }
 close($in);
 

src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl

@@ -24,38 +24,40 @@
 {
 	if ($line =~ /^0x(.*)[ \t]*U\+(.*)\+(.*)[ \t]*#(.*)$/)
 	{
+
 		# combined characters
 		my ($c, $u1, $u2) = ($1, $2, $3);
 		my $rest = "U+" . $u1 . "+" . $u2 . $4;
 		my $code = hex($c);
 		my $ucs1 = hex($u1);
 		my $ucs2 = hex($u2);
 
-		push @all, { direction => BOTH,
-					 ucs => $ucs1,
-					 ucs_second => $ucs2,
-					 code => $code,
-					 comment => $rest,
-					 f => $in_file,
-					 l => $.
-		};
+		push @all,
+		  { direction  => BOTH,
+			ucs        => $ucs1,
+			ucs_second => $ucs2,
+			code       => $code,
+			comment    => $rest,
+			f          => $in_file,
+			l          => $. };
 	}
 	elsif ($line =~ /^0x(.*)[ \t]*U\+(.*)[ \t]*#(.*)$/)
 	{
+
 		# non-combined characters
 		my ($c, $u, $rest) = ($1, $2, "U+" . $2 . $3);
 		my $ucs  = hex($u);
 		my $code = hex($c);
 
 		next if ($code < 0x80 && $ucs < 0x80);
 
-		push @all, { direction => BOTH,
-					 ucs => $ucs,
-					 code => $code,
-					 comment => $rest,
-					 f => $in_file,
-					 l => $.
-		};
+		push @all,
+		  { direction => BOTH,
+			ucs       => $ucs,
+			code      => $code,
+			comment   => $rest,
+			f         => $in_file,
+			l         => $. };
 	}
 }
 close($in);