From 8efdef8936500cbb2a0c9e0e4f00cb3f3b28c75d Mon Sep 17 00:00:00 2001 From: Marc-Antoine Parent Date: Thu, 19 Oct 2023 11:34:41 -0400 Subject: [PATCH] Update pgrx, add postgres 16 --- .github/workflows/ci.yml | 2 +- .../ubuntu-packages-and-docker-image.yml | 12 ++- .../self-hosting/README.md | 2 +- .../self-hosting/building-from-source.md | 4 +- pgml-extension/Cargo.lock | 77 ++++++++++++------- pgml-extension/Cargo.toml | 7 +- 6 files changed, 69 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5f65aed0..8e9eb5317 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: run: | curl https://sh.rustup.rs -sSf | sh -s -- -y source ~/.cargo/env - cargo install cargo-pgrx --version "0.10.0" --locked + cargo install cargo-pgrx --version "0.10.1" --locked if [[ ! -d ~/.pgrx ]]; then cargo pgrx init diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml index 681c084ee..df32ae287 100644 --- a/.github/workflows/ubuntu-packages-and-docker-image.yml +++ b/.github/workflows/ubuntu-packages-and-docker-image.yml @@ -72,11 +72,13 @@ jobs: libpq-dev \ libclang-dev \ wget \ + postgresql-16 \ postgresql-15 \ postgresql-14 \ postgresql-13 \ postgresql-12 \ postgresql-11 \ + postgresql-server-dev-16 \ postgresql-server-dev-15 \ postgresql-server-dev-14 \ postgresql-server-dev-13 \ @@ -98,13 +100,13 @@ jobs: with: working-directory: pgml-extension command: install - args: cargo-pgrx --version "0.10.0" --locked + args: cargo-pgrx --version "0.10.1" --locked - name: pgrx init uses: postgresml/gh-actions-cargo@master with: working-directory: pgml-extension command: pgrx - args: init --pg11=/usr/lib/postgresql/11/bin/pg_config --pg12=/usr/lib/postgresql/12/bin/pg_config --pg13=/usr/lib/postgresql/13/bin/pg_config --pg14=/usr/lib/postgresql/14/bin/pg_config --pg15=/usr/lib/postgresql/15/bin/pg_config + args: init --pg11=/usr/lib/postgresql/11/bin/pg_config --pg12=/usr/lib/postgresql/12/bin/pg_config --pg13=/usr/lib/postgresql/13/bin/pg_config --pg14=/usr/lib/postgresql/14/bin/pg_config --pg15=/usr/lib/postgresql/15/bin/pg_config --pg16=/usr/lib/postgresql/16/bin/pg_config - name: Build Postgres 11 uses: postgresml/gh-actions-cargo@master with: @@ -135,6 +137,12 @@ jobs: working-directory: pgml-extension command: pgrx args: package --pg-config /usr/lib/postgresql/15/bin/pg_config + - name: Build Postgres 16 + uses: postgresml/gh-actions-cargo@master + with: + working-directory: pgml-extension + command: pgrx + args: package --pg-config /usr/lib/postgresql/16/bin/pg_config - name: Build debs env: AWS_ACCESS_KEY_ID: ${{ vars.AWS_ACCESS_KEY_ID }} diff --git a/pgml-docs/docs/guides/deploying-postgresml/self-hosting/README.md b/pgml-docs/docs/guides/deploying-postgresml/self-hosting/README.md index e64677886..45c04b606 100644 --- a/pgml-docs/docs/guides/deploying-postgresml/self-hosting/README.md +++ b/pgml-docs/docs/guides/deploying-postgresml/self-hosting/README.md @@ -31,7 +31,7 @@ Finally, you can install PostgresML: sudo apt install -y postgresml-14 ``` -Ubuntu 22.04 ships with PostgreSQL 14, but if you have a different version installed on your system, just change `14` in the package name to your Postgres version. We currently support all versions supported by the community: Postgres 12 through 15. +Ubuntu 22.04 ships with PostgreSQL 14, but if you have a different version installed on your system, just change `14` in the package name to your Postgres version. We currently support all versions supported by the community: Postgres 12 through 16. ### Validate your installation diff --git a/pgml-docs/docs/guides/deploying-postgresml/self-hosting/building-from-source.md b/pgml-docs/docs/guides/deploying-postgresml/self-hosting/building-from-source.md index 64d6d9f30..0102fd9e4 100644 --- a/pgml-docs/docs/guides/deploying-postgresml/self-hosting/building-from-source.md +++ b/pgml-docs/docs/guides/deploying-postgresml/self-hosting/building-from-source.md @@ -40,12 +40,12 @@ For a typical deployment in production, you would need to compile and install th #### Install pgrx -`pgrx` is open source and available from crates.io. We are currently using the `0.10.0` version. It's important that your `pgrx` version matches what we're using, since there are some hard dependencies between our code and `pgrx`. +`pgrx` is open source and available from crates.io. We are currently using the `0.10.1` version. It's important that your `pgrx` version matches what we're using, since there are some hard dependencies between our code and `pgrx`. To install `pgrx`, simply run: ``` -cargo install cargo-pgrx --version "0.10.0" +cargo install cargo-pgrx --version "0.10.1" ``` Before using `pgrx`, it needs to be initialized against the installed version of PostgreSQL. In this example, we'll be using the Ubuntu 22.04 default PostgreSQL 14 installation: diff --git a/pgml-extension/Cargo.lock b/pgml-extension/Cargo.lock index 725e6ed5b..2fa238f7f 100644 --- a/pgml-extension/Cargo.lock +++ b/pgml-extension/Cargo.lock @@ -251,9 +251,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.66.1" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ "bitflags 2.4.0", "cexpr 0.6.0", @@ -371,7 +371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" dependencies = [ "serde", - "toml", + "toml 0.7.6", ] [[package]] @@ -794,18 +794,18 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "enum-map" -version = "2.6.2" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e10d4d903e79b6181943defcdc36f61f8f608e5892eca719fb0677799d3f8fe" +checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5" dependencies = [ "enum-map-derive", ] [[package]] name = "enum-map-derive" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb14d927583dd5c2eac0f2cf264fc4762aefe1ae14c47a8a20fc1939d3a5fc0" +checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ "proc-macro2", "quote 1.0.33", @@ -1244,9 +1244,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -1876,9 +1876,9 @@ dependencies = [ [[package]] name = "pgrx" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7ee7e7abe8a74124732d05fdbccd11179b4778c08736995fdfc8ca9d2e9c24" +checksum = "d2c4fe036f9493e674a7db27f7a06d54acb89735a0c1d4421128c341d3cf240f" dependencies = [ "atomic-traits", "bitflags 2.4.0", @@ -1901,9 +1901,9 @@ dependencies = [ [[package]] name = "pgrx-macros" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6d5a93b4c6ceb3735605205267a002584fd3d7fa87eed3133cba6c74f7431" +checksum = "943f9e2f46585b8f4540c72e26b079303b3520f8de0da090f96acaabe3f99e28" dependencies = [ "pgrx-sql-entity-graph", "proc-macro2", @@ -1913,9 +1913,9 @@ dependencies = [ [[package]] name = "pgrx-pg-config" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a7885744ba92cd19ad87f2bf195352a9533cd2bb10a1ebbeef7ef9d65126aa" +checksum = "a48800161320294c5a5ab72d38235e2e97f3bf1849661ee977502c8e64362285" dependencies = [ "cargo_toml", "dirs 5.0.1", @@ -1925,17 +1925,17 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "toml", + "toml 0.8.2", "url", ] [[package]] name = "pgrx-pg-sys" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916a552934ebfcf3c56277e682526c8d92264b4c9ba58a7d0a3cddf1e03c6825" +checksum = "27dd6c4f2f098f62b5a8f07cf6447f640ce81637d20f269662a043a55195ed9d" dependencies = [ - "bindgen 0.66.1", + "bindgen 0.68.1", "eyre", "libc", "memoffset 0.9.0", @@ -1953,9 +1953,9 @@ dependencies = [ [[package]] name = "pgrx-sql-entity-graph" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db087888395237259e1c643777ff619077ace10afa670e5bb4b8d510db63dac0" +checksum = "e7514a083c8c062f8bb9f53ced124f120515af3b49b92a57305e749ec736f98c" dependencies = [ "convert_case", "eyre", @@ -1968,9 +1968,9 @@ dependencies = [ [[package]] name = "pgrx-tests" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b3449cbdfdbd25bc24ae7d962fdc0c8eac2a839b5bfee7a295b6c8931b0c0b" +checksum = "9a71327ab5e5ddbc2d43ffad391ce515a358096c3713b360b57c5eec107d1cb7" dependencies = [ "clap-cargo", "eyre", @@ -2077,9 +2077,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -3046,7 +3046,19 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.14", +] + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -3071,6 +3083,19 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tracing" version = "0.1.37" diff --git a/pgml-extension/Cargo.toml b/pgml-extension/Cargo.toml index 02e34ce08..01e520419 100644 --- a/pgml-extension/Cargo.toml +++ b/pgml-extension/Cargo.toml @@ -13,14 +13,15 @@ pg12 = ["pgrx/pg12", "pgrx-tests/pg12"] pg13 = ["pgrx/pg13", "pgrx-tests/pg13"] pg14 = ["pgrx/pg14", "pgrx-tests/pg14"] pg15 = ["pgrx/pg15", "pgrx-tests/pg15"] +pg16 = ["pgrx/pg16", "pgrx-tests/pg16"] use_as_lib = [] pg_test = [] python = ["pyo3"] cuda = ["xgboost/cuda", "lightgbm/cuda"] [dependencies] -pgrx = "=0.10.0" -pgrx-pg-sys = "=0.10.0" +pgrx = "=0.10.1" +pgrx-pg-sys = "=0.10.1" xgboost = { git = "https://github.com/postgresml/rust-xgboost.git", branch = "master" } once_cell = { version = "1", features = ["parking_lot"] } rand = "0.8" @@ -51,7 +52,7 @@ flate2 = "1.0" csv = "1.2" [dev-dependencies] -pgrx-tests = "=0.10.0" +pgrx-tests = "=0.10.1" [build-dependencies] vergen = { version = "8", features = ["build", "git", "gitcl"] } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy