[ORCA] Fix compile warning.

Fix issue #1112.

This is inreoduced by GPDB commits during cherry-pick.
But since GPDB don't open -Wcast-function-type check, so
there is no warning on GP7.

Cloudberry has the flag -Wcast-function-type, use the right
warp function to fix.

Authored-by: Zhang Mingli avamingli@gmail.com

Author: avamingli

src/backend/gpopt/gpdbwrappers.cpp

@@ -2726,11 +2726,11 @@ gpdb::MakeTlistFromPathtarget(PathTarget *target)
 }
 
 Node *
-gpdb::Expression_tree_mutator(Node *node, Node *(*mutator)(), void *context)
+gpdb::Expression_tree_mutator(Node *node, Node *(*mutator)(Node*, void*), void *context)
 {
 	GP_WRAP_START;
 	{
-		return expression_tree_mutator(node, mutator, context);
+		return expression_tree_mutator_wrapper(node, mutator, context);
 	}
 	GP_WRAP_END;
 

src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp

@@ -3625,7 +3625,7 @@ SearchTlistForNonVarProjectset(Expr *node, List *itlist, Index newvarno)
 }
 
 Node *
-CTranslatorDXLToPlStmt::FixUpperExprMutatorProjectSet(Node *node, List *context)
+CTranslatorDXLToPlStmt::FixUpperExprMutatorProjectSet(Node *node, void *context)
 {
 	Var *newvar;
 
@@ -3634,16 +3634,16 @@ CTranslatorDXLToPlStmt::FixUpperExprMutatorProjectSet(Node *node, List *context)
 		return nullptr;
 	}
 
-	newvar = SearchTlistForNonVarProjectset((Expr *) node, context, OUTER_VAR);
+	newvar = SearchTlistForNonVarProjectset((Expr *) node, (List *) context, OUTER_VAR);
 	if (nullptr != newvar)
 	{
 		return (Node *) newvar;
 	}
 
 	return gpdb::Expression_tree_mutator(
 		node,
-		(Node * (*) ()) CTranslatorDXLToPlStmt::FixUpperExprMutatorProjectSet,
-		(void *) context);
+		&CTranslatorDXLToPlStmt::FixUpperExprMutatorProjectSet,
+		context);
 }
 
 //------------------------------------------------------------------------------

src/include/gpopt/gpdbwrappers.h

@@ -667,7 +667,7 @@ void SplitPathtargetAtSrfs(PlannerInfo *root, PathTarget *target,
 
 List *MakeTlistFromPathtarget(PathTarget *target);
 
-Node *Expression_tree_mutator(Node *node, Node *(*mutator)(), void *context);
+Node *Expression_tree_mutator(Node *node, Node *(*mutator)(Node*, void*), void *context);
 
 TargetEntry *TlistMember(Expr *node, List *targetlist);
 

src/include/gpopt/translate/CTranslatorDXLToPlStmt.h

@@ -639,7 +639,7 @@ class CTranslatorDXLToPlStmt
 	// get all non-dropped columns of a relation
 	static List *GetRelationActiveColums(const IMDRelation *md_rel);
 
-	static Node *FixUpperExprMutatorProjectSet(Node *node, List *context);
+	static Node *FixUpperExprMutatorProjectSet(Node *node, void *context);
 
 	// checks if index is used for Order by.
 	bool IsIndexForOrderBy(