added arguments to create_hash_partitions() to specify partition names and tablespaces

zilder · zilder · commit 194f29ffafdd · 2017-01-18T18:27:19.000+03:00
diff --git a/hash.sql b/hash.sql
@@ -15,7 +15,9 @@ CREATE OR REPLACE FUNCTION @extschema@.create_hash_partitions(
 	parent_relid		REGCLASS,
 	attribute			TEXT,
 	partitions_count	INTEGER,
-	partition_data		BOOLEAN DEFAULT TRUE)
+	partition_data		BOOLEAN DEFAULT TRUE,
+	relnames			TEXT[] DEFAULT NULL,
+	tablespaces			TEXT[] DEFAULT NULL)
 RETURNS INTEGER AS
 $$
 BEGIN
@@ -39,7 +41,9 @@ BEGIN
 	/* Create partitions */
 	PERFORM @extschema@.create_hash_partitions_internal(parent_relid,
 														attribute,
-														partitions_count);
+														partitions_count,
+														relnames,
+														tablespaces);
 
 	/* Notify backend about changes */
 	PERFORM @extschema@.on_create_partitions(parent_relid);
@@ -275,9 +279,11 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION @extschema@.create_hash_partitions_internal(
 	parent_relid		REGCLASS,
 	attribute			TEXT,
-	partitions_count	INTEGER)
+	partitions_count	INTEGER,
+	relnames			TEXT[] DEFAULT NULL,
+	tablespaces			TEXT[] DEFAULT NULL)
 RETURNS VOID AS 'pg_pathman', 'create_hash_partitions_internal'
-LANGUAGE C STRICT;
+LANGUAGE C;
 
 /*
  * Returns hash function OID for specified type
diff --git a/src/pl_hash_funcs.c b/src/pl_hash_funcs.c
@@ -13,10 +13,13 @@
 #include "relation_info.h"
 #include "utils.h"
 
+#include "catalog/namespace.h"
+#include "catalog/pg_type.h"
 #include "utils/builtins.h"
 #include "utils/typcache.h"
 #include "utils/lsyscache.h"
 #include "utils/builtins.h"
+#include "utils/array.h"
 
 
 /* Function declarations */
@@ -29,6 +32,9 @@ PG_FUNCTION_INFO_V1( get_hash_part_idx );
 PG_FUNCTION_INFO_V1( build_hash_condition );
 
 
+static char **deconstruct_text_array(Datum arr, int *num_elems);
+
+
 /*
  * Create HASH partitions implementation (written in C).
  */
@@ -41,6 +47,13 @@ create_hash_partitions_internal(PG_FUNCTION_ARGS)
 	uint32	part_count = PG_GETARG_INT32(2),
 			i;
 
+	/* Partitions names and tablespaces */
+	char  **names = NULL,
+		  **tablespaces = NULL;
+	int		names_size = 0,
+			tablespaces_size = 0;
+	RangeVar **rangevars = NULL;
+
 	/* Check that there's no partitions yet */
 	if (get_pathman_relation_info(parent_relid))
 		elog(ERROR, "cannot add new HASH partitions");
@@ -49,16 +62,84 @@ create_hash_partitions_internal(PG_FUNCTION_ARGS)
 											  TextDatumGetCString(partitioned_col_name),
 											  false);
 
+	/* Get partition names and tablespaces */
+	if (!PG_ARGISNULL(3))
+		names = deconstruct_text_array(PG_GETARG_DATUM(3), &names_size);
+
+	if (!PG_ARGISNULL(4))
+		tablespaces = deconstruct_text_array(PG_GETARG_DATUM(4), &tablespaces_size);
+
+	/* Convert partition names into RangeVars */
+	if (names_size > 0)
+	{
+		rangevars = palloc(sizeof(RangeVar) * names_size);
+		for (i = 0; i < names_size; i++)
+		{
+			List *nl = stringToQualifiedNameList(names[i]);
+
+			rangevars[i] = makeRangeVarFromNameList(nl);
+		}
+	}
+
 	for (i = 0; i < part_count; i++)
 	{
+		RangeVar   *rel = rangevars != NULL ? rangevars[i] : NULL;
+		char 	   *tablespace = tablespaces != NULL ? tablespaces[i] : NULL;
+
 		/* Create a partition (copy FKs, invoke callbacks etc) */
 		create_single_hash_partition_internal(parent_relid, i, part_count,
-											  partitioned_col_type, NULL, NULL);
+											  partitioned_col_type,
+											  rel, tablespace);
 	}
 
 	PG_RETURN_VOID();
 }
 
+/*
+ * Convert Datum into cstring array
+ */
+static char **
+deconstruct_text_array(Datum arr, int *num_elems)
+{
+	ArrayType  *arrayval;
+	int16		elemlen;
+	bool		elembyval;
+	char		elemalign;
+	Datum	   *elem_values;
+	bool	   *elem_nulls;
+	int16		i;
+
+	arrayval = DatumGetArrayTypeP(arr);
+
+	Assert(ARR_ELEMTYPE(arrayval) == TEXTOID);
+
+	get_typlenbyvalalign(ARR_ELEMTYPE(arrayval),
+						 &elemlen, &elembyval, &elemalign);
+	deconstruct_array(arrayval,
+					  ARR_ELEMTYPE(arrayval),
+					  elemlen, elembyval, elemalign,
+					  &elem_values, &elem_nulls, num_elems);
+
+	/* If there are actual values then convert them into cstrings */
+	if (num_elems > 0)
+	{
+		char **strings = palloc(sizeof(char *) * *num_elems);
+
+		for (i = 0; i < *num_elems; i++)
+		{
+			if (elem_nulls[i])
+				elog(ERROR,
+					 "Partition name and tablespace arrays cannot contain nulls");
+
+			strings[i] = TextDatumGetCString(elem_values[i]);
+		}
+
+		return strings;
+	}
+
+	return NULL;
+}
+
 /*
  * Returns hash function's OID for a specified type.
  */
