resolve conflicts caused by a merge of 'callbacks'

Author: funbringer

expected/pg_pathman.out

@@ -35,9 +35,9 @@ SELECT * FROM test.hash_rel;
   3 |     3
 (3 rows)
 
-SELECT pathman.disable_parent('test.hash_rel');
- disable_parent 
-----------------
+SELECT pathman.set_enable_parent('test.hash_rel', false);
+ set_enable_parent 
+-------------------
 
 (1 row)
 
@@ -55,9 +55,9 @@ SELECT * FROM test.hash_rel;
 ----+-------
 (0 rows)
 
-SELECT pathman.enable_parent('test.hash_rel');
- enable_parent 
----------------
+SELECT pathman.set_enable_parent('test.hash_rel', true);
+ set_enable_parent 
+-------------------
 
 (1 row)
 
@@ -1260,17 +1260,17 @@ SELECT * FROM test.range_rel WHERE dt = '2015-03-15';
  74 | Sun Mar 15 00:00:00 2015
 (1 row)
 
-SELECT pathman.disable_auto('test.range_rel');
- disable_auto 
---------------
+SELECT pathman.set_auto('test.range_rel', false);
+ set_auto 
+----------
 
 (1 row)
 
 INSERT INTO test.range_rel (dt) VALUES ('2015-06-01');
 ERROR:  no suitable partition for key 'Mon Jun 01 00:00:00 2015'
-SELECT pathman.enable_auto('test.range_rel');
- enable_auto 
--------------
+SELECT pathman.set_auto('test.range_rel', true);
+ set_auto 
+----------
 
 (1 row)
 
@@ -1768,3 +1768,58 @@ NOTICE:  100 rows copied from test_fkey_0
               10
 (1 row)
 
+/* Check callbacks */
+CREATE TABLE log(id serial, message text);
+CREATE OR REPLACE FUNCTION abc_on_partition_created_callback(args JSONB)
+RETURNS VOID AS $$
+DECLARE
+	start_value	TEXT := args->>'start';
+	end_value	TEXT := args->'end';
+BEGIN
+	INSERT INTO log(message)
+	VALUES (start_value || '-' || end_value);
+END
+$$ language plpgsql;
+CREATE TABLE abc(a serial, b int);
+SELECT create_range_partitions('abc', 'a', 1, 100, 2);
+NOTICE:  sequence "abc_seq" does not exist, skipping
+ create_range_partitions 
+-------------------------
+                       2
+(1 row)
+
+SELECT set_part_init_callback('abc', 'abc_on_partition_created_callback');
+ set_part_init_callback 
+------------------------
+ 
+(1 row)
+
+INSERT INTO abc VALUES (123, 1);
+INSERT INTO abc VALUES (223, 1);
+SELECT append_range_partition('abc');
+ append_range_partition 
+------------------------
+ public.abc_4
+(1 row)
+
+SELECT prepend_range_partition('abc');
+ prepend_range_partition 
+-------------------------
+ public.abc_5
+(1 row)
+
+SELECT add_range_partition('abc', 401, 501);
+ add_range_partition 
+---------------------
+ public.abc_6
+(1 row)
+
+SELECT message FROM log ORDER BY id;
+  message  
+-----------
+ 201-"301"
+ 301-"401"
+ -99-"1"
+ 401-"501"
+(4 rows)
+

hash.sql

@@ -24,6 +24,7 @@ DECLARE
 	v_plain_relname		TEXT;
 	v_atttype			REGTYPE;
 	v_hashfunc			REGPROC;
+	v_init_callback		REGPROCEDURE;
 
 BEGIN
 	IF partition_data = true THEN
@@ -56,9 +57,11 @@ BEGIN
 								  quote_ident(v_plain_schema),
 								  quote_ident(v_plain_relname || '_' || partnum));
 
-		EXECUTE format('CREATE TABLE %1$s (LIKE %2$s INCLUDING ALL) INHERITS (%2$s)',
-					   v_child_relname,
-					   parent_relid::TEXT);
+		EXECUTE format(
+			'CREATE TABLE %1$s (LIKE %2$s INCLUDING ALL) INHERITS (%2$s) TABLESPACE %s',
+			v_child_relname,
+			parent_relid::TEXT,
+			@extschema@.get_rel_tablespace_name(parent_relid));
 
 		EXECUTE format('ALTER TABLE %s ADD CONSTRAINT %s
 						CHECK (@extschema@.get_hash_part_idx(%s(%s), %s) = %s)',
@@ -71,17 +74,29 @@ BEGIN
 					   partnum);
 
 		PERFORM @extschema@.copy_foreign_keys(parent_relid, v_child_relname::REGCLASS);
