Remove pstrdup of TextDatumGetCString

petere · petere · commit 25371a72b95a · 2017-04-14T12:54:09.000-04:00
The result of TextDatumGetCString is already palloc'ed.
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
@@ -75,7 +75,7 @@ GetSubscription(Oid subid, bool missing_ok)
 							Anum_pg_subscription_subconninfo,
 							&isnull);
 	Assert(!isnull);
-	sub->conninfo = pstrdup(TextDatumGetCString(datum));
+	sub->conninfo = TextDatumGetCString(datum);
 
 	/* Get slotname */
 	datum = SysCacheGetAttr(SUBSCRIPTIONOID,
@@ -207,7 +207,7 @@ textarray_to_stringlist(ArrayType *textarray)
 		return NIL;
 
 	for (i = 0; i < nelems; i++)
-		res = lappend(res, makeString(pstrdup(TextDatumGetCString(elems[i]))));
+		res = lappend(res, makeString(TextDatumGetCString(elems[i])));
 
 	return res;
 }
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
@@ -767,7 +767,7 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
 	datum = SysCacheGetAttr(SUBSCRIPTIONOID, tup,
 							Anum_pg_subscription_subconninfo, &isnull);
 	Assert(!isnull);
-	conninfo = pstrdup(TextDatumGetCString(datum));
+	conninfo = TextDatumGetCString(datum);
 
 	/* Get slotname */
 	datum = SysCacheGetAttr(SUBSCRIPTIONOID, tup,
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
@@ -612,7 +612,7 @@ fetch_remote_table_info(char *nspname, char *relname,
 	while (tuplestore_gettupleslot(res->tuplestore, true, false, slot))
 	{
 		lrel->attnames[natt] =
-			pstrdup(TextDatumGetCString(slot_getattr(slot, 1, &isnull)));
+			TextDatumGetCString(slot_getattr(slot, 1, &isnull));
 		Assert(!isnull);
 		lrel->atttyps[natt] = DatumGetObjectId(slot_getattr(slot, 2, &isnull));
 		Assert(!isnull);

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ fetch_remote_table_info(char nspname, char relname,`
`612`	`612`	`while (tuplestore_gettupleslot(res->tuplestore, true, false, slot))`
`613`	`613`	`{`
`614`	`614`	`lrel->attnames[natt] =`
`615`		`- pstrdup(TextDatumGetCString(slot_getattr(slot, 1, &isnull)));`
	`615`	`+ TextDatumGetCString(slot_getattr(slot, 1, &isnull));`
`616`	`616`	`Assert(!isnull);`
`617`	`617`	`lrel->atttyps[natt] = DatumGetObjectId(slot_getattr(slot, 2, &isnull));`
`618`	`618`	`Assert(!isnull);`