Address stats export review comments.

jeff-davis · jeff-davis · commit f9f4b43b8dc0 · 2025-03-06T00:11:12.000-08:00
Per discussion, did not use Jian He's patch exactly. Reported-by: jian he <jian.universality@gmail.com> Reviewed-by: Corey Huinker <corey.huinker@gmail.com> Discussion: https://postgr.es/m/CACJufxFVq=tq9u1zrHWYSbMi1T07gS9Ff0LJScMco4HZmtZ1xw@mail.gmail.com Discussion: https://postgr.es/m/CADkLM=f1n2_Vomq0gKab7xdxDHmJGgn=DE48P8fzQOp3Mrs1Qg@mail.gmail.com
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2936,8 +2936,8 @@ _tocEntryRequired(TocEntry *te, teSection curSection, ArchiveHandle *AH)
 	{
 		if (!ropt->dumpStatistics)
 			return 0;
-		else
-			res = REQ_STATS;
+
+		res = REQ_STATS;
 	}
 
 	/*
@@ -2984,10 +2984,6 @@ _tocEntryRequired(TocEntry *te, teSection curSection, ArchiveHandle *AH)
 	if (ropt->no_subscriptions && strcmp(te->desc, "SUBSCRIPTION") == 0)
 		return 0;
 
-	/* If it's statistics and we don't want statistics, maybe ignore it */
-	if (!ropt->dumpStatistics && strcmp(te->desc, "STATISTICS DATA") == 0)
-		return 0;
-
 	/* Ignore it if section is not to be dumped/restored */
 	switch (curSection)
 	{

Original file line number	Diff line number	Diff line change
`@@ -2936,8 +2936,8 @@ _tocEntryRequired(TocEntry te, teSection curSection, ArchiveHandle AH)`
`2936`	`2936`	`{`
`2937`	`2937`	`if (!ropt->dumpStatistics)`
`2938`	`2938`	`return 0;`
`2939`		`- else`
`2940`		`- res = REQ_STATS;`
	`2939`	`+`
	`2940`	`+ res = REQ_STATS;`
`2941`	`2941`	`}`
`2942`	`2942`
`2943`	`2943`	`/*`
`@@ -2984,10 +2984,6 @@ _tocEntryRequired(TocEntry te, teSection curSection, ArchiveHandle AH)`
`2984`	`2984`	`if (ropt->no_subscriptions && strcmp(te->desc, "SUBSCRIPTION") == 0)`
`2985`	`2985`	`return 0;`
`2986`	`2986`
`2987`		`- /* If it's statistics and we don't want statistics, maybe ignore it */`
`2988`		`- if (!ropt->dumpStatistics && strcmp(te->desc, "STATISTICS DATA") == 0)`
`2989`		`- return 0;`
`2990`		`-`
`2991`	`2987`	`/* Ignore it if section is not to be dumped/restored */`
`2992`	`2988`	`switch (curSection)`
`2993`	`2989`	`{`