Upgrade deps

next
Sayan Nandan 3 years ago
parent 3dbd5276ca
commit 426948f8d5
No known key found for this signature in database
GPG Key ID: 8BC07A0A4D41DD52

102
Cargo.lock generated

@ -117,9 +117,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
[[package]]
name = "cc"
version = "1.0.72"
version = "1.0.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
[[package]]
name = "cfg-if"
@ -236,7 +236,7 @@ dependencies = [
"bitflags",
"crossterm_winapi",
"libc",
"mio",
"mio 0.7.14",
"parking_lot 0.12.0",
"signal-hook",
"signal-hook-mio",
@ -347,9 +347,9 @@ dependencies = [
[[package]]
name = "fd-lock"
version = "3.0.3"
version = "3.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcef756dea9cf3db5ce73759cf0467330427a786b47711b8d6c97620d718ceb9"
checksum = "02ecad9808e0596f8956d14f7fa868f996290bd01c8d7329d6e5bc2bb76adf8f"
dependencies = [
"cfg-if",
"rustix",
@ -424,13 +424,13 @@ dependencies = [
[[package]]
name = "getrandom"
version = "0.2.4"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"
dependencies = [
"cfg-if",
"libc",
"wasi",
"wasi 0.10.0+wasi-snapshot-preview1",
]
[[package]]
@ -477,12 +477,9 @@ dependencies = [
[[package]]
name = "io-lifetimes"
version = "0.4.4"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6ef6787e7f0faedc040f95716bdd0e62bcfcf4ba93da053b62dea2691c13864"
dependencies = [
"winapi",
]
checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6"
[[package]]
name = "itoa"
@ -519,9 +516,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.117"
version = "0.2.119"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4"
[[package]]
name = "libsky"
@ -543,9 +540,9 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
version = "0.0.37"
version = "0.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95f5690fef754d905294c56f7ac815836f2513af966aa47f2e07ac79be07827f"
checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7"
[[package]]
name = "lock_api"
@ -593,6 +590,20 @@ dependencies = [
"winapi",
]
[[package]]
name = "mio"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ba42135c6a5917b9db9cd7b293e5409e1c6b041e6f9825e92e55a894c63b6f8"
dependencies = [
"libc",
"log",
"miow",
"ntapi",
"wasi 0.11.0+wasi-snapshot-preview1",
"winapi",
]
[[package]]
name = "miow"
version = "0.3.7"
@ -664,9 +675,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.9.0"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
[[package]]
name = "openssl"
@ -884,9 +895,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.2.10"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"
dependencies = [
"bitflags",
]
@ -903,9 +914,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.5.4"
version = "1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
dependencies = [
"aho-corasick",
"memchr",
@ -920,9 +931,9 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
[[package]]
name = "rustix"
version = "0.32.1"
version = "0.33.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cee647393af53c750e15dcbf7781cdd2e550b246bde76e46c326e7ea3c73773"
checksum = "ef7ec6a44fba95d21fa522760c03c16ca5ee95cebb6e4ef579cab3e6d7ba6c06"
dependencies = [
"bitflags",
"errno",
@ -1025,7 +1036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4"
dependencies = [
"libc",
"mio",
"mio 0.7.14",
"signal-hook",
]
@ -1120,7 +1131,7 @@ dependencies = [
[[package]]
name = "skytable"
version = "0.7.0-alpha.4"
source = "git+https://github.com/skytable/client-rust?branch=next#07c5e9e0c05d7859f016067f3691d2e05655306d"
source = "git+https://github.com/skytable/client-rust?branch=next#8d1099609786cc716154f289d6ec4449e9d567cc"
dependencies = [
"async-trait",
"bb8",
@ -1134,7 +1145,7 @@ dependencies = [
[[package]]
name = "skytable"
version = "0.7.0-alpha.4"
source = "git+https://github.com/skytable/client-rust.git#07c5e9e0c05d7859f016067f3691d2e05655306d"
source = "git+https://github.com/skytable/client-rust.git#8d1099609786cc716154f289d6ec4449e9d567cc"
dependencies = [
"r2d2",
]
@ -1151,6 +1162,16 @@ version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
[[package]]
name = "socket2"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "str-buf"
version = "1.0.5"
@ -1191,9 +1212,9 @@ dependencies = [
[[package]]
name = "sysinfo"
version = "0.23.2"
version = "0.23.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92d82ade9d6621d4ca052a00bb6ea9ed513d223cba75a84625c5e9c0698ab6f5"
checksum = "07fa4c84a5305909b0eedfcc8d1f2fafdbede645bb700a45ecaafe681a0ac5d6"
dependencies = [
"cfg-if",
"core-foundation-sys",
@ -1206,9 +1227,9 @@ dependencies = [
[[package]]
name = "termcolor"
version = "1.1.2"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
dependencies = [
"winapi-util",
]
@ -1229,25 +1250,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
"wasi",
"wasi 0.10.0+wasi-snapshot-preview1",
"winapi",
]
[[package]]
name = "tokio"
version = "1.16.1"
version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"
checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
dependencies = [
"bytes",
"libc",
"memchr",
"mio",
"mio 0.8.1",
"num_cpus",
"once_cell",
"parking_lot 0.11.2",
"parking_lot 0.12.0",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"tokio-macros",
"winapi",
]
@ -1338,6 +1360,12 @@ version = "0.10.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "winapi"
version = "0.3.9"

@ -30,6 +30,7 @@ You can learn more about installation [here](https://docs.skytable.io/getting-st
- **Insanely fast**: Scale to millions of queries per second per node
- **Multiple keyspaces/tables**: Seamlessly integrates with actions to provide a SQL-like experience
- **Key/value store**: `GET` , `SET` , `UPDATE` and [all that stuff](https://docs.skytable.io/actions-overview). With the `str` and `binstr` types.
- **Authn/Authz**: Simple and secure authentication/authorization
- **Volatile tables**: For all the caching you need
- **Snapshots**: Automated (and tunable) snapshots for stress-free backups
- **Secure**: Secure connections are built into Skytable with SSL/TLS

@ -14,7 +14,7 @@ skytable = { git = "https://github.com/skytable/client-rust", branch = "next", f
"aio-sslv",
], default-features = false }
# external deps
tokio = { version = "1.16.1", features = ["full"] }
tokio = { version = "1.17.0", features = ["full"] }
clap = { version = "2", features = ["yaml"] }
rustyline = "9.1.2"
crossterm = "0.23.0"

@ -76,8 +76,8 @@ impl Runner {
}
};
let ret = match self {
Self::Insecure(con) => con.run_simple_query(&query).await,
Self::Secure(con) => con.run_simple_query(&query).await,
Self::Insecure(con) => con.run_query_raw(&query).await,
Self::Secure(con) => con.run_query_raw(&query).await,
};
match ret {
Ok(resp) => print_element(resp),
@ -87,8 +87,8 @@ impl Runner {
pub async fn check_entity(&mut self, blank: &mut String, prompt: &mut String) {
let query: Query = tokenizer::get_query(b"whereami").unwrap();
let ret = match self {
Self::Insecure(con) => con.run_simple_query(&query).await,
Self::Secure(con) => con.run_simple_query(&query).await,
Self::Insecure(con) => con.run_query_raw(&query).await,
Self::Secure(con) => con.run_query_raw(&query).await,
};
let ret = match ret {
Ok(resp) => resp,

@ -8,4 +8,4 @@ version = "0.7.3"
[dependencies]
# external deps
termcolor = "1.1.2"
termcolor = "1.1.3"

@ -19,9 +19,9 @@ log = "0.4.14"
num_cpus = "1.13.1"
openssl = { version = "0.10.38", features = ["vendored"] }
parking_lot = "0.12.0"
regex = "1.5.4"
regex = "1.5.5"
serde = { version = "1.0.136", features = ["derive"] }
tokio = { version = "1.16.1", features = ["full"] }
tokio = { version = "1.17.0", features = ["full"] }
tokio-openssl = "0.6.3"
toml = "0.5.8"
rcrypt = "0.4.0"
@ -36,7 +36,7 @@ winapi = { version = "0.3.9", features = ["fileapi"] }
[target.'cfg(unix)'.build-dependencies]
# external deps
cc = "1.0.72"
cc = "1.0.73"
[dev-dependencies]
# internal deps
@ -49,10 +49,10 @@ skytable = { git = "https://github.com/skytable/client-rust", features = [
# external deps
bincode = "1.3.3"
rand = "0.8.5"
tokio = { version = "1.16.1", features = ["test-util"] }
tokio = { version = "1.17.0", features = ["test-util"] }
[target.'cfg(unix)'.dependencies]
# external deps
libc = "0.2.117"
libc = "0.2.119"
[features]
nightly = []

@ -36,7 +36,7 @@ mod __private {
query.push("keyspace");
query.push(&ksname);
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -47,7 +47,7 @@ mod __private {
query.push("keyspace");
query.push(&ksname);
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
let mut query = Query::new();
@ -55,7 +55,7 @@ mod __private {
query.push("keyspace");
query.push(ksname);
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -67,7 +67,7 @@ mod __private {
query.push(&tblname);
query.push("keymap(str,str)");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -80,7 +80,7 @@ mod __private {
query.push("keymap(str,str)");
query.push("volatile");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -93,7 +93,7 @@ mod __private {
query.push(mykeyspace.to_owned() + ":" + &tblname);
query.push("keymap(str,str)");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -107,7 +107,7 @@ mod __private {
query.push("keymap(str,str)");
query.push("volatile");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -119,7 +119,7 @@ mod __private {
query.push(&tblname);
query.push("keymap(str,str)");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
let mut query = Query::new();
@ -127,7 +127,7 @@ mod __private {
query.push("table");
query.push(&tblname);
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -141,7 +141,7 @@ mod __private {
query.push(&my_fqe);
query.push("keymap(str,str)");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
let mut query = Query::new();
@ -149,7 +149,7 @@ mod __private {
query.push("table");
query.push(my_fqe);
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -157,7 +157,7 @@ mod __private {
query.push("USE");
query.push(&__MYENTITY__);
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
)
}
@ -166,7 +166,7 @@ mod __private {
query.push(&__MYENTITY__);
query.push("wiwofjwjfio");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
)
}
@ -174,7 +174,7 @@ mod __private {
let mykeyspace: Vec<&str> = __MYENTITY__.split(':').collect::<Vec<&str>>();
query.push("whereami");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::Array(Array::NonNullStr(vec![
mykeyspace[0].to_owned(),
mykeyspace[1].to_owned()

@ -31,7 +31,7 @@ mod __private {
query.push("INSPECT");
query.push("KEYSPACES");
assert!(matches!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::Array(Array::Str(_))
))
}
@ -41,7 +41,7 @@ mod __private {
query.push("KEYSPACE");
query.push(my_keyspace);
assert!(matches!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::Array(Array::Str(_))
))
}
@ -50,7 +50,7 @@ mod __private {
query.push("INSPECT");
query.push("TABLE");
query.push(my_table);
match con.run_simple_query(&query).await.unwrap() {
match con.run_query_raw(&query).await.unwrap() {
Element::String(st) => {
assert_eq!(st, "Keymap { data:(str,str), volatile:true }".to_owned())
}
@ -61,7 +61,7 @@ mod __private {
query.push("INSPECT");
query.push("TABLE");
query.push(__MYENTITY__);
match con.run_simple_query(&query).await.unwrap() {
match con.run_query_raw(&query).await.unwrap() {
Element::String(st) => {
assert_eq!(st, "Keymap { data:(str,str), volatile:true }".to_owned())
}
@ -73,7 +73,7 @@ mod __private {
query.push("KEYSPACES");
query.push("iowjfjofoe");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -83,7 +83,7 @@ mod __private {
query.push("ijfwijifwjo");
query.push("oijfwirfjwo");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -93,7 +93,7 @@ mod __private {
query.push("ijfwijifwjo");
query.push("oijfwirfjwo");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}

@ -39,14 +39,14 @@ mod __private {
/// Test a HEYA query: The server should return HEY!
async fn test_heya() {
query.push("heya");
let resp = con.run_simple_query(&query).await.unwrap();
let resp = con.run_query_raw(&query).await.unwrap();
assert_eq!(resp, Element::String("HEY!".to_owned()));
}
async fn test_heya_echo() {
query.push("heya");
query.push("sayan");
let resp = con.run_simple_query(&query).await.unwrap();
let resp = con.run_query_raw(&query).await.unwrap();
assert_eq!(resp, Element::String("sayan".to_owned()));
}
@ -54,7 +54,7 @@ mod __private {
async fn test_get_single_nil() {
query.push("get");
query.push("x");
let resp = con.run_simple_query(&query).await.unwrap();
let resp = con.run_query_raw(&query).await.unwrap();
assert_eq!(resp, Element::RespCode(RespCode::NotFound));
}
@ -63,12 +63,12 @@ mod __private {
query.push("set");
query.push("x");
query.push("100");
let resp = con.run_simple_query(&query).await.unwrap();
let resp = con.run_query_raw(&query).await.unwrap();
assert_eq!(resp, Element::RespCode(RespCode::Okay));
let mut query = Query::new();
query.push("get");
query.push("x");
let resp = con.run_simple_query(&query).await.unwrap();
let resp = con.run_query_raw(&query).await.unwrap();
assert_eq!(resp, Element::String("100".to_owned()));
}
@ -76,7 +76,7 @@ mod __private {
async fn test_get_syntax_error() {
query.push("get");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
let mut query = Query::new();
@ -84,7 +84,7 @@ mod __private {
query.push("x");
query.push("y");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -95,7 +95,7 @@ mod __private {
query.push("x");
query.push("100");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -107,7 +107,7 @@ mod __private {
query.push("x");
query.push("100");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// attempt the same thing again
@ -116,7 +116,7 @@ mod __private {
query.push("x");
query.push("200");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::OverwriteError)
);
}
@ -126,7 +126,7 @@ mod __private {
query.push("set");
query.push("x");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
let mut query = Query::new();
@ -135,7 +135,7 @@ mod __private {
query.push("y");
query.push("z");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -147,7 +147,7 @@ mod __private {
query.push("x");
query.push("100");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// attempt to update it
@ -156,7 +156,7 @@ mod __private {
query.push("x");
query.push("200");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -168,7 +168,7 @@ mod __private {
query.push("x");
query.push("200");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::NotFound)
);
}
@ -177,7 +177,7 @@ mod __private {
query.push("update");
query.push("x");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
let mut query = Query::new();
@ -186,7 +186,7 @@ mod __private {
query.push("y");
query.push("z");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -196,7 +196,7 @@ mod __private {
query.push("del");
query.push("x");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(0)
);
}
@ -208,7 +208,7 @@ mod __private {
query.push("x");
query.push("100");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// now delete it
@ -216,7 +216,7 @@ mod __private {
query.push("del");
query.push("x");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(1)
);
}
@ -232,7 +232,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
// now delete them
@ -242,7 +242,7 @@ mod __private {
query.push("y");
query.push("z");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
}
@ -251,7 +251,7 @@ mod __private {
async fn test_del_syntax_error() {
query.push("del");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -267,7 +267,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
// now check if they exist
@ -278,7 +278,7 @@ mod __private {
query.push("z");
query.push("a");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
}
@ -287,7 +287,7 @@ mod __private {
async fn test_exists_syntax_error() {
query.push("exists");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -303,7 +303,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
// now get them
@ -313,7 +313,7 @@ mod __private {
query.push("y");
query.push("z");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::Array(Array::Str(vec![
Some("100".to_owned()),
Some("200".to_owned()),
@ -333,7 +333,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
let mut query = Query::new();
@ -344,7 +344,7 @@ mod __private {
query.push("z");
query.push("b");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::Array(Array::Str(vec![
Some("100".to_owned()),
Some("200".to_owned()),
@ -359,7 +359,7 @@ mod __private {
async fn test_mget_syntax_error() {
query.push("mget");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -371,7 +371,7 @@ mod __private {
query.push("x");
query.push("100");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(1)
);
}
@ -387,7 +387,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
}
@ -403,7 +403,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
// now try to set them again with just another new key
@ -418,7 +418,7 @@ mod __private {
query.push("a");
query.push("apple");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(1)
);
}
@ -427,7 +427,7 @@ mod __private {
async fn test_mset_syntax_error_args_one() {
query.push("mset");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -437,7 +437,7 @@ mod __private {
query.push("y");
query.push("z");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -449,7 +449,7 @@ mod __private {
query.push("x");
query.push("100");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(1)
);
// now attempt to update it
@ -459,7 +459,7 @@ mod __private {
query.push("x");
query.push("200");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(1)
);
}
@ -475,7 +475,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
// now try to update them with just another new key
@ -490,7 +490,7 @@ mod __private {
query.push("a");
query.push("apple");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
}
@ -499,7 +499,7 @@ mod __private {
async fn test_mupdate_syntax_error_args_one() {
query.push("mupdate");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -510,7 +510,7 @@ mod __private {
query.push("y");
query.push("z");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -522,7 +522,7 @@ mod __private {
query.push("x");
query.push("100");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -534,7 +534,7 @@ mod __private {
query.push("x");
query.push("100");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// now attempt to overwrite it
@ -543,7 +543,7 @@ mod __private {
query.push("x");
query.push("100");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::OverwriteError)
);
}
@ -559,7 +559,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -575,7 +575,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// now attempt to sset again with just one new extra key
@ -590,7 +590,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::OverwriteError)
);
}
@ -599,7 +599,7 @@ mod __private {
async fn test_sset_syntax_error_args_one() {
query.push("sset");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -610,7 +610,7 @@ mod __private {
query.push("y");
query.push("z");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -622,7 +622,7 @@ mod __private {
query.push("x");
query.push("100");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// update it
@ -631,7 +631,7 @@ mod __private {
query.push("x");
query.push("200");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -642,7 +642,7 @@ mod __private {
query.push("x");
query.push("200");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::NotFound)
);
}
@ -658,7 +658,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// now update all of them
@ -671,7 +671,7 @@ mod __private {
query.push("z");
query.push("400");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -686,7 +686,7 @@ mod __private {
query.push("z");
query.push("400");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::NotFound)
);
}
@ -695,7 +695,7 @@ mod __private {
async fn test_supdate_syntax_error_args_one() {
query.push("mupdate");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -706,7 +706,7 @@ mod __private {
query.push("y");
query.push("z");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -716,7 +716,7 @@ mod __private {
query.push("sdel");
query.push("x");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::NotFound)
);
}
@ -727,14 +727,14 @@ mod __private {
query.push("x");
query.push("100");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
let mut query = Query::new();
query.push("sdel");
query.push("x");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -750,7 +750,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// now delete them
@ -760,7 +760,7 @@ mod __private {
query.push("y");
query.push("z");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
}
@ -771,7 +771,7 @@ mod __private {
query.push("y");
query.push("z");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::NotFound)
);
}
@ -780,7 +780,7 @@ mod __private {
async fn test_sdel_syntax_error() {
query.push("sdel");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -796,21 +796,21 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// now check the size
let mut query = Query::new();
query.push("dbsize");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
let mut query = Query::new();
query.push("dbsize");
query.push(__MYENTITY__);
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
}
@ -822,7 +822,7 @@ mod __private {
query.push("roigjoigjj094");
query.push("ioewjforfifrj");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -838,21 +838,21 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// now flush the database
let mut query = Query::new();
query.push("flushdb");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// now check the size
let mut query = Query::new();
query.push("dbsize");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(0)
);
}
@ -871,14 +871,14 @@ mod __private {
// add the fqe
query.push(__MYENTITY__);
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// now check the size
let mut query = Query::new();
query.push("dbsize");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(0)
);
}
@ -890,7 +890,7 @@ mod __private {
query.push("y");
query.push("z");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -907,7 +907,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
// now that the keys already exist, do it all over again
@ -920,7 +920,7 @@ mod __private {
query.push("z");
query.push("300");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(3)
);
}
@ -929,7 +929,7 @@ mod __private {
async fn test_uset_syntax_error_args_one() {
query.push("uset");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -940,7 +940,7 @@ mod __private {
query.push("two");
query.push("three");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -952,7 +952,7 @@ mod __private {
query.push("x");
query.push("helloworld");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::Okay)
);
// now check for the length
@ -960,7 +960,7 @@ mod __private {
query.push("keylen");
query.push("x");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(10)
);
}
@ -969,7 +969,7 @@ mod __private {
async fn test_keylen_syntax_error_args_one() {
query.push("keylen");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -978,14 +978,14 @@ mod __private {
query.push("x");
query.push("y");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
async fn test_mksnap_disabled() {
query.push("mksnap");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ErrorString("err-snapshot-disabled".to_owned()))
);
}
@ -993,7 +993,7 @@ mod __private {
query.push("mksnap");
query.push("/var/omgcrazysnappy");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ErrorString(
"err-invalid-snapshot-name".to_owned()
))
@ -1002,7 +1002,7 @@ mod __private {
query.push("mksnap");
query.push("../omgbacktoparent");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ErrorString(
"err-invalid-snapshot-name".to_owned()
))
@ -1023,13 +1023,13 @@ mod __private {
query.push("c");
query.push("carrots");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(6)
);
// now get 'em
let mut query = Query::new();
query.push("lskeys");
let ret = con.run_simple_query(&query).await.unwrap();
let ret = con.run_query_raw(&query).await.unwrap();
// don't forget that the keys returned are arranged according to their hashes
let ret_should_have: Vec<String> = vec!["a", "b", "c", "x", "y", "z"]
.into_iter()
@ -1058,13 +1058,13 @@ mod __private {
query.push("c");
query.push("carrots");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::UnsignedInt(6)
);
let mut query = Query::new();
query.push("lskeys");
query.push("1000");
let ret = con.run_simple_query(&query).await.unwrap();
let ret = con.run_query_raw(&query).await.unwrap();
// don't forget that the keys returned are arranged according to their hashes
let ret_should_have: Vec<String> = vec!["a", "b", "c", "x", "y", "z"]
.into_iter()
@ -1087,7 +1087,7 @@ mod __private {
);
query.push("lskeys");
query.push(&__MYENTITY__);
let ret = con.run_simple_query(&query).await.unwrap();
let ret = con.run_query_raw(&query).await.unwrap();
let ret_should_have: Vec<String> = vec!["x", "y", "z"]
.into_iter()
.map(|element| element.to_owned())
@ -1110,7 +1110,7 @@ mod __private {
query.push("lskeys");
query.push(&__MYENTITY__);
query.push(3u8.to_string());
let ret = con.run_simple_query(&query).await.unwrap();
let ret = con.run_query_raw(&query).await.unwrap();
let ret_should_have: Vec<String> = vec!["x", "y", "z"]
.into_iter()
.map(|element| element.to_owned())
@ -1130,14 +1130,14 @@ mod __private {
query.push("riufrif");
query.push("fvnjnvv");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
async fn test_mpop_syntax_error() {
query.push("mpop");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -1151,7 +1151,7 @@ mod __private {
);
query.push(vec!["mpop", "x", "y", "z"]);
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::Array(Array::Str(vec![
Some("100".to_owned()),
Some("200".to_owned()),
@ -1168,7 +1168,7 @@ mod __private {
);
query.push(vec!["mpop", "apple", "arnold", "x", "madonna", "y", "z"]);
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::Array(Array::Str(vec![
None,
None,
@ -1182,7 +1182,7 @@ mod __private {
async fn test_pop_syntax_error() {
query.push("pop");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::ActionError)
);
}
@ -1194,7 +1194,7 @@ mod __private {
query.push("pop");
query.push("x");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::String("100".to_owned())
);
}
@ -1202,7 +1202,7 @@ mod __private {
query.push("pop");
query.push("x");
assert_eq!(
con.run_simple_query(&query).await.unwrap(),
con.run_query_raw(&query).await.unwrap(),
Element::RespCode(RespCode::NotFound)
);
}

@ -35,7 +35,7 @@ macro_rules! setkeys {
count += 1;
)*
assert_eq!(
$con.run_simple_query(&q).await.unwrap(),
$con.run_query_raw(&q).await.unwrap(),
Element::UnsignedInt(count)
);
};
@ -51,13 +51,13 @@ macro_rules! push {
macro_rules! runeq {
($con:expr, $query:expr, $eq:expr) => {
assert_eq!($con.run_simple_query(&$query).await.unwrap(), $eq)
assert_eq!($con.run_query_raw(&$query).await.unwrap(), $eq)
};
}
macro_rules! runmatch {
($con:expr, $query:expr, $match:path) => {{
let ret = $con.run_simple_query(&$query).await.unwrap();
let ret = $con.run_query_raw(&$query).await.unwrap();
assert!(matches!(ret, $match(_)))
}};
}

@ -93,7 +93,7 @@ pub fn run_sanity_test(host: &str, port: u16) -> Result<(), Box<dyn Error>> {
let mut query = Query::new();
query.push("heya");
if !connection
.run_simple_query(&query)
.run_query_raw(&query)
.unwrap()
.eq(&Element::String("HEY!".to_owned()))
{
@ -106,7 +106,7 @@ pub fn run_sanity_test(host: &str, port: u16) -> Result<(), Box<dyn Error>> {
query.push(&key);
query.push(&value);
if !connection
.run_simple_query(&query)
.run_query_raw(&query)
.unwrap()
.eq(&Element::RespCode(RespCode::Okay))
{
@ -116,7 +116,7 @@ pub fn run_sanity_test(host: &str, port: u16) -> Result<(), Box<dyn Error>> {
query.push("get");
query.push(&key);
if !connection
.run_simple_query(&query)
.run_query_raw(&query)
.unwrap()
.eq(&Element::Binstr(value.as_bytes().to_owned()))
{
@ -126,7 +126,7 @@ pub fn run_sanity_test(host: &str, port: u16) -> Result<(), Box<dyn Error>> {
query.push("del");
query.push(&key);
if !connection
.run_simple_query(&query)
.run_query_raw(&query)
.unwrap()
.eq(&Element::UnsignedInt(1))
{

@ -79,7 +79,7 @@ impl DBTestFunctionConfig {
pub fn get_create_table_tokens(&self, table_name: &str) -> impl quote::ToTokens {
let Self { table_decl, .. } = self;
quote! {
con.run_simple_query(
con.run_query_raw(
&skytable::query!(
"create",
"table",
@ -130,7 +130,7 @@ impl DBTestFunctionConfig {
#ret
let __loginquery__ = ::skytable::query!("auth", "login", __username__, __password__);
assert_eq!(
con.run_simple_query(&__loginquery__).await.unwrap(),
con.run_query_raw(&__loginquery__).await.unwrap(),
::skytable::Element::RespCode(::skytable::RespCode::Okay),
"Failed to login"
);
@ -224,7 +224,7 @@ fn generate_dbtest(
body = quote! {
#body
let __create_ks =
con.run_simple_query(
con.run_query_raw(
&skytable::query!("create", "keyspace", "testsuite")
).await.unwrap();
if !(
@ -242,7 +242,7 @@ fn generate_dbtest(
body = quote! {
#body
let __switch_ks =
con.run_simple_query(
con.run_query_raw(
&skytable::query!("use", "testsuite")
).await.unwrap();
if (__switch_ks != skytable::Element::RespCode(skytable::RespCode::Okay)) {
@ -271,7 +271,7 @@ fn generate_dbtest(
body = quote! {
#body
let __switch_entity =
con.run_simple_query(
con.run_query_raw(
&skytable::query!("use", __concat_entity)
).await.unwrap();
assert_eq!(
@ -296,7 +296,7 @@ fn generate_dbtest(
{
let mut __flush__ = skytable::Query::from("flushdb");
std::assert_eq!(
con.run_simple_query(&__flush__).await.unwrap(),
con.run_query_raw(&__flush__).await.unwrap(),
skytable::Element::RespCode(skytable::RespCode::Okay)
);
}

@ -76,7 +76,7 @@ fn main() {
};
// run sanity test
let q = query!("HEYA");
match con.run_simple_query(&q) {
match con.run_query_raw(&q) {
Ok(Element::String(s)) if s.eq("HEY!") => {}
Ok(_) => err(err!("Unknown response from server")),
Err(e) => err(err!(
@ -127,7 +127,7 @@ fn err(_i: ()) -> ! {
}
fn okay(con: &mut Connection, q: Query) {
match con.run_simple_query(&q) {
match con.run_query_raw(&q) {
Ok(Element::RespCode(RespCode::Okay)) => {}
Err(e) => err(err!("An I/O error occurred while running query: {}", e)),
Ok(_) => err(err!("Unknown response from server")),

@ -12,7 +12,7 @@ libstress = { path = "../libstress" }
skytable = { git = "https://github.com/skytable/client-rust.git", branch = "next", features = [
"dbg",
] }
sysinfo = "0.23.2"
sysinfo = "0.23.5"
devtimer = "4.0.1"
# external deps
env_logger = "0.9.0"

@ -133,7 +133,7 @@ pub fn stress_linearity_concurrent_clients_set(
|| Connection::new("127.0.0.1", 2003).unwrap(),
move |sock, query| {
assert_eq!(
sock.run_simple_query(&query).unwrap(),
sock.run_query_raw(&query).unwrap(),
Element::RespCode(RespCode::Okay)
);
},
@ -184,7 +184,7 @@ pub fn stress_linearity_concurrent_clients_get(
|| Connection::new("127.0.0.1", 2003).unwrap(),
move |sock, query| {
assert_eq!(
sock.run_simple_query(&query).unwrap(),
sock.run_query_raw(&query).unwrap(),
Element::RespCode(RespCode::Okay)
);
},
@ -211,7 +211,7 @@ pub fn stress_linearity_concurrent_clients_get(
|| Connection::new("127.0.0.1", 2003).unwrap(),
move |sock, query| {
let tx = tx.clone();
tx.send(sock.run_simple_query(&query).unwrap()).unwrap();
tx.send(sock.run_query_raw(&query).unwrap()).unwrap();
},
|_| {},
true,

Loading…
Cancel
Save