Fix PGPPRO-717 correctly restore name/schema of local tables

Author: knizhnik

multimaster.c

@@ -2523,7 +2523,7 @@ MtmCreateLocalTableMap(void)
 	return htab;
 }
 
-void MtmMakeRelationLocal(Oid relid)
+static void MtmMakeRelationLocal(Oid relid)
 {
 	if (OidIsValid(relid)) {
 		MtmLock(LW_EXCLUSIVE);
@@ -2533,17 +2533,17 @@ void MtmMakeRelationLocal(Oid relid)
 }
 
 
-static void MtmMakeTableLocal(char* schema, char* name)
+void MtmMakeTableLocal(char const* schema, char const* name)
 {
-	RangeVar* rv = makeRangeVar(schema, name, -1);
+	RangeVar* rv = makeRangeVar((char*)schema, (char*)name, -1);
 	Oid relid = RangeVarGetRelid(rv, NoLock, true);
 	MtmMakeRelationLocal(relid);
 }
 
 
 typedef struct {
-	NameData schema;
-	NameData name;
+	text schema;
+	text name;
 } MtmLocalTablesTuple;
 
 static void MtmLoadLocalTables(void)
@@ -2563,7 +2563,7 @@ static void MtmLoadLocalTables(void)
 		while (HeapTupleIsValid(tuple = systable_getnext(scan)))
 		{
 			MtmLocalTablesTuple	*t = (MtmLocalTablesTuple*) GETSTRUCT(tuple);
-			MtmMakeTableLocal(NameStr(t->schema), NameStr(t->name));
+			MtmMakeTableLocal(text_to_cstring(&t->schema), text_to_cstring(&t->name));
 		}
 
 		systable_endscan(scan);

multimaster.h

@@ -404,7 +404,7 @@ extern void  MtmCheckQuorum(void);
 extern bool  MtmRecoveryCaughtUp(int nodeId, lsn_t walEndPtr);
 extern void  MtmCheckRecoveryCaughtUp(int nodeId, lsn_t slotLSN);
 extern void  MtmRecoveryCompleted(void);
-extern void  MtmMakeRelationLocal(Oid relid);
+extern void  MtmMakeTableLocal(char const* schema, char const* name);
 extern void  MtmHandleApplyError(void);
 extern void  MtmUpdateLsnMapping(int nodeId, lsn_t endLsn);
 extern lsn_t MtmGetFlushPosition(int nodeId);

pglogical_apply.c

@@ -860,7 +860,7 @@ process_remote_insert(StringInfo s, Relation rel)
 	if (strcmp(RelationGetRelationName(rel), MULTIMASTER_LOCAL_TABLES_TABLE) == 0 &&
 		strcmp(get_namespace_name(RelationGetNamespace(rel)), MULTIMASTER_SCHEMA_NAME) == 0)
 	{
-		MtmMakeRelationLocal(RelationGetRelid(rel));
+		MtmMakeTableLocal(TextDatumGetCString(new_tuple.values[0]), TextDatumGetCString(new_tuple.values[1]));
 	}
 
     ExecResetTupleTable(estate->es_tupleTable, true);