reimplement functions validate_relname(), get_number_of_partitions() in C language, refactoring & code cleanup

funbringer · funbringer · commit 33d2cf731c6b · 2016-11-25T18:15:31.000+03:00
diff --git a/expected/pathman_calamity.out b/expected/pathman_calamity.out
@@ -14,12 +14,28 @@ set client_min_messages = NOTICE;
 CREATE TABLE calamity.part_test(val serial);
 /* check function validate_relname() */
 SELECT validate_relname('calamity.part_test');
-  validate_relname  
---------------------
- calamity.part_test
+ validate_relname 
+------------------
+ 
+(1 row)
+
+SELECT validate_relname(1::REGCLASS);
+ERROR:  relation "1" does not exist
+SELECT validate_relname(NULL);
+ERROR:  relation should not be NULL
+/* check function get_number_of_partitions() */
+SELECT get_number_of_partitions('calamity.part_test');
+ get_number_of_partitions 
+--------------------------
+                        0
+(1 row)
+
+SELECT get_number_of_partitions(NULL) IS NULL;
+ ?column? 
+----------
+ t
 (1 row)
 
-/* SELECT validate_relname(NULL); -- FIXME: %s */
 /* check function get_parent_of_partition() */
 SELECT get_parent_of_partition('calamity.part_test');
 ERROR:  "part_test" is not a partition
diff --git a/hash.sql b/hash.sql
@@ -147,8 +147,7 @@ BEGIN
 		   att_val_fmt,
 		   att_fmt;
 
-	partitions_count := COUNT(*) FROM pg_catalog.pg_inherits
-						WHERE inhparent = parent_relid::oid;
+	partitions_count := @extschema@.get_number_of_partitions(parent_relid);
 
 	/* Build trigger & trigger function's names */
 	funcname := @extschema@.build_update_trigger_func_name(parent_relid);
diff --git a/init.sql b/init.sql
@@ -104,15 +104,6 @@ SELECT pg_catalog.pg_extension_config_dump('@extschema@.pathman_config', '');
 SELECT pg_catalog.pg_extension_config_dump('@extschema@.pathman_config_params', '');
 
 
-CREATE OR REPLACE FUNCTION @extschema@.partitions_count(relation REGCLASS)
-RETURNS INT AS
-$$
-BEGIN
-	RETURN count(*) FROM pg_inherits WHERE inhparent = relation;
-END
-$$
-LANGUAGE plpgsql STRICT;
-
 /*
  * Add a row describing the optional parameter to pathman_config_params.
  */
@@ -185,7 +176,8 @@ RETURNS TABLE (
 	 partattr	TEXT,
 	 range_min	TEXT,
 	 range_max	TEXT)
-AS 'pg_pathman', 'show_partition_list_internal' LANGUAGE C STRICT;
+AS 'pg_pathman', 'show_partition_list_internal'
+LANGUAGE C STRICT;
 
 /*
  * View for show_partition_list().
@@ -206,7 +198,8 @@ RETURNS TABLE (
 	relid		REGCLASS,
 	processed	INT,
 	status		TEXT)
-AS 'pg_pathman', 'show_concurrent_part_tasks_internal' LANGUAGE C STRICT;
+AS 'pg_pathman', 'show_concurrent_part_tasks_internal'
+LANGUAGE C STRICT;
 
 /*
  * View for show_concurrent_part_tasks().
@@ -353,28 +346,6 @@ END
 $$
 LANGUAGE plpgsql STRICT;
 
-/*
- * Validates relation name. It must be schema qualified.
- */
-CREATE OR REPLACE FUNCTION @extschema@.validate_relname(
-	cls		REGCLASS)
-RETURNS TEXT AS
-$$
-DECLARE
-	relname	TEXT;
-
-BEGIN
-	relname = @extschema@.get_schema_qualified_name(cls);
-
-	IF relname IS NULL THEN
-		RAISE EXCEPTION 'relation %s does not exist', cls;
-	END IF;
-
-	RETURN relname;
-END
-$$
-LANGUAGE plpgsql;
-
 /*
  * Aggregates several common relation checks before partitioning.
  * Suitable for every partitioning type.
@@ -444,25 +415,6 @@ END
 $$
 LANGUAGE plpgsql STRICT;
 
-/*
- * Returns the schema-qualified name of table.
- */
-CREATE OR REPLACE FUNCTION @extschema@.get_schema_qualified_name(
-	cls			REGCLASS,
-	delimiter	TEXT DEFAULT '.',
-	suffix		TEXT DEFAULT '')
-RETURNS TEXT AS
-$$
-BEGIN
-	RETURN (SELECT quote_ident(relnamespace::regnamespace::text) ||
-				   delimiter ||
-				   quote_ident(relname || suffix)
-			FROM pg_catalog.pg_class
-			WHERE oid = cls::oid);
-END
-$$
-LANGUAGE plpgsql STRICT;
-
 /*
  * Check if two relations have equal structures.
  */
@@ -662,41 +614,62 @@ RETURNS VOID AS 'pg_pathman', 'on_partitions_removed'
 LANGUAGE C STRICT;
 
 
