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

knizhnik · knizhnik · commit 5d3274dbb872 · 2017-05-30T12:59:54.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2522,7 +2522,7 @@ MtmCreateLocalTableMap(void)
 	return htab;
 }
 
-void MtmMakeRelationLocal(Oid relid)
+static void MtmMakeRelationLocal(Oid relid)
 {
 	if (OidIsValid(relid)) {
 		MtmLock(LW_EXCLUSIVE);
@@ -2532,17 +2532,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)
@@ -2562,7 +2562,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);
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -403,7 +403,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);
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/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);

Original file line number	Diff line number	Diff line change
`@@ -2522,7 +2522,7 @@ MtmCreateLocalTableMap(void)`
`2522`	`2522`	`return htab;`
`2523`	`2523`	`}`
`2524`	`2524`
`2525`		`-void MtmMakeRelationLocal(Oid relid)`
	`2525`	`+static void MtmMakeRelationLocal(Oid relid)`
`2526`	`2526`	`{`
`2527`	`2527`	`if (OidIsValid(relid)) {`
`2528`	`2528`	`MtmLock(LW_EXCLUSIVE);`
`@@ -2532,17 +2532,17 @@ void MtmMakeRelationLocal(Oid relid)`
`2532`	`2532`	`}`
`2533`	`2533`
`2534`	`2534`
`2535`		`-static void MtmMakeTableLocal(char* schema, char* name)`
	`2535`	`+void MtmMakeTableLocal(char const* schema, char const* name)`
`2536`	`2536`	`{`
`2537`		`- RangeVar* rv = makeRangeVar(schema, name, -1);`
	`2537`	`+ RangeVar* rv = makeRangeVar((char)schema, (char)name, -1);`
`2538`	`2538`	`Oid relid = RangeVarGetRelid(rv, NoLock, true);`
`2539`	`2539`	`MtmMakeRelationLocal(relid);`
`2540`	`2540`	`}`
`2541`	`2541`
`2542`	`2542`
`2543`	`2543`	`typedef struct {`
`2544`		`- NameData schema;`
`2545`		`- NameData name;`
	`2544`	`+ text schema;`
	`2545`	`+ text name;`
`2546`	`2546`	`} MtmLocalTablesTuple;`
`2547`	`2547`
`2548`	`2548`	`static void MtmLoadLocalTables(void)`
`@@ -2562,7 +2562,7 @@ static void MtmLoadLocalTables(void)`
`2562`	`2562`	`while (HeapTupleIsValid(tuple = systable_getnext(scan)))`
`2563`	`2563`	`{`
`2564`	`2564`	`MtmLocalTablesTuple t = (MtmLocalTablesTuple) GETSTRUCT(tuple);`
`2565`		`- MtmMakeTableLocal(NameStr(t->schema), NameStr(t->name));`
	`2565`	`+ MtmMakeTableLocal(text_to_cstring(&t->schema), text_to_cstring(&t->name));`
`2566`	`2566`	`}`
`2567`	`2567`
`2568`	`2568`	`systable_endscan(scan);`
Original file line number	Diff line number	Diff line change
`@@ -860,7 +860,7 @@ process_remote_insert(StringInfo s, Relation rel)`
`860`	`860`	`if (strcmp(RelationGetRelationName(rel), MULTIMASTER_LOCAL_TABLES_TABLE) == 0 &&`
`861`	`861`	`strcmp(get_namespace_name(RelationGetNamespace(rel)), MULTIMASTER_SCHEMA_NAME) == 0)`
`862`	`862`	`{`
`863`		`- MtmMakeRelationLocal(RelationGetRelid(rel));`
	`863`	`+ MtmMakeTableLocal(TextDatumGetCString(new_tuple.values[0]), TextDatumGetCString(new_tuple.values[1]));`
`864`	`864`	`}`
`865`	`865`
`866`	`866`	`ExecResetTupleTable(estate->es_tupleTable, true);`