improve function create_hash_partitions(), add calamity tests

funbringer · funbringer · commit 5dc7251300bf · 2017-02-09T16:12:56.000+03:00
diff --git a/expected/pathman_calamity.out b/expected/pathman_calamity.out
@@ -100,6 +100,13 @@ SELECT count(*) FROM calamity.part_test;
 (1 row)
 
 DELETE FROM calamity.part_test;
+/* test function create_hash_partitions() */
+SELECT create_hash_partitions('calamity.part_test', 'val', 2,
+							  relnames := ARRAY['calamity.p1']::TEXT[]);
+ERROR:  size of array 'relnames' must be equal to 'partitions_count'
+SELECT create_hash_partitions('calamity.part_test', 'val', 2,
+							  tablespaces := ARRAY['abcd']::TEXT[]);
+ERROR:  size of array 'tablespaces' must be equal to 'partitions_count'
 /* test stub 'enable_parent' value for PATHMAN_CONFIG_PARAMS */
 INSERT INTO calamity.part_test SELECT generate_series(1, 30);
 SELECT create_range_partitions('calamity.part_test', 'val', 1, 10);
diff --git a/hash.sql b/hash.sql
@@ -38,14 +38,6 @@ BEGIN
 	INSERT INTO @extschema@.pathman_config (partrel, attname, parttype)
 	VALUES (parent_relid, attribute, 1);
 
-	IF array_length(relnames, 1) != partitions_count THEN
-		RAISE EXCEPTION 'Partition names array size must be equal the partitions count';
-	END IF;
-
-	IF array_length(tablespaces, 1) != partitions_count THEN
-		RAISE EXCEPTION 'Partition tablespaces array size must be equal the partitions count';
-	END IF;
-
 	/* Create partitions */
 	PERFORM @extschema@.create_hash_partitions_internal(parent_relid,
 														attribute,
diff --git a/sql/pathman_calamity.sql b/sql/pathman_calamity.sql
@@ -35,6 +35,13 @@ SELECT count(*) FROM calamity.part_test;
 DELETE FROM calamity.part_test;
 
 
+/* test function create_hash_partitions() */
+SELECT create_hash_partitions('calamity.part_test', 'val', 2,
+							  relnames := ARRAY['calamity.p1']::TEXT[]);
+SELECT create_hash_partitions('calamity.part_test', 'val', 2,
+							  tablespaces := ARRAY['abcd']::TEXT[]);
+
+
 /* test stub 'enable_parent' value for PATHMAN_CONFIG_PARAMS */
 INSERT INTO calamity.part_test SELECT generate_series(1, 30);
 SELECT create_range_partitions('calamity.part_test', 'val', 1, 10);
diff --git a/src/pl_hash_funcs.c b/src/pl_hash_funcs.c
@@ -54,7 +54,7 @@ create_hash_partitions_internal(PG_FUNCTION_ARGS)
 	Oid			parent_relid = PG_GETARG_OID(0);
 	const char *partitioned_col_name = TextDatumGetCString(PG_GETARG_DATUM(1));
 	Oid			partitioned_col_type;
-	uint32		part_count = PG_GETARG_INT32(2),
+	uint32		partitions_count = PG_GETARG_INT32(2),
 				i;
 
 	/* Partition names and tablespaces */
@@ -84,6 +84,14 @@ create_hash_partitions_internal(PG_FUNCTION_ARGS)
 	if (relnames && tablespaces && relnames_size != tablespaces_size)
 		elog(ERROR, "sizes of arrays 'relnames' and 'tablespaces' are different");
 
+	/* Validate size of 'relnames' */
+	if (relnames && relnames_size != partitions_count)
+		elog(ERROR, "size of array 'relnames' must be equal to 'partitions_count'");
+
+	/* Validate size of 'tablespaces' */
+	if (tablespaces && tablespaces_size != partitions_count)
+		elog(ERROR, "size of array 'tablespaces' must be equal to 'partitions_count'");
+
 	/* Convert partition names into RangeVars */
 	if (relnames)
 	{
@@ -97,13 +105,13 @@ create_hash_partitions_internal(PG_FUNCTION_ARGS)
 	}
 
 	/* Finally create HASH partitions */
-	for (i = 0; i < part_count; i++)
+	for (i = 0; i < partitions_count; i++)
 	{
 		RangeVar   *partition_rv	= rangevars ? rangevars[i] : NULL;
 		char 	   *tablespace		= tablespaces ? tablespaces[i] : NULL;
 
 		/* Create a partition (copy FKs, invoke callbacks etc) */
-		create_single_hash_partition_internal(parent_relid, i, part_count,
+		create_single_hash_partition_internal(parent_relid, i, partitions_count,
 											  partitioned_col_type,
 											  partition_rv, tablespace);
 	}
