refactoring (static inline), introduce function WrongPartType()

funbringer · funbringer · commit f3ee021c9706 · 2017-05-10T15:55:43.000+03:00
diff --git a/src/include/relation_info.h b/src/include/relation_info.h
@@ -308,9 +308,47 @@ void forget_bounds_of_partition(Oid partition);
 PartBoundInfo *get_bounds_of_partition(Oid partition,
 									   const PartRelationInfo *prel);
 
-/* Safe casts for PartType */
-PartType DatumGetPartType(Datum datum);
-char *PartTypeToCString(PartType parttype);
+/* PartType wrappers */
+
+static inline void
+WrongPartType(PartType parttype)
+{
+	elog(ERROR, "Unknown partitioning type %u", parttype);
+}
+
+static inline PartType
+DatumGetPartType(Datum datum)
+{
+	uint32 parttype = DatumGetUInt32(datum);
+
+	if (parttype < 1 || parttype > 2)
+		WrongPartType(parttype);
+
+	return (PartType) parttype;
+}
+
+static inline char *
+PartTypeToCString(PartType parttype)
+{
+	static char *hash_str	= "1",
+				*range_str	= "2";
+
+	switch (parttype)
+	{
+		case PT_HASH:
+			return hash_str;
+
+		case PT_RANGE:
+			return range_str;
+
+		default:
+			WrongPartType(parttype);
+			return NULL; /* keep compiler happy */
+	}
+}
+
+
+
 
 /* PartRelationInfo checker */
 void shout_if_prel_is_invalid(const Oid parent_oid,
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -1588,8 +1588,7 @@ invoke_init_callback_internal(init_callback_params *cb_params)
 			break;
 
 		default:
-			elog(ERROR, "Unknown partitioning type %u", cb_params->parttype);
-			break;
+			WrongPartType(cb_params->parttype);
 	}
 
 	/* Fetch function call data */
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -781,8 +781,7 @@ handle_const(const Const *c, WalkerContext *context)
 			break;
 
 		default:
-			elog(ERROR, "Unknown partitioning type %u", prel->parttype);
-			break;
+			WrongPartType(prel->parttype);
 	}
 
 	return result;
@@ -966,7 +965,7 @@ handle_arrexpr(const ScalarArrayOpExpr *expr, WalkerContext *context)
 				break;
 
 			default:
-				elog(ERROR, "Unknown partitioning type %u", prel->parttype);
+				WrongPartType(prel->parttype);
 		}
 
 		/* Free resources */
@@ -1100,7 +1099,7 @@ handle_binary_opexpr(const Const *c,
 			}
 
 		default:
-			elog(ERROR, "Unknown partitioning type %u", prel->parttype);
+			WrongPartType(prel->parttype);
 	}
 
 binary_opexpr_return:
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -506,7 +506,7 @@ show_partition_list_internal(PG_FUNCTION_ARGS)
 					break;
 
 				default:
-					elog(ERROR, "Unknown partitioning type %u", prel->parttype);
+					WrongPartType(prel->parttype);
 			}
 
 			/* Fill tuptable */
