handle inlined SQL functions in pathman_post_parse_analysis_hook()

funbringer · funbringer · commit d3e490a00727 · 2016-11-21T17:36:53.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -516,9 +516,7 @@ pathman_post_parse_analysis_hook(ParseState *pstate, Query *query)
 	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())
@@ -532,6 +530,28 @@ pathman_post_parse_analysis_hook(ParseState *pstate, Query *query)
 	{
 		load_config(); /* perform main cache initialization */
 	}
+
+	/* Process inlined SQL functions (we've already entered planning stage) */
+	if (IsPathmanReady() && get_refcount_parenthood_statuses() > 0)
+	{
+		/* Check that pg_pathman is the last extension loaded */
+		if (post_parse_analyze_hook != pathman_post_parse_analysis_hook)
+		{
+			char *spl_value; /* value of "shared_preload_libraries" GUC */
+
+			spl_value = GetConfigOptionByName("shared_preload_libraries", NULL, false);
+
+			ereport(ERROR,
+					(errmsg("extension conflict has been detected"),
+					 errdetail("shared_preload_libraries = \"%s\"", spl_value),
+					 errhint("pg_pathman should be the last extension listed in "
+							 "\"shared_preload_libraries\" GUC in order to "
+							 "prevent possible conflicts with other extensions")));
+		}
+
+		/* Modify query tree if needed */
+		pathman_transform_query(query);
+	}
 }
 
 /*
diff --git a/src/planner_tree_modification.c b/src/planner_tree_modification.c
@@ -598,6 +598,14 @@ incr_refcount_parenthood_statuses(void)
 	per_table_parenthood_mapping_refcount++;
 }
 
+/* Return current value of usage counter */
+uint32
+get_refcount_parenthood_statuses(void)
+{
+	/* incr_refcount_parenthood_statuses() is called by pathman_planner_hook() */
+	return per_table_parenthood_mapping_refcount;
+}
+
 /* Reset all cached statuses if needed (query end) */
 void
 decr_refcount_parenthood_statuses(bool entirely)
diff --git a/src/planner_tree_modification.h b/src/planner_tree_modification.h
@@ -45,6 +45,7 @@ void assign_rel_parenthood_status(uint32 query_id, Oid relid,
 								  rel_parenthood_status new_status);
 rel_parenthood_status get_rel_parenthood_status(uint32 query_id, Oid relid);
 void incr_refcount_parenthood_statuses(void);
+uint32 get_refcount_parenthood_statuses(void);
 void decr_refcount_parenthood_statuses(bool entirely);
 
 
