gvsafronov
/
skytable
1
0
Fork 0
Code Pull Requests Activity

Cleanup and upgrade deps

Browse Source
next
Sayan Nandan 2 years ago
parent d156347bc4
commit 4d8e53f5cc
No known key found for this signature in database
GPG Key ID: 8BC07A0A4D41DD52
16 changed files with 108 additions and 75 deletions
Show Stats Download Patch File Download Diff File

114
Cargo.lock generated
Unescape Escape View File

@ -31,6 +31,18 @@ dependencies = [
"version_check",
]
[[package]]
name = "ahash"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57e6e951cfbb2db8de1828d49073a113a29fd7117b1596caa781a258c7e38d72"
dependencies = [
"cfg-if",
"getrandom",
"once_cell",
"version_check",
]
[[package]]
name = "aho-corasick"
version = "0.7.18"
@ -40,6 +52,15 @@ dependencies = [
"memchr",
]
[[package]]
name = "android_system_properties"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e"
dependencies = [
"libc",
]
[[package]]
name = "ansi_term"
version = "0.12.1"
@ -138,9 +159,9 @@ dependencies = [
[[package]]
name = "bumpalo"
version = "3.10.0"
version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
[[package]]
name = "byteorder"
@ -192,10 +213,11 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
version = "0.4.20"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6127248204b9aba09a362f6c930ef6a78f2c1b2215f8a7b398c06e1083f17af0"
checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
dependencies = [
"iana-time-zone",
"js-sys",
"num-integer",
"num-traits",
@ -264,9 +286,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
[[package]]
name = "cpufeatures"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
checksum = "1079fb8528d9f9c888b1e8aa651e6e079ade467323d58f75faf1d30b1808f540"
dependencies = [
"libc",
]
@ -327,9 +349,9 @@ dependencies = [
[[package]]
name = "crossterm"
version = "0.24.0"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab9f7409c70a38a56216480fba371ee460207dd8926ccf5b4160591759559170"
checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
dependencies = [
"bitflags",
"crossterm_winapi",
@ -400,9 +422,9 @@ dependencies = [
[[package]]
name = "either"
version = "1.7.0"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]]
name = "endian-type"
@ -498,30 +520,30 @@ checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
[[package]]
name = "futures-channel"
version = "0.3.21"
version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1"
dependencies = [
"futures-core",
]
[[package]]
name = "futures-core"
version = "0.3.21"
version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115"
[[package]]
name = "futures-task"
version = "0.3.21"
version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306"
[[package]]
name = "futures-util"
version = "0.3.21"
version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577"
dependencies = [
"futures-channel",
"futures-core",
@ -571,7 +593,7 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
dependencies = [
"ahash",
"ahash 0.7.6",
]
[[package]]
@ -598,6 +620,19 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "iana-time-zone"
version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"js-sys",
"wasm-bindgen",
"winapi",
]
[[package]]
name = "inout"
version = "0.1.3"
@ -609,9 +644,9 @@ dependencies = [
[[package]]
name = "io-lifetimes"
version = "0.7.2"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb"
checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06"
[[package]]
name = "itoa"
@ -666,9 +701,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.127"
version = "0.2.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b"
checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
[[package]]
name = "libsky"
@ -814,9 +849,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.13.0"
version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
[[package]]
name = "opaque-debug"
@ -939,9 +974,9 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
[[package]]
name = "powershell_script"
version = "1.0.2"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d5c8599ccb442b80c8c04437bcbcac2f76ff34d7b658b759fb26744dcab6c03"
checksum = "54bde2e1a395c0aee9423072d781610da37b7b120edf17d4da99f83d04f2cd54"
[[package]]
name = "ppv-lite86"
@ -1092,9 +1127,9 @@ checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
[[package]]
name = "rustix"
version = "0.35.7"
version = "0.35.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d51cc38aa10f6bbb377ed28197aa052aa4e2b762c22be9d3153d01822587e787"
checksum = "72c825b8aa8010eb9ee99b75f05e10180b9278d161583034d7574c9d617aeada"
dependencies = [
"bitflags",
"errno",
@ -1150,18 +1185,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
version = "1.0.143"
version = "1.0.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.143"
version = "1.0.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
dependencies = [
"proc-macro2",
"quote",
@ -1271,7 +1306,7 @@ dependencies = [
name = "skyd"
version = "0.8.0"
dependencies = [
"ahash",
"ahash 0.8.0",
"base64",
"bincode",
"bytes",
@ -1404,9 +1439,9 @@ dependencies = [
[[package]]
name = "sysinfo"
version = "0.25.1"
version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "373e4bc9213f734126e2be3e2e118dbc9b909c37487d8d755822bc90f70ae62a"
checksum = "71eb43e528fdc239f08717ec2a378fdb017dddbc3412de15fff527554591a66c"
dependencies = [
"cfg-if",
"core-foundation-sys",
@ -1468,12 +1503,11 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f"
checksum = "db76ff9fa4b1458b3c7f077f3ff9887394058460d21e634355b273aaf11eea45"
dependencies = [
"itoa",
"js-sys",
"libc",
"num_threads",
"time-macros",
@ -1748,7 +1782,7 @@ dependencies = [
"hmac",
"pbkdf2",
"sha1",
"time 0.3.12",
"time 0.3.13",
"zstd",
]

2
cli/Cargo.toml
Unescape Escape View File

@ -17,5 +17,5 @@ skytable = { git = "https://github.com/skytable/client-rust", branch = "next", f
tokio = { version = "1.20.1", features = ["full"] }
clap = { version = "2", features = ["yaml"] }
rustyline = "10.0.0"
crossterm = "0.24.0"
crossterm = "0.25.0"
lazy_static = "1.4.0"

2
harness/Cargo.toml
Unescape Escape View File

@ -15,5 +15,5 @@ libsky = { path = "../libsky" }
env_logger = "0.9.0"
log = "0.4.17"
zip = { version = "0.6.2", features = ["deflate"] }
powershell_script = "1.0.2"
powershell_script = "1.0.4"
openssl = { version = "0.10.41", features = ["vendored"] }

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

@ -321,7 +321,7 @@ where
Err(WorkpoolError::ThreadStartFailure(count, sum))
}
}
pub fn clone(&self) -> WorkpoolResult<Self> {
pub fn clone_pool(&self) -> WorkpoolResult<Self> {
Self::new(
self.workers.len(),
self.init_pre_loop_var.clone(),

8
server/Cargo.toml
Unescape Escape View File

@ -11,9 +11,9 @@ libsky = { path = "../libsky" }
sky_macros = { path = "../sky-macros" }
rcrypt = "0.4.0"
# external deps
ahash = "0.7.6"
ahash = "0.8.0"
bytes = "1.2.1"
chrono = "0.4.20"
chrono = "0.4.22"
clap = { version = "2", features = ["yaml"] }
env_logger = "0.9.0"
hashbrown = { version = "0.12.3", features = ["raw"] }
@ -21,7 +21,7 @@ log = "0.4.17"
openssl = { version = "0.10.41", features = ["vendored"] }
parking_lot = "0.12.1"
regex = "1.6.0"
serde = { version = "1.0.142", features = ["derive"] }
serde = { version = "1.0.144", features = ["derive"] }
tokio = { version = "1.20.1", features = ["full"] }
tokio-openssl = "0.6.3"
toml = "0.5.9"
@ -36,7 +36,7 @@ winapi = { version = "0.3.9", features = ["fileapi"] }
[target.'cfg(unix)'.dependencies]
# external deps
libc = "0.2.127"
libc = "0.2.132"
[target.'cfg(unix)'.build-dependencies]
# external deps

2
server/src/actions/lists/mod.rs
Unescape Escape View File

@ -41,7 +41,7 @@ action! {
let listname = unsafe { act.next_unchecked_bytes() };
let list = listmap.get_inner_ref();
if registry::state_okay() {
let did = if let Some(entry) = list.fresh_entry(listname.into()) {
let did = if let Some(entry) = list.fresh_entry(listname) {
let v: Vec<SharedSlice> = act.map(SharedSlice::new).collect();
entry.insert(LockedVec::new(v));
true

2
server/src/config/definitions.rs
Unescape Escape View File

@ -444,7 +444,7 @@ impl<'de> Visitor<'de> for ModesetVisitor {
match value {
"dev" => Ok(Modeset::Dev),
"prod" => Ok(Modeset::Prod),
_ => return Err(E::custom(format!("Bad value `{value}` for modeset"))),
_ => Err(E::custom(format!("Bad value `{value}` for modeset"))),
}
}
}

4
server/src/corestore/memstore.rs
Unescape Escape View File

@ -97,11 +97,11 @@ pub const AUTH: ObjectID = unsafe {
#[test]
fn test_def_macro_sanity() {
// just make sure our macro is working as expected
let mut def = DEFAULT.clone();
let mut def = DEFAULT;
def.push(b'?');
unsafe {
assert_eq!(def.as_str(), "default?");
let mut sys = SYSTEM.clone();
let mut sys = SYSTEM;
sys.push(b'?');
assert_eq!(sys.as_str(), "system?");
}

5
server/src/corestore/rc.rs
Unescape Escape View File

@ -29,7 +29,6 @@ use std::{
borrow::Borrow,
fmt::Debug,
hash::Hash,
mem::transmute,
ops::Deref,
ptr::{self, NonNull},
slice,
@ -221,9 +220,9 @@ impl SharedSliceInner {
fn new(slice: &[u8]) -> Self {
let layout = Layout::array::<u8>(slice.len()).unwrap();
let data = unsafe {
if slice.len() == 0 {
if slice.is_empty() {
// HACK(@ohsayan): Just ensure that the address is aligned for this
transmute(layout.align())
layout.align() as *mut u8
} else {
// UNSAFE(@ohsayan): Come on, just a malloc and memcpy
let array_ptr = alloc(layout);

2
server/src/storage/v1/mod.rs
Unescape Escape View File

@ -177,7 +177,7 @@ mod tests;
/// DISCLAIMER: THIS FUNCTION CAN DO TERRIBLE THINGS (especially when you think about padding)
unsafe fn raw_byte_repr<'a, T: 'a>(len: &'a T) -> &'a [u8] {
{
let ptr: *const u8 = mem::transmute(len);
let ptr: *const u8 = len as *const T as *const u8;
slice::from_raw_parts::<'a>(ptr, mem::size_of::<T>())
}
}

2
sky-bench/Cargo.toml
Unescape Escape View File

@ -18,6 +18,6 @@ clap = { version = "2", features = ["yaml"] }
log = "0.4.17"
env_logger = "0.9.0"
devtimer = "4.0.1"
serde = { version = "1.0.143", features = ["derive"] }
serde = { version = "1.0.144", features = ["derive"] }
serde_json = "1.0.83"
rand = "0.8.5"

12
sky-bench/src/bench/mod.rs
Unescape Escape View File

@ -95,14 +95,14 @@ impl<'a> LoopMonitor<'a> {
max,
current: 0,
time: 0,
name: name,
name,
}
}
/// Run cleanup
fn cleanup(&mut self) -> BResult<()> {
let last_iter = self.is_last_iter();
if let Some(ref mut cleanup) = self.inner {
let should_run_cleanup = (!last_iter) || (last_iter && !cleanup.skip_on_last);
let should_run_cleanup = !(last_iter && cleanup.skip_on_last);
if should_run_cleanup {
return cleanup.cleanup(self.name);
}
@ -161,10 +161,10 @@ impl<'a> CleanupInner<'a> {
fn cleanup(&mut self, name: &'static str) -> BResult<()> {
let r: Element = self.connection.run_query(&self.query)?;
if r.ne(&self.response) {
return Err(Error::RuntimeError(format!(
Err(Error::Runtime(format!(
"Failed to run cleanup for benchmark `{}`",
name
)));
)))
} else {
Ok(())
}
@ -185,7 +185,7 @@ pub fn run_bench(servercfg: &ServerConfig, matches: ArgMatches) -> BResult<()> {
let bench_config = BenchmarkConfig::new(servercfg, matches)?;
// check if we have enough combinations for the given query count and key size
if !util::has_enough_ncr(bench_config.kvsize(), bench_config.query_count()) {
return Err(Error::RuntimeError(
return Err(Error::Runtime(
"too low sample space for given query count. use larger kvsize".into(),
));
}
@ -251,7 +251,7 @@ pub fn run_bench(servercfg: &ServerConfig, matches: ArgMatches) -> BResult<()> {
binfo!("Finished benchmarks. Cleaning up ...");
let r: Element = misc_connection.run_query(Query::from("drop model default.tmpbench force"))?;
if r != Element::RespCode(RespCode::Okay) {
return Err(Error::RuntimeError(
return Err(Error::Runtime(
"failed to clean up after benchmarks".into(),
));
}

2
sky-bench/src/config.rs
Unescape Escape View File

@ -52,7 +52,7 @@ where
let parsed = input
.as_ref()
.parse::<T>()
.map_err(|e| Error::ConfigError(format!("parse error: `{}`", e)))?;
.map_err(|e| Error::Config(format!("parse error: `{}`", e)))?;
*target = parsed;
}
Ok(())

18
sky-bench/src/error.rs
Unescape Escape View File

@ -35,37 +35,37 @@ pub type BResult<T> = Result<T, Error>;
/// Benchmark tool errors
pub enum Error {
/// An error originating from the Skytable client
ClientError(SkyError),
Client(SkyError),
/// An error originating from the benchmark/server configuration
ConfigError(String),
Config(String),
/// A runtime error
RuntimeError(String),
Runtime(String),
}
impl From<SkyError> for Error {
fn from(e: SkyError) -> Self {
Self::ClientError(e)
Self::Client(e)
}
}
impl Display for Error {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Error::ClientError(e) => write!(f, "client error: {}", e),
Error::ConfigError(e) => write!(f, "config error: {}", e),
Error::RuntimeError(e) => write!(f, "runtime error: {}", e),
Error::Client(e) => write!(f, "client error: {}", e),
Error::Config(e) => write!(f, "config error: {}", e),
Error::Runtime(e) => write!(f, "runtime error: {}", e),
}
}
}
impl From<TryReserveError> for Error {
fn from(e: TryReserveError) -> Self {
Error::RuntimeError(format!("memory reserve error: {}", e.to_string()))
Error::Runtime(format!("memory reserve error: {}", e))
}
}
impl From<WorkpoolError> for Error {
fn from(e: WorkpoolError) -> Self {
Error::RuntimeError(format!("threadpool error: {}", e))
Error::Runtime(format!("threadpool error: {}", e))
}
}

4
sky-bench/src/util.rs
Unescape Escape View File

@ -114,7 +114,7 @@ pub fn run_sanity_test(server_config: &ServerConfig) -> BResult<()> {
for (query, expected, test_kind) in tests {
let r: Element = con.run_query(query)?;
if r != expected {
return Err(Error::RuntimeError(format!(
return Err(Error::Runtime(format!(
"sanity test for `{test_kind}` failed"
)));
}
@ -136,7 +136,7 @@ pub fn cleanup(server_config: &ServerConfig) -> BResult<()> {
let mut c = Connection::new(server_config.host(), server_config.port())?;
let r: Element = c.run_query(Query::from("drop model default.tmpbench force"))?;
if r == Element::RespCode(RespCode::Okay) {
Err(Error::RuntimeError("failed to run cleanup".into()))
Err(Error::Runtime("failed to run cleanup".into()))
} else {
Ok(())
}

2
stress-test/Cargo.toml
Unescape Escape View File

@ -14,7 +14,7 @@ skytable = { git = "https://github.com/skytable/client-rust.git", branch = "next
] }
devtimer = "4.0.1"
# external deps
sysinfo = "0.25.1"
sysinfo = "0.25.3"
env_logger = "0.9.0"
log = "0.4.17"
rand = "0.8.5"

Write Preview
Loading…
Cancel
Save