+/*
+ * Get number of partitions managed by pg_pathman.
+ */
+CREATE OR REPLACE FUNCTION @extschema@.get_number_of_partitions(
+	parent_relid		REGCLASS)
+RETURNS INT4 AS 'pg_pathman', 'get_number_of_partitions_pl'
+LANGUAGE C STRICT;
+
 /*
  * Get parent of pg_pathman's partition.
  */
-CREATE OR REPLACE FUNCTION @extschema@.get_parent_of_partition(REGCLASS)
+CREATE OR REPLACE FUNCTION @extschema@.get_parent_of_partition(
+	partition_relid		REGCLASS)
 RETURNS REGCLASS AS 'pg_pathman', 'get_parent_of_partition_pl'
 LANGUAGE C STRICT;
 
 /*
  * Extract basic type of a domain.
  */
-CREATE OR REPLACE FUNCTION @extschema@.get_base_type(REGTYPE)
+CREATE OR REPLACE FUNCTION @extschema@.get_base_type(
+	typid	REGTYPE)
 RETURNS REGTYPE AS 'pg_pathman', 'get_base_type_pl'
 LANGUAGE C STRICT;
 
 /*
  * Returns attribute type name for relation.
  */
 CREATE OR REPLACE FUNCTION @extschema@.get_attribute_type(
-	REGCLASS, TEXT)
+	relid	REGCLASS,
+	attname	TEXT)
 RETURNS REGTYPE AS 'pg_pathman', 'get_attribute_type_pl'
 LANGUAGE C STRICT;
 
 /*
  * Return tablespace name for specified relation.
  */
-CREATE OR REPLACE FUNCTION @extschema@.get_rel_tablespace_name(REGCLASS)
-RETURNS TEXT AS 'pg_pathman', 'get_rel_tablespace_name'
+CREATE OR REPLACE FUNCTION @extschema@.get_tablespace(
+	relid	REGCLASS)
+RETURNS TEXT AS 'pg_pathman', 'get_tablespace_pl'
 LANGUAGE C STRICT;
 
 
+/*
+ * Check that relation exists.
+ */
+CREATE OR REPLACE FUNCTION @extschema@.validate_relname(
+	relid	REGCLASS)
+RETURNS VOID AS 'pg_pathman', 'validate_relname'
+LANGUAGE C;
+
 /*
  * Checks if attribute is nullable
  */
 CREATE OR REPLACE FUNCTION @extschema@.is_attribute_nullable(
-	REGCLASS, TEXT)
+	relid	REGCLASS,
+	attname	TEXT)
 RETURNS BOOLEAN AS 'pg_pathman', 'is_attribute_nullable'
 LANGUAGE C STRICT;
 
@@ -713,25 +686,27 @@ LANGUAGE C STRICT;
  * Build check constraint name for a specified relation's column.
  */
 CREATE OR REPLACE FUNCTION @extschema@.build_check_constraint_name(
-	REGCLASS, INT2)
+	partition_relid	REGCLASS,
+	partitioned_col	INT2)
 RETURNS TEXT AS 'pg_pathman', 'build_check_constraint_name_attnum'
 LANGUAGE C STRICT;
 
 CREATE OR REPLACE FUNCTION @extschema@.build_check_constraint_name(
-	REGCLASS, TEXT)
+	partition_relid	REGCLASS,
+	partitioned_col	TEXT)
 RETURNS TEXT AS 'pg_pathman', 'build_check_constraint_name_attname'
 LANGUAGE C STRICT;
 
 /*
  * Build update trigger and its underlying function's names.
  */
 CREATE OR REPLACE FUNCTION @extschema@.build_update_trigger_name(
-	REGCLASS)
+	relid			REGCLASS)
 RETURNS TEXT AS 'pg_pathman', 'build_update_trigger_name'
 LANGUAGE C STRICT;
 
 CREATE OR REPLACE FUNCTION @extschema@.build_update_trigger_func_name(
-	REGCLASS)
+	relid			REGCLASS)
 RETURNS TEXT AS 'pg_pathman', 'build_update_trigger_func_name'
 LANGUAGE C STRICT;
 
