Improve hypertable DML performance with chunk exclusion

.unreleased/pr_9315

@@ -0,0 +1 @@
+Implements: #9315 Enable chunk exclusion for DML

src/CMakeLists.txt

@@ -132,6 +132,6 @@ add_subdirectory(with_clause)
 # file properties if the target was added in the same directory, so just move it
 # all here.
 set(IMPORTED_SOURCES import/allpaths.c import/heapswap.c import/list.c
-                     import/planner.c import/ts_explain.c)
+                     import/planner.c import/ts_explain.c import/ts_inherit.c)
 set_source_files_properties(${IMPORTED_SOURCES} PROPERTIES SKIP_LINTING ON)
 target_sources(${PROJECT_NAME} PRIVATE ${IMPORTED_SOURCES})

src/import/allpaths.c

@@ -518,6 +518,9 @@ ts_set_append_rel_size(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEn
 {
 	int parentRTindex = rti;
 	bool has_live_children;
+#if PG18_GE
+	double parent_tuples;
+#endif
 	double parent_rows;
 	double parent_size;
 	double *parent_attrsizes;
@@ -536,7 +539,11 @@ ts_set_append_rel_size(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEn
 	 */
 	if (enable_partitionwise_join && rel->reloptkind == RELOPT_BASEREL &&
 		rte->relkind == RELKIND_PARTITIONED_TABLE &&
+#if PG16_GE
+		bms_is_empty(rel->attr_needed[InvalidAttrNumber - rel->min_attr]))
+#else
 		rel->attr_needed[InvalidAttrNumber - rel->min_attr] == NULL)
+#endif
 		rel->consider_partitionwise_join = true;
 
 	/*
@@ -554,6 +561,9 @@ ts_set_append_rel_size(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEn
 	 * have zero rows and/or width, if they were excluded by constraints.
 	 */
 	has_live_children = false;
+#if PG18_GE
+	parent_tuples = 0;
+#endif
 	parent_rows = 0;
 	parent_size = 0;
 	nattrs = rel->max_attr - rel->min_attr + 1;
@@ -565,6 +575,10 @@ ts_set_append_rel_size(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEn
 		int childRTindex;
 		RangeTblEntry *childRTE;
 		RelOptInfo *childrel;
+#if PG16_GE
+		List *childrinfos;
+		ListCell *lc;
+#endif
 		ListCell *parentvars;
 		ListCell *childvars;
 
@@ -606,6 +620,25 @@ ts_set_append_rel_size(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEn
 		/*
 		 * Constraint exclusion failed, so copy the parent's join quals and
 		 * targetlist to the child, with appropriate variable substitutions.
+		 */
+#if PG16_GE
+		childrinfos = NIL;
+		foreach (lc, rel->joininfo)
+		{
+			RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
+
+			if (!bms_overlap(rinfo->clause_relids, rel->nulling_relids))
+				childrinfos =
+					lappend(childrinfos, adjust_appendrel_attrs(root, (Node *) rinfo, 1, &appinfo));
+		}
+		childrel->joininfo = childrinfos;
+#else
+		childrel->joininfo =
+			(List *) adjust_appendrel_attrs(root, (Node *) rel->joininfo, 1, &appinfo);
+#endif
+
+		/*
+		 * Now for the child's targetlist.
 		 *
 		 * NB: the resulting childrel->reltarget->exprs may contain arbitrary
 		 * expressions, which otherwise would not occur in a rel's targetlist.
@@ -614,8 +647,6 @@ ts_set_append_rel_size(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEn
 		 * PlaceHolderVars.)  XXX we do not bother to update the cost or width
 		 * fields of childrel->reltarget; not clear if that would be useful.
 		 */
-		childrel->joininfo =
-			(List *) adjust_appendrel_attrs(root, (Node *) rel->joininfo, 1, &appinfo);
 		childrel->reltarget->exprs =
 			(List *) adjust_appendrel_attrs(root, (Node *) rel->reltarget->exprs, 1, &appinfo);
 
@@ -696,6 +727,9 @@ ts_set_append_rel_size(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEn
 		 */
 		Assert(childrel->rows > 0);
 
+#if PG18_GE
+		parent_tuples += childrel->tuples;
+#endif
 		parent_rows += childrel->rows;
 		parent_size += childrel->reltarget->width * childrel->rows;
 
@@ -712,7 +746,8 @@ ts_set_append_rel_size(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEn
 			Var *parentvar = (Var *) lfirst(parentvars);
 			Node *childvar = (Node *) lfirst(childvars);
 
-			if (IsA(parentvar, Var))
+			/* Only process Vars that belong to the parent rel */
+			if (IsA(parentvar, Var) && parentvar->varno == parentRTindex)
 			{
 				int pndx = parentvar->varattno - rel->min_attr;
 				int32 child_width = 0;
@@ -739,17 +774,16 @@ ts_set_append_rel_size(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEn
 		int i;
 
 		Assert(parent_rows > 0);
+#if PG18_GE
+		rel->tuples = parent_tuples;
+#else
+		rel->tuples = parent_rows;
+#endif
 		rel->rows = parent_rows;
 		rel->reltarget->width = rint(parent_size / parent_rows);
 		for (i = 0; i < nattrs; i++)
 			rel->attr_widths[i] = rint(parent_attrsizes[i] / parent_rows);
 
-		/*
-		 * Set "raw tuples" count equal to "rows" for the appendrel; needed
-		 * because some places assume rel->tuples is valid for any baserel.
-		 */
-		rel->tuples = parent_rows;
-
 		/*
 		 * Note that we leave rel->pages as zero; this is important to avoid
 		 * double-counting the appendrel tree in total_table_pages.

src/import/planner.c

@@ -43,115 +43,6 @@ static Node *replace_nestloop_params(PlannerInfo *root, Node *expr);
 static Node *replace_nestloop_params_mutator(Node *node, PlannerInfo *root);
 static Plan *inject_projection_plan(Plan *subplan, List *tlist, bool parallel_safe);
 
-/* copied verbatim from optimizer/util/appendinfo.c at REL_17_6 */
-void
-ts_make_inh_translation_list(Relation oldrelation, Relation newrelation, Index newvarno,
-							 AppendRelInfo *appinfo)
-{
-	List *vars = NIL;
-	AttrNumber *pcolnos;
-	TupleDesc old_tupdesc = RelationGetDescr(oldrelation);
-	TupleDesc new_tupdesc = RelationGetDescr(newrelation);
-	Oid new_relid = RelationGetRelid(newrelation);
-	int oldnatts = old_tupdesc->natts;
-	int newnatts = new_tupdesc->natts;
-	int old_attno;
-	int new_attno = 0;
-
-	/* Initialize reverse-translation array with all entries zero */
-	appinfo->num_child_cols = newnatts;
-	appinfo->parent_colnos = pcolnos = (AttrNumber *) palloc0(newnatts * sizeof(AttrNumber));
-
-	for (old_attno = 0; old_attno < oldnatts; old_attno++)
-	{
-		Form_pg_attribute att;
-		char *attname;
-		Oid atttypid;
-		int32 atttypmod;
-		Oid attcollation;
-
-		att = TupleDescAttr(old_tupdesc, old_attno);
-		if (att->attisdropped)
-		{
-			/* Just put NULL into this list entry */
-			vars = lappend(vars, NULL);
-			continue;
-		}
-		attname = NameStr(att->attname);
-		atttypid = att->atttypid;
-		atttypmod = att->atttypmod;
-		attcollation = att->attcollation;
-
-		/*
-		 * When we are generating the "translation list" for the parent table
-		 * of an inheritance set, no need to search for matches.
-		 */
-		if (oldrelation == newrelation)
-		{
-			vars = lappend(vars,
-						   makeVar(newvarno,
-								   (AttrNumber) (old_attno + 1),
-								   atttypid,
-								   atttypmod,
-								   attcollation,
-								   0));
-			pcolnos[old_attno] = old_attno + 1;
-			continue;
-		}
-
-		/*
-		 * Otherwise we have to search for the matching column by name.
-		 * There's no guarantee it'll have the same column position, because
-		 * of cases like ALTER TABLE ADD COLUMN and multiple inheritance.
-		 * However, in simple cases, the relative order of columns is mostly
-		 * the same in both relations, so try the column of newrelation that
-		 * follows immediately after the one that we just found, and if that
-		 * fails, let syscache handle it.
-		 */
-		if (new_attno >= newnatts || (att = TupleDescAttr(new_tupdesc, new_attno))->attisdropped ||
-			strcmp(attname, NameStr(att->attname)) != 0)
-		{
-			HeapTuple newtup;
-
-			newtup = SearchSysCacheAttName(new_relid, attname);
-			if (!HeapTupleIsValid(newtup))
-				elog(ERROR,
-					 "could not find inherited attribute \"%s\" of relation \"%s\"",
-					 attname,
-					 RelationGetRelationName(newrelation));
-			new_attno = ((Form_pg_attribute) GETSTRUCT(newtup))->attnum - 1;
-			Assert(new_attno >= 0 && new_attno < newnatts);
-			ReleaseSysCache(newtup);
-
-			att = TupleDescAttr(new_tupdesc, new_attno);
-		}
-
-		/* Found it, check type and collation match */
-		if (atttypid != att->atttypid || atttypmod != att->atttypmod)
-			elog(ERROR,
-				 "attribute \"%s\" of relation \"%s\" does not match parent's type",
-				 attname,
-				 RelationGetRelationName(newrelation));
-		if (attcollation != att->attcollation)
-			elog(ERROR,
-				 "attribute \"%s\" of relation \"%s\" does not match parent's collation",
-				 attname,
-				 RelationGetRelationName(newrelation));
-
-		vars = lappend(vars,
-					   makeVar(newvarno,
-							   (AttrNumber) (new_attno + 1),
-							   atttypid,
-							   atttypmod,
-							   attcollation,
-							   0));
-		pcolnos[new_attno] = old_attno + 1;
-		new_attno++;
-	}
-
-	appinfo->translated_vars = vars;
-}
-
 /* copied verbatim from planner.c */
 struct PathTarget *
 ts_make_partial_grouping_target(struct PlannerInfo *root, PathTarget *grouping_target)

src/import/planner.h

@@ -23,9 +23,6 @@
 
 #include "export.h"
 
-extern TSDLLEXPORT void ts_make_inh_translation_list(Relation oldrelation, Relation newrelation,
-													 Index newvarno, AppendRelInfo *appinfo);
-
 extern TSDLLEXPORT struct PathTarget *ts_make_partial_grouping_target(struct PlannerInfo *root,
 																	  PathTarget *grouping_target);