Merge branch 'master' into upgrade_fix

Author: sokolcati

Diff for: .gitignore

@@ -1,5 +1,4 @@
 .deps
-isolation_output
 results/*
 regression.diffs
 regression.out

Diff for: .travis.yml

@@ -1,4 +1,6 @@
-sudo: required
+os: linux
+
+dist: focal
 
 language: c
 
@@ -18,18 +20,15 @@ notifications:
         on_failure: always
 
 env:
+    - PG_VERSION=16 LEVEL=hardcore
+    - PG_VERSION=16
+    - PG_VERSION=15 LEVEL=hardcore
+    - PG_VERSION=15
+    - PG_VERSION=14 LEVEL=hardcore
+    - PG_VERSION=14
+    - PG_VERSION=13 LEVEL=hardcore
+    - PG_VERSION=13
     - PG_VERSION=12 LEVEL=hardcore
     - PG_VERSION=12
     - PG_VERSION=11 LEVEL=hardcore
     - PG_VERSION=11
-    - PG_VERSION=10 LEVEL=hardcore
-    - PG_VERSION=10
-    - PG_VERSION=9.6 LEVEL=hardcore
-    - PG_VERSION=9.6
-    - PG_VERSION=9.5 LEVEL=hardcore
-    - PG_VERSION=9.5
-
-matrix:
-    allow_failures:
-        - env: PG_VERSION=10 LEVEL=nightmare
-        - env: PG_VERSION=9.6 LEVEL=nightmare

Diff for: Dockerfile.tmpl

@@ -2,14 +2,14 @@ FROM postgres:${PG_VERSION}-alpine
 
 # Install dependencies
 RUN apk add --no-cache \
-	openssl curl \
+	openssl curl git patch \
 	cmocka-dev \
 	perl perl-ipc-run \
 	python3 python3-dev py3-virtualenv \
 	coreutils linux-headers \
 	make musl-dev gcc bison flex \
 	zlib-dev libedit-dev \
-	clang clang-analyzer;
+	pkgconf icu-dev clang clang15 clang-analyzer;
 
 # Install fresh valgrind
 RUN apk add valgrind \
@@ -29,8 +29,8 @@ ADD . /pg/testdir
 # Grant privileges
 RUN	chown -R postgres:postgres ${PGDATA} && \
 	chown -R postgres:postgres /pg/testdir && \
-	chmod a+rwx /usr/local/lib/postgresql && \
-	chmod a+rwx /usr/local/share/postgresql/extension
+	chmod a+rwx /usr/local/share/postgresql/extension && \
+	find /usr/local/lib/postgresql -type d -print0 | xargs -0 chmod a+rwx
 
 COPY run_tests.sh /run.sh
 RUN chmod 755 /run.sh

Diff for: META.json

@@ -2,7 +2,7 @@
    "name": "pg_pathman",
    "abstract": "Fast partitioning tool for PostgreSQL",
    "description": "pg_pathman provides optimized partitioning mechanism and functions to manage partitions.",
-   "version": "1.5.11",
+   "version": "1.5.12",
    "maintainer": [
       "Arseny Sher <[email protected]>"
    ],
@@ -22,7 +22,7 @@
        "pg_pathman": {
            "file": "pg_pathman--1.5.sql",
            "docfile": "README.md",
-           "version": "1.5.11",
+           "version": "1.5.12",
            "abstract": "Effective partitioning tool for PostgreSQL 9.5 and higher"
       }
    },

Diff for: Makefile

@@ -30,6 +30,7 @@ DATA = pg_pathman--1.0--1.1.sql \
 
 PGFILEDESC = "pg_pathman - partitioning tool for PostgreSQL"
 
+ifneq (pg_pathman,$(filter pg_pathman,$(PG_TEST_SKIP)))
 REGRESS = pathman_array_qual \
 		  pathman_basic \
 		  pathman_bgw \
@@ -61,25 +62,41 @@ REGRESS = pathman_array_qual \
 		  pathman_update_triggers \
 		  pathman_upd_del \
 		  pathman_utility_stmt \
-		  pathman_views
+		  pathman_views \
+		  pathman_CVE-2020-14350
 
+REGRESS := $(filter-out pathman_upd_del, $(REGRESS))
+endif
+
+ISOLATION = insert_nodes for_update rollback_on_create_partitions
 
-EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
+REGRESS_OPTS = --temp-config $(top_srcdir)/$(subdir)/conf.add
+ISOLATION_OPTS = --temp-config $(top_srcdir)/$(subdir)/conf.add
 
-EXTRA_CLEAN = pg_pathman--$(EXTVERSION).sql ./isolation_output
+CMOCKA_EXTRA_CLEAN = missing_basic.o missing_list.o missing_stringinfo.o missing_bitmapset.o rangeset_tests.o rangeset_tests
+EXTRA_CLEAN = $(patsubst %,tests/cmocka/%, $(CMOCKA_EXTRA_CLEAN))
 
 ifdef USE_PGXS
 PG_CONFIG=pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 VNUM := $(shell $(PG_CONFIG) --version | awk '{print $$2}')
 
 # check for declarative syntax
+# this feature will not be ported to >=12
 ifeq ($(VNUM),$(filter 10% 11%,$(VNUM)))
 REGRESS += pathman_declarative
 OBJS += src/declarative.o
 override PG_CPPFLAGS += -DENABLE_DECLARATIVE
 endif
 
+# We cannot run isolation test for versions 12,13 in PGXS case
+# because 'pg_isolation_regress' is not copied to install
+# directory, see src/test/isolation/Makefile
+ifeq ($(VNUM),$(filter 12% 13%,$(VNUM)))
+undefine ISOLATION
+undefine ISOLATION_OPTS
+endif
+
 include $(PGXS)
 else
 subdir = contrib/pg_pathman
@@ -91,18 +108,6 @@ endif
 $(EXTENSION)--$(EXTVERSION).sql: init.sql hash.sql range.sql
 	cat $^ > $@
 
-ISOLATIONCHECKS=insert_nodes for_update rollback_on_create_partitions
-
-submake-isolation:
-	$(MAKE) -C $(top_builddir)/src/test/isolation all
-
-isolationcheck: | submake-isolation
-	$(MKDIR_P) isolation_output
-	$(pg_isolation_regress_check) \
-		--temp-config=$(top_srcdir)/$(subdir)/conf.add \
-		--outputdir=./isolation_output \
-		$(ISOLATIONCHECKS)
-
 python_tests:
 	$(MAKE) -C tests/python partitioning_tests CASE=$(CASE)
 

Diff for: README.md

@@ -1,20 +1,21 @@
-[![Build Status](https://travis-ci.org/postgrespro/pg_pathman.svg?branch=master)](https://travis-ci.org/postgrespro/pg_pathman)
+[![Build Status](https://travis-ci.com/postgrespro/pg_pathman.svg?branch=master)](https://travis-ci.com/postgrespro/pg_pathman)
 [![PGXN version](https://badge.fury.io/pg/pg_pathman.svg)](https://badge.fury.io/pg/pg_pathman)
 [![codecov](https://codecov.io/gh/postgrespro/pg_pathman/branch/master/graph/badge.svg)](https://codecov.io/gh/postgrespro/pg_pathman)
 [![GitHub license](https://img.shields.io/badge/license-PostgreSQL-blue.svg)](https://raw.githubusercontent.com/postgrespro/pg_pathman/master/LICENSE)
 
 ### NOTE: this project is not under development anymore
 
-`pg_pathman` supports Postgres versions [9.5..12], but most probably it won't be ported to 13 and later releases. [Native partitioning](https://www.postgresql.org/docs/current/ddl-partitioning.html) is pretty mature now and has almost everything implemented in `pg_pathman`'; we encourage users switching to it. We are still maintaining the project (fixing bugs in supported versions), but no new development is going to happen here.
+`pg_pathman` supports Postgres versions [11..15], but most probably it won't be ported to later releases. [Native partitioning](https://www.postgresql.org/docs/current/ddl-partitioning.html) is pretty mature now and has almost everything implemented in `pg_pathman`'; we encourage users switching to it. We are still maintaining the project (fixing bugs in supported versions), but no new development is going to happen here.
 
 # pg_pathman
 
 The `pg_pathman` module provides optimized partitioning mechanism and functions to manage partitions.
 
 The extension is compatible with:
 
- * PostgreSQL 9.5, 9.6, 10, 11, 12;
- * Postgres Pro Standard 9.5, 9.6, 10, 11, 12;
+ * PostgreSQL 12, 13;
+ * PostgreSQL with core-patch: 11, 14, 15;
+ * Postgres Pro Standard 11, 12, 13, 14, 15;
  * Postgres Pro Enterprise;
 
 Take a look at our Wiki [out there](https://github.com/postgrespro/pg_pathman/wiki).
@@ -95,11 +96,19 @@ shared_preload_libraries = 'pg_pathman'
 
 It is essential to restart the PostgreSQL instance. After that, execute the following query in psql:
 ```plpgsql
-CREATE EXTENSION pg_pathman;
+CREATE SCHEMA pathman;
+GRANT USAGE ON SCHEMA pathman TO PUBLIC;
+CREATE EXTENSION pg_pathman WITH SCHEMA pathman;
 ```
 
 Done! Now it's time to setup your partitioning schemes.
 
+> **Security notice**: pg_pathman is believed to be secure against
+search-path-based attacks mentioned in Postgres
+[documentation](https://www.postgresql.org/docs/current/sql-createextension.html). However,
+if *your* calls of pathman's functions doesn't exactly match the signature, they
+might be vulnerable to malicious overloading. If in doubt, install pathman to clean schema where nobody except superusers have CREATE object permission to avoid problems.
+
 > **Windows-specific**: pg_pathman imports several symbols (e.g. None_Receiver, InvalidObjectAddress) from PostgreSQL, which is fine by itself, but requires that those symbols are marked as `PGDLLIMPORT`. Unfortunately, some of them are not exported from vanilla PostgreSQL, which means that you have to either use Postgres Pro Standard/Enterprise (which includes all necessary patches), or patch and build your own distribution of PostgreSQL.
 
 ## How to update
@@ -611,7 +620,7 @@ SELECT tableoid::regclass AS partition, * FROM partitioned_table;
 - All running concurrent partitioning tasks can be listed using the `pathman_concurrent_part_tasks` view:
 ```plpgsql
 SELECT * FROM pathman_concurrent_part_tasks;
- userid | pid  | dbid  | relid | processed | status  
+ userid | pid  | dbid  | relid | processed | status
 --------+------+-------+-------+-----------+---------
  dmitry | 7367 | 16384 | test  |    472000 | working
 (1 row)
@@ -625,7 +634,7 @@ WHERE parent = 'part_test'::regclass AND range_min::int < 500;
 NOTICE:  1 rows copied from part_test_11
 NOTICE:  100 rows copied from part_test_1
 NOTICE:  100 rows copied from part_test_2
- drop_range_partition 
+ drop_range_partition
 ----------------------
  dummy_test_11
  dummy_test_1
@@ -780,8 +789,8 @@ All sections and data will remain unchanged and will be handled by the standard
 Do not hesitate to post your issues, questions and new ideas at the [issues](https://github.com/postgrespro/pg_pathman/issues) page.
 
 ## Authors
-[Ildar Musin](https://github.com/zilder)  
-Alexander Korotkov <a.korotkov(at)postgrespro.ru> Postgres Professional Ltd., Russia  
-[Dmitry Ivanov](https://github.com/funbringer)  
-Maksim Milyutin <m.milyutin(at)postgrespro.ru> Postgres Professional Ltd., Russia  
+[Ildar Musin](https://github.com/zilder)
+[Alexander Korotkov](https://github.com/akorotkov)
+[Dmitry Ivanov](https://github.com/funbringer)
+[Maksim Milyutin](https://github.com/maksm90)
 [Ildus Kurbangaliev](https://github.com/ildus)

Diff for: docker-compose.yml

@@ -1,2 +1,3 @@
-tests:
+services:
+  tests:
     build: .

Diff for: expected/for_update.out

@@ -2,37 +2,49 @@ Parsed test spec with 2 sessions
 
 starting permutation: s1_b s1_update s2_select s1_r
 create_range_partitions
+-----------------------
+                     10
+(1 row)
 
-10             
 step s1_b: begin;
 step s1_update: update test_tbl set id = 2 where id = 1;
 step s2_select: select * from test_tbl where id = 1;
-id             val            
+id|val
+--+---
+ 1|  1
+(1 row)
 
-1              1              
 step s1_r: rollback;
 
 starting permutation: s1_b s1_update s2_select_locked s1_r
 create_range_partitions
+-----------------------
+                     10
+(1 row)
 
-10             
 step s1_b: begin;
 step s1_update: update test_tbl set id = 2 where id = 1;
 step s2_select_locked: select * from test_tbl where id = 1 for share; <waiting ...>
 step s1_r: rollback;
 step s2_select_locked: <... completed>
-id             val            
+id|val
+--+---
+ 1|  1
+(1 row)
 
-1              1              
 
 starting permutation: s1_b s1_update s2_select_locked s1_c
 create_range_partitions
+-----------------------
+                     10
+(1 row)
 
-10             
 step s1_b: begin;
 step s1_update: update test_tbl set id = 2 where id = 1;
 step s2_select_locked: select * from test_tbl where id = 1 for share; <waiting ...>
 step s1_c: commit;
 step s2_select_locked: <... completed>
-id             val            
+id|val
+--+---
+(0 rows)