Fix two issues with custom_query_jumble in gen_node_support.pl

michaelpq · michaelpq · commit 27ee6ede6bc9 · 2025-03-26T09:06:36.000+09:00
A node field marked with custom_query_jumble and query_jumble_ignore would generate some code of a custom routine. The script is changed so as custom_query_jumble behaves like the other options in this case, query_jumble_ignore taking priority, with no code generated. A comment related to the code generated for node types was misplaced. Thinkos introduced in 5ac462e. Reported-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/1324036.1742945060@sss.pgh.pa.us
diff --git a/src/backend/nodes/gen_node_support.pl b/src/backend/nodes/gen_node_support.pl
@@ -1309,16 +1309,16 @@ sub elem
 			}
 		}
 
-		# node type
 		if ($query_jumble_custom)
 		{
 			# Custom function that applies to one field of a node.
-			print $jff "\tJUMBLE_CUSTOM($n, $f);\n";
+			print $jff "\tJUMBLE_CUSTOM($n, $f);\n"
+			  unless $query_jumble_ignore;
 		}
 		elsif (($t =~ /^(\w+)\*$/ or $t =~ /^struct\s+(\w+)\*$/)
 			and elem $1, @node_types)
 		{
-			# Squash constants if requested.
+			# Node type.  Squash constants if requested.
 			if ($query_jumble_squash)
 			{
 				print $jff "\tJUMBLE_ELEMENTS($f);\n"

Original file line number	Diff line number	Diff line change
`@@ -1309,16 +1309,16 @@ sub elem`
`1309`	`1309`	`}`
`1310`	`1310`	`}`
`1311`	`1311`
`1312`		`- # node type`
`1313`	`1312`	`if ($query_jumble_custom)`
`1314`	`1313`	`{`
`1315`	`1314`	`# Custom function that applies to one field of a node.`
`1316`		`- print $jff "\tJUMBLE_CUSTOM($n, $f);\n";`
	`1315`	`+ print $jff "\tJUMBLE_CUSTOM($n, $f);\n"`
	`1316`	`+ unless $query_jumble_ignore;`
`1317`	`1317`	`}`
`1318`	`1318`	`elsif (($t =~ /^(\w+)\$/ or $t =~ /^struct\s+(\w+)\$/)`
`1319`	`1319`	`and elem $1, @node_types)`
`1320`	`1320`	`{`
`1321`		`- # Squash constants if requested.`
	`1321`	`+ # Node type. Squash constants if requested.`
`1322`	`1322`	`if ($query_jumble_squash)`
`1323`	`1323`	`{`
`1324`	`1324`	`print $jff "\tJUMBLE_ELEMENTS($f);\n"`