refactoring (static inline), introduce function WrongPartType()

Author: funbringer

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,

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 */

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:

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 */

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 */

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.
  */