Fix bug in relation replication optimization

knizhnik · kelvich · commit 7032011d7922 · 2017-11-13T02:17:36.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -457,9 +457,11 @@ csn_t MtmDistributedTransactionSnapshot(TransactionId xid, int nodeId, nodemask_
 Snapshot MtmGetSnapshot(Snapshot snapshot)
 {
     snapshot = PgGetSnapshotData(snapshot);
+#if 0
 	if (snapshot != &CatalogSnapshotData) {
 		RecentGlobalDataXmin = RecentGlobalXmin = Mtm->oldestXid;
 	}
+#endif
     return snapshot;
 }
 
diff --git a/pglogical_relid_map.c b/pglogical_relid_map.c
@@ -58,7 +58,7 @@ bool pglogical_relid_map_put(Oid remote_relid, Oid local_relid)
     }
     entry = hash_search(relid_map, &remote_relid, HASH_ENTER, &found);
   	if (found) {
-	    Assert(entry->local_relid == local_relid);
+	    entry->local_relid = local_relid;
 		return false;	    
     }
     entry->local_relid = local_relid;

Original file line number	Diff line number	Diff line change
`@@ -457,9 +457,11 @@ csn_t MtmDistributedTransactionSnapshot(TransactionId xid, int nodeId, nodemask_`
`457`	`457`	`Snapshot MtmGetSnapshot(Snapshot snapshot)`
`458`	`458`	`{`
`459`	`459`	`snapshot = PgGetSnapshotData(snapshot);`
	`460`	`+#if 0`
`460`	`461`	`if (snapshot != &CatalogSnapshotData) {`
`461`	`462`	`RecentGlobalDataXmin = RecentGlobalXmin = Mtm->oldestXid;`
`462`	`463`	`}`
	`464`	`+#endif`
`463`	`465`	`return snapshot;`
`464`	`466`	`}`
`465`	`467`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ bool pglogical_relid_map_put(Oid remote_relid, Oid local_relid)`
`58`	`58`	`}`
`59`	`59`	`entry = hash_search(relid_map, &remote_relid, HASH_ENTER, &found);`
`60`	`60`	`if (found) {`
`61`		`- Assert(entry->local_relid == local_relid);`
	`61`	`+ entry->local_relid = local_relid;`
`62`	`62`	`return false;`
`63`	`63`	`}`
`64`	`64`	`entry->local_relid = local_relid;`