Merge branch 'master' into rel_future_beta

funbringer · funbringer · commit 94b2fa8ff60e · 2017-07-19T18:51:57.000+03:00
diff --git a/expected/pathman_bgw.out b/expected/pathman_bgw.out
@@ -105,5 +105,43 @@ SELECT * FROM pathman_partition_list ORDER BY partition; /* should contain 3 par
 
 DROP TABLE test_bgw.test_4 CASCADE;
 NOTICE:  drop cascades to 4 other objects
+/* test error handling in BGW */
+CREATE TABLE test_bgw.test_5(val INT4 NOT NULL);
+SELECT create_range_partitions('test_bgw.test_5', 'val', 1, 10, 2);
+ create_range_partitions 
+-------------------------
+                       2
+(1 row)
+
+CREATE OR REPLACE FUNCTION test_bgw.abort_xact(args JSONB)
+RETURNS VOID AS $$
+BEGIN
+	RAISE EXCEPTION 'aborting xact!';
+END
+$$ language plpgsql;
+SELECT set_spawn_using_bgw('test_bgw.test_5', true);
+ set_spawn_using_bgw 
+---------------------
+ 
+(1 row)
+
+SELECT set_init_callback('test_bgw.test_5', 'test_bgw.abort_xact(jsonb)');
+ set_init_callback 
+-------------------
+ 
+(1 row)
+
+INSERT INTO test_bgw.test_5 VALUES (-100);
+ERROR:  Attempt to spawn new partitions of relation "test_5" failed
+SELECT * FROM pathman_partition_list ORDER BY partition; /* should contain 3 partitions */
+     parent      |     partition     | parttype | expr | range_min | range_max 
+-----------------+-------------------+----------+------+-----------+-----------
+ test_bgw.test_5 | test_bgw.test_5_1 |        2 | val  | 1         | 11
+ test_bgw.test_5 | test_bgw.test_5_2 |        2 | val  | 11        | 21
+(2 rows)
+
+DROP FUNCTION test_bgw.abort_xact(args JSONB);
+DROP TABLE test_bgw.test_5 CASCADE;
+NOTICE:  drop cascades to 3 other objects
 DROP SCHEMA test_bgw CASCADE;
 DROP EXTENSION pg_pathman;
diff --git a/expected/pathman_callbacks.out b/expected/pathman_callbacks.out
@@ -1,14 +1,14 @@
 \set VERBOSITY terse
 CREATE EXTENSION pg_pathman;
 CREATE SCHEMA callbacks;
-/* Check callbacks */
+/* callback #1 */
 CREATE OR REPLACE FUNCTION callbacks.abc_on_part_created_callback(args JSONB)
 RETURNS VOID AS $$
 BEGIN
 	RAISE WARNING 'callback arg: %', args::TEXT;
 END
 $$ language plpgsql;
-/* callback is in public namespace, must be schema-qualified */
+/* callback #2 */
 CREATE OR REPLACE FUNCTION public.dummy_cb(args JSONB)
 RETURNS VOID AS $$
 BEGIN
@@ -184,15 +184,11 @@ WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_2",
 
 INSERT INTO callbacks.abc VALUES (201, 0); /* +1 new partition */
 WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_3", "range_max": "301", "range_min": "201", "parent_schema": "callbacks", "partition_schema": "callbacks"}
+BEGIN;
 DROP FUNCTION callbacks.abc_on_part_created_callback(jsonb);
 INSERT INTO callbacks.abc VALUES (301, 0); /* +0 new partitions (ERROR) */
 ERROR:  callback function "callbacks.abc_on_part_created_callback(jsonb)" does not exist
-CREATE OR REPLACE FUNCTION callbacks.abc_on_part_created_callback(args JSONB)
-RETURNS VOID AS $$
-BEGIN
-	RAISE WARNING 'callback arg: %', args::TEXT;
-END
-$$ language plpgsql;
+ROLLBACK;
 INSERT INTO callbacks.abc VALUES (301, 0); /* +1 new partition */
 WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_5", "range_max": "401", "range_min": "301", "parent_schema": "callbacks", "partition_schema": "callbacks"}
 DROP TABLE callbacks.abc CASCADE;
@@ -211,22 +207,22 @@ CREATE OR REPLACE FUNCTION callbacks.rotation_callback(params jsonb)
 RETURNS VOID AS
 $$
 DECLARE
-    relation	regclass;
+	relation	regclass;
 	parent_rel	regclass;
 BEGIN
 	parent_rel := concat(params->>'partition_schema', '.', params->>'parent')::regclass;
 
