prep v0.22 (#216)

* prep v0.22

* remove branch from ci

* install pgrx 0.12.5 on older vectorize

* Update Makefile

* Update Makefile

* check if exists before drop

* replace instead of drop fn

Author: ChuckHend

.github/actions/pgx-init/action.yml

@@ -27,7 +27,7 @@ runs:
             echo "pgrx is not a dependency: skipping"
             echo "skip=true" >> $GITHUB_OUTPUT
           else
-            cargo install --version ${pgrx_version} cargo-pgrx
+            cargo install --version ${pgrx_version} cargo-pgrx --locked
             echo "skip=false" >> $GITHUB_OUTPUT
           fi
       - name: pgrx init

.github/workflows/extension_ci.yml

@@ -23,36 +23,6 @@ on:
     types:
       - created
 jobs:
-  dependencies:
-    name: Install dependencies
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      # rust needed to install trunk
-      - name: Install Rust stable toolchain
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Install stoml and pg-trunk
-        shell: bash
-        run: |
-          set -xe
-          wget https://github.com/freshautomations/stoml/releases/download/v0.7.1/stoml_linux_amd64 &> /dev/null
-          mv stoml_linux_amd64 stoml
-          chmod +x stoml
-          sudo mv stoml /usr/local/bin/
-          cargo install pg-trunk
-
-      - name: Cache binaries
-        uses: actions/cache@v4
-        with:
-          path: |
-            /usr/local/bin/stoml
-            ~/.cargo/bin/trunk
-          key: ${{ runner.os }}-bins-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-bins-
-
   lint:
     name: Run linters
     runs-on: ubuntu-latest
@@ -103,7 +73,7 @@ jobs:
 
       - name: Test Core - Integration
         # skip when on external forks
-        if: github.event.pull_request.head.repo.full_name == github.repository
+        if: github.repository_owner == 'tembo-io'
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           CO_API_KEY: ${{ secrets.CO_API_KEY }}
@@ -115,8 +85,7 @@ jobs:
 
   test:
     name: Run tests
-    needs: dependencies
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     services:
       # Label used to access the service container
       vector-serve:
@@ -129,27 +98,17 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
-          prefix-key: "extension-test"
           workspaces: |
             vectorize
           # Additional directories to cache
           cache-directories: |
             /home/runner/.pgrx
       - name: Install sys dependencies
         run: |
-          sudo apt-get update && sudo apt-get install -y postgresql-server-dev-16 libopenblas-dev libreadline-dev
+          sudo apt-get update && sudo apt-get install -y build-essential libreadline-dev zlib1g-dev flex bison libclang-dev postgresql-client libicu-dev make wget pkg-config libssl-dev git gcc libopenblas-dev
       - uses: ./.github/actions/pgx-init
         with:
           working-directory: ./extension
-      - name: Restore cached binaries
-        uses: actions/cache@v4
-        with:
-          path: |
-            /usr/local/bin/stoml
-            ~/.cargo/bin/trunk
-          key: ${{ runner.os }}-bins-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-bins-
       - name: setup-tests
         run: |
           make setup
@@ -158,7 +117,7 @@ jobs:
           echo "\q" | make run
           make test-unit
       - name: integration-test
-        if: github.event.pull_request.head.repo.full_name == github.repository
+        if: github.repository_owner == 'tembo-io'
         env:
           HF_API_KEY: ${{ secrets.HF_API_KEY }}
           CO_API_KEY: ${{ secrets.CO_API_KEY }}

.github/workflows/extension_upgrade.yml

@@ -60,6 +60,8 @@ jobs:
           trunk install vectorize --version 0.20.0 --pg-config $(cargo pgrx info pg-config pg17)
           git fetch --tags
           git checkout tags/v0.20.0
+          # pgrx=0.12.5 required for v0.20.0
+          cargo install cargo-pgrx --version 0.12.5 --locked
           make test-integration
       - name: Test branch's version
         env:

.github/workflows/pg-image-build.yml

@@ -51,6 +51,7 @@ jobs:
         run: |
           echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
           echo "TAG_VER=$(/usr/local/bin/stoml extension/Cargo.toml package.version)" >> $GITHUB_OUTPUT
+          echo "PGRX_VER=$(/usr/local/bin/stoml extension/Cargo.toml dependencies.pgrx | tr -d '="')" >> $GITHUB_OUTPUT
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -66,6 +67,7 @@ jobs:
         if: github.event_name != 'release'
         run: |
             docker build \
+                --build-arg PGRX_VER=${{ steps.versions.outputs.PGRX_VER }} \
                 -f ./images/vectorize-pg/Dockerfile \
                 -t quay.io/tembo/vectorize-pg:${{ steps.versions.outputs.SHORT_SHA }}-amd64 .
             docker push quay.io/tembo/vectorize-pg:${{ steps.versions.outputs.SHORT_SHA }}-amd64
@@ -74,6 +76,7 @@ jobs:
         if: github.event_name == 'release'
         run: |
             docker build \
+                --build-arg PGRX_VER=${{ steps.versions.outputs.PGRX_VER }} \
                 -f ./images/vectorize-pg/Dockerfile \
                 -t quay.io/tembo/vectorize-pg:v${{ steps.versions.outputs.TAG_VER }}-amd64 \
                 -t quay.io/tembo/vectorize-pg:latest-amd64 .
@@ -109,6 +112,7 @@ jobs:
         run: |
           echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
           echo "TAG_VER=$(/usr/local/bin/stoml extension/Cargo.toml package.version)" >> $GITHUB_OUTPUT
+          echo "PGRX_VER=$(/usr/local/bin/stoml extension/Cargo.toml dependencies.pgrx | tr -d '="')" >> $GITHUB_OUTPUT
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -125,6 +129,7 @@ jobs:
         if: github.event_name != 'release'
         run: |
             docker build \
+                --build-arg PGRX_VER=${{ steps.versions.outputs.PGRX_VER }} \
                 -f ./images/vectorize-pg/Dockerfile \
                 --platform linux/arm64 \
                 -t quay.io/tembo/vectorize-pg:${{ steps.versions.outputs.SHORT_SHA }}-arm64 .
@@ -134,6 +139,7 @@ jobs:
         if: github.event_name == 'release'
         run: |
             docker build \
+                --build-arg PGRX_VER=${{ steps.versions.outputs.PGRX_VER }} \
                 -f ./images/vectorize-pg/Dockerfile \
                 --platform linux/arm64 \
                 -t quay.io/tembo/vectorize-pg:v${{ steps.versions.outputs.TAG_VER }}-arm64 \

extension/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vectorize"
-version = "0.21.1"
+version = "0.22.0"
 edition = "2021"
 publish = false
 
@@ -25,7 +25,7 @@ chrono = {version = "0.4.26", features = ["serde"] }
 handlebars = "5.1.0"
 log = "0.4.21"
 pgmq = "0.29"
-pgrx = "=0.12.5"
+pgrx = "=0.13.1"
 reqwest = {version = "0.11.18", features = ["json"] }
 serde = { version = "1.0.173", features = ["derive"] }
 serde_json = "1.0.103"
@@ -42,7 +42,7 @@ url = "2.4.0"
 vectorize_core = { path = "../core", package = "vectorize-core" }
 
 [dev-dependencies]
-pgrx-tests = "=0.12.5"
+pgrx-tests = "=0.13.1"
 rand = "0.8.5"
 whoami = "1.4.1"
 

extension/Makefile

@@ -4,6 +4,7 @@ DISTVERSION  = $(shell grep -m 1 '^version' Trunk.toml | sed -e 's/[^"]*"\([^"]*
 PG_VERSION:=17
 DATABASE_URL:=postgres://${USER}:${USER}@localhost:288${PG_VERSION}/postgres
 PGRX_PG_CONFIG:=$(shell cargo pgrx info pg-config pg${PG_VERSION})
+PGRX_VERSION := $(shell grep -E "^pgrx\s*=" Cargo.toml | cut -d'"' -f2 | tr -d '=')
 UPGRADE_FROM_VER:=0.16.0
 BRANCH:=$(git rev-parse --abbrev-ref HEAD)
 RUST_LOG:=debug
@@ -86,15 +87,17 @@ install-vectorscale:
 	fi; \
 	git clone https://github.com/timescale/pgvectorscale.git && \
 	cd pgvectorscale/pgvectorscale && \
+	cargo install cargo-pgrx --locked --version $$(grep -E "^pgrx\s*=" Cargo.toml | cut -d'"' -f2 | tr -d '=') && \
 	cargo pgrx install --pg-config=${PGRX_PG_CONFIG} && \
 	cd ../.. && rm -rf pgvectorscale
+	cargo install cargo-pgrx --locked --version ${PGRX_VERSION}
 
 test-integration:
 	echo "\q" | make run
 	cargo test ${TEST_NAME} -- --ignored --test-threads=1 --nocapture
 
 test-unit:
-	cargo test -- --test-threads=1
+	cargo test ${TEST_NAME} -- --test-threads=1
 
 test-version:
 	git fetch --tags
@@ -104,6 +107,7 @@ test-version:
 	cargo test -- --ignored --test-threads=1
 
 test-update:
+	cargo install cargo-pgrx --locked --version ${PGRX_VERSION}
 	echo "\q" | make run
 	psql ${DATABASE_URL} -c "CREATE EXTENSION IF NOT EXISTS vectorscale"
 	psql ${DATABASE_URL} -c "ALTER EXTENSION vectorize UPDATE"

extension/Trunk.toml

@@ -6,7 +6,7 @@ description = "The simplest way to orchestrate vector search on Postgres."
 homepage = "https://github.com/tembo-io/pg_vectorize"
 documentation = "https://github.com/tembo-io/pg_vectorize"
 categories = ["orchestration", "machine_learning"]
-version = "0.21.1"
+version = "0.22.0"
 loadable_libraries = [{ library_name = "vectorize", requires_restart = true }]
 
 [build]

extension/sql/vectorize--0.21.1--0.22.0.sql

@@ -34,7 +34,7 @@ LANGUAGE c /* Rust */
 AS 'MODULE_PATHNAME', 'table_wrapper';
 /* </end connected objects> */
 
-DROP FUNCTION vectorize."table_from";
+DROP FUNCTION IF EXISTS vectorize."table_from";
 -- src/api.rs:380
 -- vectorize::api::table_from
 CREATE  FUNCTION vectorize."table_from"(
@@ -67,8 +67,7 @@ SET params = jsonb_set(
 WHERE params ? 'table';
 
 -- Update the function to reference "relation" instead of "table"
-DROP FUNCTION vectorize."handle_table_drop";
-CREATE FUNCTION vectorize.handle_table_drop()
+CREATE OR REPLACE FUNCTION vectorize.handle_table_drop()
 RETURNS event_trigger AS $$
 DECLARE
     obj RECORD;

extension/src/api.rs

@@ -67,20 +67,7 @@ fn chunk_table(
         );
         Spi::run_with_args(
             &insert_query,
-            Some(vec![
-                (
-                    pgrx::PgOid::Custom(pgrx::pg_sys::INT4OID),
-                    original_id.into_datum(),
-                ), // OID for integer
-                (
-                    pgrx::PgOid::Custom(pgrx::pg_sys::INT4OID),
-                    chunk_index.into_datum(),
-                ), // OID for integer
-                (
-                    pgrx::PgOid::Custom(pgrx::pg_sys::TEXTOID),
-                    chunk.into_datum(),
-                ), // OID for text
-            ]),
+            &[original_id.into(), chunk_index.into(), chunk.into()],
         )?;
     }
 
@@ -271,11 +258,8 @@ fn generate(
 
 #[pg_extern]
 fn env_interpolate_guc(guc_name: &str) -> Result<String> {
-    let g: String = Spi::get_one_with_args(
-        "SELECT current_setting($1)",
-        vec![(PgBuiltInOids::TEXTOID.oid(), guc_name.into_datum())],
-    )?
-    .unwrap_or_else(|| panic!("no value set for guc: {guc_name}"));
+    let g: String = Spi::get_one_with_args("SELECT current_setting($1)", &[guc_name.into()])?
+        .unwrap_or_else(|| panic!("no value set for guc: {guc_name}"));
     env_interpolate_string(&g)
 }
 
@@ -366,10 +350,7 @@ fn import_embeddings(
             "DELETE FROM pgmq.q_{} WHERE message->>'job_name' = $1",
             VECTORIZE_QUEUE
         );
-        Spi::run_with_args(
-            &delete_q,
-            Some(vec![(PgBuiltInOids::TEXTOID.oid(), job_name.into_datum())]),
-        )?;
+        Spi::run_with_args(&delete_q, &[job_name.into()])?;
     }
 
     Ok(format!(

extension/src/bin/pgrx_embed.rs

@@ -1,2 +1,3 @@
 // https://github.com/pgcentralfoundation/pgrx/issues/1888
+#![allow(unexpected_cfgs)]
 ::pgrx::pgrx_embed!();