also rename columns in pathman.h

Author: funbringer

src/include/pathman.h

@@ -46,10 +46,10 @@
 #define PATHMAN_CONFIG						"pathman_config"
 #define Natts_pathman_config				5
 #define Anum_pathman_config_partrel			1	/* partitioned relation (regclass) */
-#define Anum_pathman_config_expression		2	/* partition expression (original) */
+#define Anum_pathman_config_expr			2	/* partition expression (original) */
 #define Anum_pathman_config_parttype		3	/* partitioning type (1|2) */
 #define Anum_pathman_config_range_interval	4	/* interval for RANGE pt. (text) */
-#define Anum_pathman_config_expression_p	5	/* parsed partitioning expression (text) */
+#define Anum_pathman_config_cooked_expr		5	/* parsed partitioning expression (text) */
 
 /* type modifier (typmod) for 'range_interval' */
 #define PATHMAN_CONFIG_interval_typmod		-1

src/init.c

@@ -636,7 +636,7 @@ pathman_config_contains_relation(Oid relid, Datum *values, bool *isnull,
 
 			/* Perform checks for non-NULL columns */
 			Assert(!isnull[Anum_pathman_config_partrel - 1]);
-			Assert(!isnull[Anum_pathman_config_expression - 1]);
+			Assert(!isnull[Anum_pathman_config_expr - 1]);
 			Assert(!isnull[Anum_pathman_config_parttype - 1]);
 		}
 
@@ -686,8 +686,8 @@ pathman_config_invalidate_parsed_expression(Oid relid)
 		HeapTuple	new_htup;
 
 		/* Reset parsed expression */
-		values[Anum_pathman_config_expression_p - 1] = (Datum) 0;
-		nulls[Anum_pathman_config_expression_p - 1]  = true;
+		values[Anum_pathman_config_cooked_expr - 1] = (Datum) 0;
+		nulls[Anum_pathman_config_cooked_expr - 1]  = true;
 
 		rel = heap_open(get_pathman_config_relid(false), RowExclusiveLock);
 
