changes to plpgsql funcs for enterprise edition

zilder · zilder · commit 04b1b20b2fd2 · 2017-01-09T16:30:32.000+03:00
diff --git a/init.sql b/init.sql
@@ -182,12 +182,12 @@ LANGUAGE plpgsql STRICT;
  */
 CREATE OR REPLACE FUNCTION @extschema@.show_partition_list()
 RETURNS TABLE (
-	 parent		REGCLASS,
-	 partition	REGCLASS,
-	 parttype	INT4,
-	 partattr	TEXT,
-	 range_min	TEXT,
-	 range_max	TEXT)
+	 parent			REGCLASS,
+	 "partition"	REGCLASS,
+	 parttype		INT4,
+	 partattr		TEXT,
+	 range_min		TEXT,
+	 range_max		TEXT)
 AS 'pg_pathman', 'show_partition_list_internal'
 LANGUAGE C STRICT;
 
@@ -580,27 +580,38 @@ SET pg_pathman.enable_partitionfilter = off; /* ensures that PartitionFilter is
  */
 CREATE OR REPLACE FUNCTION @extschema@.copy_foreign_keys(
 	parent_relid	REGCLASS,
-	partition		REGCLASS)
+	partition_relid	REGCLASS)
 RETURNS VOID AS
 $$
 DECLARE
 	rec		RECORD;
 
 BEGIN
 	PERFORM @extschema@.validate_relname(parent_relid);
-	PERFORM @extschema@.validate_relname(partition);
+	PERFORM @extschema@.validate_relname(partition_relid);
 
 	FOR rec IN (SELECT oid as conid FROM pg_catalog.pg_constraint
 				WHERE conrelid = parent_relid AND contype = 'f')
 	LOOP
 		EXECUTE format('ALTER TABLE %s ADD %s',
-					   partition::TEXT,
+					   partition_relid::TEXT,
 					   pg_catalog.pg_get_constraintdef(rec.conid));
 	END LOOP;
 END
 $$ LANGUAGE plpgsql STRICT;
 
 
+/*
+ * Partitioning key
+ */
+CREATE OR REPLACE FUNCTION @extschema@.get_partition_key(relid REGCLASS)
+RETURNS TEXT AS
+$$
+	SELECT attname FROM pathman_config WHERE partrel = relid;
+$$
+LANGUAGE sql STRICT;
+
+
 /*
  * Create DDL trigger to call pathman_ddl_trigger_func().
  */
