Undo double-quoting of index names in non-text EXPLAIN output formats.

tglsfdc · tglsfdc · commit 35a8e227e6c6 · 2020-06-22T11:46:41.000-04:00
explain_get_index_name() applied quote_identifier() to the index name. This is fine for text output, but the non-text output formats all have their own quoting conventions and would much rather start from the actual index name. For example in JSON you'd get something like "Index Name": "\"My Index\"", which is surely not desirable, especially when the same does not happen for table names. Hence, move the responsibility for applying quoting out to the callers, where it can go into already-existing special code paths for text format. This changes the API spec for users of explain_get_index_name_hook: before, they were supposed to apply quote_identifier() if necessary, now they should not. Research suggests that the only publicly available user of the hook is hypopg, and it actually forgot to apply quoting anyway, so it's fine. (In any case, there's no behavioral change for the output of a hook as seen in non-text EXPLAIN formats, so this won't break any case that programs should be relying on.) Digging in the commit logs, it appears that quoting was included in explain_get_index_name's duties when commit 604ffd2 invented it; and that was fine at the time because we only had text output format. This should have been rethought when non-text formats were invented, but it wasn't. This is a fairly clear bug for users of non-text EXPLAIN formats, so back-patch to all supported branches. Per bug #16502 from Maciek Sakrejda. Patch by me (based on investigation by Euler Taveira); thanks to Julien Rouhaud for review. Discussion: https://postgr.es/m/16502-57bd1c9f913ed1d1@postgresql.org
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
@@ -1312,7 +1312,8 @@ ExplainNode(PlanState *planstate, List *ancestors,
 				explain_get_index_name(bitmapindexscan->indexid);
 
 				if (es->format == EXPLAIN_FORMAT_TEXT)
-					appendStringInfo(es->str, " on %s", indexname);
+					appendStringInfo(es->str, " on %s",
+									 quote_identifier(indexname));
 				else
 					ExplainPropertyText("Index Name", indexname, es);
 			}
@@ -2766,6 +2767,10 @@ show_eval_params(Bitmapset *bms_params, ExplainState *es)
  *
  * We allow plugins to get control here so that plans involving hypothetical
  * indexes can be explained.
+ *
+ * Note: names returned by this function should be "raw"; the caller will
+ * apply quoting if needed.  Formerly the convention was to do quoting here,
+ * but we don't want that in non-text output formats.
  */
 static const char *
 explain_get_index_name(Oid indexId)
@@ -2778,11 +2783,10 @@ explain_get_index_name(Oid indexId)
 		result = NULL;
 	if (result == NULL)
 	{
-		/* default behavior: look in the catalogs and quote it */
+		/* default behavior: look it up in the catalogs */
 		result = get_rel_name(indexId);
 		if (result == NULL)
 			elog(ERROR, "cache lookup failed for index %u", indexId);
-		result = quote_identifier(result);
 	}
 	return result;
 }
@@ -2924,7 +2928,7 @@ ExplainIndexScanDetails(Oid indexid, ScanDirection indexorderdir,
 	{
 		if (ScanDirectionIsBackward(indexorderdir))
 			appendStringInfoString(es->str, " Backward");
-		appendStringInfo(es->str, " using %s", indexname);
+		appendStringInfo(es->str, " using %s", quote_identifier(indexname));
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -1312,7 +1312,8 @@ ExplainNode(PlanState planstate, List ancestors,`
`1312`	`1312`	`explain_get_index_name(bitmapindexscan->indexid);`
`1313`	`1313`
`1314`	`1314`	`if (es->format == EXPLAIN_FORMAT_TEXT)`
`1315`		`- appendStringInfo(es->str, " on %s", indexname);`
	`1315`	`+ appendStringInfo(es->str, " on %s",`
	`1316`	`+ quote_identifier(indexname));`
`1316`	`1317`	`else`
`1317`	`1318`	`ExplainPropertyText("Index Name", indexname, es);`
`1318`	`1319`	`}`
`@@ -2766,6 +2767,10 @@ show_eval_params(Bitmapset bms_params, ExplainState es)`
`2766`	`2767`	`*`
`2767`	`2768`	`* We allow plugins to get control here so that plans involving hypothetical`
`2768`	`2769`	`* indexes can be explained.`
	`2770`	`+ *`
	`2771`	`+ * Note: names returned by this function should be "raw"; the caller will`
	`2772`	`+ * apply quoting if needed. Formerly the convention was to do quoting here,`
	`2773`	`+ * but we don't want that in non-text output formats.`
`2769`	`2774`	`*/`
`2770`	`2775`	`static const char *`
`2771`	`2776`	`explain_get_index_name(Oid indexId)`
`@@ -2778,11 +2783,10 @@ explain_get_index_name(Oid indexId)`
`2778`	`2783`	`result = NULL;`
`2779`	`2784`	`if (result == NULL)`
`2780`	`2785`	`{`
`2781`		`- /* default behavior: look in the catalogs and quote it */`
	`2786`	`+ /* default behavior: look it up in the catalogs */`
`2782`	`2787`	`result = get_rel_name(indexId);`
`2783`	`2788`	`if (result == NULL)`
`2784`	`2789`	`elog(ERROR, "cache lookup failed for index %u", indexId);`
`2785`		`- result = quote_identifier(result);`
`2786`	`2790`	`}`
`2787`	`2791`	`return result;`
`2788`	`2792`	`}`
`@@ -2924,7 +2928,7 @@ ExplainIndexScanDetails(Oid indexid, ScanDirection indexorderdir,`
`2924`	`2928`	`{`
`2925`	`2929`	`if (ScanDirectionIsBackward(indexorderdir))`
`2926`	`2930`	`appendStringInfoString(es->str, " Backward");`
`2927`		`- appendStringInfo(es->str, " using %s", indexname);`
	`2931`	`+ appendStringInfo(es->str, " using %s", quote_identifier(indexname));`
`2928`	`2932`	`}`
`2929`	`2933`	`else`
`2930`	`2934`	`{`