Rename MemoryContextCopySetIdentifier() for clarity

petere · petere · commit bbca77623fb5 · 2018-04-06T12:37:54.000-04:00
MemoryContextCopySetIdentifier -> MemoryContextCopyAndSetIdentifier Discussion: https://www.postgresql.org/message-id/6421.1522194949@sss.pgh.pa.us
diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
@@ -528,7 +528,7 @@ RelationBuildPartitionDesc(Relation rel)
 	rel->rd_pdcxt = AllocSetContextCreate(CacheMemoryContext,
 										  "partition descriptor",
 										  ALLOCSET_DEFAULT_SIZES);
-	MemoryContextCopySetIdentifier(rel->rd_pdcxt, RelationGetRelationName(rel));
+	MemoryContextCopyAndSetIdentifier(rel->rd_pdcxt, RelationGetRelationName(rel));
 
 	oldcxt = MemoryContextSwitchTo(rel->rd_pdcxt);
 
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
@@ -214,7 +214,7 @@ RelationBuildRowSecurity(Relation relation)
 		SysScanDesc sscan;
 		HeapTuple	tuple;
 
-		MemoryContextCopySetIdentifier(rscxt,
+		MemoryContextCopyAndSetIdentifier(rscxt,
 									   RelationGetRelationName(relation));
 
 		rsdesc = MemoryContextAllocZero(rscxt, sizeof(RowSecurityDesc));
diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c
@@ -952,7 +952,7 @@ BuildCachedPlan(CachedPlanSource *plansource, List *qlist,
 		plan_context = AllocSetContextCreate(CurrentMemoryContext,
 											 "CachedPlan",
 											 ALLOCSET_START_SMALL_SIZES);
-		MemoryContextCopySetIdentifier(plan_context, plansource->query_string);
+		MemoryContextCopyAndSetIdentifier(plan_context, plansource->query_string);
 
 		/*
 		 * Copy plan into the new context.
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
@@ -741,7 +741,7 @@ RelationBuildRuleLock(Relation relation)
 									 "relation rules",
 									 ALLOCSET_SMALL_SIZES);
 	relation->rd_rulescxt = rulescxt;
-	MemoryContextCopySetIdentifier(rulescxt,
+	MemoryContextCopyAndSetIdentifier(rulescxt,
 								   RelationGetRelationName(relation));
 
 	/*
@@ -918,7 +918,7 @@ RelationBuildPartitionKey(Relation relation)
 	partkeycxt = AllocSetContextCreate(CurTransactionContext,
 									   "partition key",
 									   ALLOCSET_SMALL_SIZES);
-	MemoryContextCopySetIdentifier(partkeycxt,
+	MemoryContextCopyAndSetIdentifier(partkeycxt,
 								   RelationGetRelationName(relation));
 
 	key = (PartitionKey) MemoryContextAllocZero(partkeycxt,
@@ -1601,7 +1601,7 @@ RelationInitIndexAccessInfo(Relation relation)
 									 "index info",
 									 ALLOCSET_SMALL_SIZES);
 	relation->rd_indexcxt = indexcxt;
-	MemoryContextCopySetIdentifier(indexcxt,
+	MemoryContextCopyAndSetIdentifier(indexcxt,
 								   RelationGetRelationName(relation));
 
 	/*
@@ -5668,7 +5668,7 @@ load_relcache_init_file(bool shared)
 											 "index info",
 											 ALLOCSET_SMALL_SIZES);
 			rel->rd_indexcxt = indexcxt;
-			MemoryContextCopySetIdentifier(indexcxt,
+			MemoryContextCopyAndSetIdentifier(indexcxt,
 										   RelationGetRelationName(rel));
 
 			/*
diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c
@@ -297,7 +297,7 @@ lookup_ts_dictionary_cache(Oid dictId)
 			saveCtx = AllocSetContextCreate(CacheMemoryContext,
 											"TS dictionary",
 											ALLOCSET_SMALL_SIZES);
-			MemoryContextCopySetIdentifier(saveCtx, NameStr(dict->dictname));
+			MemoryContextCopyAndSetIdentifier(saveCtx, NameStr(dict->dictname));
 		}
 		else
 		{
@@ -306,7 +306,7 @@ lookup_ts_dictionary_cache(Oid dictId)
 			/* Don't let context's ident pointer dangle while we reset it */
 			MemoryContextSetIdentifier(saveCtx, NULL);
 			MemoryContextReset(saveCtx);
-			MemoryContextCopySetIdentifier(saveCtx, NameStr(dict->dictname));
+			MemoryContextCopyAndSetIdentifier(saveCtx, NameStr(dict->dictname));
 		}
 
 		MemSet(entry, 0, sizeof(TSDictionaryCacheEntry));
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
@@ -93,7 +93,7 @@ extern void MemoryContextCheck(MemoryContext context);
 extern bool MemoryContextContains(MemoryContext context, void *pointer);
 
 /* Handy macro for copying and assigning context ID ... but note double eval */
-#define MemoryContextCopySetIdentifier(cxt, id) \
+#define MemoryContextCopyAndSetIdentifier(cxt, id) \
 	MemoryContextSetIdentifier(cxt, MemoryContextStrdup(cxt, id))
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ lookup_ts_dictionary_cache(Oid dictId)`
`297`	`297`	`saveCtx = AllocSetContextCreate(CacheMemoryContext,`
`298`	`298`	`"TS dictionary",`
`299`	`299`	`ALLOCSET_SMALL_SIZES);`
`300`		`- MemoryContextCopySetIdentifier(saveCtx, NameStr(dict->dictname));`
	`300`	`+ MemoryContextCopyAndSetIdentifier(saveCtx, NameStr(dict->dictname));`
`301`	`301`	`}`
`302`	`302`	`else`
`303`	`303`	`{`
`@@ -306,7 +306,7 @@ lookup_ts_dictionary_cache(Oid dictId)`
`306`	`306`	`/* Don't let context's ident pointer dangle while we reset it */`
`307`	`307`	`MemoryContextSetIdentifier(saveCtx, NULL);`
`308`	`308`	`MemoryContextReset(saveCtx);`
`309`		`- MemoryContextCopySetIdentifier(saveCtx, NameStr(dict->dictname));`
	`309`	`+ MemoryContextCopyAndSetIdentifier(saveCtx, NameStr(dict->dictname));`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`MemSet(entry, 0, sizeof(TSDictionaryCacheEntry));`