@@ -659,6 +670,14 @@ CREATE OR REPLACE FUNCTION @extschema@.get_attribute_type(
 RETURNS REGTYPE AS 'pg_pathman', 'get_attribute_type_pl'
 LANGUAGE C STRICT;
 
+/*
+ * Return partition key type
+ */
+CREATE OR REPLACE FUNCTION @extschema@.get_partition_key_type(
+	relid	REGCLASS)
+RETURNS REGTYPE AS 'pg_pathman', 'get_partition_key_type'
+LANGUAGE C STRICT;
+
 /*
  * Return tablespace name for specified relation.
  */
@@ -769,7 +788,7 @@ LANGUAGE C STRICT;
  */
 CREATE OR REPLACE FUNCTION @extschema@.invoke_on_partition_created_callback(
 	parent_relid	REGCLASS,
-	partition		REGCLASS,
+	"partition"		REGCLASS,
 	init_callback	REGPROCEDURE,
 	start_value		ANYELEMENT,
 	end_value		ANYELEMENT)
@@ -781,7 +800,7 @@ LANGUAGE C;
  */
 CREATE OR REPLACE FUNCTION @extschema@.invoke_on_partition_created_callback(
 	parent_relid	REGCLASS,
-	partition		REGCLASS,
+	"partition"		REGCLASS,
 	init_callback	REGPROCEDURE)
 RETURNS VOID AS 'pg_pathman', 'invoke_on_partition_created_callback'
 LANGUAGE C;
diff --git a/range.sql b/range.sql
@@ -439,7 +439,7 @@ $$ LANGUAGE plpgsql;
  * Split RANGE partition
  */
 CREATE OR REPLACE FUNCTION @extschema@.split_range_partition(
-	partition		REGCLASS,
+	partition_relid	REGCLASS,
 	split_value		ANYELEMENT,
 	partition_name	TEXT DEFAULT NULL,
 	tablespace		TEXT DEFAULT NULL,
@@ -456,13 +456,13 @@ DECLARE
 	v_check_name	TEXT;
 
 BEGIN
-	v_parent = @extschema@.get_parent_of_partition(partition);
+	v_parent = @extschema@.get_parent_of_partition(partition_relid);
 
 	/* Acquire lock on parent */
 	PERFORM @extschema@.lock_partitioned_relation(v_parent);
 
 	/* Acquire data modification lock (prevent further modifications) */
-	PERFORM @extschema@.prevent_relation_modification(partition);
+	PERFORM @extschema@.prevent_relation_modification(partition_relid);
 
 	SELECT attname, parttype
 	FROM @extschema@.pathman_config
@@ -475,15 +475,15 @@ BEGIN
 
 	/* Check if this is a RANGE partition */
 	IF v_part_type != 2 THEN
-		RAISE EXCEPTION '"%" is not a RANGE partition', partition::TEXT;
+		RAISE EXCEPTION '"%" is not a RANGE partition', partition_relid::TEXT;
 	END IF;
 
 	v_atttype = @extschema@.get_attribute_type(v_parent, v_attname);
 
 	/* Get partition values range */
 	EXECUTE format('SELECT @extschema@.get_part_range($1, NULL::%s)',
 				   @extschema@.get_base_type(v_atttype)::TEXT)
-	USING partition
+	USING partition_relid
 	INTO p_range;
 
 	IF p_range IS NULL THEN
@@ -509,21 +509,21 @@ BEGIN
 												v_attname, split_value, p_range[2]);
 	EXECUTE format('WITH part_data AS (DELETE FROM %s WHERE %s RETURNING *)
 					INSERT INTO %s SELECT * FROM part_data',
-				   partition::TEXT,
+				   partition_relid::TEXT,
 				   v_cond,
 				   v_new_partition);
 
 	/* Alter original partition */
-	v_cond := @extschema@.build_range_condition(partition::regclass,
+	v_cond := @extschema@.build_range_condition(partition_relid::regclass,
 												v_attname, p_range[1], split_value);
-	v_check_name := @extschema@.build_check_constraint_name(partition, v_attname);
+	v_check_name := @extschema@.build_check_constraint_name(partition_relid, v_attname);
 
 	EXECUTE format('ALTER TABLE %s DROP CONSTRAINT %s',
-				   partition::TEXT,
+				   partition_relid::TEXT,
 				   v_check_name);
 
 	EXECUTE format('ALTER TABLE %s ADD CONSTRAINT %s CHECK (%s)',
-				   partition::TEXT,
+				   partition_relid::TEXT,
 				   v_check_name,
 				   v_cond);
 
@@ -958,7 +958,7 @@ LANGUAGE plpgsql;
  * Drop range partition
  */
 CREATE OR REPLACE FUNCTION @extschema@.drop_range_partition(
-	partition		REGCLASS,
+	partition_relid	REGCLASS,
 	delete_data		BOOLEAN DEFAULT TRUE)
 RETURNS TEXT AS
 $$
@@ -970,8 +970,8 @@ DECLARE
 	v_part_type		INTEGER;
 
 BEGIN
-	parent_relid := @extschema@.get_parent_of_partition(partition);
-	part_name := partition::TEXT; /* save the name to be returned */
+	parent_relid := @extschema@.get_parent_of_partition(partition_relid);
+	part_name := partition_relid::TEXT; /* save the name to be returned */
 
 	SELECT parttype
 	FROM @extschema@.pathman_config
@@ -980,7 +980,7 @@ BEGIN
 
 	/* Check if this is a RANGE partition */
 	IF v_part_type != 2 THEN
-		RAISE EXCEPTION '"%" is not a RANGE partition', partition::TEXT;
+		RAISE EXCEPTION '"%" is not a RANGE partition', partition_relid::TEXT;
 	END IF;
 
 	/* Acquire lock on parent */
@@ -989,15 +989,15 @@ BEGIN
 	IF NOT delete_data THEN
 		EXECUTE format('INSERT INTO %s SELECT * FROM %s',
 						parent_relid::TEXT,
-						partition::TEXT);
+						partition_relid::TEXT);
 		GET DIAGNOSTICS v_rows = ROW_COUNT;
 
 		/* Show number of copied rows */
-		RAISE NOTICE '% rows copied from %', v_rows, partition::TEXT;
+		RAISE NOTICE '% rows copied from %', v_rows, partition_relid::TEXT;
 	END IF;
 
 	SELECT relkind FROM pg_catalog.pg_class
-	WHERE oid = partition
+	WHERE oid = partition_relid
 	INTO v_relkind;
 
 	/*
@@ -1006,9 +1006,9 @@ BEGIN
 	 * DROP TABLE or DROP FOREIGN TABLE.
 	 */
 	IF v_relkind = 'f' THEN
-		EXECUTE format('DROP FOREIGN TABLE %s', partition::TEXT);
+		EXECUTE format('DROP FOREIGN TABLE %s', partition_relid::TEXT);
 	ELSE
-		EXECUTE format('DROP TABLE %s', partition::TEXT);
+		EXECUTE format('DROP TABLE %s', partition_relid::TEXT);
 	END IF;
 
 	/* Invalidate cache */
@@ -1026,7 +1026,7 @@ SET pg_pathman.enable_partitionfilter = off; /* ensures that PartitionFilter is
  */
 CREATE OR REPLACE FUNCTION @extschema@.attach_range_partition(
 	parent_relid	REGCLASS,
-	partition		REGCLASS,
+	partition_relid	REGCLASS,
 	start_value		ANYELEMENT,
 	end_value		ANYELEMENT)
 RETURNS TEXT AS
@@ -1038,29 +1038,29 @@ DECLARE
 
 BEGIN
 	PERFORM @extschema@.validate_relname(parent_relid);
-	PERFORM @extschema@.validate_relname(partition);
+	PERFORM @extschema@.validate_relname(partition_relid);
 
 	/* Acquire lock on parent */
 	PERFORM @extschema@.lock_partitioned_relation(parent_relid);
 
 	/* Ignore temporary tables */
 	SELECT relpersistence FROM pg_catalog.pg_class
-	WHERE oid = partition INTO rel_persistence;
+	WHERE oid = partition_relid INTO rel_persistence;
 
 	IF rel_persistence = 't'::CHAR THEN
 		RAISE EXCEPTION 'temporary table "%" cannot be used as a partition',
-						partition::TEXT;
+						partition_relid::TEXT;
 	END IF;
 
 	/* check range overlap */
 	PERFORM @extschema@.check_range_available(parent_relid, start_value, end_value);
 
-	IF NOT @extschema@.validate_relations_equality(parent_relid, partition) THEN
+	IF NOT @extschema@.validate_relations_equality(parent_relid, partition_relid) THEN
 		RAISE EXCEPTION 'partition must have the exact same structure as parent';
 	END IF;
 
 	/* Set inheritance */
-	EXECUTE format('ALTER TABLE %s INHERIT %s', partition, parent_relid);
+	EXECUTE format('ALTER TABLE %s INHERIT %s', partition_relid, parent_relid);
 
 	v_attname := attname FROM @extschema@.pathman_config WHERE partrel = parent_relid;
 
@@ -1070,9 +1070,9 @@ BEGIN
 
 	/* Set check constraint */
 	EXECUTE format('ALTER TABLE %s ADD CONSTRAINT %s CHECK (%s)',
-				   partition::TEXT,
-				   @extschema@.build_check_constraint_name(partition, v_attname),
-				   @extschema@.build_range_condition(partition,
+				   partition_relid::TEXT,
+				   @extschema@.build_check_constraint_name(partition_relid, v_attname),
+				   @extschema@.build_range_condition(partition_relid,
 													 v_attname,
 													 start_value,
 													 end_value));
@@ -1086,15 +1086,15 @@ BEGIN
 	INTO v_init_callback;
 
 	PERFORM @extschema@.invoke_on_partition_created_callback(parent_relid,
-															 partition,
+															 partition_relid,
 															 v_init_callback,
 															 start_value,
 															 end_value);
 
 	/* Invalidate cache */
 	PERFORM @extschema@.on_update_partitions(parent_relid);
 
-	RETURN partition;
+	RETURN partition_relid;
 END
 $$
 LANGUAGE plpgsql;
@@ -1104,15 +1104,15 @@ LANGUAGE plpgsql;
  * Detach range partition
  */
 CREATE OR REPLACE FUNCTION @extschema@.detach_range_partition(
-	partition		REGCLASS)
+	partition_relid		REGCLASS)
 RETURNS TEXT AS
 $$
 DECLARE
 	v_attname		TEXT;
 	parent_relid	REGCLASS;
 
 BEGIN
-	parent_relid := @extschema@.get_parent_of_partition(partition);
+	parent_relid := @extschema@.get_parent_of_partition(partition_relid);
 
 	/* Acquire lock on parent */
 	PERFORM @extschema@.lock_partitioned_relation(parent_relid);
@@ -1127,18 +1127,18 @@ BEGIN
 
 	/* Remove inheritance */
 	EXECUTE format('ALTER TABLE %s NO INHERIT %s',
-				   partition::TEXT,
+				   partition_relid::TEXT,
 				   parent_relid::TEXT);
 
 	/* Remove check constraint */
 	EXECUTE format('ALTER TABLE %s DROP CONSTRAINT %s',
-				   partition::TEXT,
-				   @extschema@.build_check_constraint_name(partition, v_attname));
+				   partition_relid::TEXT,
+				   @extschema@.build_check_constraint_name(partition_relid, v_attname));
 
 	/* Invalidate cache */
 	PERFORM @extschema@.on_update_partitions(parent_relid);
 
