[PATCH] Remove redundant Assert() calls in report_namespace_conflict() - Mailing list pgsql-hackers

From zengman
Subject [PATCH] Remove redundant Assert() calls in report_namespace_conflict()
Date
Msg-id tencent_40F8C1D82E2EE28065009AAA@qq.com
Whole thread Raw
Responses Re: [PATCH] Remove redundant Assert() calls in report_namespace_conflict()
List pgsql-hackers
Hi all,

I noticed that report_namespace_conflict() has Assert(OidIsValid(nspOid)) at the function entry, and the same assertion
isrepeated in each switch case. These duplicate assertions are redundant since the check at the top already covers all
cases.
Attached patch removes the 6 redundant assertions to make the code a bit cleaner.

```
static void
report_namespace_conflict(Oid classId, const char *name, Oid nspOid)
{
  char     *msgfmt;

  Assert(OidIsValid(nspOid));

  switch (classId)
  {
    case ConversionRelationId:
      Assert(OidIsValid(nspOid));
      msgfmt = gettext_noop("conversion \"%s\" already exists in schema \"%s\"");
      break;
    case StatisticExtRelationId:
      Assert(OidIsValid(nspOid));
      msgfmt = gettext_noop("statistics object \"%s\" already exists in schema \"%s\"");
      break;
    case TSParserRelationId:
      Assert(OidIsValid(nspOid));
      msgfmt = gettext_noop("text search parser \"%s\" already exists in schema \"%s\"");
      break;
    case TSDictionaryRelationId:
      Assert(OidIsValid(nspOid));
      msgfmt = gettext_noop("text search dictionary \"%s\" already exists in schema \"%s\"");
      break;
    case TSTemplateRelationId:
      Assert(OidIsValid(nspOid));
      msgfmt = gettext_noop("text search template \"%s\" already exists in schema \"%s\"");
      break;
    case TSConfigRelationId:
      Assert(OidIsValid(nspOid));
      msgfmt = gettext_noop("text search configuration \"%s\" already exists in schema \"%s\"");
      break;
    default:
      elog(ERROR, "unsupported object class: %u", classId);
      break;
  }

  ereport(ERROR,
      (errcode(ERRCODE_DUPLICATE_OBJECT),
       errmsg(msgfmt, name, get_namespace_name(nspOid))));
}
```

--
Regards,
Man Zeng
www.openhalo.org
Attachment

pgsql-hackers by date:

Previous
From: jian he
Date:
Subject: Re: [PATCH] Add pg_get_role_ddl() functions for role recreation
Next
From: Zsolt Parragi
Date:
Subject: Hackorum - a new mailing list frontend