Add relation Id map

knizhnik · knizhnik · commit d7a99436a60e · 2016-04-04T20:27:40.000+03:00
diff --git a/contrib/mmts/Makefile b/contrib/mmts/Makefile
@@ -1,5 +1,5 @@
 MODULE_big = multimaster
-OBJS = multimaster.o raftable.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o ddd.o bkb.o
+OBJS = multimaster.o raftable.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o pglogical_relid_map.o ddd.o bkb.o
 
 override CPPFLAGS += -I../raftable
 
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -8,11 +8,11 @@
 #include "pglogical_output/hooks.h"
 
 #define MTM_TUPLE_TRACE(fmt, ...)
-#if 1
+#if 0
 #define MTM_INFO(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__) 
 #define MTM_TRACE(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__) 
 #else
-#define MTM_INFO(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__) 
+#define MTM_INFO(fmt, ...) 
 #define MTM_TRACE(fmt, ...) 
 #endif
 
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -49,6 +49,7 @@
 #include "parser/parse_relation.h"
 
 #include "multimaster.h"
+#include "pglogical_relid_map.h"
 
 typedef struct TupleData
 {
@@ -451,19 +452,28 @@ read_rel(StringInfo s, LOCKMODE mode)
 	int			relnamelen;
 	int			nspnamelen;
 	RangeVar*	rv;
-	Oid			relid;
-
-	rv = makeNode(RangeVar);
-
-	nspnamelen = pq_getmsgbyte(s);
-	rv->schemaname = (char *) pq_getmsgbytes(s, nspnamelen);
-
-	relnamelen = pq_getmsgbyte(s);
-	rv->relname = (char *) pq_getmsgbytes(s, relnamelen);
-
-	relid = RangeVarGetRelidExtended(rv, mode, false, false, NULL, NULL);
-
-	return heap_open(relid, NoLock);
+	Oid			remote_relid = pq_getmsgint(s, 4);
+	Oid         local_relid;
+
+	local_relid = pglogical_relid_map_get(remote_relid);
+	if (local_relid == InvalidOid) { 
+		rv = makeNode(RangeVar);
+
+		nspnamelen = pq_getmsgbyte(s);
+		rv->schemaname = (char *) pq_getmsgbytes(s, nspnamelen);
+		
+		relnamelen = pq_getmsgbyte(s);
+		rv->relname = (char *) pq_getmsgbytes(s, relnamelen);
+		
+		local_relid = RangeVarGetRelidExtended(rv, mode, false, false, NULL, NULL);
+		pglogical_relid_map_put(remote_relid, local_relid);
+	} else { 
+		nspnamelen = pq_getmsgbyte(s);
+		s->cursor += nspnamelen;
+		relnamelen = pq_getmsgbyte(s);
+		s->cursor += relnamelen;
+	}
+	return heap_open(local_relid, NoLock);
 }
 
 static void
diff --git a/contrib/mmts/pglogical_proto.c b/contrib/mmts/pglogical_proto.c
@@ -36,6 +36,7 @@
 #include "utils/typcache.h"
 
 #include "multimaster.h"
+#include "pglogical_relid_map.h"
 
 static bool MtmIsFilteredTxn;
 
@@ -71,13 +72,15 @@ pglogical_write_rel(StringInfo out, PGLogicalOutputData *data, Relation rel)
 	uint8		nspnamelen;
 	const char *relname;
 	uint8		relnamelen;
-		
+	Oid         relid;
     if (MtmIsFilteredTxn) { 
 		return;
 	}
 	
-	pq_sendbyte(out, 'R');		/* sending RELATION */
-    
+	relid = RelationGetRelid(rel);
+	pq_sendbyte(out, 'R');		/* sending RELATION */	
+	pq_sendint(out, relid, sizeof relid); /* use Oid as relation identifier */
+	
 	nspname = get_namespace_name(rel->rd_rel->relnamespace);
 	if (nspname == NULL)
 		elog(ERROR, "cache lookup failed for namespace %u",
@@ -86,10 +89,10 @@ pglogical_write_rel(StringInfo out, PGLogicalOutputData *data, Relation rel)
 	
 	relname = NameStr(rel->rd_rel->relname);
 	relnamelen = strlen(relname) + 1;
-    
+	
 	pq_sendbyte(out, nspnamelen);		/* schema name length */
 	pq_sendbytes(out, nspname, nspnamelen);
-    
+	
 	pq_sendbyte(out, relnamelen);		/* table name length */
 	pq_sendbytes(out, relname, relnamelen);
 }
diff --git a/contrib/mmts/pglogical_relid_map.c b/contrib/mmts/pglogical_relid_map.c
@@ -0,0 +1,66 @@
+/*-------------------------------------------------------------------------
+ *
+ * pglogical_relid_map.c
+ *		  Logical Replication map of local Oids to to remote
+ *
+ * Copyright (c) 2012-2015, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *		  pglogical_relid_map.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+#include "utils/hsearch.h"
+#include "pglogical_relid_map.h"
+
+static HTAB *relid_map;
+
+static void
+pglogical_relid_map_init(void)
+{
+	HASHCTL	ctl;
+	int hash_flags = HASH_ELEM;
+
+	Assert(relid_map == NULL);
+
+	MemSet(&ctl, 0, sizeof(ctl));
+	ctl.keysize = sizeof(Oid);
+	ctl.entrysize = sizeof(PGLRelidMapEntry);
+
+#if PG_VERSION_NUM >= 90500
+	hash_flags |= HASH_BLOBS;
+#else
+	ctl.hash = tag_hash;
+	hash_flags |= HASH_FUNCTION;
+#endif
+
+	relid_map = hash_create("pglogical_relid_map", PGL_INIT_RELID_MAP_SIZE, &ctl, hash_flags);
+
+	Assert(relid_map != NULL);
+}
+
+Oid pglogical_relid_map_get(Oid relid)
+{
+	if (relid_map != NULL) { 
+		PGLRelidMapEntry* entry = (PGLRelidMapEntry*)hash_search(relid_map, &relid, HASH_FIND, NULL);
+		return entry ? entry->local_relid : InvalidOid;
+	}
+	return InvalidOid;
+}
+
+bool pglogical_relid_map_put(Oid remote_relid, Oid local_relid)
+{
+	bool found;	
+    PGLRelidMapEntry* entry;
+    if (relid_map == NULL) { 
+        pglogical_relid_map_init();
+    }
+    entry = hash_search(relid_map, &remote_relid, HASH_ENTER, &found);
+  	if (found) {
+	    Assert(entry->local_relid == local_relid);
+		return false;	    
+    }
+    entry->local_relid = local_relid;
+	return true;
+}
diff --git a/contrib/mmts/pglogical_relid_map.h b/contrib/mmts/pglogical_relid_map.h
@@ -0,0 +1,14 @@
+#ifndef PGLOGICAL_RELID_MAP
+#define PGLOGICAL_RELID_MAP
+
+#define PGL_INIT_RELID_MAP_SIZE 256
+
+typedef struct PGLRelidMapEntry { 
+	Oid remote_relid;
+	Oid local_relid;
+} PGLRelidMapEntry; 
+
+extern Oid  pglogical_relid_map_get(Oid relid);
+extern bool pglogical_relid_map_put(Oid remote_relid, Oid local_relid);
+
+#endif
