Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move some commonly referenced crates to workspace Cargo.toml #2981

Merged
merged 1 commit into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ bitflags = "2.4.1"
bytemuck = "1.12"
bytes = { version = "1.5", features = ["serde"] }
chrono = { version = "0.4", features = ["serde"] }
dashmap = "5.4"
datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "26e43acac3a96cec8dd4c8365f22dfb1a84306e9" }
datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", rev = "26e43acac3a96cec8dd4c8365f22dfb1a84306e9" }
datafusion-expr = { git = "https://github.com/apache/arrow-datafusion.git", rev = "26e43acac3a96cec8dd4c8365f22dfb1a84306e9" }
Expand Down Expand Up @@ -116,6 +117,7 @@ reqwest = { version = "0.11", default-features = false, features = [
"rustls-tls-native-roots",
"stream",
] }
rskafka = "0.5"
rust_decimal = "1.33"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions src/catalog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ common-recordbatch.workspace = true
common-runtime.workspace = true
common-telemetry.workspace = true
common-time.workspace = true
dashmap = "5.4"
dashmap.workspace = true
datafusion.workspace = true
datatypes.workspace = true
futures = "0.3"
Expand All @@ -38,7 +38,7 @@ paste = "1.0"
prometheus.workspace = true
regex.workspace = true
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
session.workspace = true
snafu.workspace = true
store-api.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion src/common/config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license.workspace = true
[dependencies]
common-base.workspace = true
humantime-serde.workspace = true
rskafka = "0.5"
rskafka.workspace = true
serde.workspace = true
serde_json.workspace = true
serde_with = "3"
Expand Down
2 changes: 1 addition & 1 deletion src/common/decimal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ common-error.workspace = true
common-macro.workspace = true
rust_decimal.workspace = true
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
snafu.workspace = true
2 changes: 1 addition & 1 deletion src/common/grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ common-recordbatch.workspace = true
common-runtime.workspace = true
common-telemetry.workspace = true
common-time.workspace = true
dashmap = "5.4"
dashmap.workspace = true
datafusion.workspace = true
datatypes.workspace = true
flatbuffers = "23.1"
Expand Down
2 changes: 1 addition & 1 deletion src/common/meta/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ prometheus.workspace = true
prost.workspace = true
rand.workspace = true
regex.workspace = true
rskafka = "0.5"
rskafka.workspace = true
serde.workspace = true
serde_json.workspace = true
serde_with = "3"
Expand Down
2 changes: 1 addition & 1 deletion src/common/procedure/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ futures.workspace = true
humantime-serde.workspace = true
object-store.workspace = true
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
smallvec.workspace = true
snafu.workspace = true
tokio.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion src/common/time/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ chrono.workspace = true
common-error.workspace = true
common-macro.workspace = true
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_json.workspace = true
snafu.workspace = true

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions src/datanode/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ common-recordbatch.workspace = true
common-runtime.workspace = true
common-telemetry.workspace = true
common-time.workspace = true
dashmap = "5.4"
dashmap.workspace = true
datafusion-common.workspace = true
datafusion-expr.workspace = true
datafusion.workspace = true
Expand All @@ -55,7 +55,7 @@ query.workspace = true
reqwest.workspace = true
secrecy = { version = "0.8", features = ["serde", "alloc"] }
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
servers.workspace = true
session.workspace = true
snafu.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion src/datatypes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ ordered-float = { version = "3.0", features = ["serde"] }
paste = "1.0"
rust_decimal = "1.32.0"
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
snafu.workspace = true
2 changes: 1 addition & 1 deletion src/file-engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ datatypes.workspace = true
futures.workspace = true
object-store.workspace = true
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_json.workspace = true
snafu.workspace = true
store-api.workspace = true
table.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ raft-engine.workspace = true
regex.workspace = true
script = { workspace = true, features = ["python"], optional = true }
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
servers.workspace = true
session.workspace = true
snafu.workspace = true
Expand Down
4 changes: 4 additions & 0 deletions src/log-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@ common-macro.workspace = true
common-meta.workspace = true
common-runtime.workspace = true
common-telemetry.workspace = true
dashmap.workspace = true
futures-util.workspace = true
futures.workspace = true
protobuf = { version = "2", features = ["bytes"] }
raft-engine.workspace = true
rskafka.workspace = true
serde.workspace = true
serde_json.workspace = true
snafu.workspace = true
store-api.workspace = true
tokio-util.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions src/meta-srv/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ common-procedure.workspace = true
common-runtime.workspace = true
common-telemetry.workspace = true
common-time.workspace = true
dashmap = "5.4"
dashmap.workspace = true
datatypes.workspace = true
derive_builder.workspace = true
etcd-client.workspace = true
Expand All @@ -43,7 +43,7 @@ prost.workspace = true
rand.workspace = true
regex.workspace = true
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
servers.workspace = true
snafu.workspace = true
store-api.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion src/mito2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ common-runtime.workspace = true
common-telemetry.workspace = true
common-test-util = { workspace = true, optional = true }
common-time.workspace = true
dashmap = "5.4"
dashmap.workspace = true
datafusion-common.workspace = true
datafusion-expr.workspace = true
datafusion.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion src/operator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ prometheus.workspace = true
query.workspace = true
regex.workspace = true
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
servers.workspace = true
session.workspace = true
snafu.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion src/partition/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ meta-client.workspace = true
moka = { workspace = true, features = ["future"] }
prometheus.workspace = true
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
snafu.workspace = true
store-api.workspace = true
table.workspace = true
2 changes: 1 addition & 1 deletion src/query/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ promql-parser = "0.1.1"
promql.workspace = true
regex.workspace = true
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
session.workspace = true
snafu.workspace = true
sql.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions src/servers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ rustls-pki-types = "1.0"
schemars = "0.8"
secrecy = { version = "0.8", features = ["serde", "alloc"] }
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
session.workspace = true
sha1 = "0.10"
snafu.workspace = true
Expand Down Expand Up @@ -112,7 +112,7 @@ mysql_async = { version = "0.33", default-features = false, features = [
] }
rand.workspace = true
script = { workspace = true, features = ["python"] }
serde_json = "1.0"
serde_json.workspace = true
session = { workspace = true, features = ["testing"] }
table.workspace = true
tokio-postgres = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion src/store-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ strum.workspace = true

[dev-dependencies]
async-stream.workspace = true
serde_json = "1.0"
serde_json.workspace = true
tokio.workspace = true
2 changes: 1 addition & 1 deletion tests-integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ rstest = "0.17"
rstest_reuse = "0.5"
secrecy = "0.8"
serde.workspace = true
serde_json = "1.0"
serde_json.workspace = true
servers = { workspace = true, features = ["testing"] }
session.workspace = true
snafu.workspace = true
Expand Down
Loading