Merge branch 'PGPRO_EE' of https://github.com/postgrespro/pg_pathman into PGPRO_EE

Author: zilder

.editorconfig

@@ -0,0 +1,3 @@
+[*]
+indent_style = tab
+indent_size = 4

META.json

@@ -2,7 +2,7 @@
    "name": "pg_pathman",
    "abstract": "Partitioning tool",
    "description": "The `pg_pathman` module provides optimized partitioning mechanism and functions to manage partitions.",
-   "version": "1.4.1",
+   "version": "1.4.2",
    "maintainer": [
       "Ildar Musin <i.musin@postgrespro.ru>",
       "Dmitry Ivanov <d.ivanov@postgrespro.ru>",
@@ -24,7 +24,7 @@
        "pg_pathman": {
            "file": "pg_pathman--1.4.sql",
            "docfile": "README.md",
-           "version": "1.4.1",
+           "version": "1.4.2",
            "abstract": "Partitioning tool"
       }
    },

Makefile

@@ -7,8 +7,8 @@ OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \
 	src/pl_funcs.o src/pl_range_funcs.o src/pl_hash_funcs.o src/pathman_workers.o \
 	src/hooks.o src/nodes_common.o src/xact_handling.o src/utility_stmt_hooking.o \
 	src/planner_tree_modification.o src/debug_print.o src/partition_creation.o \
-	src/compat/pg_compat.o src/compat/relation_tags.o src/compat/expand_rte_hook.o \
-	src/compat/rowmarks_fix.o $(WIN32RES)
+	src/compat/pg_compat.o src/compat/relation_tags.o src/compat/rowmarks_fix.o \
+	$(WIN32RES)
 
 override PG_CPPFLAGS += -I$(CURDIR)/src/include
 

expected/pathman_basic.out

@@ -18,7 +18,7 @@ PL/pgSQL function pathman.prepare_for_partitioning(regclass,text,boolean) line 9
 SQL statement "SELECT pathman.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data)"
-PL/pgSQL function pathman.create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
+PL/pgSQL function pathman.create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 3 at PERFORM
 \set VERBOSITY terse
 ALTER TABLE test.hash_rel ALTER COLUMN value SET NOT NULL;
 SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3, partition_data:=false);
@@ -1657,7 +1657,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.range_rel WHERE dt > '2010-12-15';
 CREATE TABLE test.tmp (id INTEGER NOT NULL, value INTEGER NOT NULL);
 INSERT INTO test.tmp VALUES (1, 1), (2, 2);
 /* Test UPDATE and DELETE */
-EXPLAIN (COSTS OFF) UPDATE test.range_rel SET value = 111 WHERE dt = '2010-06-15';
+EXPLAIN (COSTS OFF) UPDATE test.range_rel SET value = 111 WHERE dt = '2010-06-15';	/* have partitions for this 'dt' */
                                    QUERY PLAN                                   
 --------------------------------------------------------------------------------
  Update on range_rel_6
@@ -1672,7 +1672,7 @@ SELECT * FROM test.range_rel WHERE dt = '2010-06-15';
  166 | Tue Jun 15 00:00:00 2010 |   111
 (1 row)
 
-EXPLAIN (COSTS OFF) DELETE FROM test.range_rel WHERE dt = '2010-06-15';
+EXPLAIN (COSTS OFF) DELETE FROM test.range_rel WHERE dt = '2010-06-15';	/* have partitions for this 'dt' */
                                    QUERY PLAN                                   
 --------------------------------------------------------------------------------
  Delete on range_rel_6
@@ -1686,6 +1686,34 @@ SELECT * FROM test.range_rel WHERE dt = '2010-06-15';
 ----+----+-------
 (0 rows)
 