+
+		/* Fetch init_callback from 'params' table */
+		WITH stub_callback(stub) as (values (0))
+		SELECT coalesce(init_callback, 0::REGPROCEDURE)
+		FROM stub_callback
+		LEFT JOIN @extschema@.pathman_config_params AS params
+		ON params.partrel = parent_relid
+		INTO v_init_callback;
+
+		PERFORM @extschema@.invoke_on_partition_created_callback(parent_relid,
+																 v_child_relname::REGCLASS,
+																 v_init_callback);
 	END LOOP;
 
 	/* Notify backend about changes */
 	PERFORM @extschema@.on_create_partitions(parent_relid);
 
 	/* Copy data */
 	IF partition_data = true THEN
-		PERFORM @extschema@.disable_parent(parent_relid);
+		PERFORM @extschema@.set_enable_parent(parent_relid, false);
 		PERFORM @extschema@.partition_data(parent_relid);
 	ELSE
-		PERFORM @extschema@.enable_parent(parent_relid);
+		PERFORM @extschema@.set_enable_parent(parent_relid, true);
 	END IF;
 
 	RETURN partitions_count;
@@ -138,7 +153,6 @@ DECLARE
 	funcname				TEXT;
 	triggername				TEXT;
 	atttype					REGTYPE;
-	hashfunc				TEXT;
 	partitions_count		INTEGER;
 
 BEGIN

init.sql

@@ -31,11 +31,13 @@ CREATE TABLE IF NOT EXISTS @extschema@.pathman_config (
  *		partrel - regclass (relation type, stored as Oid)
  *		enable_parent - add parent table to plan
  *		auto - enable automatic partition creation
+ *		init_callback - cb to be executed on partition creation
  */
 CREATE TABLE IF NOT EXISTS @extschema@.pathman_config_params (
 	partrel			REGCLASS NOT NULL PRIMARY KEY,
 	enable_parent	BOOLEAN NOT NULL DEFAULT TRUE,
-	auto			BOOLEAN NOT NULL DEFAULT TRUE
+	auto			BOOLEAN NOT NULL DEFAULT TRUE,
+	init_callback	REGPROCEDURE NOT NULL DEFAULT 0
 );
 CREATE UNIQUE INDEX i_pathman_config_params
 ON @extschema@.pathman_config_params(partrel);
@@ -85,15 +87,15 @@ BEGIN
 	RETURN count(*) FROM pg_inherits WHERE inhparent = relation;
 END
 $$
-LANGUAGE plpgsql;
+LANGUAGE plpgsql STRICT;
 
 /*
  * Add a row describing the optional parameter to pathman_config_params.
  */
 CREATE OR REPLACE FUNCTION @extschema@.pathman_set_param(
 	relation	REGCLASS,
 	param		TEXT,
-	value		BOOLEAN)
+	value		ANYELEMENT)
 RETURNS VOID AS
 $$
 BEGIN
@@ -106,49 +108,44 @@ $$
 LANGUAGE plpgsql;
 
 /*
- * Include parent relation into query plan's for specified relation.
- */
-CREATE OR REPLACE FUNCTION @extschema@.enable_parent(relation REGCLASS)
-RETURNS VOID AS
-$$
-BEGIN
-	PERFORM @extschema@.pathman_set_param(relation, 'enable_parent', True);
-END
-$$
-LANGUAGE plpgsql;
-
-/*
- * Do not include parent relation into query plan's for specified relation.
+ * Include\exclude parent relation in query plan.
  */
-CREATE OR REPLACE FUNCTION @extschema@.disable_parent(relation REGCLASS)
+CREATE OR REPLACE FUNCTION @extschema@.set_enable_parent(
+	relation	REGCLASS,
+	value		BOOLEAN)
 RETURNS VOID AS
 $$
 BEGIN
-	PERFORM @extschema@.pathman_set_param(relation, 'enable_parent', False);
+	PERFORM @extschema@.pathman_set_param(relation, 'enable_parent', value);
 END
 $$
-LANGUAGE plpgsql;
+LANGUAGE plpgsql STRICT;
 
 /*
- * Enable automatic partition creation.
+ * Enable\disable automatic partition creation.
  */
-CREATE OR REPLACE FUNCTION @extschema@.enable_auto(relation REGCLASS)
+CREATE OR REPLACE FUNCTION @extschema@.set_auto(
+	relation	REGCLASS,
+	value		BOOLEAN)
 RETURNS VOID AS
 $$
 BEGIN
-	PERFORM @extschema@.pathman_set_param(relation, 'auto', True);
+	PERFORM @extschema@.pathman_set_param(relation, 'auto', value);
 END
 $$
