diff --git a/Cargo.lock b/Cargo.lock index 5a1a907c0..f2dd230e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -314,7 +314,7 @@ checksum = "8234d29d30873ab5a41e3557b8515d3ecbaefb1ea5be579425b3b0074b6d0e40" [[package]] name = "cassandra-protocol" version = "2.0.1" -source = "git+https://github.com/conorbros/cdrs-tokio?branch=8.0-dev#19aa0807cd1740d85d3a7f88c194f336b550d1a0" +source = "git+https://github.com/krojew/cdrs-tokio?branch=8.0-dev#3d4473f14347d8be7f24f7f86df6421f00b6dcce" dependencies = [ "arc-swap", "arrayref", @@ -332,7 +332,6 @@ dependencies = [ "snap", "thiserror", "time 0.3.17", - "tracing", "uuid", ] @@ -350,8 +349,8 @@ checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cdrs-tokio" -version = "7.0.2" -source = "git+https://github.com/conorbros/cdrs-tokio?branch=8.0-dev#19aa0807cd1740d85d3a7f88c194f336b550d1a0" +version = "7.0.3" +source = "git+https://github.com/krojew/cdrs-tokio?branch=8.0-dev#3d4473f14347d8be7f24f7f86df6421f00b6dcce" dependencies = [ "arc-swap", "atomic", @@ -1400,9 +1399,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec947b7a4ce12e3b87e353abae7ce124d025b6c7d6c5aea5cc0bcf92e9510ded" +checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" [[package]] name = "is-terminal" @@ -1491,9 +1490,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "lock_api" @@ -2161,9 +2160,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" +checksum = "ac662b3a6490de378b0ee15cf2dfff7127aebfe0b19acc65e7fbca3d299c3788" [[package]] name = "ppv-lite86" @@ -2323,11 +2322,10 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "crossbeam-deque", "either", "rayon-core", ] @@ -2782,18 +2780,18 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "serde" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055" +checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4" +checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" dependencies = [ "proc-macro2", "quote", diff --git a/shotover-proxy/Cargo.toml b/shotover-proxy/Cargo.toml index f6771073f..b646dcd8f 100644 --- a/shotover-proxy/Cargo.toml +++ b/shotover-proxy/Cargo.toml @@ -65,7 +65,7 @@ halfbrown = "0.1.11" # Transform dependencies redis-protocol = { version = "4.0.1", features = ["decode-mut"] } -cassandra-protocol = { git = "https://github.com/conorbros/cdrs-tokio", branch = "8.0-dev" } +cassandra-protocol = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } crc16 = "0.4.0" ordered-float = { version = "3.0.0", features = ["serde"] } @@ -92,7 +92,7 @@ hex-literal = "0.3.3" nix = "0.26.0" reqwest = "0.11.6" metrics-util = "0.14.0" -cdrs-tokio = { git = "https://github.com/conorbros/cdrs-tokio", branch = "8.0-dev" } +cdrs-tokio = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } scylla = { git = "https://github.com/scylladb/scylla-rust-driver", features = ["ssl"] } rstest = "0.16.0" diff --git a/shotover-proxy/tests/cassandra_int_tests/routing.rs b/shotover-proxy/tests/cassandra_int_tests/routing.rs index a00957932..afe43c61c 100644 --- a/shotover-proxy/tests/cassandra_int_tests/routing.rs +++ b/shotover-proxy/tests/cassandra_int_tests/routing.rs @@ -354,7 +354,7 @@ mod composite_key { let name: String = "0FjhKM4rJQJaniCNHEkKlelmUsYIBJJ9IZuBh44WJTrcPrez".into(); - let _ = connection + connection .execute_prepared( &range, &[ @@ -365,7 +365,7 @@ mod composite_key { .await .unwrap(); - let _ = connection + connection .execute_prepared( &simple2, &[ @@ -376,7 +376,7 @@ mod composite_key { .await .unwrap(); - let _ = connection + connection .execute_prepared( &simple1, &[ResultValue::Varchar(name), ResultValue::Boolean(true)],