Bugfix. Copy of clauses, have got by aqo_get_clauses() has a specific structure

danolivo · Alena Rybakina · commit 9a1244fe13de · 2022-08-17T09:58:01.000+03:00
and shouldn't be touched by any postgres machinery except node hash generator.
diff --git a/cardinality_hooks.c b/cardinality_hooks.c
@@ -233,10 +233,17 @@ aqo_get_parameterized_baserel_size(PlannerInfo *root,
 	{
 		MemoryContext old_ctx_m;
 
+		selectivities = list_concat(
+							get_selectivities(root, param_clauses, rel->relid,
+											  JOIN_INNER, NULL),
+							get_selectivities(root, rel->baserestrictinfo,
+											  rel->relid,
+											  JOIN_INNER, NULL));
+
+		/* Make specific copy of clauses with mutated subplans */
 		allclauses = list_concat(aqo_get_clauses(root, param_clauses),
 								 aqo_get_clauses(root, rel->baserestrictinfo));
-		selectivities = get_selectivities(root, allclauses, rel->relid,
-										  JOIN_INNER, NULL);
+
 		rte = planner_rt_fetch(rel->relid, root);
 		get_eclasses(allclauses, &nargs, &args_hash, &eclass_hash);
 
diff --git a/path_utils.c b/path_utils.c
@@ -443,18 +443,16 @@ get_path_clauses(Path *path, PlannerInfo *root, List **selectivities)
 		case T_ForeignPath:
 			/* The same as in the default case */
 		default:
-			cur = list_concat(aqo_get_clauses(root,
-											  path->parent->baserestrictinfo),
+			cur = list_concat(list_copy(path->parent->baserestrictinfo),
 							  path->param_info ?
-							  aqo_get_clauses(root,
-											  path->param_info->ppi_clauses) :
-							  NIL);
+							  path->param_info->ppi_clauses : NIL);
 			if (path->param_info)
 				cur_sel = get_selectivities(root, cur, path->parent->relid,
 											JOIN_INNER, NULL);
 			else
 				cur_sel = get_selectivities(root, cur, 0, JOIN_INNER, NULL);
 			*selectivities = cur_sel;
+			cur = aqo_get_clauses(root, cur);
 			return cur;
 			break;
 	}