-    -- drop "old" partitions
-    FOR relation IN (SELECT partition FROM
+	-- drop "old" partitions
+	FOR relation IN (SELECT partition FROM
 						(SELECT partition, range_min::INT4 FROM pathman_partition_list
 						 WHERE parent = parent_rel
 						 ORDER BY range_min::INT4 DESC
 						 OFFSET 4) t  -- remain 4 last partitions
 					 ORDER BY range_min)
-    LOOP
-        RAISE NOTICE 'dropping partition %', relation;
-        PERFORM drop_range_partition(relation);
-    END LOOP;
+	LOOP
+		RAISE NOTICE 'dropping partition %', relation;
+		PERFORM drop_range_partition(relation);
+	END LOOP;
 END
 $$ LANGUAGE plpgsql;
 SELECT * FROM pathman_partition_list
diff --git a/sql/pathman_bgw.sql b/sql/pathman_bgw.sql
@@ -53,6 +53,26 @@ SELECT * FROM pathman_partition_list ORDER BY partition; /* should contain 3 par
 DROP TABLE test_bgw.test_4 CASCADE;
 
 
+/* test error handling in BGW */
+CREATE TABLE test_bgw.test_5(val INT4 NOT NULL);
+SELECT create_range_partitions('test_bgw.test_5', 'val', 1, 10, 2);
+
+CREATE OR REPLACE FUNCTION test_bgw.abort_xact(args JSONB)
+RETURNS VOID AS $$
+BEGIN
+	RAISE EXCEPTION 'aborting xact!';
+END
+$$ language plpgsql;
+
+SELECT set_spawn_using_bgw('test_bgw.test_5', true);
+SELECT set_init_callback('test_bgw.test_5', 'test_bgw.abort_xact(jsonb)');
+INSERT INTO test_bgw.test_5 VALUES (-100);
+SELECT * FROM pathman_partition_list ORDER BY partition; /* should contain 3 partitions */
+
+DROP FUNCTION test_bgw.abort_xact(args JSONB);
+DROP TABLE test_bgw.test_5 CASCADE;
+
+
 
 DROP SCHEMA test_bgw CASCADE;
 DROP EXTENSION pg_pathman;
diff --git a/sql/pathman_callbacks.sql b/sql/pathman_callbacks.sql
@@ -3,24 +3,25 @@
 CREATE EXTENSION pg_pathman;
 CREATE SCHEMA callbacks;
 
-/* Check callbacks */
 
+
+/* callback #1 */
 CREATE OR REPLACE FUNCTION callbacks.abc_on_part_created_callback(args JSONB)
 RETURNS VOID AS $$
 BEGIN
 	RAISE WARNING 'callback arg: %', args::TEXT;
 END
 $$ language plpgsql;
 
-
-
-/* callback is in public namespace, must be schema-qualified */
+/* callback #2 */
 CREATE OR REPLACE FUNCTION public.dummy_cb(args JSONB)
 RETURNS VOID AS $$
 BEGIN
 END
 $$ language plpgsql;
 
+
+
 CREATE TABLE callbacks.abc(a serial, b int);
 SELECT create_range_partitions('callbacks.abc', 'a', 1, 100, 2);
 
@@ -78,25 +79,25 @@ SELECT create_hash_partitions('callbacks.abc', 'a', 5);
 
 DROP TABLE callbacks.abc CASCADE;
 
+
 /* test the temprary deletion of callback function */
 CREATE TABLE callbacks.abc(a serial, b int);
 SELECT set_init_callback('callbacks.abc',
 						 'callbacks.abc_on_part_created_callback(jsonb)');
 SELECT create_range_partitions('callbacks.abc', 'a', 1, 100, 2);
 
 INSERT INTO callbacks.abc VALUES (201, 0); /* +1 new partition */
+
+BEGIN;
 DROP FUNCTION callbacks.abc_on_part_created_callback(jsonb);
 INSERT INTO callbacks.abc VALUES (301, 0); /* +0 new partitions (ERROR) */
-CREATE OR REPLACE FUNCTION callbacks.abc_on_part_created_callback(args JSONB)
-RETURNS VOID AS $$
-BEGIN
-	RAISE WARNING 'callback arg: %', args::TEXT;
-END
-$$ language plpgsql;
+ROLLBACK;
+
 INSERT INTO callbacks.abc VALUES (301, 0); /* +1 new partition */
 
 DROP TABLE callbacks.abc CASCADE;
 
+
 /* more complex test using rotation of tables */
 CREATE TABLE callbacks.abc(a INT4 NOT NULL);
 INSERT INTO callbacks.abc
@@ -107,22 +108,22 @@ CREATE OR REPLACE FUNCTION callbacks.rotation_callback(params jsonb)
 RETURNS VOID AS
 $$
 DECLARE
-    relation	regclass;
+	relation	regclass;
 	parent_rel	regclass;
 BEGIN
 	parent_rel := concat(params->>'partition_schema', '.', params->>'parent')::regclass;
 
-    -- drop "old" partitions
-    FOR relation IN (SELECT partition FROM
+	-- drop "old" partitions
+	FOR relation IN (SELECT partition FROM
 						(SELECT partition, range_min::INT4 FROM pathman_partition_list
 						 WHERE parent = parent_rel
 						 ORDER BY range_min::INT4 DESC
 						 OFFSET 4) t  -- remain 4 last partitions
 					 ORDER BY range_min)
-    LOOP
-        RAISE NOTICE 'dropping partition %', relation;
-        PERFORM drop_range_partition(relation);
-    END LOOP;
+	LOOP
+		RAISE NOTICE 'dropping partition %', relation;
+		PERFORM drop_range_partition(relation);
+	END LOOP;
 END
 $$ LANGUAGE plpgsql;
 
@@ -140,6 +141,8 @@ SELECT * FROM pathman_partition_list
 WHERE parent = 'callbacks.abc'::REGCLASS
 ORDER BY range_min::INT4;
 
+
+
 DROP TABLE callbacks.abc CASCADE;
 DROP SCHEMA callbacks CASCADE;
 DROP EXTENSION pg_pathman CASCADE;
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -452,11 +452,10 @@ create_partitions_for_value_internal(Oid relid, Datum value, Oid value_type,
 		FlushErrorState();
 
 		/* Produce log message if we're in BGW */
-		error->elevel	= LOG;
-		error->message	= psprintf(CppAsString(create_partitions_for_value_internal)
-								   ": %s [%u]", error->message, MyProcPid);
-
-		ReThrowError(error);
+		elog(LOG,
+			 CppAsString(create_partitions_for_value_internal) ": %s [%u]",
+			 error->message,
+			 MyProcPid);
 
 		/* Reset 'partid' in case of error */
 		partid = InvalidOid;
