Extra checks for temp relations access during function creation/deletion.

kelvich · kelvich · commit 8eda1a5f44ce · 2016-09-30T14:20:25.000+03:00
Fixes rangefuncs and portals regression tests.
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
@@ -406,6 +406,19 @@ RangeVarGetRelidExtended(const RangeVar *relation, LOCKMODE lockmode,
 		oldRelId = relId;
 	}
 
+	/*
+	 * MTM-CRUTCH: It's possible to create DDL statements that are checking
+	 * for relation existense but do not open them. So in case of temp relation
+	 * we won't call relation_open() and hence will not set MyXactAccessedTempRel.
+	 *
+	 * To skip replication of such DDL do dummy open/close here.
+	 */
+	if (OidIsValid(relId))
+	{
+		Relation	r = try_relation_open(relId, NoLock);
+		relation_close(r, NoLock);
+	}
+
 	if (!OidIsValid(relId) && !missing_ok)
 	{
 		if (relation->schemaname)
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
@@ -1120,6 +1120,10 @@ RemoveFunctionById(Oid funcOid)
 	Relation	relation;
 	HeapTuple	tup;
 	bool		isagg;
+	Oid language_oid;
+	HeapTuple languageTuple;
+	Form_pg_language languageStruct;
+	Oid	languageValidator;
 
 	/*
 	 * Delete the pg_proc tuple.
@@ -1132,6 +1136,18 @@ RemoveFunctionById(Oid funcOid)
 
 	isagg = ((Form_pg_proc) GETSTRUCT(tup))->proisagg;
 
+	/*
+	 * MTM-CRUTCH: We need to know wheteher our function had
+	 * accessed temp relation or not. So validate function body
+	 * again -- that will set MyXactAccessedTempRel.
+	 */
+	language_oid = ((Form_pg_proc) GETSTRUCT(tup))->prolang;
+	languageTuple = SearchSysCache1(LANGOID, language_oid);
+	languageStruct = (Form_pg_language) GETSTRUCT(languageTuple);
+	languageValidator = languageStruct->lanvalidator;
+	OidFunctionCall1(languageValidator, ObjectIdGetDatum(funcOid));
+	ReleaseSysCache(languageTuple);
+
 	simple_heap_delete(relation, &tup->t_self);
 
 	ReleaseSysCache(tup);
