Skip to content

Commit 35e2cae

Browse files
authored
Merge pull request scylladb#120 from wprzytula/latency-awareness-scale-parameter
Latency awareness - support `scale` parameter
2 parents 9dbd22c + c1f8b42 commit 35e2cae

File tree

6 files changed

+132
-41
lines changed

6 files changed

+132
-41
lines changed

scylla-rust-wrapper/Cargo.lock

Lines changed: 122 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scylla-rust-wrapper/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ categories = ["database"]
1010
license = "MIT OR Apache-2.0"
1111

1212
[dependencies]
13-
scylla = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "1a913a19", features = ["ssl"]}
14-
tokio = { version = "1.1.0", features = ["full"] }
13+
scylla = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "40aaee6", features = ["ssl"]}
14+
tokio = { version = "1.27.0", features = ["full"] }
1515
lazy_static = "1.4.0"
1616
uuid = "1.1.2"
1717
machine-uid = "0.2.0"
@@ -32,7 +32,7 @@ chrono = "0.4.20"
3232
assert_matches = "1.5.0"
3333
ntest = "0.9.0"
3434
rusty-fork = "0.3.0"
35-
scylla-proxy = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "1a913a19"}
35+
scylla-proxy = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "40aaee6"}
3636

3737
[lib]
3838
name = "scylla_cpp_driver"

scylla-rust-wrapper/src/cass_error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl From<&BadQuery> for CassError {
6565
impl From<&NewSessionError> for CassError {
6666
fn from(error: &NewSessionError) -> Self {
6767
match error {
68-
NewSessionError::FailedToResolveAddress(_string) => {
68+
NewSessionError::FailedToResolveAnyHostname(_hostnames) => {
6969
CassError::CASS_ERROR_LIB_NO_HOSTS_AVAILABLE
7070
}
7171
NewSessionError::EmptyKnownNodesList => CassError::CASS_ERROR_LIB_NO_HOSTS_AVAILABLE,

scylla-rust-wrapper/src/cass_types.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
use crate::argconv::*;
22
use crate::cass_error::CassError;
33
use crate::types::*;
4-
use scylla::batch::{BatchType, Consistency, SerialConsistency};
4+
use scylla::batch::BatchType;
55
use scylla::frame::response::result::ColumnType;
6+
use scylla::frame::types::{Consistency, SerialConsistency};
67
use scylla::transport::topology::{CollectionType, CqlType, NativeType, UserDefinedType};
78
use std::collections::HashMap;
89
use std::convert::TryFrom;

0 commit comments

Comments
 (0)