small changes in validate_hash_constraint()

funbringer · funbringer · commit 69028ca82bf1 · 2017-04-04T18:46:25.000+03:00
diff --git a/src/include/init.h b/src/include/init.h
@@ -218,7 +218,7 @@ bool validate_range_constraint(const Expr *expr,
 bool validate_hash_constraint(const Expr *expr,
 							  const PartRelationInfo *prel,
 							  const AttrNumber part_attno,
-							  uint32 *part_hash);
+							  uint32 *part_idx);
 
 
 #endif /* PATHMAN_INIT_H */
diff --git a/src/include/relation_info.h b/src/include/relation_info.h
@@ -176,7 +176,7 @@ typedef struct
 	bool			byval;
 
 	/* For HASH partitions */
-	uint32			hash;
+	uint32			part_idx;
 } PartBoundInfo;
 
 /*
diff --git a/src/init.c b/src/init.c
@@ -988,27 +988,27 @@ read_opexpr_const(const OpExpr *opexpr,
 /*
  * Validate hash constraint. It MUST have this exact format:
  *
- *		get_hash_part_idx(TYPE_HASH_PROC(VALUE), PARTITIONS_COUNT) = CUR_PARTITION_HASH
+ *		get_hash_part_idx(TYPE_HASH_PROC(VALUE), PARTITIONS_COUNT) = CUR_PARTITION_IDX
  *
- * Writes 'part_hash' hash value for this partition on success.
+ * Writes 'part_idx' hash value for this partition on success.
  */
 bool
 validate_hash_constraint(const Expr *expr,
 						 const PartRelationInfo *prel,
 						 const AttrNumber part_attno,
-						 uint32 *part_hash)
+						 uint32 *part_idx)
 {
 	const TypeCacheEntry   *tce;
 	const OpExpr		   *eq_expr;
 	const FuncExpr		   *get_hash_expr,
 						   *type_hash_proc_expr;
-	const Var			   *var; /* partitioned column */
 
 	if (!expr)
 		return false;
 
 	if (!IsA(expr, OpExpr))
 		return false;
+
 	eq_expr = (const OpExpr *) expr;
 
 	/* Check that left expression is a function call */
@@ -1027,31 +1027,51 @@ validate_hash_constraint(const Expr *expr,
 	{
 		Node   *first = linitial(get_hash_expr->args);	/* arg #1: TYPE_HASH_PROC(VALUE) */
 		Node   *second = lsecond(get_hash_expr->args);	/* arg #2: PARTITIONS_COUNT */
-		Const  *cur_partition_hash;						/* hash value for this partition */
+		Const  *cur_partition_idx;						/* hash value for this partition */
+		Node   *hash_arg;
 
 		if (!IsA(first, FuncExpr) || !IsA(second, Const))
 			return false;
 
 		type_hash_proc_expr = (FuncExpr *) first;
 
-		/* Check that function is indeed TYPE_HASH_PROC */
-		if (type_hash_proc_expr->funcid != prel->hash_proc ||
-				!(IsA(linitial(type_hash_proc_expr->args), Var) ||
-				  IsA(linitial(type_hash_proc_expr->args), RelabelType)))
-		{
+		/* Check that function is indeed TYPE_HASH_PROC() */
+		if (type_hash_proc_expr->funcid != prel->hash_proc)
 			return false;
-		}
 
-		/* Extract argument into 'var' */
-		if (IsA(linitial(type_hash_proc_expr->args), RelabelType))
-			var = (Var *) ((RelabelType *) linitial(type_hash_proc_expr->args))->arg;
-		else
-			var = (Var *) linitial(type_hash_proc_expr->args);
-
-		/* Check that 'var' is the partitioning key attribute */
-		if (var->varoattno != part_attno)
+		/* There should be exactly 1 argument */
+		if (list_length(type_hash_proc_expr->args) != 1)
 			return false;
 
+		/* Extract arg of TYPE_HASH_PROC() */
+		hash_arg = (Node *) linitial(type_hash_proc_expr->args);
+
+		/* Check arg of TYPE_HASH_PROC() */
+		switch (nodeTag(hash_arg))
+		{
+			case T_RelabelType:
+				{
+					hash_arg = (Node *) ((RelabelType *) hash_arg)->arg;
+				}
+				/* FALL THROUGH (no break) */
+
+			case T_Var:
+				{
+					Var *var = (Var *) hash_arg;
+
+					if (!IsA(var, Var))
+						return false;
+
+					/* Check that 'var' is the partitioning key attribute */
+					if (var->varoattno != part_attno)
+						return false;
+				}
+				break;
+
+			default:
+				return false;
+		}
+
 		/* Check that PARTITIONS_COUNT is equal to total amount of partitions */
 		if (DatumGetUInt32(((Const *) second)->constvalue) != PrelChildrenCount(prel))
 			return false;
@@ -1060,22 +1080,22 @@ validate_hash_constraint(const Expr *expr,
 		if (!IsA(lsecond(eq_expr->args), Const))
 			return false;
 
-		cur_partition_hash = lsecond(eq_expr->args);
+		/* Fetch CUR_PARTITION_IDX */
+		cur_partition_idx = lsecond(eq_expr->args);
 
 		/* Check that CUR_PARTITION_HASH is NOT NULL */
-		if (cur_partition_hash->constisnull)
+		if (cur_partition_idx->constisnull)
 			return false;
 
-		*part_hash = DatumGetUInt32(cur_partition_hash->constvalue);
-		if (*part_hash >= PrelChildrenCount(prel))
+		*part_idx = DatumGetUInt32(cur_partition_idx->constvalue);
+		if (*part_idx >= PrelChildrenCount(prel))
 			return false;
 
 		return true; /* everything seems to be ok */
 	}
 
 	return false;
 }
-
 /* needed for find_inheritance_children_array() function */
 static int
 oid_cmp(const void *p1, const void *p2)
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -479,7 +479,7 @@ fill_prel_with_partitions(PartRelationInfo *prel,
 		switch (prel->parttype)
 		{
 			case PT_HASH:
-				prel->children[bound_info->hash] = bound_info->child_rel;
+				prel->children[bound_info->part_idx] = bound_info->child_rel;
 				break;
 
 			case PT_RANGE:
@@ -1047,7 +1047,7 @@ fill_pbin_with_bounds(PartBoundInfo *pbin,
 			{
 				if (!validate_hash_constraint(constraint_expr,
 											  prel, part_attno,
-											  &pbin->hash))
+											  &pbin->part_idx))
 				{
 					DisablePathman(); /* disable pg_pathman since config is broken */
 					ereport(ERROR,

Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ fill_prel_with_partitions(PartRelationInfo *prel,`
`479`	`479`	`switch (prel->parttype)`
`480`	`480`	`{`
`481`	`481`	`case PT_HASH:`
`482`		`- prel->children[bound_info->hash] = bound_info->child_rel;`
	`482`	`+ prel->children[bound_info->part_idx] = bound_info->child_rel;`
`483`	`483`	`break;`
`484`	`484`
`485`	`485`	`case PT_RANGE:`
`@@ -1047,7 +1047,7 @@ fill_pbin_with_bounds(PartBoundInfo *pbin,`
`1047`	`1047`	`{`
`1048`	`1048`	`if (!validate_hash_constraint(constraint_expr,`
`1049`	`1049`	`prel, part_attno,`
`1050`		`- &pbin->hash))`
	`1050`	`+ &pbin->part_idx))`
`1051`	`1051`	`{`
`1052`	`1052`	`DisablePathman(); /* disable pg_pathman since config is broken */`
`1053`	`1053`	`ereport(ERROR,`