@@ -746,7 +721,8 @@ CREATE OR REPLACE FUNCTION @extschema@.add_to_pathman_config(
 RETURNS BOOLEAN AS 'pg_pathman', 'add_to_pathman_config'
 LANGUAGE C;
 
-CREATE OR REPLACE FUNCTION @extschema@.invalidate_relcache(relid OID)
+CREATE OR REPLACE FUNCTION @extschema@.invalidate_relcache(
+	OID)
 RETURNS VOID AS 'pg_pathman'
 LANGUAGE C STRICT;
 
@@ -755,18 +731,18 @@ LANGUAGE C STRICT;
  * Lock partitioned relation to restrict concurrent
  * modification of partitioning scheme.
  */
- CREATE OR REPLACE FUNCTION @extschema@.lock_partitioned_relation(
-	 REGCLASS)
- RETURNS VOID AS 'pg_pathman', 'lock_partitioned_relation'
- LANGUAGE C STRICT;
+CREATE OR REPLACE FUNCTION @extschema@.lock_partitioned_relation(
+	parent_relid	REGCLASS)
+RETURNS VOID AS 'pg_pathman', 'lock_partitioned_relation'
+LANGUAGE C STRICT;
 
 /*
  * Lock relation to restrict concurrent modification of data.
  */
- CREATE OR REPLACE FUNCTION @extschema@.prevent_relation_modification(
-	 REGCLASS)
- RETURNS VOID AS 'pg_pathman', 'prevent_relation_modification'
- LANGUAGE C STRICT;
+CREATE OR REPLACE FUNCTION @extschema@.prevent_relation_modification(
+	parent_relid	REGCLASS)
+RETURNS VOID AS 'pg_pathman', 'prevent_relation_modification'
+LANGUAGE C STRICT;
 
 
 /*
diff --git a/range.sql b/range.sql
@@ -158,7 +158,7 @@ BEGIN
 			parent_relid,
 			start_value,
 			start_value + p_interval,
-			@extschema@.get_rel_tablespace_name(parent_relid);
+			@extschema@.get_tablespace(parent_relid);
 
 		start_value := start_value + p_interval;
 	END LOOP;
@@ -270,7 +270,7 @@ BEGIN
 			parent_relid,
 			start_value,
 			start_value + p_interval,
-			tablespace := @extschema@.get_rel_tablespace_name(parent_relid));
+			tablespace := @extschema@.get_tablespace(parent_relid));
 
 		start_value := start_value + p_interval;
 	END LOOP;
@@ -343,7 +343,7 @@ BEGIN
 			parent_relid,
 			start_value,
 			start_value + p_interval,
-			tablespace := @extschema@.get_rel_tablespace_name(parent_relid));
+			tablespace := @extschema@.get_tablespace(parent_relid));
 
 		start_value := start_value + p_interval;
 		part_count := part_count + 1;
@@ -416,7 +416,7 @@ BEGIN
 			parent_relid,
 			start_value,
 			start_value + p_interval,
-			@extschema@.get_rel_tablespace_name(parent_relid);
+			@extschema@.get_tablespace(parent_relid);
 
 		start_value := start_value + p_interval;
 		part_count := part_count + 1;
@@ -733,7 +733,7 @@ DECLARE
 	v_atttype		REGTYPE;
 
 BEGIN
-	IF @extschema@.partitions_count(parent_relid) = 0 THEN
+	IF @extschema@.get_number_of_partitions(parent_relid) = 0 THEN
 		RAISE EXCEPTION 'cannot append to empty partitions set';
 	END IF;
 
@@ -843,7 +843,7 @@ DECLARE
 	v_atttype		REGTYPE;
 
 BEGIN
-	IF @extschema@.partitions_count(parent_relid) = 0 THEN
+	IF @extschema@.get_number_of_partitions(parent_relid) = 0 THEN
 		RAISE EXCEPTION 'cannot prepend to empty partitions set';
 	END IF;
 
@@ -907,7 +907,7 @@ BEGIN
 	END IF;
 
 	/* check range overlap */
-	IF @extschema@.partitions_count(parent_relid) > 0 THEN
+	IF @extschema@.get_number_of_partitions(parent_relid) > 0 THEN
 		PERFORM @extschema@.check_range_available(parent_relid,
 												  start_value,
 												  end_value);
diff --git a/sql/pathman_calamity.sql b/sql/pathman_calamity.sql
@@ -16,7 +16,12 @@ CREATE TABLE calamity.part_test(val serial);
 
 /* check function validate_relname() */
 SELECT validate_relname('calamity.part_test');
-/* SELECT validate_relname(NULL); -- FIXME: %s */
+SELECT validate_relname(1::REGCLASS);
+SELECT validate_relname(NULL);
+
+/* check function get_number_of_partitions() */
+SELECT get_number_of_partitions('calamity.part_test');
+SELECT get_number_of_partitions(NULL) IS NULL;
 
 /* check function get_parent_of_partition() */
 SELECT get_parent_of_partition('calamity.part_test');
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -556,7 +556,7 @@ spawn_partitions_val(Oid parent_relid,			/* parent's Oid */
 
 		/* What, again? Don't want to deal with this nightmare */
 		if (move_bound_op_ret_type != range_bound_type)
-			elog(ERROR, "error in spawn_partitions_val()");
+			elog(ERROR, "error in function " CppAsString(spawn_partitions_val));
 	}
 
 	/* Get operator's underlying function */
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
diff --git a/src/relation_info.c b/src/relation_info.c
diff --git a/tests/python/partitioning_test.py b/tests/python/partitioning_test.py

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,7 @@ spawn_partitions_val(Oid parent_relid, /* parent's Oid */`
`556`	`556`
`557`	`557`	`/* What, again? Don't want to deal with this nightmare */`
`558`	`558`	`if (move_bound_op_ret_type != range_bound_type)`
`559`		`- elog(ERROR, "error in spawn_partitions_val()");`
	`559`	`+ elog(ERROR, "error in function " CppAsString(spawn_partitions_val));`
`560`	`560`	`}`
`561`	`561`
`562`	`562`	`/* Get operator's underlying function */`