Fix broken XML formatting in EXPLAIN output for incremental sorts.

tglsfdc · tglsfdc · commit 87a174c0e77e · 2020-10-23T11:32:33.000-04:00
The ExplainCloseGroup arguments for incremental sort usage data didn't match the corresponding ExplainOpenGroup. This only matters for XML-format output, which is probably why we'd not noticed. Daniel Gustafsson, per bug #16683 from Frits Jalvingh Discussion: https://postgr.es/m/16683-8005033324ad34e9@postgresql.org
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
@@ -2827,7 +2827,7 @@ show_incremental_sort_group_info(IncrementalSortGroupInfo *groupInfo,
 			ExplainPropertyInteger("Peak Sort Space Used", "kB",
 								   groupInfo->maxMemorySpaceUsed, es);
 
-			ExplainCloseGroup("Sort Spaces", memoryName.data, true, es);
+			ExplainCloseGroup("Sort Space", memoryName.data, true, es);
 		}
 		if (groupInfo->maxDiskSpaceUsed > 0)
 		{
@@ -2844,7 +2844,7 @@ show_incremental_sort_group_info(IncrementalSortGroupInfo *groupInfo,
 			ExplainPropertyInteger("Peak Sort Space Used", "kB",
 								   groupInfo->maxDiskSpaceUsed, es);
 
-			ExplainCloseGroup("Sort Spaces", diskName.data, true, es);
+			ExplainCloseGroup("Sort Space", diskName.data, true, es);
 		}
 
 		ExplainCloseGroup("Incremental Sort Groups", groupName.data, true, es);

Original file line number	Diff line number	Diff line change
`@@ -2827,7 +2827,7 @@ show_incremental_sort_group_info(IncrementalSortGroupInfo *groupInfo,`
`2827`	`2827`	`ExplainPropertyInteger("Peak Sort Space Used", "kB",`
`2828`	`2828`	`groupInfo->maxMemorySpaceUsed, es);`
`2829`	`2829`
`2830`		`- ExplainCloseGroup("Sort Spaces", memoryName.data, true, es);`
	`2830`	`+ ExplainCloseGroup("Sort Space", memoryName.data, true, es);`
`2831`	`2831`	`}`
`2832`	`2832`	`if (groupInfo->maxDiskSpaceUsed > 0)`
`2833`	`2833`	`{`
`@@ -2844,7 +2844,7 @@ show_incremental_sort_group_info(IncrementalSortGroupInfo *groupInfo,`
`2844`	`2844`	`ExplainPropertyInteger("Peak Sort Space Used", "kB",`
`2845`	`2845`	`groupInfo->maxDiskSpaceUsed, es);`
`2846`	`2846`
`2847`		`- ExplainCloseGroup("Sort Spaces", diskName.data, true, es);`
	`2847`	`+ ExplainCloseGroup("Sort Space", diskName.data, true, es);`
`2848`	`2848`	`}`
`2849`	`2849`
`2850`	`2850`	`ExplainCloseGroup("Incremental Sort Groups", groupName.data, true, es);`