Fix. Conventionally use of hooks.

Also, some arrangement for stable14 added by a.lepikhov

Author: Daniil Anisimov

aqo_shared.c

@@ -28,7 +28,7 @@ aqo_init_shmem(void)
 	HASHCTL		info;
 
 	if (aqo_shmem_startup_next)
-		aqo_shmem_startup_next();
+		(*aqo_shmem_startup_next)();
 
 	aqo_state = NULL;
 	stat_htab = NULL;

cardinality_hooks.c

@@ -114,7 +114,7 @@ aqo_set_baserel_rows_estimate(PlannerInfo *root, RelOptInfo *rel)
 
 default_estimator:
 	rel->predicted_cardinality = -1.;
-	aqo_set_baserel_rows_estimate_next(root, rel);
+	(*aqo_set_baserel_rows_estimate_next)(root, rel);
 }
 
 static void
@@ -225,7 +225,7 @@ aqo_get_parameterized_baserel_size(PlannerInfo *root,
 	return predicted;
 
 default_estimator:
-	return aqo_get_parameterized_baserel_size_next(root, rel, param_clauses);
+	return (*aqo_get_parameterized_baserel_size_next)(root, rel, param_clauses);
 }
 
 /*
@@ -300,7 +300,7 @@ aqo_set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
 
 default_estimator:
 	rel->predicted_cardinality = -1;
-	aqo_set_joinrel_size_estimates_next(root, rel, outer_rel, inner_rel,
+	(*aqo_set_joinrel_size_estimates_next)(root, rel, outer_rel, inner_rel,
 										sjinfo, restrictlist);
 }
 
@@ -373,7 +373,7 @@ aqo_get_parameterized_joinrel_size(PlannerInfo *root,
 	return predicted;
 
 default_estimator:
-	return aqo_get_parameterized_joinrel_size_next(root, rel,
+	return (*aqo_get_parameterized_joinrel_size_next)(root, rel,
 												  outer_path, inner_path,
 												  sjinfo, clauses);
 }
@@ -458,8 +458,8 @@ aqo_estimate_num_groups(PlannerInfo *root, List *groupExprs,
 
 default_estimator:
 	if (aqo_estimate_num_groups_next)
-		return aqo_estimate_num_groups_next(root, groupExprs, subpath,
-											grouped_rel, pgset);
+		return (*aqo_estimate_num_groups_next)(root, groupExprs, subpath,
+											   grouped_rel, pgset);
 	else
 		return estimate_num_groups(root, groupExprs, subpath->rows,
 								   pgset);

path_utils.c

@@ -542,7 +542,7 @@ aqo_create_plan(PlannerInfo *root, Path *src, Plan **dest)
 	AQOPlanNode	   *node;
 
 	if (aqo_create_plan_next)
-		aqo_create_plan_next(root, src, dest);
+		(*aqo_create_plan_next)(root, src, dest);
 
 	if (!query_context.use_aqo && !query_context.learn_aqo &&
 		!query_context.collect_stat)

postprocessing.c

@@ -600,7 +600,7 @@ aqo_ExecutorStart(QueryDesc *queryDesc, int eflags)
 		StoreToQueryEnv(queryDesc);
 	}
 
-	aqo_ExecutorStart_next(queryDesc, eflags);
+	(*aqo_ExecutorStart_next)(queryDesc, eflags);
 
 	if (use_aqo)
 		StorePlanInternals(queryDesc);
@@ -725,7 +725,7 @@ aqo_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count,
 
 	PG_TRY();
 	{
-		aqo_ExecutorRun_next(queryDesc, direction, count, execute_once);
+		(*aqo_ExecutorRun_next)(queryDesc, direction, count, execute_once);
 	}
 	PG_FINALLY();
 	{
@@ -841,7 +841,7 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)
 	MemoryContextSwitchTo(oldctx);
 	MemoryContextReset(AQOLearnMemCtx);
 
-	aqo_ExecutorEnd_next(queryDesc);
+	(*aqo_ExecutorEnd_next)(queryDesc);
 
 	/*
 	 * standard_ExecutorEnd clears the queryDesc->planstate. After this point no
@@ -982,7 +982,7 @@ print_into_explain(PlannedStmt *plannedstmt, IntoClause *into,
 				   QueryEnvironment *queryEnv)
 {
 	if (aqo_ExplainOnePlan_next)
-		aqo_ExplainOnePlan_next(plannedstmt, into, es, queryString,
+		(*aqo_ExplainOnePlan_next)(plannedstmt, into, es, queryString,
 									 params, planduration, queryEnv);
 
 	if (IsQueryDisabled() || !aqo_show_details)
@@ -1038,7 +1038,7 @@ print_node_explain(ExplainState *es, PlanState *ps, Plan *plan)
 
 	/* Extension, which took a hook early can be executed early too. */
 	if (aqo_ExplainOneNode_next)
-		aqo_ExplainOneNode_next(es, ps, plan);
+		(*aqo_ExplainOneNode_next)(es, ps, plan);
 
 	if (IsQueryDisabled() || !plan || es->format != EXPLAIN_FORMAT_TEXT)
 		return;

preprocessing.c

@@ -128,7 +128,7 @@ aqo_planner(Query *parse, const char *query_string, int cursorOptions,
 		MemoryContextSwitchTo(oldctx);
 		disable_aqo_for_query();
 
-		return aqo_planner_next(parse, query_string, cursorOptions, boundParams);
+		return (*aqo_planner_next)(parse, query_string, cursorOptions, boundParams);
 	}
 
 	selectivity_cache_clear();
@@ -149,7 +149,7 @@ aqo_planner(Query *parse, const char *query_string, int cursorOptions,
 		MemoryContextSwitchTo(oldctx);
 		disable_aqo_for_query();
 
-		return aqo_planner_next(parse, query_string, cursorOptions, boundParams);
+		return (*aqo_planner_next)(parse, query_string, cursorOptions, boundParams);
 	}
 
 	elog(DEBUG1, "AQO will be used for query '%s', class "UINT64_FORMAT,
@@ -320,7 +320,7 @@ aqo_planner(Query *parse, const char *query_string, int cursorOptions,
 		PlannedStmt *stmt;
 
 		MemoryContextSwitchTo(oldctx);
-		stmt = aqo_planner_next(parse, query_string, cursorOptions, boundParams);
+		stmt = (*aqo_planner_next)(parse, query_string, cursorOptions, boundParams);
 
 		/* Release the memory, allocated for AQO predictions */
 		MemoryContextReset(AQOPredictMemCtx);