do not perform finish_delayed_invalidation() & load_config() on transaction-related utility statements

funbringer · funbringer · commit 7804c9b282ad · 2016-09-01T16:28:08.000+03:00
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/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?
  */
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
