various style fixes

Author: funbringer

aqo.c

@@ -2,8 +2,8 @@
 
 PG_MODULE_MAGIC;
 
-void		_PG_init(void);
-void		_PG_fini(void);
+void _PG_init(void);
+
 
 /* Strategy of determining feature space for new queries. */
 int			aqo_mode;
@@ -50,17 +50,17 @@ bool		explain_aqo;
 instr_time	query_starttime;
 double		query_planning_time;
 
-/* Saved hook values in case of unload */
-post_parse_analyze_hook_type prev_post_parse_analyze_hook;
-planner_hook_type prev_planner_hook;
-ExecutorStart_hook_type prev_ExecutorStart_hook;
-ExecutorEnd_hook_type prev_ExecutorEnd_hook;
-set_baserel_rows_estimate_hook_type prev_set_baserel_rows_estimate_hook;
-get_parameterized_baserel_size_hook_type prev_get_parameterized_baserel_size_hook;
-set_joinrel_size_estimates_hook_type prev_set_joinrel_size_estimates_hook;
-get_parameterized_joinrel_size_hook_type prev_get_parameterized_joinrel_size_hook;
-copy_generic_path_info_hook_type prev_copy_generic_path_info_hook;
-ExplainOnePlan_hook_type prev_ExplainOnePlan_hook;
+/* Saved hook values */
+post_parse_analyze_hook_type				prev_post_parse_analyze_hook;
+planner_hook_type							prev_planner_hook;
+ExecutorStart_hook_type						prev_ExecutorStart_hook;
+ExecutorEnd_hook_type						prev_ExecutorEnd_hook;
+set_baserel_rows_estimate_hook_type			prev_set_baserel_rows_estimate_hook;
+get_parameterized_baserel_size_hook_type	prev_get_parameterized_baserel_size_hook;
+set_joinrel_size_estimates_hook_type		prev_set_joinrel_size_estimates_hook;
+get_parameterized_joinrel_size_hook_type	prev_get_parameterized_joinrel_size_hook;
+copy_generic_path_info_hook_type			prev_copy_generic_path_info_hook;
+ExplainOnePlan_hook_type					prev_ExplainOnePlan_hook;
 
 /*****************************************************************************
  *
@@ -83,49 +83,28 @@ _PG_init(void)
 							 NULL,
 							 NULL);
 
-	prev_planner_hook = planner_hook;
-	planner_hook = &aqo_planner;
-	prev_post_parse_analyze_hook = post_parse_analyze_hook;
-	post_parse_analyze_hook = &get_query_text;
-	prev_ExecutorStart_hook = ExecutorStart_hook;
-	ExecutorStart_hook = &aqo_ExecutorStart;
-	prev_ExecutorEnd_hook = ExecutorEnd_hook;
-	ExecutorEnd_hook = &learn_query_stat;
-	prev_set_baserel_rows_estimate_hook = set_baserel_rows_estimate_hook;
-	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_copy_generic_path_info_hook = copy_generic_path_info_hook;
-	copy_generic_path_info_hook = &aqo_copy_generic_path_info;
-	prev_ExplainOnePlan_hook = ExplainOnePlan_hook;
-	ExplainOnePlan_hook = print_into_explain;
-	init_deactivated_queries_storage();
-}
+	prev_planner_hook							= planner_hook;
+	planner_hook								= aqo_planner;
+	prev_post_parse_analyze_hook				= post_parse_analyze_hook;
+	post_parse_analyze_hook						= get_query_text;
+	prev_ExecutorStart_hook						= ExecutorStart_hook;
+	ExecutorStart_hook							= aqo_ExecutorStart;
+	prev_ExecutorEnd_hook						= ExecutorEnd_hook;
+	ExecutorEnd_hook							= learn_query_stat;
+	prev_set_baserel_rows_estimate_hook			= set_baserel_rows_estimate_hook;
+	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_copy_generic_path_info_hook			= copy_generic_path_info_hook;
+	copy_generic_path_info_hook					= aqo_copy_generic_path_info;
+	prev_ExplainOnePlan_hook					= ExplainOnePlan_hook;
+	ExplainOnePlan_hook							= print_into_explain;
 
-void
-_PG_fini(void)
-{
-	planner_hook = prev_planner_hook;
-	post_parse_analyze_hook = prev_post_parse_analyze_hook;
-	ExecutorStart_hook = prev_ExecutorStart_hook;
-	ExecutorEnd_hook = prev_ExecutorEnd_hook;
-	set_baserel_rows_estimate_hook = prev_set_baserel_rows_estimate_hook;
-	get_parameterized_baserel_size_hook =
-		prev_get_parameterized_baserel_size_hook;
-	set_joinrel_size_estimates_hook = prev_set_joinrel_size_estimates_hook;
-	get_parameterized_joinrel_size_hook =
-		prev_get_parameterized_joinrel_size_hook;
-	copy_generic_path_info_hook = prev_copy_generic_path_info_hook;
-	ExplainOnePlan_hook = prev_ExplainOnePlan_hook;
-	fini_deactivated_queries_storage();
+	init_deactivated_queries_storage();
 }
 
 PG_FUNCTION_INFO_V1(invalidate_deactivated_queries_cache);

aqo.h

@@ -183,8 +183,8 @@ typedef struct
 	int			planning_time_without_aqo_size;
 	int			cardinality_error_with_aqo_size;
 	int			cardinality_error_without_aqo_size;
-	long long	executions_with_aqo;
-	long long	executions_without_aqo;
+	int64		executions_with_aqo;
+	int64		executions_without_aqo;
 }	QueryStat;
 
 /* Parameters of autotuning */

