Skip to content

Commit

Permalink
Merge branch 'main' into json-lambda
Browse files Browse the repository at this point in the history
  • Loading branch information
sundy-li authored Oct 9, 2024
2 parents 462f140 + 0c550c5 commit 085d709
Show file tree
Hide file tree
Showing 47 changed files with 1,979 additions and 483 deletions.
75 changes: 39 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ http = "1"
itertools = "0.10.5"
jsonb = "0.4.3"
jwt-simple = "0.11.0"
libc = { version = "0.2.158" }
match-template = "0.0.1"
mysql_async = { version = "0.34", default-features = false, features = ["native-tls-tls"] }
object_store_opendal = "0.46"
Expand Down
2 changes: 1 addition & 1 deletion src/common/arrow/src/arrow/array/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
//! to a concrete struct based on [`PhysicalType`](crate::arrow::datatypes::PhysicalType) available from [`Array::data_type`].
//! All immutable arrays are backed by [`Buffer`](crate::arrow::buffer::Buffer) and thus cloning and slicing them is `O(1)`.
//!
//! Most arrays contain a [`MutableArray`] counterpart that is neither clonable nor sliceable, but
//! Most arrays contain a [`MutableArray`] counterpart that is neither cloneable nor sliceable, but
//! can be operated in-place.
use std::any::Any;
use std::sync::Arc;
Expand Down
3 changes: 2 additions & 1 deletion src/common/base/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ databend-common-exception = { workspace = true }
enquote = "1.1.0"
fastrace = { workspace = true }
futures = { workspace = true }
libc = "0.2.153"
libc = { workspace = true }
log = { workspace = true }
logcall = { workspace = true }
micromarshal = "0.5.0"
Expand All @@ -50,6 +50,7 @@ prometheus-parse = "0.2.3"
rand = { workspace = true, features = ["serde1"] }
regex = { workspace = true }
replace_with = "0.1.7"
rustix = "0.38.37"
semver = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand Down
Loading

0 comments on commit 085d709

Please sign in to comment.