Merge branch 'PGPROEE9_6_MULTIMASTER' into PGPROEE9_6

vbwagner · vbwagner · commit 4563ca75bc4a · 2017-04-20T15:11:12.000+03:00
diff --git a/contrib/mmts/multimaster--1.0.sql b/contrib/mmts/multimaster--1.0.sql
@@ -87,7 +87,7 @@ CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema text, rel_name text, prim
 CREATE OR REPLACE FUNCTION mtm.alter_sequences() RETURNS boolean AS 
 $$
 DECLARE
-    seq_class pg_class%rowtype;
+    seq_class record;
     seq_tuple record;
     node_id int;
     max_nodes int;
@@ -97,25 +97,20 @@ BEGIN
     select current_setting('multimaster.max_nodes') into max_nodes;
     select id, "allNodes" into node_id from mtm.get_cluster_state();
     FOR seq_class IN
-        SELECT * FROM pg_class WHERE pg_class.relkind = 'S'
+        SELECT '"' || ns.nspname || '"."' || seq.relname || '"' as seqname FROM pg_namespace ns,pg_class seq WHERE seq.relkind = 'S' and seq.relnamespace=ns.oid
     LOOP
-	    BEGIN
-            EXECUTE 'select * from ' || seq_class.relname || ';' INTO seq_tuple;
+            EXECUTE 'select * from ' || seq_class.seqname INTO seq_tuple;
             IF seq_tuple.increment_by != max_nodes THEN
                 altered := true;
                 RAISE NOTICE 'Altering step for sequence % to %.', seq_tuple.sequence_name, max_nodes;
-                EXECUTE 'ALTER SEQUENCE ' || seq_class.relname || ' INCREMENT BY ' || max_nodes || ';';
+                EXECUTE 'ALTER SEQUENCE ' || seq_class.seqname || ' INCREMENT BY ' || max_nodes || ';';
             END IF;
             IF (seq_tuple.last_value % max_nodes) != node_id THEN
                 altered := true;
                 new_start := (seq_tuple.last_value / max_nodes + 1)*max_nodes + node_id;
                 RAISE NOTICE 'Altering start for sequence % to %.', seq_tuple.sequence_name, new_start;
-                EXECUTE 'ALTER SEQUENCE ' || seq_class.relname || ' RESTART WITH ' || new_start || ';';
+                EXECUTE 'ALTER SEQUENCE ' || seq_class.seqname || ' RESTART WITH ' || new_start || ';';
             END IF;
-       EXCEPTION
-            WHEN OTHERS THEN
-	            RAISE NOTICE 'Failed to alter sequence %s', seq_class.relname;
-       END;
     END LOOP;
     IF altered = false THEN
         RAISE NOTICE 'All found sequnces have proper params.';
@@ -125,4 +120,4 @@ END
 $$
 LANGUAGE plpgsql;
 
-select mtm.alter_sequences();
+-- select mtm.alter_sequences();
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -62,6 +62,7 @@
 #include "access/htup_details.h"
 #include "catalog/indexing.h"
 #include "catalog/namespace.h"
+#include "catalog/pg_constraint_fn.h"
 #include "pglogical_output/hooks.h"
 #include "parser/analyze.h"
 #include "parser/parse_relation.h"
@@ -2143,7 +2144,9 @@ static void
 MtmLockCluster(void)
 {
 	timestamp_t delay = MIN_WAIT_TIMEOUT;
-	Assert(!MtmClusterLocked);
+	if (MtmClusterLocked) { 
+		MtmUnlockCluster();
+	}
 	MtmLock(LW_EXCLUSIVE);
 	if (BIT_CHECK(Mtm->originLockNodeMask, MtmNodeId-1)) {
 		elog(ERROR, "There is already pending exclusive lock");
@@ -4876,8 +4879,8 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 	bool skipCommand = false;
 	bool executed = false;
 
-	MTM_LOG3("%d: Process utility statement tag=%d, context=%d, issubtrans=%d, query=%s", 
-			 MyProcPid, nodeTag(parsetree), context, IsSubTransaction(), queryString);
+	MTM_LOG2("%d: Process utility statement tag=%d, context=%d, issubtrans=%d, creating_extension=%d, query=%s", 
+			 MyProcPid, nodeTag(parsetree), context, IsSubTransaction(), creating_extension, queryString);
 	switch (nodeTag(parsetree))
 	{
 		case T_TransactionStmt:
@@ -5130,24 +5133,14 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 			break;
 	}
 
-	/* XXX: dirty. Clear on new tx */
-	/* Some "black magic here":( We want to avoid redundant execution of utility statement by ProcessUtilitySlow (which is done with PROCESS_UTILITY_SUBCOMMAND).
-	 * But if we allow only PROCESS_UTILITY_TOPLEVEL context, then we will not replicated DDL inside dynamic queries in plpgsql functions (see https://jira.postgrespro.ru/browse/CORE-526).
-	 * If we disable only PROCESS_UTILITY_SUBCOMMAND, then we will get problems with "create extension" which is executed also in PROCESS_UTILITY_QUERY context.
-	 * So workaround at this moment is to treat extension as special case. 
-	 * TODO: try to find right solution and rewrite this dummy check.
-	 */
-	if (!skipCommand && (context == PROCESS_UTILITY_TOPLEVEL || (context == PROCESS_UTILITY_QUERY && !creating_extension) || MtmUtilityProcessedInXid != GetCurrentTransactionId()))
-		MtmUtilityProcessedInXid = InvalidTransactionId;
-
-	if (!skipCommand && !MtmTx.isReplicated && (MtmUtilityProcessedInXid == InvalidTransactionId)) {
+	if (!skipCommand && !MtmTx.isReplicated && (context == PROCESS_UTILITY_TOPLEVEL || MtmUtilityProcessedInXid != GetCurrentTransactionId())) 
+	{
 		MtmUtilityProcessedInXid = GetCurrentTransactionId();
-
-		if (context == PROCESS_UTILITY_TOPLEVEL)
+		if (context == PROCESS_UTILITY_TOPLEVEL) { 
 			MtmProcessDDLCommand(queryString, true);
-		else
+		} else { 
 			MtmProcessDDLCommand(ActivePortal->sourceText, true);
-
+		}
 		executed = true;
 	}
 
@@ -5177,6 +5170,26 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 	{
 		MtmFinishDDLCommand();
 	}
+    if (nodeTag(parsetree) == T_CreateStmt)
+	{
+		CreateStmt* create = (CreateStmt*)parsetree;
+		Oid relid = RangeVarGetRelid(create->relation, NoLock, true);
+		if (relid != InvalidOid) { 
+			Oid constraint_oid;
+			Bitmapset* pk = get_primary_key_attnos(relid, true, &constraint_oid);
+			if (pk == NULL && !MtmVolksWagenMode) {
+				elog(WARNING, 
+					 MtmIgnoreTablesWithoutPk
+					 ? "Table %s.%s without primary will not be replicated"
+					 : "Updates and deletes of table %s.%s without primary will not be replicated",
+					 create->relation->schemaname ? create->relation->schemaname : "public",
+					 create->relation->relname);
+			}
+		}
+	}
+	if (context == PROCESS_UTILITY_TOPLEVEL) { 
+		MtmUtilityProcessedInXid = InvalidTransactionId;
+	}
 }
 
 static void
