rename macro isTempOrToastNamespace to isTempOrTempToastNamespace

Done for clarity

diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index db2bafd4fab770a84e9976516f345a32b5ff2f55..5eb8fd4cd004a0e3df3bb10719ffc2e6d3c54594 100644 (file)
--- a/src/backend/catalog/namespace.c
+++ b/src/backend/catalog/namespace.c
@@ -629,7 +629,7 @@ RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid)
    switch (newRelation->relpersistence)
    {
        case RELPERSISTENCE_TEMP:
-           if (!isTempOrToastNamespace(nspid))
+           if (!isTempOrTempToastNamespace(nspid))
            {
                if (isAnyTempNamespace(nspid))
                    ereport(ERROR,
@@ -642,7 +642,7 @@ RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid)
            }
            break;
        case RELPERSISTENCE_PERMANENT:
-           if (isTempOrToastNamespace(nspid))
+           if (isTempOrTempToastNamespace(nspid))
                newRelation->relpersistence = RELPERSISTENCE_TEMP;
            else if (isAnyTempNamespace(nspid))
                ereport(ERROR,
@@ -2992,11 +2992,11 @@ isTempToastNamespace(Oid namespaceId)
 }
 
 /*
- * isTempOrToastNamespace - is the given namespace my temporary-table
+ * isTempOrTempToastNamespace - is the given namespace my temporary-table
  *     namespace or my temporary-toast-table namespace?
  */
 bool
-isTempOrToastNamespace(Oid namespaceId)
+isTempOrTempToastNamespace(Oid namespaceId)
 {
    if (OidIsValid(myTempNamespace) &&
     (myTempNamespace == namespaceId || myTempToastNamespace == namespaceId))
@@ -3036,7 +3036,7 @@ bool
 isOtherTempNamespace(Oid namespaceId)
 {
    /* If it's my own temp namespace, say "false" */
-   if (isTempOrToastNamespace(namespaceId))
+   if (isTempOrTempToastNamespace(namespaceId))
        return false;
    /* Else, if it's any temp namespace, say "true" */
    return isAnyTempNamespace(namespaceId);

diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c
index 94543e1d51023df5351f44414a5a39a2480fac0f..c8e7ea852cb4e9056ba82ba499262732d5ff2409 100644 (file)
--- a/src/backend/catalog/toasting.c
+++ b/src/backend/catalog/toasting.c
@@ -254,7 +254,7 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
     * Toast tables for regular relations go in pg_toast; those for temp
     * relations go into the per-backend temp-toast-table namespace.
     */
-   if (isTempOrToastNamespace(rel->rd_rel->relnamespace))
+   if (isTempOrTempToastNamespace(rel->rd_rel->relnamespace))
        namespaceid = GetTempToastNamespace();
    else
        namespaceid = PG_TOAST_NAMESPACE;

diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c
index 8c663379ae7e854b59589e69e81bad0423cae0c4..c73a249bd8fdc85ea35ee23dda61a9e3f65099f4 100644 (file)
--- a/src/backend/utils/adt/dbsize.c
+++ b/src/backend/utils/adt/dbsize.c
@@ -836,7 +836,7 @@ pg_relation_filepath(PG_FUNCTION_ARGS)
            backend = InvalidBackendId;
            break;
        case RELPERSISTENCE_TEMP:
-           if (isTempOrToastNamespace(relform->relnamespace))
+           if (isTempOrTempToastNamespace(relform->relnamespace))
                backend = MyBackendId;
            else
            {

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 96bed96e75362e8c7ec458c6727004083bbb149e..b6f03df6a43c66a44e38e6917239ab7854c7c9bb 100644 (file)
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -913,7 +913,7 @@ RelationBuildDesc(Oid targetRelId, bool insertIt)
            relation->rd_islocaltemp = false;
            break;
        case RELPERSISTENCE_TEMP:
-           if (isTempOrToastNamespace(relation->rd_rel->relnamespace))
+           if (isTempOrTempToastNamespace(relation->rd_rel->relnamespace))
            {
                relation->rd_backend = MyBackendId;
                relation->rd_islocaltemp = true;
@@ -2811,7 +2811,7 @@ RelationBuildLocalRelation(const char *relname,
            rel->rd_islocaltemp = false;
            break;
        case RELPERSISTENCE_TEMP:
-           Assert(isTempOrToastNamespace(relnamespace));
+           Assert(isTempOrTempToastNamespace(relnamespace));
            rel->rd_backend = MyBackendId;
            rel->rd_islocaltemp = true;
            break;

diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h
index 77ce041cef9fa234899f60a67da5d68f8e05bb21..4ec0dd6f6ff7ceb1ed49aa15520f2fd2501ced3c 100644 (file)
--- a/src/include/catalog/namespace.h
+++ b/src/include/catalog/namespace.h
@@ -121,7 +121,7 @@ extern char *NameListToQuotedString(List *names);
 
 extern bool isTempNamespace(Oid namespaceId);
 extern bool isTempToastNamespace(Oid namespaceId);
-extern bool isTempOrToastNamespace(Oid namespaceId);
+extern bool isTempOrTempToastNamespace(Oid namespaceId);
 extern bool isAnyTempNamespace(Oid namespaceId);
 extern bool isOtherTempNamespace(Oid namespaceId);
 extern int GetTempNamespaceBackendId(Oid namespaceId);