From c0dff134efbec032cf973f75b8a1e0f11db7750d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Nov 2025 21:11:00 +0000 Subject: [PATCH 1/2] Bump oxigraph from 0.4.9 to 0.5.2 in /rust/case2geojson Bumps [oxigraph](https://github.com/oxigraph/oxigraph) from 0.4.9 to 0.5.2. - [Release notes](https://github.com/oxigraph/oxigraph/releases) - [Changelog](https://github.com/oxigraph/oxigraph/blob/main/CHANGELOG.md) - [Commits](https://github.com/oxigraph/oxigraph/compare/v0.4.9...v0.5.2) --- updated-dependencies: - dependency-name: oxigraph dependency-version: 0.5.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- rust/case2geojson/Cargo.lock | 111 +++++++++++++++++++++++++---------- rust/case2geojson/Cargo.toml | 2 +- 2 files changed, 82 insertions(+), 31 deletions(-) diff --git a/rust/case2geojson/Cargo.lock b/rust/case2geojson/Cargo.lock index fd746ec..fd132bb 100644 --- a/rust/case2geojson/Cargo.lock +++ b/rust/case2geojson/Cargo.lock @@ -27,7 +27,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom", + "getrandom 0.2.16", "once_cell", "version_check", ] @@ -485,6 +485,18 @@ dependencies = [ "wasi", ] +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasip2", +] + [[package]] name = "half" version = "2.6.0" @@ -568,7 +580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" dependencies = [ "bitmaps", - "rand_core", + "rand_core 0.6.4", "rand_xoshiro", "sized-chunks", "typenum", @@ -1080,12 +1092,12 @@ dependencies = [ [[package]] name = "oxigraph" -version = "0.4.9" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d28e7314364160e878e8a004598de4c45bd615a9eca09ec2aaedfb119cad06ba" +checksum = "dd894a613f26824b6b373ea2c5f3234abe5199669d2d45e81c066bc116224f8c" dependencies = [ "dashmap", - "getrandom", + "getrandom 0.3.4", "libc", "oxiri", "oxrdf", @@ -1115,11 +1127,23 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54b4ed3a7192fa19f5f48f99871f2755047fabefd7f222f12a1df1773796a102" +[[package]] +name = "oxjsonld" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5b44046d987eafa6762dffa7f51cb7ac4fbff371fcc0e8e57060b5c478871c0" +dependencies = [ + "json-event-parser", + "oxiri", + "oxrdf", + "thiserror 2.0.12", +] + [[package]] name = "oxrdf" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a04761319ef84de1f59782f189d072cbfc3a9a40c4e8bded8667202fbd35b02a" +checksum = "380cb0b0f0b7c38c5c9f3f5a90b5a7e8e89c751b3f087c4d16101c16a221cf16" dependencies = [ "oxilangtag", "oxiri", @@ -1130,10 +1154,11 @@ dependencies = [ [[package]] name = "oxrdfio" -version = "0.1.7" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d45d81e8e5313e13f88da6c040f5edcd5aa48e91d1cdf0972f5bc79362890d" +checksum = "19c493572957ed196c076ad30c778215f85d28530e56451cdb07f564dddabfcd" dependencies = [ + "oxjsonld", "oxrdf", "oxrdfxml", "oxttl", @@ -1142,9 +1167,9 @@ dependencies = [ [[package]] name = "oxrdfxml" -version = "0.1.6" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e00a36021b71d74281cf9ffbbda57210bb9cb84b7f28bda50a3ee9641b6ce5d" +checksum = "0fdb40d6d81141e19b4898c8930e6b50c85b7155a2377b9ac1e62a9588f32b5f" dependencies = [ "oxilangtag", "oxiri", @@ -1164,9 +1189,9 @@ dependencies = [ [[package]] name = "oxttl" -version = "0.1.7" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc2f05b9179f1033582fe3ae58a96cb4311dd1a2116791c3236117d5427f275" +checksum = "357f8c6b875ee108f3aa34249383c50bfda2c195a9d5e6178ba5ee53546e7225" dependencies = [ "memchr", "oxilangtag", @@ -1312,25 +1337,30 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "rand" -version = "0.8.5" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "libc", "rand_chacha", - "rand_core", + "rand_core 0.9.3", ] [[package]] name = "rand_chacha" -version = "0.3.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.9.3", ] [[package]] @@ -1338,8 +1368,14 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom", + "getrandom 0.3.4", ] [[package]] @@ -1348,7 +1384,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -1574,9 +1610,9 @@ checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "sparesults" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b845f8f37245959132c0561bb737c28eb9c0b693b92535fc5c3965a9390724d" +checksum = "63c2001427f2d0575e3f6d68e2ff9597988361bc0e3b1b5cf444991258860e18" dependencies = [ "json-event-parser", "memchr", @@ -1587,9 +1623,9 @@ dependencies = [ [[package]] name = "spareval" -version = "0.1.3" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503e405d90d89d7172a3b71ca2f57feb4e09d174302b550a3ae088c6eb6459c" +checksum = "9014a55e3f69ebb491768d80690aab9f93b7b7479b0b344e2ad09eee439a5f42" dependencies = [ "hex", "json-event-parser", @@ -1610,9 +1646,9 @@ dependencies = [ [[package]] name = "spargebra" -version = "0.3.5" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8907e262be4b4b363218f4688f5654d423a958aa4b8d7c7a7f898be591fa474e" +checksum = "1f870f0c4790ff7de07b205b1502f1eae114849ea6ba278327aa45c091ecfeb1" dependencies = [ "oxilangtag", "oxiri", @@ -1624,9 +1660,9 @@ dependencies = [ [[package]] name = "sparopt" -version = "0.2.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790bbdf13560c2afc245ab0f82a489003b3918e668ebd45c65fe46bfd7a1763" +checksum = "559d593b1ed5806562944a3ea831dbce356f9c079e92fb32814fafe4a9f84ea5" dependencies = [ "oxrdf", "rand", @@ -1783,6 +1819,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + [[package]] name = "wasm-bindgen" version = "0.2.100" @@ -1964,6 +2009,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + [[package]] name = "xsd-types" version = "0.9.6" diff --git a/rust/case2geojson/Cargo.toml b/rust/case2geojson/Cargo.toml index 28500f3..9afb04d 100644 --- a/rust/case2geojson/Cargo.toml +++ b/rust/case2geojson/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" geojson = "0.24.1" iref = "3.2.2" json-ld = { git = "https://github.com/miterst/json-ld.git", rev = "6b48152595b661ae5ada46747e15f373e698d151" } -oxigraph = { version = "0.4.1", default-features = false} +oxigraph = { version = "0.5.2", default-features = false} serde_json = "1.0.145" static-iref = "3.0.0" tokio = { version = "1.48.0", features = ["macros", "rt-multi-thread", "test-util"] } From 9d4cdb01a4facf8e354b5aa4963469aca47d2cc3 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 19 Nov 2025 16:25:16 -0500 Subject: [PATCH 2/2] Update SPARQL calls References: * https://github.com/oxigraph/oxigraph/issues/1509 Signed-off-by: Alex Nelson --- rust/case2geojson/src/main.rs | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/rust/case2geojson/src/main.rs b/rust/case2geojson/src/main.rs index bd818df..c7fe5c8 100644 --- a/rust/case2geojson/src/main.rs +++ b/rust/case2geojson/src/main.rs @@ -26,7 +26,7 @@ use json_ld::{ JsonLdProcessor, RemoteDocument, }; use oxigraph::model::{GraphNameRef, LiteralRef, NamedNodeRef, QuadRef}; -use oxigraph::sparql::QueryResults; +use oxigraph::sparql::{QueryResults, SparqlEvaluator}; use oxigraph::store::Store; use static_iref::iri; use std::{env, fs}; @@ -153,7 +153,13 @@ WHERE "#; // SPARQL query - if let QueryResults::Solutions(solutions) = store.query(query).unwrap() { + if let QueryResults::Solutions(solutions) = SparqlEvaluator::new() + .parse_query(query) + .expect("SPARQL syntax expected to be OK") + .on_store(&store) + .execute() + .expect("SPARQL expected to execute") + { for option_solution in solutions { let solution = option_solution.unwrap(); @@ -387,8 +393,8 @@ mod tests { ); let store = Store::new()?; - assert!(store.insert(quad0)?); - assert!(!store.insert(quad1)?); + store.insert(quad0)?; + store.insert(quad1)?; assert!(store.contains(quad2)?); Result::<_, Box>::Ok(()) @@ -425,7 +431,13 @@ WHERE { ))?; // SPARQL query - if let QueryResults::Solutions(mut solutions) = store.query(query)? { + if let QueryResults::Solutions(mut solutions) = SparqlEvaluator::new() + .parse_query(query) + .expect("SPARQL syntax expected to be OK") + .on_store(&store) + .execute() + .expect("SPARQL expected to execute") + { assert_eq!( solutions.next().unwrap()?.get("nLocation"), Some(&n_kb_location.into_owned().into())