From ab246c12a673b071f5270118027342edd6322ed1 Mon Sep 17 00:00:00 2001 From: PerikAdjust Date: Fri, 1 Mar 2024 13:44:06 +0100 Subject: [PATCH] add pg16 test, add modifications to adapt to pg16 --- .github/workflows/main.yml | 2 +- .gitignore | 3 +++ expected/parallel_test.out | 9 ++++++++- expected/parallel_test_0.out | 9 ++++++++- sql/parallel_test.sql | 9 ++++++++- src/common.c | 3 +++ src/md5.c | 3 +++ src/sha.c | 3 +++ 8 files changed, 37 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aca8b0d..e654cb6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: test: strategy: matrix: - pg: [15, 14, 13, 12, 11, 10] + pg: [16, 15, 14, 13, 12, 11, 10] name: 🐘 PostgreSQL ${{ matrix.pg }} runs-on: ubuntu-latest container: pgxn/pgxn-tools diff --git a/.gitignore b/.gitignore index a384c72..11f3ca1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ *.o *.so +*.dylib + + sha*.sql.in sha*.sql sha*.c diff --git a/expected/parallel_test.out b/expected/parallel_test.out index 139289b..ec6a54e 100644 --- a/expected/parallel_test.out +++ b/expected/parallel_test.out @@ -1,6 +1,13 @@ BEGIN; SET max_parallel_workers_per_gather=4; -SET force_parallel_mode=on; +DO $$ +BEGIN + IF current_setting('server_version_num')::int >= 160000 THEN + EXECUTE 'SET debug_parallel_query = on'; + ELSE + EXECUTE 'SET force_parallel_mode = on'; + END IF; +END $$; CREATE TABLE parallel_test(i int, md md5hash, md2 md5hash) WITH (parallel_workers = 4); INSERT INTO parallel_test (i, md, md2) SELECT i, md5(i::text), md5((i + 1)::text) diff --git a/expected/parallel_test_0.out b/expected/parallel_test_0.out index bf7f2dd..64dbf90 100644 --- a/expected/parallel_test_0.out +++ b/expected/parallel_test_0.out @@ -1,6 +1,13 @@ BEGIN; SET max_parallel_workers_per_gather=4; -SET force_parallel_mode=on; +DO $$ +BEGIN + IF current_setting('server_version_num')::int >= 160000 THEN + EXECUTE 'SET debug_parallel_query = on'; + ELSE + EXECUTE 'SET force_parallel_mode = on'; + END IF; +END $$; CREATE TABLE parallel_test(i int, md md5hash, md2 md5hash) WITH (parallel_workers = 4); INSERT INTO parallel_test (i, md, md2) SELECT i, md5(i::text), md5((i + 1)::text) diff --git a/sql/parallel_test.sql b/sql/parallel_test.sql index 696aeea..959f00d 100644 --- a/sql/parallel_test.sql +++ b/sql/parallel_test.sql @@ -1,6 +1,13 @@ BEGIN; SET max_parallel_workers_per_gather=4; -SET force_parallel_mode=on; +DO $$ +BEGIN + IF current_setting('server_version_num')::int >= 160000 THEN + EXECUTE 'SET debug_parallel_query = on'; + ELSE + EXECUTE 'SET force_parallel_mode = on'; + END IF; +END $$; CREATE TABLE parallel_test(i int, md md5hash, md2 md5hash) WITH (parallel_workers = 4); INSERT INTO parallel_test (i, md, md2) diff --git a/src/common.c b/src/common.c index dbf235a..ce17bb4 100644 --- a/src/common.c +++ b/src/common.c @@ -10,6 +10,9 @@ #include "common.h" #include "fmgr.h" +#if PG_VERSION_NUM >= 160000 +#include "varatt.h" +#endif PG_MODULE_MAGIC; diff --git a/src/md5.c b/src/md5.c index 19d97fd..e75dc02 100644 --- a/src/md5.c +++ b/src/md5.c @@ -13,6 +13,9 @@ #include "fmgr.h" #include "utils/builtins.h" #include "libpq/pqformat.h" +#if PG_VERSION_NUM >= 160000 +#include "varatt.h" +#endif #define MD5_LENGTH 16 diff --git a/src/sha.c b/src/sha.c index c69e7b1..cfb16ec 100644 --- a/src/sha.c +++ b/src/sha.c @@ -24,6 +24,9 @@ #ifndef SHA_NAME #error No algorithm name defined #endif +#if PG_VERSION_NUM >= 160000 +#include "varatt.h" +#endif typedef struct Sha { unsigned char bytes[SHA_LENGTH];