Merged newer pathman

Author: vbwagner

contrib/pg_pathman/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.3",
+   "version": "1.4.6",
    "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.3",
+           "version": "1.4.6",
            "abstract": "Partitioning tool"
       }
    },

contrib/pg_pathman/Makefile

@@ -10,7 +10,11 @@ OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \
 	src/compat/pg_compat.o src/compat/relation_tags.o src/compat/rowmarks_fix.o \
 	$(WIN32RES)
 
+ifdef USE_PGXS
+override PG_CPPFLAGS += -I$(CURDIR)/src/include
+else
 override PG_CPPFLAGS += -I$(top_srcdir)/$(subdir)/src/include
+endif
 
 EXTENSION = pg_pathman
 
@@ -35,6 +39,7 @@ REGRESS = pathman_array_qual \
 		  pathman_domains \
 		  pathman_expressions \
 		  pathman_foreign_keys \
+		  pathman_gaps \
 		  pathman_inserts \
 		  pathman_interval \
 		  pathman_join_clause \
@@ -48,7 +53,8 @@ REGRESS = pathman_array_qual \
 		  pathman_runtime_nodes \
 		  pathman_update_trigger \
 		  pathman_upd_del \
-		  pathman_utility_stmt
+		  pathman_utility_stmt \
+		  pathman_views
 
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 

contrib/pg_pathman/expected/pathman_bgw.out

@@ -132,7 +132,7 @@ SELECT set_init_callback('test_bgw.test_5', 'test_bgw.abort_xact(jsonb)');
 (1 row)
 
 INSERT INTO test_bgw.test_5 VALUES (-100);
-ERROR:  Attempt to spawn new partitions of relation "test_5" failed
+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 
 -----------------+-------------------+----------+------+-----------+-----------
@@ -143,5 +143,80 @@ SELECT * FROM pathman_partition_list ORDER BY partition; /* should contain 3 par
 DROP FUNCTION test_bgw.abort_xact(args JSONB);
 DROP TABLE test_bgw.test_5 CASCADE;
 NOTICE:  drop cascades to 3 other objects
+/*
+ * Tests for ConcurrentPartWorker
+ */
+CREATE TABLE test_bgw.conc_part(id INT4 NOT NULL);
+INSERT INTO test_bgw.conc_part SELECT generate_series(1, 500);
+SELECT create_hash_partitions('test_bgw.conc_part', 'id', 5, false);
+ create_hash_partitions 
+------------------------
+                      5
+(1 row)
+
+BEGIN;
+/* Also test FOR SHARE/UPDATE conflicts in BGW */
+SELECT * FROM test_bgw.conc_part ORDER BY id LIMIT 1 FOR SHARE;
+ id 
+----
+  1
+(1 row)
+
+/* Run partitioning bgworker */
+SELECT partition_table_concurrently('test_bgw.conc_part', 10, 1);
+NOTICE:  worker started, you can stop it with the following command: select public.stop_concurrent_part_task('conc_part');
+ partition_table_concurrently 
+------------------------------
+ 
+(1 row)
+
+/* Wait until bgworker starts */
+SELECT pg_sleep(1);
+ pg_sleep 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+/* Wait until it finises */
+DO $$
+DECLARE
+	ops int8;
+BEGIN
+	LOOP
+		SELECT count(*)
+		FROM pathman_concurrent_part_tasks
+		WHERE processed < 500 -- protect from endless loops
+		INTO ops;
+
+		IF ops > 0 THEN
+			PERFORM pg_sleep(0.2);
+		ELSE
+			EXIT;
+		END IF;
+	END LOOP;
+END
+$$ LANGUAGE plpgsql;
+/* Check amount of tasks and rows in parent and partitions */
+SELECT count(*) FROM pathman_concurrent_part_tasks;
+ count 
+-------
+     0
+(1 row)
+
+SELECT count(*) FROM ONLY test_bgw.conc_part;
+ count 
+-------
+     0
+(1 row)
+
+SELECT count(*) FROM test_bgw.conc_part;
+ count 
+-------
+   500
+(1 row)
+
+DROP TABLE test_bgw.conc_part CASCADE;
+NOTICE:  drop cascades to 5 other objects
 DROP SCHEMA test_bgw CASCADE;
 DROP EXTENSION pg_pathman;

contrib/pg_pathman/expected/pathman_calamity.out

@@ -12,7 +12,7 @@ SELECT debug_capture();
 SELECT get_pathman_lib_version();
  get_pathman_lib_version 
 -------------------------
- 10403
+ 10406
 (1 row)
 
 set client_min_messages = NOTICE;
@@ -855,6 +855,25 @@ NOTICE:  drop cascades to 2 other objects
 DROP SCHEMA calamity CASCADE;
 NOTICE:  drop cascades to 15 other objects
 DROP EXTENSION pg_pathman;
+/*
+ * -------------------------------
+ *  Special tests (SET statement)
+ * -------------------------------
+ */
+CREATE EXTENSION pg_pathman;
+SET pg_pathman.enable = false;
+NOTICE:  RuntimeAppend, RuntimeMergeAppend and PartitionFilter nodes and some other options have been disabled
+SET pg_pathman.enable = true;
+NOTICE:  RuntimeAppend, RuntimeMergeAppend and PartitionFilter nodes and some other options have been enabled
+SET pg_pathman.enable = false;
+NOTICE:  RuntimeAppend, RuntimeMergeAppend and PartitionFilter nodes and some other options have been disabled
+RESET pg_pathman.enable;
+NOTICE:  RuntimeAppend, RuntimeMergeAppend and PartitionFilter nodes and some other options have been enabled
+RESET ALL;
+BEGIN; ROLLBACK;
+BEGIN ISOLATION LEVEL SERIALIZABLE; ROLLBACK;
+BEGIN; SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; ROLLBACK;
+DROP EXTENSION pg_pathman;
 /*
  * -------------------------------------
  *  Special tests (pathman_cache_stats)