Skip to content

Commit 553b517

Browse files
authored
Cleanup overlapping rust dependencies and bump up some to latest version (#2377)
1 parent ab7d333 commit 553b517

File tree

22 files changed

+81
-81
lines changed

22 files changed

+81
-81
lines changed

interactive_engine/executor/assembly/groot/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pegasus_server = { path = "../../engine/pegasus/server" }
1616
runtime_integration = { path = "../../ir/integrated" }
1717
log = "0.4"
1818
log4rs = "1.2"
19-
tokio = { version = "1.0", features = ["macros", "sync"] }
19+
tokio = { version = "1.24", features = ["macros", "sync"] }
2020

2121
[features]
2222
column_filter_push_down = ["runtime_integration/column_filter_push_down"]

interactive_engine/executor/assembly/v6d/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ edition = "2018"
88
[dependencies]
99
log = "0.4"
1010
log4rs = "1.2"
11-
serde = "1.0.72"
12-
serde_derive = "1.0.72"
13-
serde_json = "1.0.3"
14-
structopt = "0.2"
15-
lru_time_cache = "0.8.0"
11+
serde = "1.0"
12+
serde_derive = "1.0"
13+
serde_json = "1.0"
14+
structopt = "0.3"
15+
lru_time_cache = "0.11"
1616
dotproperties = "0.1.0"
17-
tokio = { version = "1.0", features = ["macros", "sync"] }
17+
tokio = { version = "1.24", features = ["macros", "sync"] }
1818

1919
global_query = { path = "../../store/global_query" , features = ["with_v6d"] }
2020
pegasus = { path = "../../engine/pegasus/pegasus", package = "pegasus" }

interactive_engine/executor/common/dyn_type/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ edition = "2018"
55

66
[dependencies]
77
dyn-clonable = "0.9.0"
8-
itertools = "0.9"
8+
itertools = "0.10"
99
lazy_static = "1.3.0"
1010
pegasus_common = { path = "../../engine/pegasus/common" }

interactive_engine/executor/engine/pegasus/benchmark/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ edition = "2018"
1111
pegasus_graph = { path = "../graph" }
1212
pegasus = { path = "../pegasus" }
1313
pegasus_common = { path = "../common" }
14-
tonic = { version = "0.5", features = ["default", "compression"] }
15-
prost = "0.8"
16-
tokio = { version = "1.0", features = ["macros", "sync", "rt-multi-thread"] }
14+
tonic = { version = "0.8", features = ["default", "compression"] }
15+
prost = "0.11"
16+
tokio = { version = "1.24", features = ["macros", "sync", "rt-multi-thread"] }
1717
structopt = "0.3"
18-
futures = "0.3.19"
18+
futures = "0.3"
1919
log = "0.4"
2020

2121
[build-dependencies]
22-
tonic-build = { version = "0.5", features = ["default", "compression"] }
22+
tonic-build = { version = "0.8", features = ["default", "compression"] }
2323

2424
[features]
2525
default = []

interactive_engine/executor/engine/pegasus/clients/rust/client/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2018"
88
[dependencies]
99
pegasus_server = { path = "../../../server" }
1010
pegasus = { path = "../../../pegasus" }
11-
tonic = "0.6"
12-
prost = "0.9"
13-
tokio = { version = "1.0", features = ["macros", "sync", "rt-multi-thread"] }
14-
tokio-stream = { version = "0.1.3", features = ["net"] }
11+
tonic = "0.8"
12+
prost = "0.11"
13+
tokio = { version = "1.24", features = ["macros", "sync", "rt-multi-thread"] }
14+
tokio-stream = { version = "0.1.11", features = ["net"] }

interactive_engine/executor/engine/pegasus/common/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ edition = "2018"
66

77
[dependencies]
88
log = "0.4"
9-
crossbeam-channel = "0.4.4"
9+
crossbeam-channel = "0.5.6"
1010
crossbeam-queue = "0.3"
11-
crossbeam-deque = "0.7"
12-
crossbeam-utils = "0.8.7"
13-
backtrace = "0.3.45"
11+
crossbeam-deque = "0.8"
12+
crossbeam-utils = "0.8.14"
13+
backtrace = "0.3.67"
1414
log4rs = { version = "1.2", optional = true }
1515
bitflags = "1.2.1"
16-
bytes = "0.6"
17-
byteorder = "1.3.0"
18-
serde = { version = "1.0.72", optional = true }
19-
env_logger = { version = "0.6" , optional = true }
20-
time = { version = "0.1", optional = true }
16+
bytes = "1.3"
17+
byteorder = "1.4.3"
18+
serde = { version = "1.0", optional = true }
19+
env_logger = { version = "0.10" , optional = true }
2120
smallvec = "1.6"
22-
rand = "0.8.3"
21+
rand = "0.8.5"
22+
time = { version = "0.3", optional = true, features = [ "formatting" ]}
2323

2424
[dev-dependencies]
2525
bincode = "1.0.1"
26-
rand = "0.8"
26+
rand = "0.8.5"
2727

2828
[features]
2929
env_log = ["env_logger", "time"]

interactive_engine/executor/engine/pegasus/common/src/logs.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ mod log_4_rs {
8282
#[cfg(feature = "env_logger")]
8383
mod log_env {
8484
use std::io::Write;
85-
8685
use env_logger::fmt::Color;
8786
use log::Level;
87+
use time::format_description;
88+
use time::OffsetDateTime;
8889

8990
pub fn init_log() {
9091
env_logger::Builder::from_default_env()
9192
.format(|buf, record| {
92-
let t = time::now();
9393
let mut level_style = buf.style();
9494
match record.level() {
9595
Level::Error => {
@@ -112,12 +112,13 @@ mod log_env {
112112
level_style.set_color(Color::Blue);
113113
}
114114
};
115-
115+
let dt = OffsetDateTime::now_utc();
116+
let dt_fmt = format_description::parse("[year]-[month]-[day] [hour]:[minute]:[second]").unwrap();
116117
writeln!(
117118
buf,
118119
"{},{:03} {}\t[{}] [{}:{}] {}",
119-
time::strftime("%Y-%m-%d %H:%M:%S", &t).unwrap(),
120-
t.tm_nsec / 1000_000,
120+
dt.format(&dt_fmt).unwrap(),
121+
dt.millisecond(),
121122
level_style.value(record.level()),
122123
::std::thread::current()
123124
.name()

interactive_engine/executor/engine/pegasus/executor/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ edition = "2018"
88
log = "0.4"
99
lazy_static = "1.3.0"
1010
crossbeam-queue = "0.3"
11-
crossbeam-channel = "0.4.4"
12-
crossbeam-utils = "0.8.7"
11+
crossbeam-channel = "0.5.6"
12+
crossbeam-utils = "0.8.14"
1313
num_cpus = "1.11"
1414
pegasus_common = { path = "../common" }
1515
pegasus_memory = { path = "../memory" }

interactive_engine/executor/engine/pegasus/graph/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ authors = ["chenqiang.mcq <chenqiang.mcq@alibaba-inc.com>"]
55
edition = "2018"
66

77
[dependencies]
8-
byteorder = "1.3.0"
8+
byteorder = "1.4.3"
99
nohash-hasher = "0.2.0"
10-
crossbeam-utils = "0.8.7"
10+
crossbeam-utils = "0.8.14"
1111
#snap = "1"
12-
rand = "0.8.3"
12+
rand = "0.8.5"
1313
memmap = "0.7.0"
1414
ahash = "0.7.2"
1515
lazy_static = "1.3.0"

interactive_engine/executor/engine/pegasus/memory/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ mem = []
1010

1111
[dependencies]
1212
#log = "0.4"
13-
crossbeam-utils = "0.8.7"
13+
crossbeam-utils = "0.8.14"
1414
lazy_static = "1.3.0"

0 commit comments

Comments
 (0)