From 07e5e66742333ab100a557e6e3f710e92fa1fd92 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 14 Apr 2021 09:10:57 +0200 Subject: [PATCH] Improve quoting in some error messages --- contrib/amcheck/verify_nbtree.c | 6 +++--- src/backend/access/brin/brin.c | 4 ++-- src/backend/access/index/indexam.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c index b31906cbcfd..3d06be55632 100644 --- a/contrib/amcheck/verify_nbtree.c +++ b/contrib/amcheck/verify_nbtree.c @@ -290,7 +290,7 @@ bt_index_check_internal(Oid indrelid, bool parentcheck, bool heapallindexed, if (heaprel == NULL || heapid != IndexGetRelation(indrelid, false)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_TABLE), - errmsg("could not open parent table of index %s", + errmsg("could not open parent table of index \"%s\"", RelationGetRelationName(indrel)))); /* Relation suitable for checking as B-Tree? */ @@ -535,7 +535,7 @@ bt_check_every_level(Relation rel, Relation heaprel, bool heapkeyspace, if (metad->btm_fastroot != metad->btm_root) ereport(DEBUG1, (errcode(ERRCODE_NO_DATA), - errmsg_internal("harmless fast root mismatch in index %s", + errmsg_internal("harmless fast root mismatch in index \"%s\"", RelationGetRelationName(rel)), errdetail_internal("Fast root block %u (level %u) differs from true root block %u (level %u).", metad->btm_fastroot, metad->btm_fastlevel, @@ -2277,7 +2277,7 @@ bt_downlink_missing_check(BtreeCheckState *state, bool rightsplit, { ereport(DEBUG1, (errcode(ERRCODE_NO_DATA), - errmsg_internal("harmless interrupted page split detected in index %s", + errmsg_internal("harmless interrupted page split detected in index \"%s\"", RelationGetRelationName(state->rel)), errdetail_internal("Block=%u level=%u left sibling=%u page lsn=%X/%X.", blkno, opaque->btpo_level, diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c index f885f3ab3af..c320e215082 100644 --- a/src/backend/access/brin/brin.c +++ b/src/backend/access/brin/brin.c @@ -1060,7 +1060,7 @@ brin_summarize_range(PG_FUNCTION_ARGS) if (heapRel == NULL || heapoid != IndexGetRelation(indexoid, false)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_TABLE), - errmsg("could not open parent table of index %s", + errmsg("could not open parent table of index \"%s\"", RelationGetRelationName(indexRel)))); /* OK, do it */ @@ -1137,7 +1137,7 @@ brin_desummarize_range(PG_FUNCTION_ARGS) if (heapRel == NULL || heapoid != IndexGetRelation(indexoid, false)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_TABLE), - errmsg("could not open parent table of index %s", + errmsg("could not open parent table of index \"%s\"", RelationGetRelationName(indexRel)))); /* the revmap does the hard work */ diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 9b5afa12ad6..5e22479b7ad 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -93,14 +93,14 @@ #define CHECK_REL_PROCEDURE(pname) \ do { \ if (indexRelation->rd_indam->pname == NULL) \ - elog(ERROR, "function %s is not defined for index %s", \ + elog(ERROR, "function \"%s\" is not defined for index \"%s\"", \ CppAsString(pname), RelationGetRelationName(indexRelation)); \ } while(0) #define CHECK_SCAN_PROCEDURE(pname) \ do { \ if (scan->indexRelation->rd_indam->pname == NULL) \ - elog(ERROR, "function %s is not defined for index %s", \ + elog(ERROR, "function \"%s\" is not defined for index \"%s\"", \ CppAsString(pname), RelationGetRelationName(scan->indexRelation)); \ } while(0)