gvsafronov
/
skytable
1
0
Fork 0
Code Pull Requests Activity

Upgrade skytable client driver version

Browse Source
next
Sayan Nandan 3 years ago
parent 6c9a36d397
commit eea0f86c97
6 changed files with 526 additions and 496 deletions
Show Stats Download Patch File Download Diff File

76
Cargo.lock generated
Unescape Escape View File

@ -58,9 +58,9 @@ checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.67" version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
[[package]] [[package]]
name = "cfg-if" name = "cfg-if"
@ -97,6 +97,17 @@ dependencies = [
"yaml-rust", "yaml-rust",
] ]
[[package]]
name = "clipboard-win"
version = "4.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e4ea1881992efc993e4dc50a324cdbd03216e41bdc8385720ff47efc9bd2ca8"
dependencies = [
"error-code",
"str-buf",
"winapi",
]
[[package]] [[package]]
name = "crossterm" name = "crossterm"
version = "0.19.0" version = "0.19.0"
@ -179,6 +190,26 @@ dependencies = [
"termcolor", "termcolor",
] ]
[[package]]
name = "error-code"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5115567ac25674e0043e472be13d14e537f37ea8aa4bdc4aef0c89add1db1ff"
dependencies = [
"libc",
"str-buf",
]
[[package]]
name = "fd-lock"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0010f02effd88c702318c5dde0463206be67495d0b4d906ba7c0a8f166cc7f06"
dependencies = [
"libc",
"winapi",
]
[[package]] [[package]]
name = "foreign-types" name = "foreign-types"
version = "0.3.2" version = "0.3.2"
@ -194,16 +225,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "fs2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
dependencies = [
"libc",
"winapi",
]
[[package]] [[package]]
name = "fs_extra" name = "fs_extra"
version = "1.2.0" version = "1.2.0"
@ -306,9 +327,9 @@ dependencies = [
[[package]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.2.2" version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
@ -374,9 +395,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.94" version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
[[package]] [[package]]
name = "libsky" name = "libsky"
@ -620,9 +641,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.26" version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
dependencies = [ dependencies = [
"unicode-xid", "unicode-xid",
] ]
@ -724,14 +745,15 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
[[package]] [[package]]
name = "rustyline" name = "rustyline"
version = "8.0.0" version = "8.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9e1b597fcd1eeb1d6b25b493538e5aa19629eb08932184b85fef931ba87e893" checksum = "fbd4eaf7a7738f76c98e4f0395253ae853be3eb018f7b0bb57fe1b6c17e31874"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cfg-if", "cfg-if",
"clipboard-win",
"dirs-next", "dirs-next",
"fs2", "fd-lock",
"libc", "libc",
"log", "log",
"memchr", "memchr",
@ -882,7 +904,7 @@ dependencies = [
[[package]] [[package]]
name = "skytable" name = "skytable"
version = "0.2.3" version = "0.2.3"
source = "git+https://github.com/skytable/client-rust?branch=next#7ce1d2b371a0dba96c0c0c8cf1aa2ca911c225e4" source = "git+https://github.com/skytable/client-rust?branch=next#f36d7567ccae39a512d581d7f0d205c88db82b63"
dependencies = [ dependencies = [
"bytes", "bytes",
"tokio", "tokio",
@ -900,6 +922,12 @@ version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
[[package]]
name = "str-buf"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d44a3643b4ff9caf57abcee9c2c621d6c03d9135e0d8b589bd9afb5992cb176a"
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.8.0" version = "0.8.0"
@ -1024,9 +1052,9 @@ checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
[[package]] [[package]]
name = "vcpkg" name = "vcpkg"
version = "0.2.12" version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa"
[[package]] [[package]]
name = "vec_map" name = "vec_map"

2
cli/src/runner.rs
Unescape Escape View File

@ -106,7 +106,7 @@ impl Runner {
} }
pub async fn run_query(&mut self, unescaped_items: &str) { pub async fn run_query(&mut self, unescaped_items: &str) {
let query = libsky::turn_into_query(unescaped_items); let query = libsky::turn_into_query(unescaped_items);
match self.con.run_simple_query(query).await { match self.con.run_simple_query(&query).await {
Ok(resp) => match resp { Ok(resp) => match resp {
Response::InvalidResponse => { Response::InvalidResponse => {
println!("ERROR: The server sent an invalid response"); println!("ERROR: The server sent an invalid response");

2
libsky/src/lib.rs
Unescape Escape View File

@ -53,7 +53,7 @@ pub fn split_into_args(q: &str) -> Vec<String> {
pub fn turn_into_query(q: &str) -> Query { pub fn turn_into_query(q: &str) -> Query {
let mut query = Query::new(); let mut query = Query::new();
split_into_args(q).into_iter().for_each(|arg| { split_into_args(q).into_iter().for_each(|arg| {
query.arg(arg); query.push(arg);
}); });
query query
} }

910
server/src/tests/kvengine.rs
View File

File diff suppressed because it is too large Load Diff

28
sky-bench/src/main.rs
Unescape Escape View File

@ -196,7 +196,9 @@ mod benchtool {
.map(|_| ran_string(8, &mut rand)) .map(|_| ran_string(8, &mut rand))
.collect(); .collect();
let set_packs: Vec<Vec<u8>> = (0..num) let set_packs: Vec<Vec<u8>> = (0..num)
.map(|idx| libsky::into_raw_query(&format!("SET {} {}", keys[idx], values[idx]))) .map(|idx| {
libsky::into_raw_query(&format!("SET {} {}", keys[idx], values[idx]))
})
.collect(); .collect();
set_packs.into_iter().for_each(|packet| { set_packs.into_iter().for_each(|packet| {
np.execute(packet); np.execute(packet);
@ -321,9 +323,9 @@ mod benchtool {
let mut connection = Connection::new(host, port)?; let mut connection = Connection::new(host, port)?;
// test heya // test heya
let mut query = Query::new(); let mut query = Query::new();
query.arg("heya"); query.push("heya");
if !connection if !connection
.run_simple_query(query) .run_simple_query(&query)
.unwrap() .unwrap()
.eq(&Response::Item(Element::String("HEY!".to_owned()))) .eq(&Response::Item(Element::String("HEY!".to_owned())))
{ {
@ -332,31 +334,31 @@ mod benchtool {
let key = ran_string(65536, &mut rng); let key = ran_string(65536, &mut rng);
let value = ran_string(65536, &mut rng); let value = ran_string(65536, &mut rng);
let mut query = Query::new(); let mut query = Query::new();
query.arg("set"); query.push("set");
query.arg(&key); query.push(&key);
query.arg(&value); query.push(&value);
if !connection if !connection
.run_simple_query(query) .run_simple_query(&query)
.unwrap() .unwrap()
.eq(&Response::Item(Element::RespCode(RespCode::Okay))) .eq(&Response::Item(Element::RespCode(RespCode::Okay)))
{ {
return Err("SET test failed".into()); return Err("SET test failed".into());
} }
let mut query = Query::new(); let mut query = Query::new();
query.arg("get"); query.push("get");
query.arg(&key); query.push(&key);
if !connection if !connection
.run_simple_query(query) .run_simple_query(&query)
.unwrap() .unwrap()
.eq(&Response::Item(Element::String(value.to_owned()))) .eq(&Response::Item(Element::String(value.to_owned())))
{ {
return Err("GET test failed".into()); return Err("GET test failed".into());
} }
let mut query = Query::new(); let mut query = Query::new();
query.arg("del"); query.push("del");
query.arg(&key); query.push(&key);
if !connection if !connection
.run_simple_query(query) .run_simple_query(&query)
.unwrap() .unwrap()
.eq(&Response::Item(Element::UnsignedInt(1))) .eq(&Response::Item(Element::UnsignedInt(1)))
{ {

4
sky-macros/src/lib.rs
Unescape Escape View File

@ -67,9 +67,9 @@ fn parse_dbtest(mut input: syn::ItemFn) -> Result<TokenStream, syn::Error> {
let mut query = skytable::Query::new(); let mut query = skytable::Query::new();
#body #body
{ {
let mut __flush__ = skytable::Query::new(); __flush__.arg("flushdb"); let mut __flush__ = skytable::Query::from("flushdb");
std::assert_eq!( std::assert_eq!(
con.run_simple_query(__flush__).await.unwrap(), con.run_simple_query(&__flush__).await.unwrap(),
skytable::Response::Item(skytable::Element::RespCode(skytable::RespCode::Okay)) skytable::Response::Item(skytable::Element::RespCode(skytable::RespCode::Okay))
); );
} }

Write Preview
Loading…
Cancel
Save