postgrespro
diff --git a/‎cardinality_hooks.c‎
Lines changed: 6 additions & 0 deletions b/‎cardinality_hooks.c‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎postprocessing.c‎
Lines changed: 9 additions & 9 deletions b/‎postprocessing.c‎
Lines changed: 9 additions & 9 deletions
@@ -208,12 +208,16 @@ aqo_get_parameterized_baserel_size(PlannerInfo *root,
 
 	if (query_context.use_aqo || query_context.learn_aqo)
 	{
+		MemoryContext mcxt;
+
 		allclauses = list_concat(list_copy(param_clauses),
 								 list_copy(rel->baserestrictinfo));
 		selectivities = get_selectivities(root, allclauses, rel->relid,
 										  JOIN_INNER, NULL);
 		relid = planner_rt_fetch(rel->relid, root)->relid;
 		get_eclasses(allclauses, &nargs, &args_hash, &eclass_hash);
+
+		mcxt = MemoryContextSwitchTo(CacheMemoryContext);
 		forboth(l, allclauses, l2, selectivities)
 		{
 			current_hash = get_clause_hash(
@@ -222,6 +226,8 @@ aqo_get_parameterized_baserel_size(PlannerInfo *root,
 			cache_selectivity(current_hash, rel->relid, relid,
 							  *((double *) lfirst(l2)));
 		}
+
+		MemoryContextSwitchTo(mcxt);
 		pfree(args_hash);
 		pfree(eclass_hash);
 	}
 
@@ -94,9 +94,9 @@ learn_sample(List *clauselist, List *selectivities, List *relidslist,
 {
 	int			fss_hash;
 	int			nfeatures;
-	double	  *matrix[aqo_K];
-	double	   targets[aqo_K];
-	double	   *features;
+	double		*matrix[aqo_K];
+	double		targets[aqo_K];
+	double		*features;
 	double		target;
 	int			i;
 
@@ -138,14 +138,14 @@ restore_selectivities(List *clauselist,
 					  JoinType join_type,
 					  bool was_parametrized)
 {
-	List	   *lst = NIL;
-	ListCell   *l;
+	List		*lst = NIL;
+	ListCell	*l;
 	int			i = 0;
 	bool		parametrized_sel;
 	int			nargs;
-	int		   *args_hash;
-	int		   *eclass_hash;
-	double	   *cur_sel;
+	int			*args_hash;
+	int			*eclass_hash;
+	double		*cur_sel;
 	int			cur_hash;
 	int			cur_relid;
 
@@ -290,7 +290,7 @@ learnOnPlanState(PlanState *p, void *context)
 				}
 				else
 					/* This node does not required to sum tuples of each worker
-					 * to calculate produced rows.  */
+					 * to calculate produced rows. */
 					learn_rows = p->instrument->ntuples / p->instrument->nloops;
 
 				if (p->plan->predicted_cardinality > 0.)
Original file line number	Diff line number	Diff line change
`@@ -208,12 +208,16 @@ aqo_get_parameterized_baserel_size(PlannerInfo *root,`
`208`	`208`
`209`	`209`	`if (query_context.use_aqo \|\| query_context.learn_aqo)`
`210`	`210`	`{`
	`211`	`+ MemoryContext mcxt;`
	`212`	`+`
`211`	`213`	`allclauses = list_concat(list_copy(param_clauses),`
`212`	`214`	`list_copy(rel->baserestrictinfo));`
`213`	`215`	`selectivities = get_selectivities(root, allclauses, rel->relid,`
`214`	`216`	`JOIN_INNER, NULL);`
`215`	`217`	`relid = planner_rt_fetch(rel->relid, root)->relid;`
`216`	`218`	`get_eclasses(allclauses, &nargs, &args_hash, &eclass_hash);`
	`219`	`+`
	`220`	`+ mcxt = MemoryContextSwitchTo(CacheMemoryContext);`
`217`	`221`	`forboth(l, allclauses, l2, selectivities)`
`218`	`222`	`{`
`219`	`223`	`current_hash = get_clause_hash(`
`@@ -222,6 +226,8 @@ aqo_get_parameterized_baserel_size(PlannerInfo *root,`
`222`	`226`	`cache_selectivity(current_hash, rel->relid, relid,`
`223`	`227`	`((double ) lfirst(l2)));`
`224`	`228`	`}`
	`229`	`+`
	`230`	`+ MemoryContextSwitchTo(mcxt);`
`225`	`231`	`pfree(args_hash);`
`226`	`232`	`pfree(eclass_hash);`
`227`	`233`	`}`