auto_tuning.c

@@ -125,7 +125,7 @@ automatical_query_tuning(int query_hash, QueryStat * stat)
 	double		t_aqo,
 				t_not_aqo;
 	double		p_use = -1;
-	long long	num_iterations;
+	int64		num_iterations;
 
 	num_iterations = stat->executions_with_aqo + stat->executions_without_aqo;
 	learn_aqo = true;

cardinality_hooks.c

@@ -45,7 +45,7 @@ void
 call_default_set_baserel_rows_estimate(PlannerInfo *root, RelOptInfo *rel)
 {
 	if (prev_set_baserel_rows_estimate_hook)
-		(*prev_set_baserel_rows_estimate_hook) (root, rel);
+		prev_set_baserel_rows_estimate_hook(root, rel);
 	else
 		set_baserel_rows_estimate_standard(root, rel);
 }
@@ -59,11 +59,9 @@ call_default_get_parameterized_baserel_size(PlannerInfo *root,
 											List *param_clauses)
 {
 	if (prev_get_parameterized_baserel_size_hook)
-		return (*prev_get_parameterized_baserel_size_hook) (root, rel,
-															param_clauses);
+		return prev_get_parameterized_baserel_size_hook(root, rel, param_clauses);
 	else
-		return get_parameterized_baserel_size_standard(root, rel,
-													   param_clauses);
+		return get_parameterized_baserel_size_standard(root, rel, param_clauses);
 }
 
 /*
@@ -78,11 +76,11 @@ call_default_get_parameterized_joinrel_size(PlannerInfo *root,
 											List *restrict_clauses)
 {
 	if (prev_get_parameterized_joinrel_size_hook)
-		return (*prev_get_parameterized_joinrel_size_hook) (root, rel,
-															outer_path,
-															inner_path,
-															sjinfo,
-															restrict_clauses);
+		return prev_get_parameterized_joinrel_size_hook(root, rel,
+														outer_path,
+														inner_path,
+														sjinfo,
+														restrict_clauses);
 	else
 		return get_parameterized_joinrel_size_standard(root, rel,
 													   outer_path,
@@ -102,11 +100,11 @@ call_default_set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
 										List *restrictlist)
 {
 	if (prev_set_joinrel_size_estimates_hook)
-		(*prev_set_joinrel_size_estimates_hook) (root, rel,
-												 outer_rel,
-												 inner_rel,
-												 sjinfo,
-												 restrictlist);
+		prev_set_joinrel_size_estimates_hook(root, rel,
+											 outer_rel,
+											 inner_rel,
+											 sjinfo,
+											 restrictlist);
 	else
 		set_joinrel_size_estimates_standard(root, rel,
 											outer_rel,

hash.c

@@ -566,7 +566,7 @@ has_consts(List *lst)
 /*
  * Returns pointer on the args list in clause or NULL.
  */