-LANGUAGE plpgsql;
+LANGUAGE plpgsql STRICT;
 
 /*
- * Disable automatic partition creation.
+ * Set partition creation callback
  */
-CREATE OR REPLACE FUNCTION @extschema@.disable_auto(relation REGCLASS)
+CREATE OR REPLACE FUNCTION @extschema@.set_part_init_callback(
+	relation	REGCLASS,
+	callback	REGPROC)
 RETURNS VOID AS
 $$
 BEGIN
-	PERFORM @extschema@.pathman_set_param(relation, 'auto', False);
+	PERFORM @extschema@.validate_on_partition_created_callback(callback);
+	PERFORM @extschema@.pathman_set_param(relation, 'init_callback', callback);
 END
 $$
 LANGUAGE plpgsql;
@@ -201,6 +198,7 @@ DECLARE
 	v_limit_clause	TEXT := '';
 	v_where_clause	TEXT := '';
 	ctids			TID[];
+
 BEGIN
 	SELECT attname INTO v_attr
 	FROM @extschema@.pathman_config WHERE partrel = p_relation;
@@ -276,7 +274,7 @@ BEGIN
 	RETURN;
 END
 $$
-LANGUAGE plpgsql
+LANGUAGE plpgsql STRICT
 SET pg_pathman.enable_partitionfilter = on; /* ensures that PartitionFilter is ON */
 
 /*
@@ -296,7 +294,7 @@ BEGIN
 	PERFORM @extschema@.on_remove_partitions(parent_relid);
 END
 $$
-LANGUAGE plpgsql;
+LANGUAGE plpgsql STRICT;
 
 /*
  * Aggregates several common relation checks before partitioning.
@@ -365,7 +363,7 @@ BEGIN
 	INTO schema, relname;
 END
 $$
-LANGUAGE plpgsql;
+LANGUAGE plpgsql STRICT;
 
 /*
  * Returns schema-qualified name for table
@@ -384,7 +382,7 @@ BEGIN
 			WHERE oid = cls::oid);
 END
 $$
-LANGUAGE plpgsql;
+LANGUAGE plpgsql STRICT;
 
 /*
  * Validates relation name. It must be schema qualified
@@ -484,7 +482,7 @@ BEGIN
 	EXECUTE format('DROP FUNCTION IF EXISTS %s() CASCADE',
 				   @extschema@.build_update_trigger_func_name(parent_relid));
 END
-$$ LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql STRICT;
 
 /*
  * Drop partitions
@@ -569,7 +567,7 @@ BEGIN
 					   pg_get_constraintdef(rec.conid));
 	END LOOP;
 END
-$$ LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql STRICT;
 
 
 /*
@@ -703,3 +701,41 @@ LANGUAGE C STRICT;
 CREATE OR REPLACE FUNCTION @extschema@.debug_capture()
 RETURNS VOID AS 'pg_pathman', 'debug_capture'
 LANGUAGE C STRICT;
+
+/*
+ * Return tablespace name for specified relation.
+ */
+CREATE OR REPLACE FUNCTION @extschema@.get_rel_tablespace_name(relation REGCLASS)
+RETURNS TEXT AS 'pg_pathman', 'get_rel_tablespace_name'
+LANGUAGE C STRICT;
+
+/*
+ * Checks that callback function meets specific requirements. Particularly it
+ * must have the only JSONB argument and VOID return type.
+ */
+CREATE OR REPLACE FUNCTION @extschema@.validate_on_partition_created_callback(callback REGPROC)
+RETURNS VOID AS 'pg_pathman', 'validate_on_part_init_callback_pl'
+LANGUAGE C STRICT;
+
+
+/*
+ * Invoke init_callback on RANGE partition.
+ */
+CREATE OR REPLACE FUNCTION @extschema@.invoke_on_partition_created_callback(
+	parent_relid	REGCLASS,
+	partition		REGCLASS,
+	init_callback	REGPROCEDURE,
+	start_value		ANYELEMENT,
+	end_value		ANYELEMENT)
+RETURNS VOID AS 'pg_pathman', 'invoke_on_partition_created_callback'
+LANGUAGE C;
+
+/*
+ * Invoke init_callback on HASH partition.
+ */
+CREATE OR REPLACE FUNCTION @extschema@.invoke_on_partition_created_callback(
+	parent_relid	REGCLASS,
+	partition		REGCLASS,
+	init_callback	REGPROCEDURE)
+RETURNS VOID AS 'pg_pathman', 'invoke_on_partition_created_callback'
+LANGUAGE C;