Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit73fe875

Browse files
committed
rename macro isTempOrToastNamespace to isTempOrTempToastNamespace
Done for clarity
1 parent5d16332 commit73fe875

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

‎src/backend/catalog/namespace.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid)
629629
switch (newRelation->relpersistence)
630630
{
631631
caseRELPERSISTENCE_TEMP:
632-
if (!isTempOrToastNamespace(nspid))
632+
if (!isTempOrTempToastNamespace(nspid))
633633
{
634634
if (isAnyTempNamespace(nspid))
635635
ereport(ERROR,
@@ -642,7 +642,7 @@ RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid)
642642
}
643643
break;
644644
caseRELPERSISTENCE_PERMANENT:
645-
if (isTempOrToastNamespace(nspid))
645+
if (isTempOrTempToastNamespace(nspid))
646646
newRelation->relpersistence=RELPERSISTENCE_TEMP;
647647
elseif (isAnyTempNamespace(nspid))
648648
ereport(ERROR,
@@ -2992,11 +2992,11 @@ isTempToastNamespace(Oid namespaceId)
29922992
}
29932993

29942994
/*
2995-
*isTempOrToastNamespace - is the given namespace my temporary-table
2995+
*isTempOrTempToastNamespace - is the given namespace my temporary-table
29962996
*namespace or my temporary-toast-table namespace?
29972997
*/
29982998
bool
2999-
isTempOrToastNamespace(OidnamespaceId)
2999+
isTempOrTempToastNamespace(OidnamespaceId)
30003000
{
30013001
if (OidIsValid(myTempNamespace)&&
30023002
(myTempNamespace==namespaceId||myTempToastNamespace==namespaceId))
@@ -3036,7 +3036,7 @@ bool
30363036
isOtherTempNamespace(OidnamespaceId)
30373037
{
30383038
/* If it's my own temp namespace, say "false" */
3039-
if (isTempOrToastNamespace(namespaceId))
3039+
if (isTempOrTempToastNamespace(namespaceId))
30403040
return false;
30413041
/* Else, if it's any temp namespace, say "true" */
30423042
returnisAnyTempNamespace(namespaceId);

‎src/backend/catalog/toasting.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
254254
* Toast tables for regular relations go in pg_toast; those for temp
255255
* relations go into the per-backend temp-toast-table namespace.
256256
*/
257-
if (isTempOrToastNamespace(rel->rd_rel->relnamespace))
257+
if (isTempOrTempToastNamespace(rel->rd_rel->relnamespace))
258258
namespaceid=GetTempToastNamespace();
259259
else
260260
namespaceid=PG_TOAST_NAMESPACE;

‎src/backend/utils/adt/dbsize.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ pg_relation_filepath(PG_FUNCTION_ARGS)
836836
backend=InvalidBackendId;
837837
break;
838838
caseRELPERSISTENCE_TEMP:
839-
if (isTempOrToastNamespace(relform->relnamespace))
839+
if (isTempOrTempToastNamespace(relform->relnamespace))
840840
backend=MyBackendId;
841841
else
842842
{

‎src/backend/utils/cache/relcache.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ RelationBuildDesc(Oid targetRelId, bool insertIt)
913913
relation->rd_islocaltemp= false;
914914
break;
915915
caseRELPERSISTENCE_TEMP:
916-
if (isTempOrToastNamespace(relation->rd_rel->relnamespace))
916+
if (isTempOrTempToastNamespace(relation->rd_rel->relnamespace))
917917
{
918918
relation->rd_backend=MyBackendId;
919919
relation->rd_islocaltemp= true;
@@ -2811,7 +2811,7 @@ RelationBuildLocalRelation(const char *relname,
28112811
rel->rd_islocaltemp= false;
28122812
break;
28132813
caseRELPERSISTENCE_TEMP:
2814-
Assert(isTempOrToastNamespace(relnamespace));
2814+
Assert(isTempOrTempToastNamespace(relnamespace));
28152815
rel->rd_backend=MyBackendId;
28162816
rel->rd_islocaltemp= true;
28172817
break;

‎src/include/catalog/namespace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ extern char *NameListToQuotedString(List *names);
121121

122122
externboolisTempNamespace(OidnamespaceId);
123123
externboolisTempToastNamespace(OidnamespaceId);
124-
externboolisTempOrToastNamespace(OidnamespaceId);
124+
externboolisTempOrTempToastNamespace(OidnamespaceId);
125125
externboolisAnyTempNamespace(OidnamespaceId);
126126
externboolisOtherTempNamespace(OidnamespaceId);
127127
externintGetTempNamespaceBackendId(OidnamespaceId);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp