NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit995e0fb

committed

Un-break genbki.pl's error reporting capabilities.

This essentially reverts commit69eb643, which added a fast pathin Catalog::ParseData, but neglected to preserve the behavior ofadding a line_number field in each hash. That makes it impossiblefor genbki.pl to provide any localization of error reports, which isbad enough; but actually the affected error reports failed entirely,producing useless bleats like "use of undefined value in sprintf".69eb643 claimed to get a 15% speedup, but I'm not sure I believethat: the time to rebuild the bki files changes by less than 1% forme. In any case, making debugging of mistakes in .dat files moredifficult would not be justified by even an order of magnitudespeedup here; it's just not that big a chunk of the total build time.Per report from David Wheeler. Although it's also broken in v16,I don't think this is worth a back-patch, since we're very unlikelyto touch the v16 catalog data again.Discussion:https://postgr.es/m/19238.1710953049@sss.pgh.pa.us

1 parent1218ca9 commit995e0fbCopy full SHA for 995e0fb

File tree

1 file changed

-21

lines changed

src/backend/catalog
- Catalog.pm

1 file changed

-21

lines changed

`‎src/backend/catalog/Catalog.pm`

Lines changed: 7 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -300,21 +300,21 @@ sub ParseHeader`
`300`	`300`
`301`	`301`	`# Parses a file containing Perl data structure literals, returning live data.`
`302`	`302`	`#`
`303`		`-# The parameter $preserve_formatting needs to be set for callers that want`
	`303`	`+# The parameter $preserve_comments needs to be set for callers that want`
`304`	`304`	`# to work with non-data lines in the data files, such as comments and blank`
`305`	`305`	`# lines. If a caller just wants to consume the data, leave it unset.`
	`306`	`+# (When requested, non-data lines will be returned as array entries that`
	`307`	`+# are strings not hashes, so extra code is needed to deal with that.)`
`306`	`308`	`subParseData`
`307`	`309`	`{`
`308`		`-my ($input_file,$schema,$preserve_formatting) =@_;`
	`310`	`+my ($input_file,$schema,$preserve_comments) =@_;`
`309`	`311`
`310`	`312`	`open(my$ifd,'<',$input_file) \|\|die"$input_file:$!";`
`311`	`313`	`$input_file =~/(\w+)\.dat$/`
`312`	`314`	`ordie"Input file$input_file needs to be a .dat file.\n";`
`313`	`315`	`my$catname =$1;`
`314`	`316`	`my$data = [];`
`315`	`317`
`316`		`-if ($preserve_formatting)`
`317`		`-{`
`318`	`318`	`# Scan the input file.`
`319`	`319`	`while (<$ifd>)`
`320`	`320`	`{`
`@@ -369,31 +369,17 @@ sub ParseData`
`369`	`369`	`# with --full-tuples to print autogenerated entries, which seems like`
`370`	`370`	`# useful behavior for debugging.)`
`371`	`371`	`#`
`372`		`-# Otherwise, we have a non-data string, which weneed tokeepin`
`373`		`-#order to preserve formatting.`
	`372`	`+# Otherwise, we have a non-data string, which we keeponly if`
	`373`	`+#the caller requested it.`
`374`	`374`	`if (defined$hash_ref)`
`375`	`375`	`{`
`376`	`376`	`push@$data,$hash_refif !$hash_ref->{autogenerated};`
`377`	`377`	`}`
`378`	`378`	`else`
`379`	`379`	`{`
`380`		`-push@$data,$_;`
	`380`	`+push@$data,$_if$preserve_comments;`
`381`	`381`	`}`
`382`	`382`	`}`
`383`		`-}`
`384`		`-else`
`385`		`-{`
`386`		`-# When we only care about the contents, it's faster to read and eval`
`387`		`-# the whole file at once.`
`388`		`-local$/;`
`389`		`-my$full_file = <$ifd>;`
`390`		`-eval"\$data =$full_file"## no critic (ProhibitStringyEval)`
`391`		`-ordie"error parsing$input_file\n";`
`392`		`-foreachmy$hash_ref (@{$data})`
`393`		`-{`
`394`		`-AddDefaultValues($hash_ref,$schema,$catname);`
`395`		`-}`
`396`		`-}`
`397`	`383`
`398`	`384`	`close$ifd;`
`399`	`385`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit995e0fb

File tree

1 file changed

1 file changed

`‎src/backend/catalog/Catalog.pm`

0 commit comments