EPQ: fix multilevel (see router_lazy_init_constraint())

Author: funbringer

src/include/relation_info.h

@@ -367,9 +367,9 @@ void shout_if_prel_is_invalid(const Oid parent_oid,
 							  const PartType expected_part_type);
 
 /* Bounds cache */
-Expr *get_partition_constraint_expr(Oid partition);
 void forget_bounds_of_partition(Oid partition);
 PartBoundInfo *get_bounds_of_partition(Oid partition, const PartRelationInfo *prel);
+Expr *get_partition_constraint_expr(Oid partition, bool raise_error);
 void invalidate_bounds_cache(void);
 
 /* Parents cache */

src/partition_router.c

@@ -20,6 +20,7 @@
 #include "commands/trigger.h"
 #include "executor/nodeModifyTable.h"
 #include "foreign/fdwapi.h"
+#include "optimizer/clauses.h"
 #include "storage/bufmgr.h"
 #include "utils/guc.h"
 #include "utils/rel.h"
@@ -378,12 +379,33 @@ router_lazy_init_junkfilter(PartitionRouterState *state, EState *estate)
 static void
 router_lazy_init_constraint(PartitionRouterState *state)
 {
-	Relation rel = state->current_rri->ri_RelationDesc;
-
 	if (state->constraint == NULL)
 	{
-		Expr *expr = get_partition_constraint_expr(RelationGetRelid(rel));
-		state->constraint = ExecInitExpr(expr, NULL);
+		Relation	rel = state->current_rri->ri_RelationDesc;
+		Oid			relid = RelationGetRelid(rel);
+		List	   *clauses = NIL;
+		Expr	   *expr;
+
+		while (OidIsValid(relid))
+		{
+			/* It's probably OK if expression is NULL */
+			expr = get_partition_constraint_expr(relid, false);
+			expr = expression_planner(expr);
+
+			if (!expr)
+				break;
+
+			/* Add this constraint to set */
+			clauses = lappend(clauses, expr);
+
+			/* Consider parent's check constraint as well */
+			relid = get_parent_of_partition(relid);
+		}
+
+		if (!clauses)
+			elog(ERROR, "no recheck constraint for relid %d", relid);
+
+		state->constraint = ExecInitExpr(make_ands_explicit(clauses), NULL);
 	}
 }
 

src/relation_info.c

@@ -1000,7 +1000,7 @@ get_bounds_of_partition(Oid partition, const PartRelationInfo *prel)
 		pbin_local.byval = prel->ev_byval;
 
 		/* Try to build constraint's expression tree (may emit ERROR) */
-		con_expr = get_partition_constraint_expr(partition);
+		con_expr = get_partition_constraint_expr(partition, true);
 
 		/* Grab bounds/hash and fill in 'pbin_local' (may emit ERROR) */
 		fill_pbin_with_bounds(&pbin_local, prel, con_expr);
@@ -1046,7 +1046,7 @@ invalidate_bounds_cache(void)
  * build_check_constraint_name_internal() is used to build conname.
  */
 Expr *
-get_partition_constraint_expr(Oid partition)
+get_partition_constraint_expr(Oid partition, bool raise_error)
 {
 	Oid			conid;			/* constraint Oid */
 	char	   *conname;		/* constraint name */
@@ -1060,11 +1060,12 @@ get_partition_constraint_expr(Oid partition)
 
 	if (!OidIsValid(conid))
 	{
-		DisablePathman(); /* disable pg_pathman since config is broken */
+		if (!raise_error)
+			return NULL;
+
 		ereport(ERROR,
 				(errmsg("constraint \"%s\" of partition \"%s\" does not exist",
-						conname, get_rel_name_or_relid(partition)),
-				 errhint(INIT_ERROR_HINT)));
+						conname, get_rel_name_or_relid(partition))));
 	}
 
 	con_tuple = SearchSysCache1(CONSTROID, ObjectIdGetDatum(conid));
@@ -1073,11 +1074,12 @@ get_partition_constraint_expr(Oid partition)
 								   &conbin_isnull);
 	if (conbin_isnull)
 	{
-		DisablePathman(); /* disable pg_pathman since config is broken */
-		ereport(WARNING,
+		if (!raise_error)
+			return NULL;
+
+		ereport(ERROR,
 				(errmsg("constraint \"%s\" of partition \"%s\" has NULL conbin",
-						conname, get_rel_name_or_relid(partition)),
-				 errhint(INIT_ERROR_HINT)));
+						conname, get_rel_name_or_relid(partition))));
 		pfree(conname);
 
 		return NULL; /* could not parse */