-	RETURN partition;
+	RETURN partition_relid;
 END
 $$
 LANGUAGE plpgsql;
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -780,6 +780,9 @@ create_single_partition_internal(Oid parent_relid,
 	create_stmt.oncommit		= ONCOMMIT_NOOP;
 	create_stmt.tablespacename	= tablespace;
 	create_stmt.if_not_exists	= false;
+#ifdef PGPRO_VERSION
+	create_stmt.partition_info  = NULL;
+#endif
 
 	/* Do we have to escalate privileges? */
 	if (need_priv_escalation)
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -42,6 +42,7 @@ PG_FUNCTION_INFO_V1( get_number_of_partitions_pl );
 PG_FUNCTION_INFO_V1( get_parent_of_partition_pl );
 PG_FUNCTION_INFO_V1( get_base_type_pl );
 PG_FUNCTION_INFO_V1( get_attribute_type_pl );
+PG_FUNCTION_INFO_V1( get_partition_key_type );
 PG_FUNCTION_INFO_V1( get_tablespace_pl );
 
 PG_FUNCTION_INFO_V1( show_partition_list_internal );
@@ -228,6 +229,23 @@ get_attribute_type_pl(PG_FUNCTION_ARGS)
 	PG_RETURN_OID(get_attribute_type(relid, text_to_cstring(attname), false));
 }
 
+/*
+ * Return partition key type
+ */
+Datum
+get_partition_key_type(PG_FUNCTION_ARGS)
+{
+	Oid					relid = PG_GETARG_OID(0);
+	const PartRelationInfo   *prel = get_pathman_relation_info(relid);
+
+	if (!prel)
+		elog(ERROR,
+			 "Relation '%s' isn't partitioned by pg_pathman",
+			 get_rel_name(relid));
+
+	PG_RETURN_OID(prel->atttype);
+}
+
 /*
  * Return tablespace name for specified relation
  */
@@ -254,7 +272,6 @@ get_tablespace_pl(PG_FUNCTION_ARGS)
 	PG_RETURN_TEXT_P(cstring_to_text(result));
 }
 
-
 /*
  * ----------------------
  *  Common purpose VIEWs
