Commit7804c9b

committed

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

1 parent4a97264 commit7804c9bCopy full SHA for 7804c9b

File tree

+49

-0

lines changed

+49

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`#include"runtimeappend.h"`
`15`	`15`	`#include"runtime_merge_append.h"`
`16`	`16`	`#include"utils.h"`
	`17`	`+#include"xact_handling.h"`
`17`	`18`
`18`	`19`	`#include"miscadmin.h"`
`19`	`20`	`#include"optimizer/cost.h"`
`@@ -451,6 +452,14 @@ pathman_post_parse_analysis_hook(ParseState pstate, Query query)`
`451`	`452`	`if (post_parse_analyze_hook_next)`
`452`	`453`	`post_parse_analyze_hook_next(pstate,query);`
`453`	`454`
	`455`	`+/* We shouldn't do anything on BEGIN or SET ISOLATION LEVEL stmts */`
	`456`	`+if (query->commandType==CMD_UTILITY&&`
	`457`	`+(xact_is_transaction_stmt(query->utilityStmt)\|\|`
	`458`	`+xact_is_set_transaction_stmt(query->utilityStmt)))`
	`459`	`+{`
	`460`	`+return;`
	`461`	`+}`
	`462`	`+`
`454`	`463`	`/* Finish delayed invalidation jobs */`
`455`	`464`	`if (IsPathmanReady())`
`456`	`465`	`finish_delayed_invalidation();`

Lines changed: 36 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,42 @@ xact_is_level_read_committed(void)`
`109`	`109`	`return false;`
`110`	`110`	`}`
`111`	`111`
	`112`	`+/*`
	`113`	`+ * Check if 'stmt' is BEGIN\ROLLBACK etc transaction statement.`
	`114`	`+ */`
	`115`	`+bool`
	`116`	`+xact_is_transaction_stmt(Node*stmt)`
	`117`	`+{`
	`118`	`+if (!stmt)`
	`119`	`+return false;`
	`120`	`+`
	`121`	`+if (IsA(stmt,TransactionStmt))`
	`122`	`+return true;`
	`123`	`+`
	`124`	`+return false;`
	`125`	`+}`
	`126`	`+`
	`127`	`+/*`
	`128`	`+ * Check if 'stmt' is SET TRANSACTION statement.`
	`129`	`+ */`
	`130`	`+bool`
	`131`	`+xact_is_set_transaction_stmt(Node*stmt)`
	`132`	`+{`
	`133`	`+if (!stmt)`
	`134`	`+return false;`
	`135`	`+`
	`136`	`+if (IsA(stmt,VariableSetStmt))`
	`137`	`+{`
	`138`	`+VariableSetStmtvar_set_stmt= (VariableSetStmt)stmt;`
	`139`	`+`
	`140`	`+/* special case for SET TRANSACTION ... */`
	`141`	`+if (var_set_stmt->kind==VAR_SET_MULTI)`
	`142`	`+return true;`
	`143`	`+}`
	`144`	`+`
	`145`	`+return false;`
	`146`	`+}`
	`147`	`+`
`112`	`148`	`/*`
`113`	`149`	`* Do we hold the specified lock?`
`114`	`150`	`*/`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`
`14`	`14`	`#include"pathman.h"`
`15`	`15`
	`16`	`+#include"postgres.h"`
	`17`	`+`
`16`	`18`
`17`	`19`	`/*`
`18`	`20`	`* Transaction locks.`
`@@ -28,5 +30,7 @@ void xact_unlock_rel_exclusive(Oid relid);`
`28`	`30`	`*/`
`29`	`31`	`boolxact_bgw_conflicting_lock_exists(Oidrelid);`
`30`	`32`	`boolxact_is_level_read_committed(void);`
	`33`	`+boolxact_is_transaction_stmt(Node*stmt);`
	`34`	`+boolxact_is_set_transaction_stmt(Node*stmt);`
`31`	`35`
`32`	`36`	`#endif`

Comments

(0)