Add information about line contents on parsing failure of wait_event_names.txt

michaelpq · michaelpq · commit aea7fe33fb6a · 2023-07-14T09:09:23.000+09:00
The contents of the line whose parsing failed was not reported in the error message produced by generate-wait_event_types.pl, making harder than necessary the debugging of incorrectly-shaped entries in the file. Reported-by: Andres Freund Discussion: https://postgr.es/m/ZK9S3jFEV1X797Ll@paquier.xyz
diff --git a/src/backend/utils/activity/generate-wait_event_types.pl b/src/backend/utils/activity/generate-wait_event_types.pl
@@ -72,7 +72,7 @@
 # Read the sorted lines and populate the hash table
 foreach my $line (@lines_sorted)
 {
-	die "unable to parse wait_event_names.txt"
+	die "unable to parse wait_event_names.txt for line $line\n"
 	  unless $line =~ /^(\w+)\t+(\w+)\t+(\w+)\t+("\w.*\.")$/;
 
 	(   my $waitclassname,

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@`
`72`	`72`	`# Read the sorted lines and populate the hash table`
`73`	`73`	`foreach my $line (@lines_sorted)`
`74`	`74`	`{`
`75`		`- die "unable to parse wait_event_names.txt"`
	`75`	`+ die "unable to parse wait_event_names.txt for line $line\n"`
`76`	`76`	`unless $line =~ /^(\w+)\t+(\w+)\t+(\w+)\t+("\w.*\.")$/;`
`77`	`77`
`78`	`78`	`( my $waitclassname,`