From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 23 Oct 2020 15:32:33 +0000 (-0400)
Subject: Fix broken XML formatting in EXPLAIN output for incremental sorts.
X-Git-Tag: REL_13_1~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4538708d58400c8c0336ebabca0b7bdb72e0ff6;p=thirdparty%2Fpostgresql.git

Fix broken XML formatting in EXPLAIN output for incremental sorts.

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
index c98c9b5547c..0ad49612d28 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -2830,7 +2830,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)
 		{
@@ -2847,7 +2847,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);