make check constraint machinery aware of different TupleDescs (part_attno)

funbringer · funbringer · commit a7b9ea38b34a · 2017-02-02T16:29:59.000+03:00
diff --git a/src/init.c b/src/init.c
@@ -77,15 +77,18 @@ static int cmp_range_entries(const void *p1, const void *p2, void *arg);
 
 static bool validate_range_constraint(const Expr *expr,
 									  const PartRelationInfo *prel,
+									  const AttrNumber part_attno,
 									  Datum *min,
 									  Datum *max);
 
 static bool validate_hash_constraint(const Expr *expr,
 									 const PartRelationInfo *prel,
+									 const AttrNumber part_attno,
 									 uint32 *part_hash);
 
 static bool read_opexpr_const(const OpExpr *opexpr,
 							  const PartRelationInfo *prel,
+							  const AttrNumber part_attno,
 							  Datum *val);
 
 static int oid_cmp(const void *p1, const void *p2);
@@ -347,6 +350,7 @@ init_shmem_config(void)
 void
 fill_prel_with_partitions(const Oid *partitions,
 						  const uint32 parts_count,
+						  const char *part_column_name,
 						  PartRelationInfo *prel)
 {
 	uint32			i;
@@ -361,7 +365,18 @@ fill_prel_with_partitions(const Oid *partitions,
 
 	for (i = 0; i < PrelChildrenCount(prel); i++)
 	{
-		con_expr = get_partition_constraint_expr(partitions[i], prel->attnum);
+		AttrNumber part_attno;
+
+		/* NOTE: Partitions may have different TupleDescs */
+		part_attno = get_attnum(partitions[i], part_column_name);
+
+		/* Raise ERROR if there's no such column */
+		if (part_attno == InvalidAttrNumber)
+			elog(ERROR, "partition \"%s\" has no column \"%s\"",
+				 get_rel_name_or_relid(partitions[i]),
+				 part_column_name);
+
+		con_expr = get_partition_constraint_expr(partitions[i], part_attno);
 
 		/* Perform a partitioning_type-dependent task */
 		switch (prel->parttype)
@@ -370,13 +385,13 @@ fill_prel_with_partitions(const Oid *partitions,
 				{
 					uint32	hash; /* hash value < parts_count */
 
-					if (validate_hash_constraint(con_expr, prel, &hash))
+					if (validate_hash_constraint(con_expr, prel, part_attno, &hash))
 						prel->children[hash] = partitions[i];
 					else
 					{
 						DisablePathman(); /* disable pg_pathman since config is broken */
 						ereport(ERROR,
-								(errmsg("Wrong constraint format for HASH partition \"%s\"",
+								(errmsg("wrong constraint format for HASH partition \"%s\"",
 										get_rel_name_or_relid(partitions[i])),
 								 errhint(INIT_ERROR_HINT)));
 					}
@@ -387,7 +402,7 @@ fill_prel_with_partitions(const Oid *partitions,
 				{
 					Datum	range_min, range_max;
 
-					if (validate_range_constraint(con_expr, prel,
+					if (validate_range_constraint(con_expr, prel, part_attno,
 												  &range_min, &range_max))
 					{
 						prel->ranges[i].child_oid	= partitions[i];
@@ -398,7 +413,7 @@ fill_prel_with_partitions(const Oid *partitions,
 					{
 						DisablePathman(); /* disable pg_pathman since config is broken */
 						ereport(ERROR,
-								(errmsg("Wrong constraint format for RANGE partition \"%s\"",
+								(errmsg("wrong constraint format for RANGE partition \"%s\"",
 										get_rel_name_or_relid(partitions[i])),
 								 errhint(INIT_ERROR_HINT)));
 					}
@@ -905,6 +920,7 @@ cmp_range_entries(const void *p1, const void *p2, void *arg)
 static bool
 validate_range_constraint(const Expr *expr,
 						  const PartRelationInfo *prel,
+						  const AttrNumber part_attno,
 						  Datum *min,
 						  Datum *max)
 {
@@ -928,23 +944,21 @@ validate_range_constraint(const Expr *expr,
 
 	if (strategy == BTGreaterEqualStrategyNumber)
 	{
-		if (!read_opexpr_const(opexpr, prel, min))
+		if (!read_opexpr_const(opexpr, prel, part_attno, min))
 			return false;
 	}
-	else
-		return false;
+	else return false;
 
 	/* check that right operand is < operator */
 	opexpr = (OpExpr *) lsecond(boolexpr->args);
 	strategy = get_op_opfamily_strategy(opexpr->opno, tce->btree_opf);
 
 	if (strategy == BTLessStrategyNumber)
 	{
-		if (!read_opexpr_const(opexpr, prel, max))
+		if (!read_opexpr_const(opexpr, prel, part_attno, max))
 			return false;
 	}
-	else
-		return false;
+	else return false;
 
 	return true;
 }
@@ -957,6 +971,7 @@ validate_range_constraint(const Expr *expr,
 static bool
 read_opexpr_const(const OpExpr *opexpr,
 				  const PartRelationInfo *prel,
+				  const AttrNumber part_attno,
 				  Datum *val)
 {
 	const Node	   *left;
@@ -990,7 +1005,7 @@ read_opexpr_const(const OpExpr *opexpr,
 	else return false;
 
 	/* VAR.attno == partitioned attribute number */
-	if (part_attr->varoattno != prel->attnum)
+	if (part_attr->varoattno != part_attno)
 		return false;
 
 	/* CONST is NOT NULL */
@@ -1026,6 +1041,7 @@ read_opexpr_const(const OpExpr *opexpr,
 static bool
 validate_hash_constraint(const Expr *expr,
 						 const PartRelationInfo *prel,
+						 const AttrNumber part_attno,
 						 uint32 *part_hash)
 {
 	const TypeCacheEntry   *tce;
@@ -1079,7 +1095,7 @@ validate_hash_constraint(const Expr *expr,
 			var = (Var *) linitial(type_hash_proc_expr->args);
 
 		/* Check that 'var' is the partitioning key attribute */
-		if (var->varoattno != prel->attnum)
+		if (var->varoattno != part_attno)
 			return false;
 
 		/* Check that PARTITIONS_COUNT is equal to total amount of partitions */
diff --git a/src/init.h b/src/init.h
@@ -122,6 +122,7 @@ void unload_config(void);
 
 void fill_prel_with_partitions(const Oid *partitions,
 							   const uint32 parts_count,
+							   const char *part_column_name,
 							   PartRelationInfo *prel);
 
 /* Result of find_inheritance_children_array() */
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -197,7 +197,9 @@ refresh_pathman_relation_info(Oid relid,
 	 * will try to refresh it again (and again), until the error is fixed
 	 * by user manually (i.e. invalid check constraints etc).
 	 */
-	fill_prel_with_partitions(prel_children, prel_children_count, prel);
+	fill_prel_with_partitions(prel_children,
+							  prel_children_count,
+							  part_column_name, prel);
 
 	/* Peform some actions for each child */
 	for (i = 0; i < prel_children_count; i++)
