fix config loading

zilder · zilder · commit fd46919c5f5b · 2016-11-23T14:56:57.000+03:00
diff --git a/src/init.c b/src/init.c
@@ -870,9 +870,11 @@ cmp_range_entries(const void *p1, const void *p2, void *arg)
 
 	/* If range is half open */
 	if (v1->infinite_min)
+	{
 		if (v2->infinite_min)
 			return Int32GetDatum(0);
 		return Int32GetDatum(-1);
+	}
 
 	/* Else if range is closed */
 	return OidFunctionCall2(cmp_proc_oid, v1->min, v2->min);
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -834,22 +834,6 @@ build_range_check_constraint(Oid child_relid,
 	return range_constr;
 }
 
-// static int16_t
-// cmp_boundaries(FmgrInfo cmp_func, Datum s1, Datum s2, bool s1_infinite, bool s2_infinite)
-// {
-// 	if (s1_infinite && s2_infinite)
-// 		elog(ERROR,
-// 			 "two half open ranges are overlap");
-
-// 	if (s1_infinite)
-// 		return -1;
-
-// 	if (s2_infinite)
-// 		return 1;
-
-// 	return DatumGetInt16(FunctionCall2(&cmp_func, start_value, ranges[i].max));
-// }
-
 /* Check if range overlaps with any partitions */
 bool
 check_range_available(Oid parent_relid,
@@ -882,32 +866,21 @@ check_range_available(Oid parent_relid,
 	ranges = PrelGetRangesArray(prel);
 	for (i = 0; i < PrelChildrenCount(prel); i++)
 	{
-		// int c1 = cmp_boundaries(cmp_func, start_value, ranges[i].max, infinite_start, ranges[i].infinite_max);
-		// int c2 = cmp_boundaries(cmp_func, end_value, ranges[i].min, infinite_end, ranges[i].infinite_min);
-
-		/* If both ranges are half open then they are obviously overlap */
-		// if (infinite_start && ranges[i].infinite_max)
-		// 	return false;
-		// if (infinite_end && ranges[i].infinite_min)
-		// 	return false;
-
-		// int		c1 = FunctionCall2(&cmp_func, start_value, ranges[i].max),
-		// 		c2 = FunctionCall2(&cmp_func, end_value, ranges[i].min);
 		int c1, c2;
 
 		/*
 		 * If the range we're checking starts with minus infinity or current
-		 * range is ends in plus infinity then the left boundary of the first
-		 * one is on the left
+		 * range ends in plus infinity then the left boundary of the first
+		 * range is on the left. Otherwise compare specific values
 		 */
 		c1 = (infinite_start || ranges[i].infinite_max) ?
 			-1 : FunctionCall2(&cmp_func, start_value, ranges[i].max);
 		/*
-		 * Similary check the right boundary of first range is on the right
-		 * of the beginning of second one
+		 * Similary check that right boundary of the range we're checking is on
+		 * the right of the beginning of the current one
 		 */
 		c2 = (infinite_end || ranges[i].infinite_min) ?
-			-1 : FunctionCall2(&cmp_func, end_value, ranges[i].max);
+			-1 : FunctionCall2(&cmp_func, end_value, ranges[i].min);
 
 		/* There's someone! */
 		if (c1 < 0 && c2 > 0)
