Refactor pathman_process_utility_callback

Maksim Milyutin · Maksim Milyutin · commit 639f014bd636 · 2017-05-26T19:05:18.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -755,24 +755,25 @@ pathman_relcache_hook(Datum arg, Oid relid)
  */
 void
 #if PG_VERSION_NUM >= 100000
-pathman_process_utility_hook(PlannedStmt *pstmt,
+pathman_process_utility_hook(PlannedStmt *first_arg,
 							 const char *queryString,
 							 ProcessUtilityContext context,
 							 ParamListInfo params,
 							 QueryEnvironment *queryEnv,
 							 DestReceiver *dest, char *completionTag)
 {
-	Node   *parsetree = pstmt->utilityStmt;
-	int		stmt_location = pstmt->stmt_location,
-			stmt_len = pstmt->stmt_len;
+	Node   *parsetree = first_arg->utilityStmt;
+	int		stmt_location = first_arg->stmt_location,
+			stmt_len = first_arg->stmt_len;
 #else
-pathman_process_utility_hook(Node *parsetree,
+pathman_process_utility_hook(Node *first_arg,
 							 const char *queryString,
 							 ProcessUtilityContext context,
 							 ParamListInfo params,
 							 DestReceiver *dest,
 							 char *completionTag)
 {
+	Node   *parsetree = first_arg;
 	int		stmt_location = -1,
 			stmt_len = 0;
 #endif
@@ -825,27 +826,9 @@ pathman_process_utility_hook(Node *parsetree,
 		}
 	}
 
-#if PG_VERSION_NUM >= 100000
-	/* Call hooks set by other extensions if needed */
-	if (process_utility_hook_next)
-		process_utility_hook_next(pstmt, queryString,
-								  context, params, queryEnv,
-								  dest, completionTag);
-	/* Else call internal implementation */
-	else
-		standard_ProcessUtility(pstmt, queryString,
-								context, params, queryEnv,
-								dest, completionTag);
-#else
-	/* Call hooks set by other extensions if needed */
-	if (process_utility_hook_next)
-		process_utility_hook_next(parsetree, queryString,
-								  context, params,
-								  dest, completionTag);
-	/* Else call internal implementation */
-	else
-		standard_ProcessUtility(parsetree, queryString,
-								context, params,
-								dest, completionTag);
-#endif
+	/* 'first_arg' is PlannedStmt in pg10 or Node parsetree in pg9.6 and lower */
+	call_process_utility_compat(
+			(process_utility_hook_next) ? process_utility_hook_next :
+										  standard_ProcessUtility,
+			first_arg, queryString, context, params, queryEnv, dest, completionTag);
 }
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -97,6 +97,28 @@
 #endif
 
 
+/*
+ * call_process_utility_compat()
+ *
+ * the parameter 'first_arg' is:
+ * 	- in pg 10 PlannedStmt object
+ * 	- in pg 9.6 and lower Node parsetree
+ */
+#if PG_VERSION_NUM >= 100000
+#define call_process_utility_compat(process_utility, first_arg, query_string, \
+									context, params, query_env, dest, \
+									completion_tag) \
+		(process_utility)((first_arg), (query_string), (context), (params), \
+						  (query_env), (dest), (completion_tag))
+#elif PG_VERSION_NUM >= 90500
+#define call_process_utility_compat(process_utility, first_arg, query_string, \
+									context, params, query_env, dest, \
+									completion_tag) \
+		(process_utility)((first_arg), (query_string), (context), (params), \
+						  (dest), (completion_tag))
+#endif
+
+
 /*
  * CatalogIndexInsert()
  */
