Skip to content
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.

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

chore: update pgrx to 0.12.5 & add pg17 in check and release #600

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/psql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
test:
strategy:
matrix:
version: [14, 15, 16]
version: [14, 15, 16, 17]
arch: ["x86_64"]
runs-on: ubuntu-latest
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
binary:
strategy:
matrix:
version: [14, 15, 16]
version: [14, 15, 16, 17]
arch: ["x86_64", "aarch64"]
runs-on: ubuntu-20.04
env:
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
needs: ["binary", "semver"]
strategy:
matrix:
version: [14, 15, 16]
version: [14, 15, 16, 17]
platform: ["amd64", "arm64"]
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
version: [14, 15, 16]
version: [14, 15, 16, 17]
rootless: [true, false]
steps:
- name: Checkout
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release_enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
binary:
strategy:
matrix:
version: [14, 15, 16]
version: [14, 15, 16, 17]
arch: ["x86_64", "aarch64"]
schema: ["vectors", "extensions", "public"]
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
needs: ["binary", "semver"]
strategy:
matrix:
version: [14, 15, 16]
version: [14, 15, 16, 17]
platform: ["amd64", "arm64"]
schema: ["vectors", "extensions", "public"]
runs-on: ubuntu-latest
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
version: [14, 15, 16]
version: [14, 15, 16, 17]
schema: ["vectors", "extensions", "public"]
steps:
- name: Checkout
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ jobs:
touch ~/.cargo/config.toml
echo 'target.aarch64-unknown-linux-gnu.linker = "aarch64-linux-gnu-gcc"' >> ~/.cargo/config.toml
echo 'target.aarch64-unknown-linux-gnu.runner = ["qemu-aarch64-static", "-L", "/usr/aarch64-linux-gnu"]' >> ~/.cargo/config.toml
rustup target add x86_64-unknown-linux-gnu
rustup target add aarch64-unknown-linux-gnu
- name: Set up Sccache
uses: mozilla-actions/[email protected]
- name: Set up Cache
Expand Down Expand Up @@ -95,6 +97,9 @@ jobs:
export PGRX_PG_CONFIG_PATH=$(pwd)/vendor/pg16_${ARCH}_debian/pg_config/pg_config
export PGRX_TARGET_INFO_PATH_PG16=$(pwd)/vendor/pg16_${ARCH}_debian/pgrx_binding
cargo clippy --package pgvectors --features pg16 --no-deps --target $ARCH-unknown-linux-gnu
export PGRX_PG_CONFIG_PATH=$(pwd)/vendor/pg17_${ARCH}_debian/pg_config/pg_config
export PGRX_TARGET_INFO_PATH_PG17=$(pwd)/vendor/pg17_${ARCH}_debian/pgrx_binding
cargo clippy --package pgvectors --features pg17 --no-deps --target $ARCH-unknown-linux-gnu
- name: Build
run: |
cargo build --workspace --exclude pgvectors --exclude pyvectors --target $ARCH-unknown-linux-gnu
Expand All @@ -107,6 +112,9 @@ jobs:
export PGRX_PG_CONFIG_PATH=$(pwd)/vendor/pg16_${ARCH}_debian/pg_config/pg_config
export PGRX_TARGET_INFO_PATH_PG16=$(pwd)/vendor/pg16_${ARCH}_debian/pgrx_binding
cargo build --package pgvectors --lib --features pg16 --target $ARCH-unknown-linux-gnu
export PGRX_PG_CONFIG_PATH=$(pwd)/vendor/pg17_${ARCH}_debian/pg_config/pg_config
export PGRX_TARGET_INFO_PATH_PG17=$(pwd)/vendor/pg17_${ARCH}_debian/pgrx_binding
cargo build --package pgvectors --lib --features pg17 --target $ARCH-unknown-linux-gnu
- name: Test
run: |
cargo test --workspace --exclude pgvectors --exclude pyvectors --no-fail-fast --target $ARCH-unknown-linux-gnu
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/update_vendor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,21 @@ jobs:
run: |
export BRANCH=$(grep -o 'pgrx = { git = "https://github.com/tensorchord/pgrx.git", branch = "[^"]*' Cargo.toml | cut -d '"' -f 4)
docker run --rm --platform linux/amd64 -v ./:/mnt/build \
-e "VERSION=14" -e "BRANCH=$BRANCH" debian:buster bash /mnt/build/scripts/update_vendor.sh &
-e "VERSION=14" -e "BRANCH=$BRANCH" debian:bookworm bash /mnt/build/scripts/update_vendor.sh &
docker run --rm --platform linux/amd64 -v ./:/mnt/build \
-e "VERSION=15" -e "BRANCH=$BRANCH" debian:buster bash /mnt/build/scripts/update_vendor.sh &
-e "VERSION=15" -e "BRANCH=$BRANCH" debian:bookworm bash /mnt/build/scripts/update_vendor.sh &
docker run --rm --platform linux/amd64 -v ./:/mnt/build \
-e "VERSION=16" -e "BRANCH=$BRANCH" debian:buster bash /mnt/build/scripts/update_vendor.sh &
-e "VERSION=16" -e "BRANCH=$BRANCH" debian:bookworm bash /mnt/build/scripts/update_vendor.sh &
docker run --rm --platform linux/amd64 -v ./:/mnt/build \
-e "VERSION=17" -e "BRANCH=$BRANCH" debian:bookworm bash /mnt/build/scripts/update_vendor.sh &
docker run --rm --platform linux/arm64 -v ./:/mnt/build \
-e "VERSION=14" -e "BRANCH=$BRANCH" debian:bookworm bash /mnt/build/scripts/update_vendor.sh &
docker run --rm --platform linux/arm64 -v ./:/mnt/build \
-e "VERSION=14" -e "BRANCH=$BRANCH" debian:buster bash /mnt/build/scripts/update_vendor.sh &
-e "VERSION=15" -e "BRANCH=$BRANCH" debian:bookworm bash /mnt/build/scripts/update_vendor.sh &
docker run --rm --platform linux/arm64 -v ./:/mnt/build \
-e "VERSION=15" -e "BRANCH=$BRANCH" debian:buster bash /mnt/build/scripts/update_vendor.sh &
-e "VERSION=16" -e "BRANCH=$BRANCH" debian:bookworm bash /mnt/build/scripts/update_vendor.sh &
docker run --rm --platform linux/arm64 -v ./:/mnt/build \
-e "VERSION=16" -e "BRANCH=$BRANCH" debian:buster bash /mnt/build/scripts/update_vendor.sh &
-e "VERSION=17" -e "BRANCH=$BRANCH" debian:bookworm bash /mnt/build/scripts/update_vendor.sh &
wait
sudo chown -R $USER ./vendor
- name: Create Pull Request
Expand Down
76 changes: 43 additions & 33 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ libc.workspace = true
log.workspace = true
memmap2.workspace = true
paste.workspace = true
pgrx = { version = "=0.12.1", default-features = false, features = [] }
pgrx = { version = "=0.12.5", default-features = false, features = [] }
rand.workspace = true
rustix.workspace = true
serde.workspace = true
Expand Down Expand Up @@ -88,7 +88,7 @@ rust.unused_lifetimes = "warn"
rust.unused_qualifications = "warn"