-List	  **
+List **
 get_clause_args_ptr(Expr *clause)
 {
 	switch (clause->type)
@@ -595,6 +595,7 @@ get_clause_args_ptr(Expr *clause)
 bool
 clause_is_eq_clause(Expr *clause)
 {
+	/* TODO: fix this horrible mess */
 	return (
 			clause->type == T_OpExpr ||
 			clause->type == T_DistinctExpr ||
@@ -658,5 +659,4 @@ clause_is_eq_clause(Expr *clause)
 			  ((OpExpr *) clause)->opno == 3240 ||
 			  ((OpExpr *) clause)->opno == 3240
 		);
-	/* TBD: make this less awful */
 }

postprocessing.c

@@ -36,7 +36,7 @@ static void update_query_stat_row(double *et, int *et_size,
 					  double planning_time,
 					  double execution_time,
 					  double cardinality_error,
-					  long long *n_exec);
+					  int64 *n_exec);
 
 
 /*
@@ -264,7 +264,7 @@ update_query_stat_row(double *et, int *et_size,
 					  double planning_time,
 					  double execution_time,
 					  double cardinality_error,
-					  long long *n_exec)
+					  int64 *n_exec)
 {
 	int			i;
 
@@ -313,7 +313,7 @@ aqo_ExecutorStart(QueryDesc *queryDesc, int eflags)
 		queryDesc->instrument_options |= INSTRUMENT_ROWS;
 
 	if (prev_ExecutorStart_hook)
-		(*prev_ExecutorStart_hook) (queryDesc, eflags);
+		prev_ExecutorStart_hook(queryDesc, eflags);
 	else
 		standard_ExecutorStart(queryDesc, eflags);
 }
@@ -348,7 +348,7 @@ aqo_copy_generic_path_info(PlannerInfo *root, Plan *dest, Path *src)
 	dest->was_parametrized = (src->param_info != NULL);
 
 	if (prev_copy_generic_path_info_hook)
-		(*prev_copy_generic_path_info_hook) (root, dest, src);
+		prev_copy_generic_path_info_hook(root, dest, src);
 }
 
 /*
@@ -439,7 +439,7 @@ learn_query_stat(QueryDesc *queryDesc)
 	disable_aqo_for_query();
 
 	if (prev_ExecutorEnd_hook)
-		(*prev_ExecutorEnd_hook) (queryDesc);
+		prev_ExecutorEnd_hook(queryDesc);
 	else
 		standard_ExecutorEnd(queryDesc);
 }

preprocessing.c

@@ -69,8 +69,9 @@ get_query_text(ParseState *pstate, Query *query)
 {
 	if (pstate)
 		query_text = pstate->p_sourcetext;
+
 	if (prev_post_parse_analyze_hook)
-		(*prev_post_parse_analyze_hook) (pstate, query);
+		prev_post_parse_analyze_hook(pstate, query);
 }
 
 /*
@@ -82,7 +83,7 @@ call_default_planner(Query *parse,
 					 ParamListInfo boundParams)
 {
 	if (prev_planner_hook)
-		return (*prev_planner_hook) (parse, cursorOptions, boundParams);
+		return prev_planner_hook(parse, cursorOptions, boundParams);
 	else
 		return standard_planner(parse, cursorOptions, boundParams);
 }