Skip to content

Add support for PostgreSQL18 #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shinyaaa merged 15 commits into from
Jan 8, 2026
Merged

Add support for PostgreSQL18 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e7bbf73
Add support fo PostgreSQL 18
shinyaaa Jul 31, 2025
353d1aa
Fix 962da900a
shinyaaa Jul 31, 2025
d10a79d
Fix 5983a4cff
shinyaaa Aug 1, 2025
8a1bb0b
Fix cbc127917
shinyaaa Aug 1, 2025
7bc4d45
Fix e596e077b
shinyaaa Aug 4, 2025
8c64622
Fix 525392d57
shinyaaa Aug 4, 2025
15bf8bf
Fix 37c87e63f
shinyaaa Aug 4, 2025
a7b05c0
Fix 426ea6111
shinyaaa Aug 4, 2025
32c6f4c
Fix e83a8ae44
shinyaaa Aug 5, 2025
07953bd
Update nbtsort-18.c to HEAD of REL_18_STABLE
shinyaaa Aug 5, 2025
d532226
Fix test.yml and Makefile
shinyaaa Aug 5, 2025
65f9f48
Fix trivial miss
shinyaaa Aug 27, 2025
51969ab
Add v18 to test target
shinyaaa Dec 4, 2025
7c58aa9
Update cache versions
shinyaaa Dec 4, 2025
845b4b7
Add libnuma-dev to build.yaml
shinyaaa Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:
strategy:
matrix:
PGVERSION: # TODO: build with master branch
- "18"
- "17"
- "16"
- "15"
- "14"
- "13"

env:
CACHE_VERSION: 20221222 # to identify cache version
CACHE_VERSION: 20251204 # to identify cache version

steps:
- name: cat version
Expand Down Expand Up @@ -65,6 +65,7 @@ jobs:
libselinux-dev \
libedit-dev \
liblz4-dev \
libnuma-dev \
zlib1g-dev \
postgresql-${{ env.PGVERSION }} \
postgresql-server-dev-${{ env.PGVERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
RHEL_VERSION: ["8", "9", "10"]
PG_VERSION: ["13", "14", "15", "16", "17"]
PG_VERSION: ["14", "15", "16", "17", "18"]
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:
strategy:
matrix:
PGVERSION: # TODO: build with master branch
- "17.2"
- "16.6"
- "15.10"
- "14.15"
- "13.18"
- "18.1"
- "17.7"
- "16.11"
- "15.15"
- "14.20"

env:
CACHE_VERSION: 20221222 # to identify cache version
CACHE_VERSION: 20251204 # to identify cache version

steps:
- name: cat version
Expand Down
25 changes: 18 additions & 7 deletions bin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ sql/init-16.sql:
cp sql/init-extension-v3.sql sql/init-16.sql
sql/init-17.sql:
cp sql/init-extension-v3.sql sql/init-17.sql
sql/init-18.sql:
cp sql/init-extension-v3.sql sql/init-18.sql

sql/load_bin.sql: sql/load_bin-$(MAJORVERSION).sql
cp sql/load_bin-$(MAJORVERSION).sql sql/load_bin.sql
Expand Down Expand Up @@ -97,6 +99,8 @@ sql/load_bin-16.sql:
cp sql/load_bin-v2.sql sql/load_bin-16.sql
sql/load_bin-17.sql:
cp sql/load_bin-v2.sql sql/load_bin-17.sql
sql/load_bin-18.sql:
cp sql/load_bin-v2.sql sql/load_bin-18.sql

sql/load_csv.sql: sql/load_csv-$(MAJORVERSION).sql
cp sql/load_csv-$(MAJORVERSION).sql sql/load_csv.sql
Expand Down Expand Up @@ -124,6 +128,8 @@ sql/load_csv-16.sql:
cp sql/load_csv-v3.sql sql/load_csv-16.sql
sql/load_csv-17.sql:
cp sql/load_csv-v3.sql sql/load_csv-17.sql
sql/load_csv-18.sql:
cp sql/load_csv-v3.sql sql/load_csv-18.sql

sql/load_filter.sql: sql/load_filter-$(MAJORVERSION).sql
cp sql/load_filter-$(MAJORVERSION).sql sql/load_filter.sql
Expand Down Expand Up @@ -151,7 +157,8 @@ sql/load_filter-16.sql:
cp sql/load_filter-v3.sql sql/load_filter-16.sql
sql/load_filter-17.sql:
cp sql/load_filter-v3.sql sql/load_filter-17.sql

sql/load_filter-18.sql:
cp sql/load_filter-v3.sql sql/load_filter-18.sql

sql/load_function.sql: sql/load_function-$(MAJORVERSION).sql
cp sql/load_function-$(MAJORVERSION).sql sql/load_function.sql
Expand Down Expand Up @@ -179,6 +186,8 @@ sql/load_function-16.sql:
cp sql/load_function-v3.sql sql/load_function-16.sql
sql/load_function-17.sql:
cp sql/load_function-v3.sql sql/load_function-17.sql
sql/load_function-18.sql:
cp sql/load_function-v3.sql sql/load_function-18.sql

sql/write_bin.sql: sql/write_bin-$(MAJORVERSION).sql
cp sql/write_bin-$(MAJORVERSION).sql sql/write_bin.sql
Expand Down Expand Up @@ -206,17 +215,19 @@ sql/write_bin-16.sql:
cp sql/write_bin-v2.sql sql/write_bin-16.sql
sql/write_bin-17.sql:
cp sql/write_bin-v2.sql sql/write_bin-17.sql
sql/write_bin-18.sql:
cp sql/write_bin-v2.sql sql/write_bin-18.sql

.PHONY: subclean
clean: subclean

subclean:
rm -f sql/init.sql sql/init-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
rm -f sql/load_bin.sql sql/load_bin-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
rm -f sql/load_csv.sql sql/load_csv-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
rm -f sql/load_filter.sql sql/load_filter-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
rm -f sql/load_function.sql sql/load_function-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
rm -f sql/write_bin.sql sql/write_bin-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
rm -f sql/init.sql sql/init-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17,18}.sql
rm -f sql/load_bin.sql sql/load_bin-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17,18}.sql
rm -f sql/load_csv.sql sql/load_csv-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17,18}.sql
rm -f sql/load_filter.sql sql/load_filter-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17,18}.sql
rm -f sql/load_function.sql sql/load_function-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17,18}.sql
rm -f sql/write_bin.sql sql/write_bin-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17,18}.sql

installcheck: sql/init.sql sql/load_bin.sql sql/load_csv.sql sql/load_function.sql sql/load_filter.sql sql/write_bin.sql

Expand Down
2 changes: 1 addition & 1 deletion include/pg_bulkload.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ typedef Parser *(*ParserCreate)(void);
#endif
#endif

#ifdef HAVE_LONG_INT_64
Copy link
Contributor

@zwyan0 zwyan0 Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pg17まだ#ifdef HAVE_LONG_INT_64利用しているようですね
https://github.com/postgres/postgres/blob/498b163a161e2a545a327ae5604682d5e00f3dfa/src/include/c.h#L520

こちらの修正を見ると、正しいように見えます
Use <stdint.h> and <inttypes.h> for c.h integers.

分岐とか入れたほうがよさそうですかね？

Copy link
Contributor Author

@shinyaaa shinyaaa Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SIZEOF_LONG is defined at ./configure, regardless of the PostgreSQL version. Therefore, it is safe to use #if SIZEOF_LONG == 8 in any version of PostgreSQL.

#if SIZEOF_LONG == 8
#define int64_FMT "%ld"
#else
#define int64_FMT "%lld"
Expand Down
Loading