diff --git a/src/rangeset.c b/src/rangeset.c
@@ -162,7 +162,7 @@ irange_union_internal(IndexRange first,
 	/* IndexRanges intersect */
 	if (iranges_intersect(first, second))
 	{
-		/* Calculate the intersection of 'first' and 'second' */
+		/* Calculate the union of 'first' and 'second' */
 		IndexRange ir_union = irange_union_simple(first, second);
 
 		/* if lossiness is the same, unite them and skip */
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -509,10 +509,7 @@ fill_prel_with_partitions(PartRelationInfo *prel,
 			default:
 				{
 					DisablePathman(); /* disable pg_pathman since config is broken */
-					ereport(ERROR,
-							(errmsg("Unknown partitioning type for relation \"%s\"",
-									get_rel_name_or_relid(PrelParentRelid(prel))),
-							 errhint(INIT_ERROR_HINT)));
+					WrongPartType(prel->parttype);
 				}
 				break;
 		}
@@ -1243,10 +1240,7 @@ fill_pbin_with_bounds(PartBoundInfo *pbin,
 		default:
 			{
 				DisablePathman(); /* disable pg_pathman since config is broken */
-				ereport(ERROR,
-						(errmsg("Unknown partitioning type for relation \"%s\"",
-								get_rel_name_or_relid(PrelParentRelid(prel))),
-						 errhint(INIT_ERROR_HINT)));
+				WrongPartType(prel->parttype);
 			}
 			break;
 	}
@@ -1264,41 +1258,6 @@ cmp_range_entries(const void *p1, const void *p2, void *arg)
 }
 
 
-/*
- * Safe PartType wrapper.
- */
-PartType
-DatumGetPartType(Datum datum)
-{
-	uint32 val = DatumGetUInt32(datum);
-
-	if (val < 1 || val > 2)
-		elog(ERROR, "Unknown partitioning type %u", val);
-
-	return (PartType) val;
-}
-
-char *
-PartTypeToCString(PartType parttype)
-{
-	static char *hash_str	= "1",
-				*range_str	= "2";
-
-	switch (parttype)
-	{
-		case PT_HASH:
-			return hash_str;
-
-		case PT_RANGE:
-			return range_str;
-
-		default:
-			elog(ERROR, "Unknown partitioning type %u", parttype);
-			return NULL; /* keep compiler happy */
-	}
-}
-
-
 /*
  * Common PartRelationInfo checks. Emit ERROR if anything is wrong.
  */

Original file line number	Diff line number	Diff line change
`@@ -1588,8 +1588,7 @@ invoke_init_callback_internal(init_callback_params *cb_params)`
`1588`	`1588`	`break;`
`1589`	`1589`
`1590`	`1590`	`default:`
`1591`		`- elog(ERROR, "Unknown partitioning type %u", cb_params->parttype);`
`1592`		`- break;`
	`1591`	`+ WrongPartType(cb_params->parttype);`
`1593`	`1592`	`}`
`1594`	`1593`
`1595`	`1594`	`/* Fetch function call data */`
Original file line number	Diff line number	Diff line change
`@@ -781,8 +781,7 @@ handle_const(const Const c, WalkerContext context)`
`781`	`781`	`break;`
`782`	`782`
`783`	`783`	`default:`
`784`		`- elog(ERROR, "Unknown partitioning type %u", prel->parttype);`
`785`		`- break;`
	`784`	`+ WrongPartType(prel->parttype);`
`786`	`785`	`}`
`787`	`786`
`788`	`787`	`return result;`
`@@ -966,7 +965,7 @@ handle_arrexpr(const ScalarArrayOpExpr expr, WalkerContext context)`
`966`	`965`	`break;`
`967`	`966`
`968`	`967`	`default:`
`969`		`- elog(ERROR, "Unknown partitioning type %u", prel->parttype);`
	`968`	`+ WrongPartType(prel->parttype);`
`970`	`969`	`}`
`971`	`970`
`972`	`971`	`/* Free resources */`
`@@ -1100,7 +1099,7 @@ handle_binary_opexpr(const Const *c,`
`1100`	`1099`	`}`
`1101`	`1100`
`1102`	`1101`	`default:`
`1103`		`- elog(ERROR, "Unknown partitioning type %u", prel->parttype);`
	`1102`	`+ WrongPartType(prel->parttype);`
`1104`	`1103`	`}`
`1105`	`1104`
`1106`	`1105`	`binary_opexpr_return:`
Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ show_partition_list_internal(PG_FUNCTION_ARGS)`
`506`	`506`	`break;`
`507`	`507`
`508`	`508`	`default:`
`509`		`- elog(ERROR, "Unknown partitioning type %u", prel->parttype);`
	`509`	`+ WrongPartType(prel->parttype);`
`510`	`510`	`}`
`511`	`511`
`512`	`512`	`/* Fill tuptable */`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ irange_union_internal(IndexRange first,`
`162`	`162`	`/* IndexRanges intersect */`
`163`	`163`	`if (iranges_intersect(first, second))`
`164`	`164`	`{`
`165`		`- /* Calculate the intersection of 'first' and 'second' */`
	`165`	`+ /* Calculate the union of 'first' and 'second' */`
`166`	`166`	`IndexRange ir_union = irange_union_simple(first, second);`
`167`	`167`
`168`	`168`	`/* if lossiness is the same, unite them and skip */`