Cleanup overlapping rust dependencies and bump up some to latest vers…

…ion (#2377)
alibaba · Jan 10, 2023 · 553b517 · 553b517
1 parent ab7d333
commit 553b517
Show file tree

Hide file tree

Showing 22 changed files with 81 additions and 81 deletions.
diff --git a/interactive_engine/executor/assembly/groot/Cargo.toml b/interactive_engine/executor/assembly/groot/Cargo.toml
@@ -16,7 +16,7 @@ pegasus_server = { path = "../../engine/pegasus/server" }
 runtime_integration =  { path = "../../ir/integrated" }
 log = "0.4"
 log4rs = "1.2"
-tokio = { version = "1.0", features = ["macros", "sync"] }
+tokio = { version = "1.24", features = ["macros", "sync"] }
 
 [features]
 column_filter_push_down = ["runtime_integration/column_filter_push_down"]
diff --git a/interactive_engine/executor/assembly/v6d/Cargo.toml b/interactive_engine/executor/assembly/v6d/Cargo.toml
@@ -8,13 +8,13 @@ edition = "2018"
 [dependencies]
 log = "0.4"
 log4rs = "1.2"
-serde = "1.0.72"
-serde_derive = "1.0.72"
-serde_json = "1.0.3"
-structopt = "0.2"
-lru_time_cache = "0.8.0"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
+structopt = "0.3"
+lru_time_cache = "0.11"
 dotproperties = "0.1.0"
-tokio = { version = "1.0", features = ["macros", "sync"] }
+tokio = { version = "1.24", features = ["macros", "sync"] }
 
 global_query = { path = "../../store/global_query" , features = ["with_v6d"] }
 pegasus = { path = "../../engine/pegasus/pegasus", package = "pegasus" }

diff --git a/interactive_engine/executor/common/dyn_type/Cargo.toml b/interactive_engine/executor/common/dyn_type/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2018"
 
 [dependencies]
 dyn-clonable = "0.9.0"
-itertools = "0.9"
+itertools = "0.10"
 lazy_static = "1.3.0"
 pegasus_common = { path = "../../engine/pegasus/common" }
diff --git a/interactive_engine/executor/engine/pegasus/benchmark/Cargo.toml b/interactive_engine/executor/engine/pegasus/benchmark/Cargo.toml
@@ -11,15 +11,15 @@ edition = "2018"
 pegasus_graph = { path = "../graph" }
 pegasus = { path = "../pegasus" }
 pegasus_common = { path = "../common" }
-tonic = { version = "0.5", features = ["default", "compression"] }
-prost = "0.8"
-tokio = { version = "1.0", features = ["macros", "sync", "rt-multi-thread"] }
+tonic = { version = "0.8", features = ["default", "compression"] }
+prost = "0.11"
+tokio = { version = "1.24", features = ["macros", "sync", "rt-multi-thread"] }
 structopt = "0.3"
-futures = "0.3.19"
+futures = "0.3"
 log = "0.4"
 
 [build-dependencies]
-tonic-build = { version = "0.5", features = ["default", "compression"] }
+tonic-build = { version = "0.8", features = ["default", "compression"] }
 
 [features]
 default = []

diff --git a/interactive_engine/executor/engine/pegasus/clients/rust/client/Cargo.toml b/interactive_engine/executor/engine/pegasus/clients/rust/client/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 [dependencies]
 pegasus_server = { path = "../../../server" }
 pegasus = { path = "../../../pegasus" }
-tonic = "0.6"
-prost = "0.9"
-tokio = { version = "1.0", features = ["macros", "sync", "rt-multi-thread"] }
-tokio-stream = { version = "0.1.3", features = ["net"] }
+tonic = "0.8"
+prost = "0.11"
+tokio = { version = "1.24", features = ["macros", "sync", "rt-multi-thread"] }
+tokio-stream = { version = "0.1.11", features = ["net"] }
diff --git a/interactive_engine/executor/engine/pegasus/common/Cargo.toml b/interactive_engine/executor/engine/pegasus/common/Cargo.toml
@@ -6,24 +6,24 @@ edition = "2018"
 
 [dependencies]
 log = "0.4"
-crossbeam-channel = "0.4.4"
+crossbeam-channel = "0.5.6"
 crossbeam-queue = "0.3"
-crossbeam-deque = "0.7"
-crossbeam-utils = "0.8.7"
-backtrace = "0.3.45"
+crossbeam-deque = "0.8"
+crossbeam-utils = "0.8.14"
+backtrace = "0.3.67"
 log4rs = { version = "1.2", optional = true }
 bitflags = "1.2.1"
-bytes = "0.6"
-byteorder = "1.3.0"
-serde = { version = "1.0.72", optional = true }
-env_logger = { version = "0.6" , optional = true }
-time = { version = "0.1", optional = true }
+bytes = "1.3"
+byteorder = "1.4.3"
+serde = { version = "1.0", optional = true }
+env_logger = { version = "0.10" , optional = true }
 smallvec = "1.6"
-rand = "0.8.3"
+rand = "0.8.5"
+time = { version = "0.3", optional = true, features = [ "formatting" ]}
 
 [dev-dependencies]
 bincode = "1.0.1"
-rand = "0.8"
+rand = "0.8.5"
 
 [features]
 env_log = ["env_logger", "time"]

diff --git a/interactive_engine/executor/engine/pegasus/common/src/logs.rs b/interactive_engine/executor/engine/pegasus/common/src/logs.rs
@@ -82,14 +82,14 @@ mod log_4_rs {
 #[cfg(feature = "env_logger")]
 mod log_env {
     use std::io::Write;
-
     use env_logger::fmt::Color;
     use log::Level;
+    use time::format_description;
+    use time::OffsetDateTime;
 
     pub fn init_log() {
         env_logger::Builder::from_default_env()
             .format(|buf, record| {
-                let t = time::now();
                 let mut level_style = buf.style();
                 match record.level() {
                     Level::Error => {
@@ -112,12 +112,13 @@ mod log_env {
                         level_style.set_color(Color::Blue);
                     }
                 };
-
+                let dt = OffsetDateTime::now_utc();
+                let dt_fmt = format_description::parse("[year]-[month]-[day] [hour]:[minute]:[second]").unwrap();
                 writeln!(
                     buf,
                     "{},{:03} {}\t[{}] [{}:{}] {}",
-                    time::strftime("%Y-%m-%d %H:%M:%S", &t).unwrap(),
-                    t.tm_nsec / 1000_000,
+                    dt.format(&dt_fmt).unwrap(),
+                    dt.millisecond(),
                     level_style.value(record.level()),
                     ::std::thread::current()
                         .name()

diff --git a/interactive_engine/executor/engine/pegasus/executor/Cargo.toml b/interactive_engine/executor/engine/pegasus/executor/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2018"
 log = "0.4"
 lazy_static = "1.3.0"
 crossbeam-queue = "0.3"
-crossbeam-channel = "0.4.4"
-crossbeam-utils = "0.8.7"
+crossbeam-channel = "0.5.6"
+crossbeam-utils = "0.8.14"
 num_cpus = "1.11"
 pegasus_common = { path = "../common" }
 pegasus_memory = { path = "../memory" }
diff --git a/interactive_engine/executor/engine/pegasus/graph/Cargo.toml b/interactive_engine/executor/engine/pegasus/graph/Cargo.toml
@@ -5,11 +5,11 @@ authors = ["chenqiang.mcq <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-byteorder = "1.3.0"
+byteorder = "1.4.3"
 nohash-hasher = "0.2.0"
-crossbeam-utils = "0.8.7"
+crossbeam-utils = "0.8.14"
 #snap = "1"
-rand = "0.8.3"
+rand = "0.8.5"
 memmap = "0.7.0"
 ahash = "0.7.2"
 lazy_static = "1.3.0"

diff --git a/interactive_engine/executor/engine/pegasus/memory/Cargo.toml b/interactive_engine/executor/engine/pegasus/memory/Cargo.toml
@@ -10,5 +10,5 @@ mem = []
 
 [dependencies]
 #log = "0.4"
-crossbeam-utils = "0.8.7"
+crossbeam-utils = "0.8.14"
 lazy_static = "1.3.0"
diff --git a/interactive_engine/executor/engine/pegasus/network/Cargo.toml b/interactive_engine/executor/engine/pegasus/network/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2018"
 log = "0.4"
 lazy_static = "1.3.0"
 pegasus_common = { path = "../common" }
-crossbeam-channel = "0.4.4"
-crossbeam-utils = "0.8.7"
+crossbeam-channel = "0.5.6"
+crossbeam-utils = "0.8.14"
 crossbeam-queue = "0.3"
 toml = "0.5"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/interactive_engine/executor/engine/pegasus/pegasus/Cargo.toml b/interactive_engine/executor/engine/pegasus/pegasus/Cargo.toml
@@ -10,13 +10,13 @@ pegasus_memory = { path = "../memory" }
 pegasus_network = { path = "../network" }
 pegasus_executor = { path = "../executor" }
 pegasus_graph = { path = "../graph" }
-crossbeam-channel = "0.4.4"
+crossbeam-channel = "0.5.6"
 crossbeam-queue = "0.3"
-crossbeam-utils = "0.8.7"
+crossbeam-utils = "0.8.14"
 log = "0.4"
 smallvec = "1.6"
 lazy_static = "1.3.0"
-backtrace = "0.3.45"
+backtrace = "0.3.67"
 bitflags = "1.2.1"
 hibitset = "0.6.3"
 enum_dispatch = "0.3"
@@ -32,9 +32,8 @@ mem = ["pegasus_memory/mem"]
 default = []
 
 [dev-dependencies]
-time = "0.1"
-env_logger = { version = "0.6" }
+env_logger = "0.10"
 structopt = "0.3"
-rand = "0.8.3"
+rand = "0.8.5"
 
 
diff --git a/interactive_engine/executor/engine/pegasus/server/Cargo.toml b/interactive_engine/executor/engine/pegasus/server/Cargo.toml
@@ -10,12 +10,12 @@ pegasus_network = { path = "../network"}
 pegasus_memory = { path = "../memory"}
 pegasus = { path = "../pegasus" }
 log = "0.4"
-crossbeam-utils = "0.8.7"
-#crossbeam-channel = "0.3.6"
-tonic = "0.6"
-prost = "0.9"
-tokio = { version = "1.0", features = ["macros", "sync", "rt-multi-thread"] }
-tokio-stream = "0.1.3"
+crossbeam-utils = "0.8.14"
+#crossbeam-channel = "0.5.6"
+tonic = "0.8"
+prost = "0.11"
+tokio = { version = "1.24", features = ["macros", "sync", "rt-multi-thread"] }
+tokio-stream = "0.1.11"
 toml = "0.5"
 serde = { version = "1.0", features = ["derive"] }
 hyper = "0.14"
@@ -28,7 +28,7 @@ libloading = "0.7"
 structopt = "0.3"
 
 [build-dependencies]
-tonic-build = "0.5"
+tonic-build = "0.8"
 
 [features]
 default = []

diff --git a/interactive_engine/executor/engine/pegasus/server/src/rpc.rs b/interactive_engine/executor/engine/pegasus/server/src/rpc.rs
@@ -275,7 +275,7 @@ impl<S: pb::job_service_server::JobService> RPCJobServer<S> {
         }
 
         if let Some(dur) = rpc_config.rpc_timeout_ms.take() {
-            builder.timeout(Duration::from_millis(dur));
+            builder = builder.timeout(Duration::from_millis(dur));
         }
 
         if let Some(size) = rpc_config.rpc_initial_stream_window_size {

diff --git a/interactive_engine/executor/ir/common/Cargo.toml b/interactive_engine/executor/ir/common/Cargo.toml
@@ -6,12 +6,12 @@ edition = "2018"
 [dependencies]
 dyn_type = {path = "../../common/dyn_type"}
 pegasus_common = { path = "../../engine/pegasus/common" }
-prost = "0.9"
+prost = "0.11"
 serde = { version = "1.0", features = ["derive"] }
-tonic = "0.4"
+tonic = "0.8"
 
 [build-dependencies]
-prost-build = "0.9"
+prost-build = "0.11"
 
 [features]
 default = []

diff --git a/interactive_engine/executor/ir/core/Cargo.toml b/interactive_engine/executor/ir/core/Cargo.toml
@@ -8,14 +8,14 @@ crate-type = ["rlib", "cdylib"]
 
 [dependencies]
 dyn_type = {path = "../../common/dyn_type"}
-env_logger = "0.9.0"
+env_logger = "0.10"
 ir_common = {path = "../common"}
 lazy_static = "1.3.0"
 log = "0.4"
 pegasus_client = {path = "../../engine/pegasus/clients/rust/client"}
 pegasus_server = {path = "../../engine/pegasus/server"}
 pegasus = {path = "../../engine/pegasus/pegasus"}
-prost = "0.9"
+prost = "0.11"
 serde = "1.0"
 serde_json = "1.0"
 vec_map = { version = "0.8.2", features = ["serde"] }

diff --git a/interactive_engine/executor/ir/integrated/Cargo.toml b/interactive_engine/executor/ir/integrated/Cargo.toml
@@ -7,11 +7,11 @@ edition = "2018"
 
 [dependencies]
 log = "0.4"
-crossbeam-channel = "0.4.4"
-prost = "0.9"
+crossbeam-channel = "0.5.6"
+prost = "0.11"
 lazy_static = "1.3.0"
-structopt = "0.2"
-tokio = { version = "1.0", features = ["macros", "sync"] }
+structopt = "0.3"
+tokio = { version = "1.24", features = ["macros", "sync"] }
 clap = "2.32.0"
 pegasus = { path = "../../engine/pegasus/pegasus" }
 pegasus_client = {path = "../../engine/pegasus/clients/rust/client"}

diff --git a/interactive_engine/executor/ir/runtime/Cargo.toml b/interactive_engine/executor/ir/runtime/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2018"
 
 [dependencies]
 dyn_type = {path = "../../common/dyn_type"}
-indexmap = "1.7.0"
+indexmap = "1.9"
 ir_common = {path = "../common"}
 lazy_static = "1.3.0"
 log = "0.4"
 pegasus_common = { path = "../../engine/pegasus/common" }
 pegasus = { path = "../../engine/pegasus/pegasus" }
 pegasus_server = { path = "../../engine/pegasus/server" }
 graph_proxy = { path="../graph_proxy" }
-prost = "0.9"
+prost = "0.11"
 vec_map = "0.8.2"
 ahash = "0.8"
 

diff --git a/interactive_engine/executor/store/exp_store/Cargo.toml b/interactive_engine/executor/store/exp_store/Cargo.toml
@@ -17,16 +17,16 @@ bincode = "1.0.1"
 clap = "2.32.0"
 csv = "1.1"
 chrono = "0.4"
-env_logger = "0.7.1"
-lazy_static = "1.1.1"
+env_logger = "0.10"
+lazy_static = "1.3.0"
 log = "0.4"
-indexmap = { version = "1.7", features = ["serde"] }
-itertools = "0.9"
-jemallocator = { version = "0.3.0", optional = true }
+indexmap = { version = "1.9", features = ["serde"] }
+itertools = "0.10"
+jemallocator = { version = "0.5", optional = true }
 dyn_type = { path = "../../common/dyn_type" }
 pegasus_common = { path = "../../engine/pegasus/common" }
 petgraph = { version = "0.5.0", features = ["serde-1"] }
-rand = "0.5.5"
+rand = "0.8.5"
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
 serde_json = "1.0"

diff --git a/interactive_engine/executor/store/global_query/Cargo.toml b/interactive_engine/executor/store/global_query/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2021"
 
 [dependencies]
 log = "0.4"
-itertools = "0.7.8"
-byteorder = "1.3.1"
-serde = "1.0.72"
+itertools = "0.10"
+byteorder = "1.4.3"
+serde = "1.0"
 libc = "0.2"
 groot-store = { path = "../groot" }
 ir_common = {path = "../../ir/common"}

diff --git a/interactive_engine/executor/store/groot/Cargo.toml b/interactive_engine/executor/store/groot/Cargo.toml
@@ -6,13 +6,13 @@ edition = "2018"
 build = "build.rs"
 
 [dependencies]
-byteorder = "1"
+byteorder = "1.4.3"
 log = "0.4"
 protobuf = { version = "2.27", features = ["with-bytes"] }
-serde = "1.0.72"
-serde_derive = "1.0.72"
+serde = "1.0"
+serde_derive = "1.0"
 serde_json = "1.0"
-structopt = "0.2"
+structopt = "0.3"
 tempfile = "3"
 crossbeam-epoch = "0.7"
 rust-ini = "0.13"
@@ -28,7 +28,7 @@ dyn_type = { path = "../../common/dyn_type" }
 protoc-grpcio = "3.0"
 
 [dev-dependencies]
-rand = "0.7.3"
+rand = "0.8.5"
 
 [[bin]]
 name = "write_bench"
diff --git a/interactive_engine/executor/store/groot/src/api/property.rs b/interactive_engine/executor/store/groot/src/api/property.rs
@@ -855,7 +855,7 @@ impl Property {
     fn cast_long_list(&self) -> Result<Vec<i64>, String> {
         match self {
             Property::ListInt(list) => Ok(list.iter().map(|i| *i as i64).collect()),
-            Property::ListLong(list) => (Ok(list.clone())),
+            Property::ListLong(list) => Ok(list.clone()),
             _ => Err(format!("get list fail from property=>{:?}", self)),
         }
     }