Use fully qualified names in mtm.alter_sequences

knizhnik · kelvich · commit 46962bc9d6e2 · 2017-11-13T02:17:39.000+03:00
diff --git a/multimaster--1.0.sql b/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.';
diff --git a/multimaster.c b/multimaster.c
@@ -4892,8 +4892,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_LOG1("%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:
