Qualify CREATE AGGREGATE stmts in Preprocess (#5834)

src/backend/distributed/commands/aggregate.c

@@ -22,6 +22,20 @@
 #include "utils/lsyscache.h"
 
 
+/*
+ * PreprocessDefineAggregateStmt only qualifies the node with schema name.
+ * We will handle the rest in the Postprocess phase.
+ */
+List *
+PreprocessDefineAggregateStmt(Node *node, const char *queryString,
+							  ProcessUtilityContext processUtilityContext)
+{
+	QualifyTreeNode((Node *) node);
+
+	return NIL;
+}
+
+
 /*
  * PostprocessDefineAggregateStmt actually creates the plan we need to execute for
  * aggregate propagation.
@@ -37,8 +51,6 @@
 List *
 PostprocessDefineAggregateStmt(Node *node, const char *queryString)
 {
-	QualifyTreeNode((Node *) node);
-
 	DefineStmt *stmt = castNode(DefineStmt, node);
 
 	if (!ShouldPropagate())

src/backend/distributed/commands/distribute_object_ops.c

@@ -44,7 +44,7 @@ static DistributeObjectOps Aggregate_AlterOwner = {
 static DistributeObjectOps Aggregate_Define = {
 	.deparse = NULL,
 	.qualify = QualifyDefineAggregateStmt,
-	.preprocess = NULL,
+	.preprocess = PreprocessDefineAggregateStmt,
 	.postprocess = PostprocessDefineAggregateStmt,
 	.address = DefineAggregateStmtObjectAddress,
 	.markDistributed = true,

src/include/distributed/commands.h

@@ -123,6 +123,8 @@ typedef enum SearchForeignKeyColumnFlags
 
 
 /* aggregate.c - forward declarations */
+extern List * PreprocessDefineAggregateStmt(Node *node, const char *queryString,
+											ProcessUtilityContext processUtilityContext);
 extern List * PostprocessDefineAggregateStmt(Node *node, const char *queryString);
 
 /* cluster.c - forward declarations */