diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/catalog/namespace.c | 10 | ||||
| -rw-r--r-- | src/backend/catalog/toasting.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/dbsize.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/cache/relcache.c | 4 | ||||
| -rw-r--r-- | src/include/catalog/namespace.h | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index db2bafd4fab..5eb8fd4cd00 100644 --- 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 94543e1d510..c8e7ea852cb 100644 --- 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 8c663379ae7..c73a249bd8f 100644 --- 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 96bed96e753..b6f03df6a43 100644 --- 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 77ce041cef9..4ec0dd6f6ff 100644 --- 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); |