Revert "Update to pgrx 0.11.0 & Postgres 16" (#1101)

levkk · web-flow · commit aa3155b35d15 · 2023-10-19T11:43:10.000-07:00
diff --git 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.11.0" --locked
+          cargo install cargo-pgrx --version "0.10.0" --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
@@ -72,16 +72,16 @@ jobs:
           libpq-dev \
           libclang-dev \
           wget \
-          postgresql-16 \
           postgresql-15 \
           postgresql-14 \
           postgresql-13 \
           postgresql-12 \
-          postgresql-server-dev-16 \
+          postgresql-11 \
           postgresql-server-dev-15 \
           postgresql-server-dev-14 \
           postgresql-server-dev-13 \
           postgresql-server-dev-12 \
+          postgresql-server-dev-11 \
           lsb-release \
           python3.10 \
           python3-pip \
@@ -98,7 +98,7 @@ jobs:
       with:
         working-directory: pgml-extension
         command: install
-        args: cargo-pgrx --version "0.11.0" --locked
+        args: cargo-pgrx --version "0.10.0" --locked
     - name: pgrx init
       uses: postgresml/gh-actions-cargo@master
       with:
@@ -135,12 +135,6 @@ 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-dashboard/content/docs/guides/setup/developers.md b/pgml-dashboard/content/docs/guides/setup/developers.md
@@ -70,7 +70,7 @@ Once there, you can initialize `pgrx` and get going:
 
 #### Pgrx command line and environments
 ```commandline
-cargo install cargo-pgrx --version "0.11.0" --locked && \
+cargo install cargo-pgrx --version "0.10.0" --locked && \
 cargo pgrx init # This will take a few minutes
 ```
 
diff --git a/pgml-dashboard/content/docs/guides/setup/v2/installation.md b/pgml-dashboard/content/docs/guides/setup/v2/installation.md
@@ -36,7 +36,7 @@ brew bundle
 PostgresML is written in Rust, so you'll need to install the latest compiler from [rust-lang.org](https://rust-lang.org). Additionally, we use the Rust PostgreSQL extension framework `pgrx`, which requires some initialization steps:
 
 ```bash
-cargo install cargo-pgrx --version 0.11.0 && \
+cargo install cargo-pgrx --version 0.10.0 && \
 cargo pgrx init
 ```
 
@@ -294,7 +294,7 @@ We use the `pgrx` Postgres Rust extension framework, which comes with its own in
 
 ```bash
 cd pgml-extension && \
-cargo install cargo-pgrx --version 0.11.0 && \
+cargo install cargo-pgrx --version 0.10.0 && \
 cargo pgrx init
 ```
 
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
@@ -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.11.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.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`.
 
 To install `pgrx`, simply run:
 
 ```
-cargo install cargo-pgrx --version "0.11.0"
+cargo install cargo-pgrx --version "0.10.0"
 ```
 
 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
diff --git a/pgml-extension/Cargo.toml b/pgml-extension/Cargo.toml
@@ -7,20 +7,20 @@ edition = "2021"
 crate-type = ["lib", "cdylib"]
 
 [features]
-default = ["pg16", "python"]
+default = ["pg15", "python"]
+pg11 = ["pgrx/pg11", "pgrx-tests/pg11"]
 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.11.0"
-pgrx-pg-sys = "=0.11.0"
+pgrx = "=0.10.0"
+pgrx-pg-sys = "=0.10.0"
 xgboost = { git = "https://github.com/postgresml/rust-xgboost.git", branch = "master" }
 once_cell = { version = "1", features = ["parking_lot"] }
 rand = "0.8"
@@ -51,7 +51,7 @@ flate2 = "1.0"
 csv = "1.2"
 
 [dev-dependencies]
-pgrx-tests = "=0.11.0"
+pgrx-tests = "=0.10.0"
 
 [build-dependencies]
 vergen = { version = "8", features = ["build", "git", "gitcl"] }
