refactoring (Pl/PgSQL), remove function common_relation_checks()

Author: funbringer

expected/pathman_foreign_keys.out

@@ -71,8 +71,8 @@ CREATE TABLE fkeys.replies(
 INSERT INTO fkeys.messages SELECT g, md5(g::text) FROM generate_series(1, 10) as g;
 INSERT INTO fkeys.replies SELECT g, g, md5(g::text) FROM generate_series(1, 10) as g;
 SELECT create_range_partitions('fkeys.messages', 'id', 1, 100, 2); /* not ok */
-WARNING:  foreign key "replies_message_id_fkey" references relation "fkeys.messages"
-ERROR:  relation "fkeys.messages" is referenced from other relations
+WARNING:  foreign key "replies_message_id_fkey" references table "fkeys.messages"
+ERROR:  table "fkeys.messages" is referenced from other tables
 ALTER TABLE fkeys.replies DROP CONSTRAINT replies_message_id_fkey;
 SELECT create_range_partitions('fkeys.messages', 'id', 1, 100, 2); /* ok */
 NOTICE:  sequence "messages_seq" does not exist, skipping

hash.sql

@@ -21,18 +21,10 @@ CREATE OR REPLACE FUNCTION @extschema@.create_hash_partitions(
 RETURNS INTEGER AS
 $$
 BEGIN
-	PERFORM @extschema@.validate_relname(parent_relid);
-
-	IF partition_data = true THEN
-		/* Acquire data modification lock */
-		PERFORM @extschema@.prevent_relation_modification(parent_relid);
-	ELSE
-		/* Acquire lock on parent */
-		PERFORM @extschema@.lock_partitioned_relation(parent_relid);
-	END IF;
-
 	expression := lower(expression);
-	PERFORM @extschema@.common_relation_checks(parent_relid, expression);
+	PERFORM @extschema@.prepare_for_partitioning(parent_relid,
+												 expression,
+												 partition_data);
 
 	/* Insert new entry to pathman config */
 	EXECUTE format('ANALYZE %s', parent_relid);

init.sql

@@ -438,51 +438,58 @@ $$
 LANGUAGE plpgsql STRICT;
 
 /*
- * Aggregates several common relation checks before partitioning.
- * Suitable for every partitioning type.
+ * Check a few things and take locks before partitioning.
  */
-CREATE OR REPLACE FUNCTION @extschema@.common_relation_checks(
-	relation		REGCLASS,
-	expression		TEXT)
-RETURNS BOOLEAN AS
+CREATE OR REPLACE FUNCTION @extschema@.prepare_for_partitioning(
+	parent_relid	REGCLASS,
+	expression		TEXT,
+	partition_data	BOOLEAN)
+RETURNS VOID AS
 $$
 DECLARE
-	v_rec			RECORD;
+	constr_name	TEXT;
 	is_referenced	BOOLEAN;
 	rel_persistence	CHAR;
 
 BEGIN
+	PERFORM @extschema@.validate_relname(parent_relid);
+
+	IF partition_data = true THEN
+		/* Acquire data modification lock */
+		PERFORM @extschema@.prevent_relation_modification(parent_relid);
+	ELSE
+		/* Acquire lock on parent */
+		PERFORM @extschema@.lock_partitioned_relation(parent_relid);
+	END IF;
+
 	/* Ignore temporary tables */
 	SELECT relpersistence FROM pg_catalog.pg_class
-	WHERE oid = relation INTO rel_persistence;
+	WHERE oid = parent_relid INTO rel_persistence;
 
 	IF rel_persistence = 't'::CHAR THEN
-		RAISE EXCEPTION 'temporary table "%" cannot be partitioned',
-						relation::TEXT;
+		RAISE EXCEPTION 'temporary table "%" cannot be partitioned', parent_relid;
 	END IF;
 
 	IF EXISTS (SELECT * FROM @extschema@.pathman_config
-			   WHERE partrel = relation) THEN
-		RAISE EXCEPTION 'relation "%" has already been partitioned', relation;
+			   WHERE partrel = parent_relid) THEN
+		RAISE EXCEPTION 'table "%" has already been partitioned', parent_relid;
 	END IF;
 
 	/* Check if there are foreign keys that reference the relation */
-	FOR v_rec IN (SELECT * FROM pg_catalog.pg_constraint
-				  WHERE confrelid = relation::REGCLASS::OID)
+	FOR constr_name IN (SELECT conname FROM pg_catalog.pg_constraint
+					WHERE confrelid = parent_relid::REGCLASS::OID)
 	LOOP
 		is_referenced := TRUE;
-		RAISE WARNING 'foreign key "%" references relation "%"',
-				v_rec.conname, relation;
+		RAISE WARNING 'foreign key "%" references table "%"', constr_name, parent_relid;
 	END LOOP;
 
 	IF is_referenced THEN
-		RAISE EXCEPTION 'relation "%" is referenced from other relations', relation;
+		RAISE EXCEPTION 'table "%" is referenced from other tables', parent_relid;
 	END IF;
 
-	RETURN FALSE;
 END
-$$
-LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql;
+
 
 /*
  * Returns relname without quotes or something.

range.sql

@@ -60,29 +60,6 @@ BEGIN
 END
 $$ LANGUAGE plpgsql;
 
-
-CREATE OR REPLACE FUNCTION @extschema@.prepare_for_partitioning(
-	parent_relid	REGCLASS,
-	expression		TEXT,
-	partition_data	BOOLEAN)
-RETURNS VOID AS
-$$
-BEGIN
-	PERFORM @extschema@.validate_relname(parent_relid);
-
-	IF partition_data = true THEN
-		/* Acquire data modification lock */
-		PERFORM @extschema@.prevent_relation_modification(parent_relid);
-	ELSE
-		/* Acquire lock on parent */
-		PERFORM @extschema@.lock_partitioned_relation(parent_relid);
-	END IF;
-
-	expression := lower(expression);
-	PERFORM @extschema@.common_relation_checks(parent_relid, expression);
-END
-$$ LANGUAGE plpgsql;
-
 /*
  * Creates RANGE partitions for specified relation based on datetime attribute
  */
@@ -106,7 +83,9 @@ DECLARE
 
 BEGIN
 	expression := lower(expression);
-	PERFORM @extschema@.prepare_for_partitioning(parent_relid, expression, partition_data);
+	PERFORM @extschema@.prepare_for_partitioning(parent_relid,
+												 expression,
+												 partition_data);
 
 	IF p_count < 0 THEN
 		RAISE EXCEPTION '"p_count" must not be less than 0';
@@ -206,7 +185,9 @@ DECLARE
 
 BEGIN
 	expression := lower(expression);
-	PERFORM @extschema@.prepare_for_partitioning(parent_relid, expression, partition_data);
+	PERFORM @extschema@.prepare_for_partitioning(parent_relid,
+												 expression,
+												 partition_data);
 
 	IF p_count < 0 THEN
 		RAISE EXCEPTION 'partitions count must not be less than zero';
@@ -307,7 +288,9 @@ BEGIN
 	END IF;
 
 	expression := lower(expression);
-	PERFORM @extschema@.prepare_for_partitioning(parent_relid, expression, partition_data);
+	PERFORM @extschema@.prepare_for_partitioning(parent_relid,
+												 expression,
+												 partition_data);
 
 	/* Check boundaries */
 	PERFORM @extschema@.check_boundaries(parent_relid,
@@ -358,7 +341,9 @@ DECLARE
 
 BEGIN
 	expression := lower(expression);
-	PERFORM @extschema@.prepare_for_partitioning(parent_relid, expression, partition_data);
+	PERFORM @extschema@.prepare_for_partitioning(parent_relid,
+												 expression,
+												 partition_data);
 
 	/* Check boundaries */
 	PERFORM @extschema@.check_boundaries(parent_relid,
@@ -415,8 +400,9 @@ DECLARE
 
 BEGIN
 	expression := lower(expression);
-	PERFORM @extschema@.prepare_for_partitioning(parent_relid, expression,
-		partition_data);
+	PERFORM @extschema@.prepare_for_partitioning(parent_relid,
+												 expression,
+												 partition_data);
 
 	/* Check boundaries */
 	PERFORM @extschema@.check_boundaries(parent_relid,
@@ -483,6 +469,9 @@ DECLARE
 BEGIN
 	parent_relid = @extschema@.get_parent_of_partition(partition_relid);
 
+	PERFORM @extschema@.validate_relname(parent_relid);
+	PERFORM @extschema@.validate_relname(partition_relid);
+
 	/* Acquire lock on parent */
 	PERFORM @extschema@.lock_partitioned_relation(parent_relid);
 
@@ -839,8 +828,11 @@ DECLARE
 
 BEGIN
 	parent_relid := @extschema@.get_parent_of_partition(partition_relid);
-	part_name := partition_relid::TEXT; /* save the name to be returned */
 
+	PERFORM @extschema@.validate_relname(parent_relid);
+	PERFORM @extschema@.validate_relname(partition_relid);
+
+	part_name := partition_relid::TEXT; /* save the name to be returned */
 	part_type := @extschema@.get_partition_type(parent_relid);
 
 	/* Check if this is a RANGE partition */
@@ -972,18 +964,22 @@ RETURNS TEXT AS
 $$
 DECLARE
 	parent_relid	REGCLASS;
-	part_expr		TEXT;
+	part_type		INTEGER;
 
 BEGIN
 	parent_relid := @extschema@.get_parent_of_partition(partition_relid);
 
+	PERFORM @extschema@.validate_relname(parent_relid);
+	PERFORM @extschema@.validate_relname(partition_relid);
+
 	/* Acquire lock on parent */
 	PERFORM @extschema@.prevent_relation_modification(parent_relid);
 
-	part_expr := @extschema@.get_partition_key(parent_relid);
+	part_type := @extschema@.get_partition_type(parent_relid);
 
-	IF part_expr IS NULL THEN
-		RAISE EXCEPTION 'table "%" is not partitioned', parent_relid::TEXT;
+	/* Check if this is a RANGE partition */
+	IF part_type != 2 THEN
+		RAISE EXCEPTION '"%" is not a RANGE partition', partition_relid::TEXT;
 	END IF;
 
 	/* Remove inheritance */