Clean up some perlcritic warnings

In Catalog.pm, mark eval of a string instead of a block as allowed.
Disallow perlcritic completely in Gen_dummy_probes.pl, as it's
generated code.
Protect a couple of lines in plperl code from  perltidy, so that the
annotation for perlcritic stays on the same line as the construct it
would otherwise object to.

diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm
index 7497d9cd9fbcc874f074eb9229c31f2e5878966a..f387c865c6818a5b0bd980ab6f97e153998cb5df 100644 (file)
--- a/src/backend/catalog/Catalog.pm
+++ b/src/backend/catalog/Catalog.pm
@@ -250,7 +250,10 @@ sub ParseData
 
                        if ($lcnt == $rcnt)
                        {
-                               eval '$hash_ref = ' . $_;
+                               # We're treating the input line as a piece of Perl, so we
+                               # need to use string eval here. Tell perlcritic we know what
+                               # we're doing.
+                               eval '$hash_ref = ' . $_; ## no critic (ProhibitStringyEval)
                                if (!ref $hash_ref)
                                {
                                        die "$input_file: error parsing line $.:\n$_\n";

diff --git a/src/backend/utils/Gen_dummy_probes.pl b/src/backend/utils/Gen_dummy_probes.pl
index a38fea3e043e3d8e03e19daaff607dd1cc840a08..91d79684e997ab98708bd92596bdf9748dd7449c 100644 (file)
--- a/src/backend/utils/Gen_dummy_probes.pl
+++ b/src/backend/utils/Gen_dummy_probes.pl
@@ -14,6 +14,9 @@
 #
 #-------------------------------------------------------------------------
 
+# turn off perlcritic for autogened code
+## no critic
+
 $0 =~ s/^.*?(\w+)[\.\w+]*$/$1/;
 
 use strict;

diff --git a/src/pl/plperl/plc_perlboot.pl b/src/pl/plperl/plc_perlboot.pl
index ff059648696f8409e0e61ec8d255f43d8311ce8a..05334a662d3317fb2c3dbd9b91acead3c58ba00d 100644 (file)
--- a/src/pl/plperl/plc_perlboot.pl
+++ b/src/pl/plperl/plc_perlboot.pl
@@ -51,9 +51,9 @@ sub ::encode_array_constructor
 }
 
 {
-
-       package PostgreSQL::InServer
-         ;    ## no critic (RequireFilenameMatchesPackage);
+#<<< protect next line from perltidy so perlcritic annotation works
+       package PostgreSQL::InServer;  ## no critic (RequireFilenameMatchesPackage)
+#>>>
        use strict;
        use warnings;
 

diff --git a/src/pl/plperl/plc_trusted.pl b/src/pl/plperl/plc_trusted.pl
index 7b11a3f52b0756b51ac7dd6ab644c0a2a282a3bd..dea3727682cf577fb7b92f2bd9641ac851d282af 100644 (file)
--- a/src/pl/plperl/plc_trusted.pl
+++ b/src/pl/plperl/plc_trusted.pl
@@ -1,7 +1,8 @@
 #  src/pl/plperl/plc_trusted.pl
 
-package PostgreSQL::InServer::safe
-  ;    ## no critic (RequireFilenameMatchesPackage);
+#<<< protect next line from perltidy so perlcritic annotation works
+package PostgreSQL::InServer::safe; ## no critic (RequireFilenameMatchesPackage)
+#>>>
 
 # Load widely useful pragmas into plperl to make them available.
 #