Disable hooks while expression is parsing

ildus · ildus · commit a36a14c87d3b · 2017-03-22T14:52:29.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -65,6 +65,10 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		set_join_pathlist_next(root, joinrel, outerrel,
 							   innerrel, jointype, extra);
 
+	/* Hooks can be disabled */
+	if (!hooks_enabled)
+		return;
+
 	/* Check that both pg_pathman & RuntimeAppend nodes are enabled */
 	if (!IsPathmanReady() || !pg_pathman_enable_runtimeappend)
 		return;
@@ -204,6 +208,10 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 	if (set_rel_pathlist_hook_next != NULL)
 		set_rel_pathlist_hook_next(root, rel, rti, rte);
 
+	/* Hooks can be disabled */
+	if (!hooks_enabled)
+		return;
+
 	/* Make sure that pg_pathman is ready */
 	if (!IsPathmanReady())
 		return;
@@ -484,6 +492,18 @@ pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)
 
 	PG_TRY();
 	{
+		/* Hooks can be disabled */
+		if (!hooks_enabled)
+		{
+			/* Invoke original hook if needed */
+			if (planner_hook_next)
+				result = planner_hook_next(parse, cursorOptions, boundParams);
+			else
+				result = standard_planner(parse, cursorOptions, boundParams);
+
+			return result;
+		}
+
 		if (pathman_ready)
 		{
 			/* Increment relation tags refcount */
@@ -543,6 +563,10 @@ pathman_post_parse_analysis_hook(ParseState *pstate, Query *query)
 	if (post_parse_analyze_hook_next)
 		post_parse_analyze_hook_next(pstate, query);
 
+	/* Hooks can be disabled */
+	if (!hooks_enabled)
+		return;
+
 	 /* We shouldn't do anything on BEGIN or SET ISOLATION LEVEL stmts */
 	if (query->commandType == CMD_UTILITY &&
 			(xact_is_transaction_stmt(query->utilityStmt) ||
@@ -617,6 +641,10 @@ pathman_relcache_hook(Datum arg, Oid relid)
 	if (!IsPathmanReady())
 		return;
 
+	/* Hooks can be disabled */
+	if (!hooks_enabled)
+		return;
+
 	/* We shouldn't even consider special OIDs */
 	if (relid < FirstNormalObjectId)
 		return;
diff --git a/src/include/pathman.h b/src/include/pathman.h
@@ -84,6 +84,9 @@
 extern Oid	pathman_config_relid;
 extern Oid	pathman_config_params_relid;
 
+/* Hooks enable state */
+extern bool hooks_enabled;
+
 /*
  * Just to clarify our intentions (return the corresponding relid).
  */
diff --git a/src/init.c b/src/init.c
@@ -1135,7 +1135,7 @@ validate_hash_constraint(const Expr *expr,
 
 	if (list_length(get_hash_expr->args) == 2)
 	{
-		Node   *first = linitial(get_hash_expr->args);	/* arg #1: TYPE_HASH_PROC(VALUE) */
+		Node   *first = linitial(get_hash_expr->args);	/* arg #1: TYPE_HASH_PROC(EXPRESSION) */
 		Node   *second = lsecond(get_hash_expr->args);	/* arg #2: PARTITIONS_COUNT */
 		Const  *cur_partition_hash;						/* hash value for this partition */
 
@@ -1146,9 +1146,7 @@ validate_hash_constraint(const Expr *expr,
 
 		/* Check that function is indeed TYPE_HASH_PROC */
 		if (type_hash_proc_expr->funcid != prel->hash_proc)
-		{
 			return false;
-		}
 
 		/* Check that PARTITIONS_COUNT is equal to total amount of partitions */
 		if (DatumGetUInt32(((Const *) second)->constvalue) != PrelChildrenCount(prel))
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -29,6 +29,7 @@
 #include "commands/tablecmds.h"
 #include "commands/tablespace.h"
 #include "miscadmin.h"
+#include "nodes/plannodes.h"
 #include "parser/parser.h"
 #include "parser/parse_func.h"
 #include "parser/parse_relation.h"
@@ -2053,7 +2054,7 @@ static bool location_cleaning_walker(Node *node, void *context)
 	return raw_expression_tree_walker(node, location_cleaning_walker, context);
 }
 
-/* By given relation id and expression returns query node */
+/* By given relation id and expression returns node */
 Node *
 get_expression_node(Oid relid, const char *expr, bool analyze)
 {
@@ -2064,7 +2065,7 @@ get_expression_node(Oid relid, const char *expr, bool analyze)
 				*raw_node;
 	Query		*query;
 	TargetEntry	*target_entry;
-	post_parse_analyze_hook_type orig_hook = NULL;
+	PlannedStmt *plan;
 
 	target_list = ((SelectStmt *)parsetree)->targetList;
 
@@ -2074,16 +2075,17 @@ get_expression_node(Oid relid, const char *expr, bool analyze)
 		return raw_node;
 	}
 
-	//turn off parse hooks
-	orig_hook = post_parse_analyze_hook;
-	post_parse_analyze_hook = NULL;
+	/* We don't need pathman hooks on next stages */
+	hooks_enabled = false;
 
 	querytree_list = pg_analyze_and_rewrite(parsetree, query_string, NULL, 0);
 	query = (Query *)lfirst(list_head(querytree_list));
-	target_entry = (TargetEntry *)lfirst(list_head(query->targetList));
-	//plan = pg_plan_query(query, 0, NULL);
+	plan = pg_plan_query(query, 0, NULL);
 
-	post_parse_analyze_hook = orig_hook;
+	target_entry = lfirst(list_head(plan->planTree->targetlist));
+
+	/* Hooks can work now */
+	hooks_enabled = true;
 
 	return (Node *)target_entry->expr;
 }
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -42,6 +42,9 @@ PG_MODULE_MAGIC;
 Oid		pathman_config_relid = InvalidOid,
 		pathman_config_params_relid = InvalidOid;
 
+/* Used to temporary disable hooks */
+bool hooks_enabled = true;
+
 
 /* pg module functions */
 void _PG_init(void);
@@ -141,7 +144,7 @@ _PG_init(void)
 	/* Apply initial state */
 	restore_pathman_init_state(&temp_init_state);
 
-	/* Initialize 'next' hook pointers */
+	/* Set basic hooks */
 	set_rel_pathlist_hook_next		= set_rel_pathlist_hook;
 	set_rel_pathlist_hook			= pathman_rel_pathlist_hook;
 	set_join_pathlist_next			= set_join_pathlist_hook;