@@ -714,13 +714,13 @@ pathman_config_refresh_parsed_expression(Oid relid,
 	HeapTuple				htup_new;
 
 	/* get and parse expression */
-	expr_cstr = TextDatumGetCString(values[Anum_pathman_config_expression - 1]);
+	expr_cstr = TextDatumGetCString(values[Anum_pathman_config_expr - 1]);
 	expr_datum = cook_partitioning_expression(relid, expr_cstr, NULL);
 	pfree(expr_cstr);
 
 	/* prepare tuple values */
-	values[Anum_pathman_config_expression_p - 1] = expr_datum;
-	isnull[Anum_pathman_config_expression_p - 1] = false;
+	values[Anum_pathman_config_cooked_expr - 1] = expr_datum;
+	isnull[Anum_pathman_config_cooked_expr - 1] = false;
 
 	rel = heap_open(get_pathman_config_relid(false), RowExclusiveLock);
 
@@ -816,7 +816,7 @@ read_pathman_config(void)
 		/* These attributes are marked as NOT NULL, check anyway */
 		Assert(!isnull[Anum_pathman_config_partrel - 1]);
 		Assert(!isnull[Anum_pathman_config_parttype - 1]);
-		Assert(!isnull[Anum_pathman_config_expression - 1]);
+		Assert(!isnull[Anum_pathman_config_expr - 1]);
 
 		/* Extract values from Datums */
 		relid = DatumGetObjectId(values[Anum_pathman_config_partrel - 1]);

src/partition_creation.c

@@ -1716,7 +1716,7 @@ build_partitioning_expression(Oid parent_relid,
 		elog(ERROR, "table \"%s\" is not partitioned",
 			 get_rel_name_or_relid(parent_relid));
 
-	expr_cstr = TextDatumGetCString(values[Anum_pathman_config_expression - 1]);
+	expr_cstr = TextDatumGetCString(values[Anum_pathman_config_expr - 1]);
 	expr = parse_partitioning_expression(parent_relid, expr_cstr, NULL, NULL);
 	pfree(expr_cstr);
 
@@ -1726,9 +1726,9 @@ build_partitioning_expression(Oid parent_relid,
 		char *expr_p_cstr;
 
 		/* We can safely assume that this field will always remain not null */
-		Assert(!isnull[Anum_pathman_config_expression_p - 1]);
+		Assert(!isnull[Anum_pathman_config_cooked_expr - 1]);
 		expr_p_cstr =
-				TextDatumGetCString(values[Anum_pathman_config_expression_p - 1]);
+				TextDatumGetCString(values[Anum_pathman_config_cooked_expr - 1]);
 
 		/* Finally return expression type */
 		*expr_type = exprType(stringToNode(expr_p_cstr));

src/pl_funcs.c

@@ -798,11 +798,11 @@ add_to_pathman_config(PG_FUNCTION_ARGS)
 	values[Anum_pathman_config_parttype - 1]		= Int32GetDatum(parttype);
 	isnull[Anum_pathman_config_parttype - 1]		= false;
 
-	values[Anum_pathman_config_expression - 1]		= CStringGetTextDatum(expression);
-	isnull[Anum_pathman_config_expression - 1]		= false;
+	values[Anum_pathman_config_expr - 1]		= CStringGetTextDatum(expression);
+	isnull[Anum_pathman_config_expr - 1]		= false;
 
-	values[Anum_pathman_config_expression_p - 1]	= expr_datum;
-	isnull[Anum_pathman_config_expression_p - 1]	= false;
+	values[Anum_pathman_config_cooked_expr - 1]	= expr_datum;
+	isnull[Anum_pathman_config_cooked_expr - 1]	= false;
 
 	/* Insert new row into PATHMAN_CONFIG */
 	pathman_config = heap_open(get_pathman_config_relid(false), RowExclusiveLock);

src/relation_info.c

@@ -167,13 +167,13 @@ refresh_pathman_relation_info(Oid relid,
 	prel->parttype	= DatumGetPartType(values[Anum_pathman_config_parttype - 1]);
 
 	/* Fetch cooked partitioning expression */
-	expr = TextDatumGetCString(values[Anum_pathman_config_expression_p - 1]);
+	expr = TextDatumGetCString(values[Anum_pathman_config_cooked_expr - 1]);
 
 	/* Expression and attname should be saved in cache context */
 	old_mcxt = MemoryContextSwitchTo(PathmanRelationCacheContext);
 
 	/* Build partitioning expression tree */
-	prel->expr_cstr = TextDatumGetCString(values[Anum_pathman_config_expression - 1]);
+	prel->expr_cstr = TextDatumGetCString(values[Anum_pathman_config_expr - 1]);
 	prel->expr = (Node *) stringToNode(expr);
 	fix_opfuncids(prel->expr);
 
@@ -360,7 +360,7 @@ get_pathman_relation_info(Oid relid)
 		/* Check that PATHMAN_CONFIG table contains this relation */
 		if (pathman_config_contains_relation(relid, values, isnull, NULL, &iptr))
 		{
-			bool upd_expr = isnull[Anum_pathman_config_expression_p - 1];
+			bool upd_expr = isnull[Anum_pathman_config_cooked_expr - 1];
 			if (upd_expr)
 				pathman_config_refresh_parsed_expression(relid, values, isnull, &iptr);
 
@@ -1012,7 +1012,7 @@ try_perform_parent_refresh(Oid parent)
 
 	if (pathman_config_contains_relation(parent, values, isnull, NULL, &iptr))
 	{
-		bool should_update_expr = isnull[Anum_pathman_config_expression_p - 1];
+		bool should_update_expr = isnull[Anum_pathman_config_cooked_expr - 1];
 
 		if (should_update_expr)
 			pathman_config_refresh_parsed_expression(parent, values, isnull, &iptr);