+EXPLAIN (COSTS OFF) UPDATE test.range_rel SET value = 222 WHERE dt = '1990-01-01';	/* no partitions for this 'dt' */
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
+ Update on range_rel
+   ->  Seq Scan on range_rel
+         Filter: (dt = 'Mon Jan 01 00:00:00 1990'::timestamp without time zone)
+(3 rows)
+
+UPDATE test.range_rel SET value = 111 WHERE dt = '1990-01-01';
+SELECT * FROM test.range_rel WHERE dt = '1990-01-01';
+ id | dt | value 
+----+----+-------
+(0 rows)
+
+EXPLAIN (COSTS OFF) DELETE FROM test.range_rel WHERE dt < '1990-01-01';	/* no partitions for this 'dt' */
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
+ Delete on range_rel
+   ->  Seq Scan on range_rel
+         Filter: (dt < 'Mon Jan 01 00:00:00 1990'::timestamp without time zone)
+(3 rows)
+
+DELETE FROM test.range_rel WHERE dt < '1990-01-01';
+SELECT * FROM test.range_rel WHERE dt < '1990-01-01';
+ id | dt | value 
+----+----+-------
+(0 rows)
+
 EXPLAIN (COSTS OFF) UPDATE test.range_rel r SET value = t.value FROM test.tmp t WHERE r.dt = '2010-01-01' AND r.id = t.id;
                                          QUERY PLAN                                         
 --------------------------------------------------------------------------------------------

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;

expected/pathman_calamity.out

@@ -12,7 +12,7 @@ SELECT debug_capture();
 SELECT get_pathman_lib_version();
  get_pathman_lib_version 
 -------------------------
- 10401
+ 10402
 (1 row)
 
 set client_min_messages = NOTICE;

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

expected/pathman_expressions.out

@@ -234,7 +234,7 @@ PL/pgSQL function prepare_for_partitioning(regclass,text,boolean) line 9 at PERF
 SQL statement "SELECT public.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data)"
-PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
+PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 3 at PERFORM
 /* Try using system attributes */
 SELECT create_hash_partitions('test_exprs.hash_rel', 'xmin', 4);
 ERROR:  failed to analyze partitioning expression "xmin"
@@ -244,7 +244,7 @@ PL/pgSQL function prepare_for_partitioning(regclass,text,boolean) line 9 at PERF
 SQL statement "SELECT public.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data)"
-PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
+PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 3 at PERFORM
 /* Try using subqueries */
 SELECT create_hash_partitions('test_exprs.hash_rel',
 							  'value, (select oid from pg_class limit 1)',
@@ -256,7 +256,7 @@ PL/pgSQL function prepare_for_partitioning(regclass,text,boolean) line 9 at PERF
 SQL statement "SELECT public.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data)"
-PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
+PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 3 at PERFORM
 /* Try using mutable expression */
 SELECT create_hash_partitions('test_exprs.hash_rel', 'random()', 4);
 ERROR:  failed to analyze partitioning expression "random()"
@@ -266,7 +266,7 @@ PL/pgSQL function prepare_for_partitioning(regclass,text,boolean) line 9 at PERF
 SQL statement "SELECT public.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data)"
-PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
+PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 3 at PERFORM
 /* Try using broken parentheses */
 SELECT create_hash_partitions('test_exprs.hash_rel', 'value * value2))', 4);
 ERROR:  failed to parse partitioning expression "value * value2))"
@@ -276,7 +276,7 @@ CONTEXT:  PL/pgSQL function prepare_for_partitioning(regclass,text,boolean) line
 SQL statement "SELECT public.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data)"
-PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
+PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 3 at PERFORM
 /* Try using missing columns */
 SELECT create_hash_partitions('test_exprs.hash_rel', 'value * value3', 4);
 ERROR:  failed to analyze partitioning expression "value * value3"
@@ -287,7 +287,7 @@ CONTEXT:  PL/pgSQL function prepare_for_partitioning(regclass,text,boolean) line
 SQL statement "SELECT public.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data)"
-PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
+PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 3 at PERFORM
 /* Check that 'pathman_hooks_enabled' is true (1 partition in plan) */
 EXPLAIN (COSTS OFF) INSERT INTO test_exprs.canary_copy
 SELECT * FROM test_exprs.canary WHERE val = 1;