Skip to content

Upgrade the pgrx version to 0.14.1 #7

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
bizwark merged 4 commits into from
Apr 24, 2025
Merged

Upgrade the pgrx version to 0.14.1 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00c8f31
Upgrade pgrx version to 0.14.1 for rag extensions.
bizwark Apr 23, 2025
3994b9e
Update README.md with the correct pgrx version.
bizwark Apr 23, 2025
8abe8fa
Fix version string in pgrx line of Cargo.toml for rag extension.
bizwark Apr 23, 2025
82a0376
Fix pgrx line of Cargo.toml in extension.
bizwark Apr 23, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ cd lib/jina_reranker_v1_tiny_en && tar xzf model.onnx.tar.gz && cd ../..
Then (with up-to-date Rust installed):

```bash
cargo install --locked cargo-pgrx@0.12.6
cargo install --locked cargo-pgrx@0.14.1
```

Finally, inside each of the three folders inside `exts`:
Expand Down
5 changes: 2 additions & 3 deletions exts/rag/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ path = "./src/bin/pgrx_embed.rs"

[features]
default = ["pg16"]
pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]
pg13 = ["pgrx/pg13", "pgrx-tests/pg13" ]
pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ]
pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ]
Expand All @@ -24,15 +23,15 @@ pg_test = []
docx-rust = "0.1.8"
htmd = "0.1.6"
pdf-extract = "0.7.7"
pgrx = "0.12.6"
pgrx = "0.14.1"
serde = "1.0.209"
serde_json = "1.0.120"
text-splitter = { version = "0.14.1" }
unicode-normalization = "0.1.24"
ureq = { version = "2.9.7", features = ["json"] }

[dev-dependencies]
pgrx-tests = "0.12.6"
pgrx-tests = "0.14.1"

[profile.dev]
panic = "unwind"
Expand Down
5 changes: 2 additions & 3 deletions exts/rag_bge_small_en_v15/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ path = "./src/bin/pgrx_embed.rs"

[features]
default = ["pg16"]
pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]
pg13 = ["pgrx/pg13", "pgrx-tests/pg13" ]
pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ]
pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ]
Expand All @@ -26,7 +25,7 @@ fastembed = "=3.14.1"
tokenizers = "0.19.1"
text-splitter = { version = "0.14.1", features = ["tokenizers"] }
serde_json = "1.0.120"
pgrx = "0.12.6"
pgrx = "0.14.1"
tonic = "0.12.3"
prost = "0.13.3"
tokio = "1.40.0"
Expand All @@ -46,7 +45,7 @@ ort-sys = { path = "../../lib/ort-2.0.0-rc.4/ort-sys" }
tonic-build = "0.12.3"

[dev-dependencies]
pgrx-tests = "0.12.6"
pgrx-tests = "0.14.1"

[profile.dev]
panic = "unwind"
Expand Down
4 changes: 2 additions & 2 deletions exts/rag_bge_small_en_v15/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static PID: OnceLock<i64> = OnceLock::new();
static TEXT_EMBEDDING: tokio::sync::OnceCell<TextEmbedding> = tokio::sync::OnceCell::const_new();

#[pg_guard]
pub extern "C" fn _PG_init() {
pub extern "C-unwind" fn _PG_init() {
let pid = std::process::id() as i64;
PID.set(pid)
.expect_or_pg_err("Impossible concurrent access to set PID value");
Expand Down Expand Up @@ -129,7 +129,7 @@ impl EmbeddingGenerator for EmbeddingGeneratorStruct {

#[pg_guard]
#[no_mangle]
pub extern "C" fn background_main(arg: pg_sys::Datum) {
pub extern "C-unwind" fn background_main(arg: pg_sys::Datum) {
let pid = unsafe { i64::from_polymorphic_datum(arg, false, pg_sys::INT8OID).unwrap_or_pg_err("No PID received") };
let name = BackgroundWorker::get_name();
log!("{ERR_PREFIX} {name} started, received PID {pid}");
Expand Down
5 changes: 2 additions & 3 deletions exts/rag_jina_reranker_v1_tiny_en/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ path = "./src/bin/pgrx_embed.rs"

[features]
default = ["pg16"]
pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]
pg13 = ["pgrx/pg13", "pgrx-tests/pg13" ]
pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ]
pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ]
Expand All @@ -23,7 +22,7 @@ remote_onnx = []

[dependencies]
fastembed = "=3.14.1"
pgrx = "0.12.6"
pgrx = "0.14.1"
tonic = "0.12.3"
prost = "0.13.3"
tokio = "1.40.0"
Expand All @@ -43,7 +42,7 @@ ort-sys = { path = "../../lib/ort-2.0.0-rc.4/ort-sys" }
tonic-build = "0.12.3"

[dev-dependencies]
pgrx-tests = "0.12.6"
pgrx-tests = "0.14.1"

[profile.dev]
panic = "unwind"
Expand Down
4 changes: 2 additions & 2 deletions exts/rag_jina_reranker_v1_tiny_en/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static PID: OnceLock<i64> = OnceLock::new();
static TEXT_RERANK: tokio::sync::OnceCell<TextRerank> = tokio::sync::OnceCell::const_new();

#[pg_guard]
pub extern "C" fn _PG_init() {
pub extern "C-unwind" fn _PG_init() {
let pid = std::process::id() as i64;
PID.set(pid)
.expect_or_pg_err("Impossible concurrent access to set PID value");
Expand Down Expand Up @@ -133,7 +133,7 @@ impl Reranker for RerankerStruct {

#[pg_guard]
#[no_mangle]
pub extern "C" fn background_main(arg: pg_sys::Datum) {
pub extern "C-unwind" fn background_main(arg: pg_sys::Datum) {
let pid = unsafe { i64::from_polymorphic_datum(arg, false, pg_sys::INT8OID).unwrap_or_pg_err("No PID received") };
let name = BackgroundWorker::get_name();
log!("{ERR_PREFIX} {name} started, received PID {pid}");
Expand Down