[patch.crates-io]
pgrx = { git = "https://github.com/tensorchord/pgrx.git", branch = "v0.12.1-patch" }
pgrx = { git = "https://github.com/tensorchord/pgrx.git", branch = "v0.12.5-patch" }

[profile.opt]
inherits = "dev"
Expand Down
3 changes: 0 additions & 3 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
[toolchain]
channel = "nightly-2024-09-14"
profile = "default"
components = ["rust-analyzer", "rust-src"]
targets = ["aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu"]
2 changes: 1 addition & 1 deletion src/logger/postgres.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ fn write_pipe_chunks(pid: u32, mut msg: &[u8], dest: LogDestination) {
chunk.extend((len as u16).to_le_bytes());
chunk.extend((pid as i32).to_le_bytes());
#[cfg(feature = "pg14")]
chunk.extend((is_last as u8).to_le_bytes());
chunk.extend(is_last.to_le_bytes());
#[cfg(any(feature = "pg15", feature = "pg16", feature = "pg17"))]
chunk.extend((flags as u8).to_le_bytes());
chunk.extend_from_slice(&msg[..len]);
Expand Down
10 changes: 5 additions & 5 deletions vendor/pg14_aarch64_debian/pg_config/pg_config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ MANDIR = /usr/share/postgresql/14/man
SHAREDIR = /usr/share/postgresql/14
SYSCONFDIR = /etc/postgresql-common
PGXS = /usr/lib/postgresql/14/lib/pgxs/src/makefiles/pgxs.mk
CONFIGURE = '--build=aarch64-linux-gnu' '--prefix=/usr' '--includedir=${prefix}/include' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var' '--disable-option-checking' '--disable-silent-rules' '--libdir=${prefix}/lib/aarch64-linux-gnu' '--runstatedir=/run' '--disable-maintainer-mode' '--disable-dependency-tracking' '--with-tcl' '--with-perl' '--with-python' '--with-pam' '--with-openssl' '--with-libxml' '--with-libxslt' '--mandir=/usr/share/postgresql/14/man' '--docdir=/usr/share/doc/postgresql-doc-14' '--sysconfdir=/etc/postgresql-common' '--datarootdir=/usr/share/' '--datadir=/usr/share/postgresql/14' '--bindir=/usr/lib/postgresql/14/bin' '--libdir=/usr/lib/aarch64-linux-gnu/' '--libexecdir=/usr/lib/postgresql/' '--includedir=/usr/include/postgresql/' '--with-extra-version= (Debian 14.13-1.pgdg100+1)' '--enable-nls' '--enable-thread-safety' '--enable-debug' '--disable-rpath' '--with-uuid=e2fs' '--with-gnu-ld' '--with-gssapi' '--with-ldap' '--with-pgport=5432' '--with-system-tzdata=/usr/share/zoneinfo' 'AWK=mawk' 'MKDIR_P=/bin/mkdir -p' 'PROVE=/usr/bin/prove' 'PYTHON=/usr/bin/python3' 'TAR=/bin/tar' 'XSLTPROC=xsltproc --nonet' 'CFLAGS=-g -O2 -fstack-protector-strong -Wformat -Werror=format-security' 'LDFLAGS=-Wl,-z,relro -Wl,-z,now' '--enable-tap-tests' '--with-icu' '--with-llvm' 'LLVM_CONFIG=/usr/bin/llvm-config-13' 'CLANG=/usr/bin/clang-13' '--with-lz4' '--with-systemd' '--with-selinux' '--enable-dtrace' 'build_alias=aarch64-linux-gnu' 'CPPFLAGS=-Wdate-time -D_FORTIFY_SOURCE=2' 'CXXFLAGS=-g -O2 -fstack-protector-strong -Wformat -Werror=format-security'
CONFIGURE = '--build=aarch64-linux-gnu' '--prefix=/usr' '--includedir=${prefix}/include' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--sysconfdir=/etc' '--localstatedir=/var' '--disable-option-checking' '--disable-silent-rules' '--libdir=${prefix}/lib/aarch64-linux-gnu' '--runstatedir=/run' '--disable-maintainer-mode' '--disable-dependency-tracking' '--with-tcl' '--with-perl' '--with-python' '--with-pam' '--with-openssl' '--with-libxml' '--with-libxslt' '--mandir=/usr/share/postgresql/14/man' '--docdir=/usr/share/doc/postgresql-doc-14' '--sysconfdir=/etc/postgresql-common' '--datarootdir=/usr/share/' '--datadir=/usr/share/postgresql/14' '--bindir=/usr/lib/postgresql/14/bin' '--libdir=/usr/lib/aarch64-linux-gnu/' '--libexecdir=/usr/lib/postgresql/' '--includedir=/usr/include/postgresql/' '--with-extra-version= (Debian 14.13-1.pgdg120+1)' '--enable-nls' '--enable-thread-safety' '--enable-debug' '--disable-rpath' '--with-uuid=e2fs' '--with-gnu-ld' '--with-gssapi' '--with-ldap' '--with-pgport=5432' '--with-system-tzdata=/usr/share/zoneinfo' 'AWK=mawk' 'MKDIR_P=/bin/mkdir -p' 'PROVE=/usr/bin/prove' 'PYTHON=/usr/bin/python3' 'TAR=/bin/tar' 'XSLTPROC=xsltproc --nonet' 'CFLAGS=-g -O2 -fstack-protector-strong -Wformat -Werror=format-security' 'LDFLAGS=-Wl,-z,relro -Wl,-z,now' '--enable-tap-tests' '--with-icu' '--with-llvm' 'LLVM_CONFIG=/usr/bin/llvm-config-16' 'CLANG=/usr/bin/clang-16' '--with-lz4' '--with-systemd' '--with-selinux' '--enable-dtrace' 'build_alias=aarch64-linux-gnu' 'CPPFLAGS=-Wdate-time -D_FORTIFY_SOURCE=2' 'CXXFLAGS=-g -O2 -fstack-protector-strong -Wformat -Werror=format-security'
CC = gcc
CPPFLAGS = -Wdate-time -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -I/usr/include/libxml2
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Werror=vla -Wendif-labels -Wmissing-format-attribute -Wimplicit-fallthrough=3 -Wcast-function-type -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -Wno-format-truncation -Wno-stringop-truncation -g -g -O2 -fstack-protector-strong -Wformat -Werror=format-security
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Werror=vla -Wendif-labels -Wmissing-format-attribute -Wimplicit-fallthrough=3 -Wcast-function-type -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -Wno-format-truncation -Wno-stringop-truncation -moutline-atomics -g -g -O2 -fstack-protector-strong -Wformat -Werror=format-security
CFLAGS_SL = -fPIC
LDFLAGS = -Wl,-z,relro -Wl,-z,now -L/usr/lib/llvm-13/lib -Wl,--as-needed
LDFLAGS = -Wl,-z,relro -Wl,-z,now -L/usr/lib/llvm-16/lib -Wl,--as-needed
LDFLAGS_EX =
LDFLAGS_SL =
LIBS = -lpgcommon -lpgport -lselinux -llz4 -lxslt -lxml2 -lpam -lssl -lcrypto -lgssapi_krb5 -lz -lreadline -lpthread -lrt -ldl -lm
VERSION = PostgreSQL 14.13 (Debian 14.13-1.pgdg100+1)
LIBS = -lpgcommon -lpgport -lselinux -llz4 -lxslt -lxml2 -lpam -lssl -lcrypto -lgssapi_krb5 -lz -lreadline -lm
VERSION = PostgreSQL 14.13 (Debian 14.13-1.pgdg120+1)
Loading
Loading