Skip to content

Commit e545e77

Browse files
authored
Merge branch 'main' into feat-registry
2 parents c2955e0 + 448108b commit e545e77

File tree

57 files changed

+351
-479
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+351
-479
lines changed

Cargo.lock

Lines changed: 64 additions & 176 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ object = { opt-level = 3 }
105105
rustc-demangle = { opt-level = 3 }
106106

107107
[patch.crates-io]
108-
# http-types doesn't play well with the new errors api.
109-
# This fork address this problem, and should be removed once we upgrade to
110-
# new toolchain.
111-
http-types = { git = "https://github.com/Xuanwo/http-types", rev = "106fc6d" }
108+
# If there are dependencies that need patching, they can be listed below.
109+
# For example:
110+
# http-types = { git = "https://github.com/Xuanwo/http-types", rev = "106fc6d" }

src/binaries/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ databend-meta = { path = "../meta/service" }
4747
databend-query = { path = "../query/service" }
4848

4949
# Crates.io dependencies
50-
anyhow = "1.0.64"
51-
clap = { version = "3.2.5", features = ["derive", "env"] }
50+
anyhow = "1.0.65"
51+
clap = { version = "3.2.22", features = ["derive", "env"] }
5252
openraft = { git = "https://github.com/datafuselabs/openraft", tag = "v0.7.2" }
5353
sentry = "0.27.0"
54-
serde = { version = "1.0.137", features = ["derive"] }
55-
serde_json = "1.0.81"
56-
tokio-stream = "0.1.9"
54+
serde = { version = "1.0.144", features = ["derive"] }
55+
serde_json = "1.0.85"
56+
tokio-stream = "0.1.10"
5757
tonic = "0.7.2"
58-
tracing = "0.1.35"
59-
url = "2.2.2"
58+
tracing = "0.1.36"
59+
url = "2.3.1"
6060

6161
[[bin]]
6262
name = "databend-meta"

src/common/arrow/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ arrow = { package = "arrow2", version = "0.14.0", default-features = false, feat
3939
"io_parquet_compression",
4040
] }
4141
arrow-format = { version = "0.7.0", features = ["flight-data", "flight-service", "ipc"] }
42-
futures = "0.3.21"
42+
futures = "0.3.24"
4343
parquet2 = { version = "0.16.3", default_features = false }
4444

4545
[dev-dependencies]

src/common/base/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,24 @@ common-exception = { path = "../exception" }
2626
# Github dependencies
2727

2828
# Crates.io dependencies
29-
async-trait = "0.1.56"
30-
ctrlc = { version = "3.2.2", features = ["termination"] }
31-
futures = "0.3.21"
32-
libc = "0.2.126"
29+
async-trait = "0.1.57"
30+
ctrlc = { version = "3.2.3", features = ["termination"] }
31+
futures = "0.3.24"
32+
libc = "0.2.133"
3333
num_cpus = "1.13.1"
34-
once_cell = "1.12.0"
34+
once_cell = "1.15.0"
3535
parking_lot = "0.12.1"
36-
pprof = { version = "0.10.0", features = [
36+
pprof = { version = "0.10.1", features = [
3737
"flamegraph",
3838
"protobuf-codec",
3939
"protobuf",
4040
] }
41-
serde = { version = "1.0.137", features = ["derive"] }
41+
serde = { version = "1.0.144", features = ["derive"] }
4242
tikv-jemalloc-ctl = { version = "0.4.2", optional = true }
4343
tikv-jemalloc-sys = "0.4.3"
44-
tokio = { version = "1.19.2", features = ["full"] }
45-
tracing = "0.1.35"
44+
tokio = { version = "1.21.1", features = ["full"] }
45+
tracing = "0.1.36"
4646
uuid = { version = "1.1.2", features = ["serde", "v4"] }
4747

4848
[dev-dependencies]
49-
anyhow = "1.0.64"
49+
anyhow = "1.0.65"

src/common/building/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ doctest = false
1111
test = false
1212

1313
[dependencies]
14-
anyhow = "1.0.64"
14+
anyhow = "1.0.65"
1515
cargo-license = "0.5.1"
1616
cargo_metadata = "0.15.0"
1717
git2 = { version = "0.14.4", default-features = false }
18-
tracing = "0.1.35"
19-
vergen = "7.2.1"
18+
tracing = "0.1.36"
19+
vergen = "7.4.2"

src/common/cache/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ common-exception = { path = "../exception" }
2121
# Github dependencies
2222

2323
# Crates.io dependencies
24-
filetime = "0.2.16"
24+
filetime = "0.2.17"
2525
ritelinked = { version = "0.3.2", default-features = false, features = ["ahash", "inline-more"] }
26-
tracing = "0.1.35"
26+
tracing = "0.1.36"
2727
walkdir = "2.3.2"
2828

2929
[target.'cfg(not(target_os = "macos"))'.dependencies]

src/common/contexts/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ test = false
1111
[dependencies]
1212
common-base = { path = "../base" }
1313

14-
async-trait = "0.1.56"
14+
async-trait = "0.1.57"
1515
opendal = { version = "0.17.1", features = ["layers-retry"] }

src/common/exception/Cargo.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ test = false
1313
[dependencies] # In alphabetical order
1414
common-arrow = { path = "../arrow" }
1515

16-
anyhow = "1.0.64"
16+
anyhow = "1.0.65"
1717
bincode = { version = "2.0.0-rc.1", features = ["serde", "std", "alloc"] }
18-
octocrab = "0.16.0"
19-
paste = "1.0.7"
18+
paste = "1.0.9"
2019
prost = "0.10.4"
21-
serde = { version = "1.0.137", features = ["derive"] }
22-
serde_json = "1.0.81"
20+
serde = { version = "1.0.144", features = ["derive"] }
21+
serde_json = "1.0.85"
2322
thiserror = "1"
24-
time = "0.3.10"
23+
time = "0.3.14"
2524
tonic = "0.7.2"
2625

2726
# Github dependencies

src/common/exception/src/exception_into.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,6 @@ impl From<prost::EncodeError> for ErrorCode {
179179
}
180180
}
181181

182-
// === octocrab error ===
183-
impl From<octocrab::Error> for ErrorCode {
184-
fn from(error: octocrab::Error) -> Self {
185-
ErrorCode::NetworkRequestError(format!("octocrab error, cause: {}", error))
186-
}
187-
}
188-
189182
// === ser/de to/from tonic::Status ===
190183
#[derive(thiserror::Error, serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)]
191184
pub struct SerializedError {

0 commit comments

Comments
 (0)