Allow learning (and predicting for) on a ForeignScan, an Append, a MergeAppend, a SubqueryScan nodes.

Tags: shardman.

Author: danolivo

path_utils.c

@@ -79,7 +79,7 @@ get_path_clauses(Path *path, PlannerInfo *root, List **selectivities)
 	List	   *inner_sel = NIL;
 	List	   *outer;
 	List	   *outer_sel = NIL;
-	List	   *cur;
+	List	   *cur = NIL;
 	List	   *cur_sel = NIL;
 
 	Assert(selectivities != NULL);
@@ -160,6 +160,32 @@ get_path_clauses(Path *path, PlannerInfo *root, List **selectivities)
 			return get_path_clauses(((LimitPath *) path)->subpath, root,
 									selectivities);
 			break;
+		case T_SubqueryScanPath:
+			return get_path_clauses(((SubqueryScanPath *) path)->subpath, root,
+									selectivities);
+			break;
+		case T_AppendPath:
+		{
+			ListCell *lc;
+
+			foreach (lc, ((AppendPath *) path)->subpaths)
+			{
+				Path *subpath = lfirst(lc);
+
+				cur = list_concat(cur, list_copy(
+					get_path_clauses(subpath, root, selectivities)));
+				cur_sel = list_concat(cur_sel, *selectivities);
+			}
+			cur = list_concat(cur, list_copy(path->parent->baserestrictinfo));
+			*selectivities = list_concat(cur_sel,
+										 get_selectivities(root,
+											path->parent->baserestrictinfo,
+											0, JOIN_INNER, NULL));
+			return cur;
+		}
+			break;
+		case T_ForeignPath:
+			/* The same as in the default case */
 		default:
 			cur = list_concat(list_copy(path->parent->baserestrictinfo),
 							  path->param_info ?

postprocessing.c

@@ -252,7 +252,9 @@ learnOnPlanState(PlanState *p, void *context)
 			ctx->relidslist = list_copy(p->plan->path_relids);
 
 		if (p->instrument && (p->righttree != NULL || p->lefttree == NULL ||
-							  p->plan->path_clauses != NIL))
+							  p->plan->path_clauses != NIL ||
+							  IsA(p, ForeignScanState) ||
+							  IsA(p, AppendState) || IsA(p, MergeAppendState)))
 		{
 			double learn_rows = 0.;
 			double predicted = 0.;