Merge pull request #180 from alexander-kuzmenkov/cooked-key

ildus · web-flow · commit 38b48da9533d · 2018-10-08T19:59:41.000+03:00
Make get_partition_cooked_key work for tables with no partitions.
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -142,22 +142,33 @@ get_partition_key_type_pl(PG_FUNCTION_ARGS)
 }
 
 /*
- * Return partition key type.
+ * Return cooked partition key.
  */
 Datum
 get_partition_cooked_key_pl(PG_FUNCTION_ARGS)
 {
-	Oid					relid = PG_GETARG_OID(0);
-	PartRelationInfo   *prel;
-	Datum				res;
+	/* Values extracted from PATHMAN_CONFIG */
+	Datum		values[Natts_pathman_config];
+	bool		isnull[Natts_pathman_config];
+
+	Oid	relid = PG_GETARG_OID(0);
+	char	   *expr_cstr;
+	Node	   *expr;
+	char	   *cooked_cstr;
+
+	/* Check that table is registered in PATHMAN_CONFIG */
+	if (!pathman_config_contains_relation(relid, values, isnull, NULL, NULL))
+		elog(ERROR, "table \"%s\" is not partitioned",
+			 get_rel_name_or_relid(relid));
 
-	prel = get_pathman_relation_info(relid);
-	shout_if_prel_is_invalid(relid, prel, PT_ANY);
+	expr_cstr = TextDatumGetCString(values[Anum_pathman_config_expr - 1]);
+	expr = cook_partitioning_expression(relid, expr_cstr, NULL);
+	cooked_cstr = nodeToString(expr);
 
-	res = CStringGetTextDatum(nodeToString(prel->expr));
-	close_pathman_relation_info(prel);
+	pfree(expr_cstr);
+	pfree(expr);
 
-	PG_RETURN_TEXT_P(res);
+	PG_RETURN_TEXT_P(CStringGetTextDatum(cooked_cstr));
 }
 
 /*
