Merge branch 'master' of github.com:postgrespro/pg_pathman

zilder · zilder · commit 0a99fcb5611b · 2016-09-01T18:31:14.000+03:00
diff --git a/expected/pg_pathman.out b/expected/pg_pathman.out
@@ -1690,7 +1690,7 @@ INSERT INTO messages SELECT g, md5(g::text) FROM generate_series(1, 10) as g;
 INSERT INTO replies SELECT g, g, md5(g::text) FROM generate_series(1, 10) as g;
 SELECT create_range_partitions('messages', 'id', 1, 100, 2);
 WARNING:  Foreign key 'replies_message_id_fkey' references to the relation 'messages'
-ERROR:  Relation 'messages' is referenced from other relations
+ERROR:  Relation "messages" is referenced from other relations
 ALTER TABLE replies DROP CONSTRAINT replies_message_id_fkey;
 SELECT create_range_partitions('messages', 'id', 1, 100, 2);
 NOTICE:  sequence "messages_seq" does not exist, skipping
diff --git a/init.sql b/init.sql
@@ -341,7 +341,7 @@ BEGIN
 	END LOOP;
 
 	IF is_referenced THEN
-		RAISE EXCEPTION 'Relation ''%'' is referenced from other relations', p_relation;
+		RAISE EXCEPTION 'Relation "%" is referenced from other relations', p_relation;
 	END IF;
 
 	RETURN TRUE;
@@ -515,7 +515,7 @@ BEGIN
 	DELETE FROM @extschema@.pathman_config_params WHERE partrel = parent_relid;
 
 	IF conf_num_del = 0 THEN
-		RAISE EXCEPTION 'table % has no partitions', parent_relid::text;
+		RAISE EXCEPTION 'Relation "%" has no partitions', parent_relid::text;
 	END IF;
 
 	FOR v_rec IN (SELECT inhrelid::regclass::text AS tbl
diff --git a/src/hooks.c b/src/hooks.c
@@ -14,6 +14,7 @@
 #include "runtimeappend.h"
 #include "runtime_merge_append.h"
 #include "utils.h"
+#include "xact_handling.h"
 
 #include "miscadmin.h"
 #include "optimizer/cost.h"
@@ -451,6 +452,14 @@ pathman_post_parse_analysis_hook(ParseState *pstate, Query *query)
 	if (post_parse_analyze_hook_next)
 		post_parse_analyze_hook_next(pstate, query);
 
+	 /* We shouldn't do anything on BEGIN or SET ISOLATION LEVEL stmts */
+	if (query->commandType == CMD_UTILITY &&
+			(xact_is_transaction_stmt(query->utilityStmt) ||
+			 xact_is_set_transaction_stmt(query->utilityStmt)))
+	{
+		return;
+	}
+
 	/* Finish delayed invalidation jobs */
 	if (IsPathmanReady())
 		finish_delayed_invalidation();
diff --git a/src/pathman_workers.c b/src/pathman_workers.c
@@ -18,7 +18,6 @@
 #include "pathman_workers.h"
 #include "relation_info.h"
 #include "utils.h"
-#include "xact_handling.h"
 
 #include "access/htup_details.h"
 #include "access/xact.h"
@@ -360,17 +359,6 @@ bgw_main_spawn_partitions(Datum main_arg)
 		 DebugPrintDatum(value, args->value_type), MyProcPid);
 #endif
 
-	/* Check again if there's a conflicting lock */
-	if (xact_bgw_conflicting_lock_exists(args->partitioned_table))
-	{
-		elog(LOG, "%s: there's a conflicting lock on relation \"%s\"",
-			 spawn_partitions_bgw,
-			 get_rel_name_or_relid(args->partitioned_table));
-
-		dsm_detach(segment);
-		return; /* exit quickly */
-	}
-
 	/* Create partitions and save the Oid of the last one */
 	args->result = create_partitions_internal(args->partitioned_table,
 											  value, /* unpacked Datum */
diff --git a/src/xact_handling.c b/src/xact_handling.c
@@ -109,6 +109,42 @@ xact_is_level_read_committed(void)
 	return false;
 }
 
+/*
+ * Check if 'stmt' is BEGIN\ROLLBACK etc transaction statement.
+ */
+bool
+xact_is_transaction_stmt(Node *stmt)
+{
+	if (!stmt)
+		return false;
+
+	if (IsA(stmt, TransactionStmt))
+		return true;
+
+	return false;
+}
+
+/*
+ * Check if 'stmt' is SET TRANSACTION statement.
+ */
+bool
+xact_is_set_transaction_stmt(Node *stmt)
+{
+	if (!stmt)
+		return false;
+
+	if (IsA(stmt, VariableSetStmt))
+	{
+		VariableSetStmt *var_set_stmt = (VariableSetStmt *) stmt;
+
+		/* special case for SET TRANSACTION ... */
+		if (var_set_stmt->kind == VAR_SET_MULTI)
+			return true;
+	}
+
+	return false;
+}
+
 /*
  * Do we hold the specified lock?
  */
@@ -132,7 +168,7 @@ do_we_hold_the_lock(Oid relid, LOCKMODE lockmode)
 			return false;
 
 		default:
-			return false; /* should not happen */
+			return false;
 	}
 }
 
diff --git a/src/xact_handling.h b/src/xact_handling.h
@@ -13,6 +13,8 @@
 
 #include "pathman.h"
 
+#include "postgres.h"
+
 
 /*
  * Transaction locks.
@@ -28,5 +30,7 @@ void xact_unlock_rel_exclusive(Oid relid);
  */
 bool xact_bgw_conflicting_lock_exists(Oid relid);
 bool xact_is_level_read_committed(void);
+bool xact_is_transaction_stmt(Node *stmt);
+bool xact_is_set_transaction_stmt(Node *stmt);
 
 #endif
