From 0a4208d91d8db32696c7aa3f68c8a70519d58ef5 Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Sun, 7 Jun 2026 21:16:16 +0200 Subject: [PATCH] Use a patched version of `permutation_iterator` for Qdrant edge (#797) --- runtime/Cargo.lock | 62 ++++++---------------------------------------- runtime/Cargo.toml | 6 +++++ 2 files changed, 14 insertions(+), 54 deletions(-) diff --git a/runtime/Cargo.lock b/runtime/Cargo.lock index fbfba36a..ffc6b325 100644 --- a/runtime/Cargo.lock +++ b/runtime/Cargo.lock @@ -2568,17 +2568,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.15" @@ -4888,11 +4877,10 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "permutation_iterator" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55405179fe06e4e3820ddaf9f9b51cdff9e7496af9554acdb2b1921a86ca9cb" +source = "git+https://github.com/SommerEngineering/permutation-iterator-rs.git?rev=76836ed316d18dfef530ba908f58481c343e80d7#76836ed316d18dfef530ba908f58481c343e80d7" dependencies = [ "blake2-rfc", - "rand 0.7.3", + "rand 0.8.6", ] [[package]] @@ -5429,25 +5417,14 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ + "libc", + "rand_chacha 0.3.1", "rand_core 0.6.4", "serde", ] @@ -5475,12 +5452,12 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.5.1", + "rand_core 0.6.4", ] [[package]] @@ -5503,21 +5480,13 @@ dependencies = [ "rand_core 0.10.0", ] -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - [[package]] name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ + "getrandom 0.2.15", "serde", ] @@ -5546,15 +5515,6 @@ dependencies = [ "rand 0.10.1", ] -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_pcg" version = "0.10.2" @@ -7982,12 +7942,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 2f3a5d64..01f582c6 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -51,8 +51,14 @@ bytes = "1.11.1" qdrant-edge = "0.7.2" [patch.crates-io] +# Issue: It was not possible to build qdrant-edge for macOS. See PR 9312: https://github.com/qdrant/qdrant/pull/9312 +# State: The PR was merged, but not yet released. We use the git version for now. qdrant-edge = { git = "https://github.com/SommerEngineering/qdrant.git", rev = "462c84d82ced126e4a2b7914544bfde16a509eb1" } +# Issue: This repo was not updated since 2020. The rand crate was outdated. We patched it to use a newer version of rand. +# State: There is a PR for a long time, but it was not merged. We use the git version for now. +permutation_iterator = { git = "https://github.com/SommerEngineering/permutation-iterator-rs.git", rev = "76836ed316d18dfef530ba908f58481c343e80d7" } + [target.'cfg(target_os = "windows")'.dependencies] windows-registry = "0.6.1" windows-native-keyring-store = "1.0.0"