From 9210788465c3d2417c658e624e31bb53208f2d1a Mon Sep 17 00:00:00 2001 From: Aaron Dewes Date: Tue, 29 Oct 2024 16:16:31 +0100 Subject: [PATCH] chore: Update petgraph --- Cargo.lock | 91 ++++--------------- query-engine/core/Cargo.toml | 2 +- query-engine/core/src/query_graph/mod.rs | 2 +- .../connectors/schema-connector/Cargo.toml | 2 +- 4 files changed, 19 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 27821a9edd9a..5a8528f52a3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -410,15 +410,6 @@ dependencies = [ "user-facing-errors", ] -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -1209,22 +1200,13 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "crypto-common", "subtle", ] @@ -1490,12 +1472,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" -[[package]] -name = "fixedbitset" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" - [[package]] name = "fixedbitset" version = "0.4.2" @@ -1939,7 +1915,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -2502,7 +2478,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -2654,7 +2630,7 @@ dependencies = [ "serde_bytes", "serde_with", "sha-1", - "sha2 0.10.7", + "sha2", "socket2 0.5.7", "stringprep", "strsim 0.11.1", @@ -2830,7 +2806,7 @@ dependencies = [ "serde", "serde_json", "sha1", - "sha2 0.10.7", + "sha2", "smallvec", "subprocess", "thiserror", @@ -3085,12 +3061,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssl" version = "0.10.60" @@ -3208,12 +3178,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "ordermap" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" - [[package]] name = "os_str_bytes" version = "6.5.1" @@ -3291,7 +3255,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -3357,17 +3321,7 @@ checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", - "sha2 0.10.7", -] - -[[package]] -name = "petgraph" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" -dependencies = [ - "fixedbitset 0.1.9", - "ordermap", + "sha2", ] [[package]] @@ -3376,7 +3330,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ - "fixedbitset 0.4.2", + "fixedbitset", "indexmap 1.9.3", ] @@ -3504,7 +3458,7 @@ dependencies = [ "md-5", "memchr", "rand 0.8.5", - "sha2 0.10.7", + "sha2", "stringprep", ] @@ -3674,7 +3628,7 @@ dependencies = [ "lazy_static", "log", "multimap", - "petgraph 0.6.3", + "petgraph", "prost", "prost-types", "regex", @@ -3913,7 +3867,7 @@ dependencies = [ "lru 0.7.8", "once_cell", "opentelemetry", - "petgraph 0.4.13", + "petgraph", "psl", "query-connector", "query-engine-metrics", @@ -4783,7 +4737,7 @@ dependencies = [ "quaint", "serde", "serde_json", - "sha2 0.9.9", + "sha2", "tracing", "tracing-error", "user-facing-errors", @@ -5059,7 +5013,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -5070,20 +5024,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest", ] [[package]] @@ -5094,7 +5035,7 @@ checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -5103,7 +5044,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.7", + "digest", "keccak", ] diff --git a/query-engine/core/Cargo.toml b/query-engine/core/Cargo.toml index db5d67c7994f..9e3e38cb79f6 100644 --- a/query-engine/core/Cargo.toml +++ b/query-engine/core/Cargo.toml @@ -19,7 +19,7 @@ futures.workspace = true indexmap.workspace = true itertools.workspace = true once_cell = "1" -petgraph = "0.4" +petgraph = "0.6" query-structure = { path = "../query-structure", features = [ "default_generators", ] } diff --git a/query-engine/core/src/query_graph/mod.rs b/query-engine/core/src/query_graph/mod.rs index 8459584a0c42..810f600ce327 100644 --- a/query-engine/core/src/query_graph/mod.rs +++ b/query-engine/core/src/query_graph/mod.rs @@ -271,7 +271,7 @@ impl QueryGraph { /// Checks if the given node is marked as one of the result nodes in the graph. pub fn is_result_node(&self, node: &NodeRef) -> bool { - self.result_nodes.iter().any(|rn| rn.index() == node.node_ix.index()) + self.result_nodes.iter().any(|rn| petgraph::adj::IndexType::index(rn) == node.node_ix.index()) } /// Checks if the subgraph starting at the given node contains the node designated as the overall result. diff --git a/schema-engine/connectors/schema-connector/Cargo.toml b/schema-engine/connectors/schema-connector/Cargo.toml index d3416f468862..54720d4f37a1 100644 --- a/schema-engine/connectors/schema-connector/Cargo.toml +++ b/schema-engine/connectors/schema-connector/Cargo.toml @@ -12,7 +12,7 @@ user-facing-errors = { path = "../../../libs/user-facing-errors" } chrono.workspace = true enumflags2.workspace = true -sha2 = "0.9.1" +sha2 = "0.10" tracing.workspace = true tracing-error = "0.2"