Fix. Conventionally use of hooks.

Also, some arrangement for stable14 added by a.lepikhov

Author: Daniil Anisimov

aqo.c

@@ -309,50 +309,11 @@ _PG_init(void)
 							 NULL,
 							 NULL);
 
-<<<<<<< HEAD
-	prev_shmem_startup_hook						= shmem_startup_hook;
-	shmem_startup_hook							= aqo_init_shmem;
-	prev_planner_hook							= planner_hook;
-	planner_hook								= aqo_planner;
-	prev_ExecutorStart_hook						= ExecutorStart_hook;
-	ExecutorStart_hook							= aqo_ExecutorStart;
-	prev_ExecutorRun							= ExecutorRun_hook;
-	ExecutorRun_hook							= aqo_ExecutorRun;
-	prev_ExecutorEnd_hook						= ExecutorEnd_hook;
-	ExecutorEnd_hook							= aqo_ExecutorEnd;
-
-	/* Cardinality prediction hooks. */
-	prev_set_baserel_rows_estimate_hook			= set_baserel_rows_estimate_hook;
-	set_foreign_rows_estimate_hook				= aqo_set_baserel_rows_estimate;
-	set_baserel_rows_estimate_hook				= aqo_set_baserel_rows_estimate;
-	prev_get_parameterized_baserel_size_hook	= get_parameterized_baserel_size_hook;
-	get_parameterized_baserel_size_hook			= aqo_get_parameterized_baserel_size;
-	prev_set_joinrel_size_estimates_hook		= set_joinrel_size_estimates_hook;
-	set_joinrel_size_estimates_hook				= aqo_set_joinrel_size_estimates;
-	prev_get_parameterized_joinrel_size_hook	= get_parameterized_joinrel_size_hook;
-	get_parameterized_joinrel_size_hook			= aqo_get_parameterized_joinrel_size;
-	prev_estimate_num_groups_hook				= estimate_num_groups_hook;
-	estimate_num_groups_hook					= aqo_estimate_num_groups_hook;
-	parampathinfo_postinit_hook					= ppi_hook;
-
-	prev_create_plan_hook						= create_plan_hook;
-	create_plan_hook							= aqo_create_plan_hook;
-
-	/* Service hooks. */
-	prev_ExplainOnePlan_hook					= ExplainOnePlan_hook;
-	ExplainOnePlan_hook							= print_into_explain;
-	prev_ExplainOneNode_hook					= ExplainOneNode_hook;
-	ExplainOneNode_hook							= print_node_explain;
-
-	prev_create_upper_paths_hook				= create_upper_paths_hook;
-	create_upper_paths_hook						= aqo_store_upper_signature_hook;
-=======
 	aqo_shmem_init();
 	aqo_preprocessing_init();
 	aqo_postprocessing_init();
 	aqo_cardinality_hooks_init();
 	aqo_path_utils_init();
->>>>>>> daf05a0 (Bugfix. Do away with possible conflict of hooks, declared as 'extern' in)
 
 	init_deactivated_queries_storage();
 
@@ -387,7 +348,6 @@ _PG_init(void)
 	RegisterAQOPlanNodeMethods();
 
 	EmitWarningsOnPlaceholders("aqo");
-	RequestAddinShmemSpace(aqo_memsize());
 }
 
 /*

aqo_shared.c

@@ -18,7 +18,6 @@ int fs_max_items = 10000; /* Max number of different feature spaces in ML model
 int fss_max_items = 100000; /* Max number of different feature subspaces in ML model */
 
 static shmem_startup_hook_type	aqo_shmem_startup_next = NULL;
-static shmem_request_hook_type	aqo_shmem_request_next = NULL;
 
 static void on_shmem_shutdown(int code, Datum arg);
 
@@ -29,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;
@@ -128,9 +127,6 @@ aqo_shmem_request(void)
 {
 	Size	size;
 
-	if (aqo_shmem_request_next)
-		aqo_shmem_request_next();
-
 	size = MAXALIGN(sizeof(AQOSharedState));
 	size = add_size(size, hash_estimate_size(fs_max_items, sizeof(AQOSharedState)));
 	size = add_size(size, hash_estimate_size(fs_max_items, sizeof(StatEntry)));
@@ -146,6 +142,6 @@ aqo_shmem_init(void)
 {
 	aqo_shmem_startup_next	= shmem_startup_hook;
 	shmem_startup_hook		= aqo_init_shmem;
-	aqo_shmem_request_next	= shmem_request_hook;
-	shmem_request_hook		= aqo_shmem_request;
+
+	aqo_shmem_request();
 }

cardinality_hooks.c

@@ -108,7 +108,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
@@ -219,7 +219,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);
 }
 
 /*
@@ -294,7 +294,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);
 }
 
@@ -367,7 +367,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);
 }
@@ -456,7 +456,7 @@ aqo_estimate_num_groups_hook(PlannerInfo *root, List *groupExprs,
 
 default_estimator:
 	if (aqo_estimate_num_groups_next)
-		return aqo_estimate_num_groups_next(root, groupExprs, subpath,
+		return (*aqo_estimate_num_groups_next)(root, groupExprs, subpath,
 											grouped_rel, pgset, estinfo);
 	else
 		return estimate_num_groups(root, groupExprs, subpath->rows,

path_utils.c

@@ -541,7 +541,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,
@@ -322,7 +322,7 @@ aqo_planner(Query *parse, const char *query_string, int cursorOptions,
 		/* Release the memory, allocated for AQO predictions */
 		MemoryContextReset(AQOPredictMemCtx);
 
-		stmt = aqo_planner_next(parse, query_string, cursorOptions, boundParams);
+		stmt = (*aqo_planner_next)(parse, query_string, cursorOptions, boundParams);
 		return stmt;
 	}
 }