Fix make_table_local

knizhnik · kelvich · commit fbeac1ba508e · 2017-11-13T02:17:36.000+03:00
diff --git a/multimaster--1.0.sql b/multimaster--1.0.sql
@@ -83,7 +83,5 @@ CREATE FUNCTION mtm.check_deadlock(xid bigint) RETURNS boolean
 AS 'MODULE_PATHNAME','mtm_check_deadlock'
 LANGUAGE C;
 
--- CREATE TABLE IF NOT EXISTS public.ddl_log (issued timestamp with time zone not null, query text);
-
--- CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema text, rel_name text, primary key(rel_schema, rel_name));
+CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema text, rel_name text, primary key(rel_schema, rel_name));
 
diff --git a/multimaster.c b/multimaster.c
@@ -2331,7 +2331,7 @@ MtmCreateLocalTableMap(void)
 	return htab;
 }
 
-static void MtmMakeRelationLocal(Oid relid)
+void MtmMakeRelationLocal(Oid relid)
 {
 	if (OidIsValid(relid)) { 
 		MtmLock(LW_EXCLUSIVE);		
@@ -2341,7 +2341,7 @@ static void MtmMakeRelationLocal(Oid relid)
 }	
 
 
-void MtmMakeTableLocal(char* schema, char* name)
+static void MtmMakeTableLocal(char* schema, char* name)
 {
 	RangeVar* rv = makeRangeVar(schema, name, -1);
 	Oid relid = RangeVarGetRelid(rv, NoLock, true);
@@ -4179,7 +4179,7 @@ mtm_get_cluster_info(PG_FUNCTION_ARGS)
 
 Datum mtm_make_table_local(PG_FUNCTION_ARGS)
 {
-	Oid	reloid = PG_GETARG_OID(1);
+	Oid	reloid = PG_GETARG_OID(0);
 	RangeVar   *rv;
 	Relation	rel;
 	TupleDesc	tupDesc;
@@ -4192,8 +4192,8 @@ Datum mtm_make_table_local(PG_FUNCTION_ARGS)
 	rv = makeRangeVar(MULTIMASTER_SCHEMA_NAME, MULTIMASTER_LOCAL_TABLES_TABLE, -1);
 	rel = heap_openrv(rv, RowExclusiveLock);
 	if (rel != NULL) {
-		char* tableName = get_rel_name(reloid);
-		Oid   schemaid = get_rel_namespace(reloid);
+		char* tableName = RelationGetRelationName(rel);
+		Oid   schemaid = RelationGetNamespace(rel);
 		char* schemaName = get_namespace_name(schemaid);
 
 		tupDesc = RelationGetDescr(rel);
diff --git a/multimaster.h b/multimaster.h
@@ -396,7 +396,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  MtmMakeTableLocal(char* schema, char* name);
+extern void  MtmMakeRelationLocal(Oid relid);
 extern void  MtmHandleApplyError(void);
 extern void  MtmUpdateLsnMapping(int nodeId, lsn_t endLsn);
 extern lsn_t MtmGetFlushPosition(int nodeId);
diff --git a/pglogical_apply.c b/pglogical_apply.c
@@ -818,10 +818,16 @@ process_remote_insert(StringInfo s, Relation rel)
 	if (ActiveSnapshotSet())
 		PopActiveSnapshot();
 
+	if (strcmp(RelationGetRelationName(rel), MULTIMASTER_LOCAL_TABLES_TABLE) == 0 &&
+		strcmp(get_namespace_name(RelationGetNamespace(rel)), MULTIMASTER_SCHEMA_NAME) == 0)
+	{
+		MtmMakeRelationLocal(RelationGetRelid(rel));
+	}
+		
     heap_close(rel, NoLock);
     ExecResetTupleTable(estate->es_tupleTable, true);
     FreeExecutorState(estate);
-
+	   
 	CommandCounterIncrement();
 }
 
