Skip to content

Commit e98625c

Browse files
lewiszlwalamb
andauthored
Minor: Extract common deps into workspace (#7982)
* Improve datafusion-* * More common crates * Extract async-trait * Extract more * Fix cli --------- Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>
1 parent 4e60cdd commit e98625c

File tree

16 files changed

+140
-108
lines changed

16 files changed

+140
-108
lines changed

Cargo.toml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,41 @@ arrow-array = { version = "48.0.0", default-features = false, features = ["chron
5454
arrow-buffer = { version = "48.0.0", default-features = false }
5555
arrow-flight = { version = "48.0.0", features = ["flight-sql-experimental"] }
5656
arrow-schema = { version = "48.0.0", default-features = false }
57+
async-trait = "0.1.73"
58+
bigdecimal = "0.4.1"
59+
bytes = "1.4"
60+
ctor = "0.2.0"
61+
datafusion = { path = "datafusion/core" }
62+
datafusion-common = { path = "datafusion/common" }
63+
datafusion-expr = { path = "datafusion/expr" }
64+
datafusion-sql = { path = "datafusion/sql" }
65+
datafusion-optimizer = { path = "datafusion/optimizer" }
66+
datafusion-physical-expr = { path = "datafusion/physical-expr" }
67+
datafusion-physical-plan = { path = "datafusion/physical-plan" }
68+
datafusion-execution = { path = "datafusion/execution" }
69+
datafusion-proto = { path = "datafusion/proto" }
70+
datafusion-sqllogictest = { path = "datafusion/sqllogictest" }
71+
datafusion-substrait = { path = "datafusion/substrait" }
72+
dashmap = "5.4.0"
73+
doc-comment = "0.3"
74+
env_logger = "0.10"
75+
futures = "0.3"
76+
half = "2.2.1"
77+
indexmap = "2.0.0"
78+
itertools = "0.11"
79+
log = "^0.4"
80+
num_cpus = "1.13.0"
81+
object_store = "0.7.0"
82+
parking_lot = "0.12"
5783
parquet = { version = "48.0.0", features = ["arrow", "async", "object_store"] }
84+
rand = "0.8"
85+
rstest = "0.18.0"
86+
serde_json = "1"
5887
sqlparser = { version = "0.39.0", features = ["visitor"] }
88+
tempfile = "3"
89+
thiserror = "1.0.44"
5990
chrono = { version = "0.4.31", default-features = false }
91+
url = "2.2"
6092

6193
[profile.release]
6294
codegen-units = 1

benchmarks/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ snmalloc = ["snmalloc-rs"]
3636
arrow = { workspace = true }
3737
datafusion = { path = "../datafusion/core", version = "32.0.0" }
3838
datafusion-common = { path = "../datafusion/common", version = "32.0.0" }
39-
env_logger = "0.10"
40-
futures = "0.3"
41-
log = "^0.4"
39+
env_logger = { workspace = true }
40+
futures = { workspace = true }
41+
log = { workspace = true }
4242
mimalloc = { version = "0.1", optional = true, default-features = false }
43-
num_cpus = "1.13.0"
43+
num_cpus = { workspace = true }
4444
parquet = { workspace = true }
4545
serde = { version = "1.0.136", features = ["derive"] }
46-
serde_json = "1.0.78"
46+
serde_json = { workspace = true }
4747
snmalloc-rs = { version = "0.3", optional = true }
4848
structopt = { version = "0.3", default-features = false }
4949
test-utils = { path = "../test-utils/", version = "0.1.0" }

datafusion-examples/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,26 @@ rust-version = { workspace = true }
3333
arrow = { workspace = true }
3434
arrow-flight = { workspace = true }
3535
arrow-schema = { workspace = true }
36-
async-trait = "0.1.41"
37-
bytes = "1.4"
38-
dashmap = "5.4"
36+
async-trait = { workspace = true }
37+
bytes = { workspace = true }
38+
dashmap = { workspace = true }
3939
datafusion = { path = "../datafusion/core", features = ["avro"] }
4040
datafusion-common = { path = "../datafusion/common" }
4141
datafusion-expr = { path = "../datafusion/expr" }
4242
datafusion-optimizer = { path = "../datafusion/optimizer" }
4343
datafusion-sql = { path = "../datafusion/sql" }
44-
env_logger = "0.10"
45-
futures = "0.3"
46-
log = "0.4"
44+
env_logger = { workspace = true }
45+
futures = { workspace = true }
46+
log = { workspace = true }
4747
mimalloc = { version = "0.1", default-features = false }
48-
num_cpus = "1.13.0"
48+
num_cpus = { workspace = true }
4949
object_store = { version = "0.7.0", features = ["aws", "http"] }
5050
prost = { version = "0.12", default-features = false }
5151
prost-derive = { version = "0.11", default-features = false }
5252
serde = { version = "1.0.136", features = ["derive"] }
53-
serde_json = "1.0.82"
54-
tempfile = "3"
53+
serde_json = { workspace = true }
54+
tempfile = { workspace = true }
5555
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot"] }
5656
tonic = "0.10"
57-
url = "2.2"
57+
url = { workspace = true }
5858
uuid = "1.2"

datafusion/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ arrow-buffer = { workspace = true }
4646
arrow-schema = { workspace = true }
4747
chrono = { workspace = true }
4848
half = { version = "2.1", default-features = false }
49-
num_cpus = "1.13.0"
49+
num_cpus = { workspace = true }
5050
object_store = { version = "0.7.0", default-features = false, optional = true }
5151
parquet = { workspace = true, optional = true }
5252
pyo3 = { version = "0.20.0", optional = true }

datafusion/core/Cargo.toml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,61 +57,61 @@ arrow = { workspace = true }
5757
arrow-array = { workspace = true }
5858
arrow-schema = { workspace = true }
5959
async-compression = { version = "0.4.0", features = ["bzip2", "gzip", "xz", "zstd", "futures-io", "tokio"], optional = true }
60-
async-trait = "0.1.73"
61-
bytes = "1.4"
60+
async-trait = { workspace = true }
61+
bytes = { workspace = true }
6262
bzip2 = { version = "0.4.3", optional = true }
6363
chrono = { workspace = true }
64-
dashmap = "5.4.0"
64+
dashmap = { workspace = true }
6565
datafusion-common = { path = "../common", version = "32.0.0", features = ["object_store"], default-features = false }
66-
datafusion-execution = { path = "../execution", version = "32.0.0" }
67-
datafusion-expr = { path = "../expr", version = "32.0.0" }
66+
datafusion-execution = { workspace = true }
67+
datafusion-expr = { workspace = true }
6868
datafusion-optimizer = { path = "../optimizer", version = "32.0.0", default-features = false }
6969
datafusion-physical-expr = { path = "../physical-expr", version = "32.0.0", default-features = false }
70-
datafusion-physical-plan = { path = "../physical-plan", version = "32.0.0", default-features = false }
71-
datafusion-sql = { path = "../sql", version = "32.0.0" }
70+
datafusion-physical-plan = { workspace = true }
71+
datafusion-sql = { workspace = true }
7272
flate2 = { version = "1.0.24", optional = true }
73-
futures = "0.3"
73+
futures = { workspace = true }
7474
glob = "0.3.0"
7575
half = { version = "2.1", default-features = false }
7676
hashbrown = { version = "0.14", features = ["raw"] }
77-
indexmap = "2.0.0"
78-
itertools = "0.11"
79-
log = "^0.4"
77+
indexmap = { workspace = true }
78+
itertools = { workspace = true }
79+
log = { workspace = true }
8080
num-traits = { version = "0.2", optional = true }
81-
num_cpus = "1.13.0"
82-
object_store = "0.7.0"
83-
parking_lot = "0.12"
81+
num_cpus = { workspace = true }
82+
object_store = { workspace = true }
83+
parking_lot = { workspace = true }
8484
parquet = { workspace = true, optional = true }
8585
pin-project-lite = "^0.2.7"
86-
rand = "0.8"
86+
rand = { workspace = true }
8787
sqlparser = { workspace = true }
88-
tempfile = "3"
88+
tempfile = { workspace = true }
8989
tokio = { version = "1.28", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "parking_lot"] }
9090
tokio-util = { version = "0.7.4", features = ["io"] }
91-
url = "2.2"
91+
url = { workspace = true }
9292
uuid = { version = "1.0", features = ["v4"] }
9393
xz2 = { version = "0.1", optional = true }
9494
zstd = { version = "0.13", optional = true, default-features = false }
9595

9696
[dev-dependencies]
97-
async-trait = "0.1.53"
98-
bigdecimal = "0.4.1"
97+
async-trait = { workspace = true }
98+
bigdecimal = { workspace = true }
9999
criterion = { version = "0.5", features = ["async_tokio"] }
100100
csv = "1.1.6"
101-
ctor = "0.2.0"
102-
doc-comment = "0.3"
103-
env_logger = "0.10"
104-
half = "2.2.1"
101+
ctor = { workspace = true }
102+
doc-comment = { workspace = true }
103+
env_logger = { workspace = true }
104+
half = { workspace = true }
105105
postgres-protocol = "0.6.4"
106106
postgres-types = { version = "0.2.4", features = ["derive", "with-chrono-0_4"] }
107107
rand = { version = "0.8", features = ["small_rng"] }
108108
rand_distr = "0.4.3"
109109
regex = "1.5.4"
110-
rstest = "0.18.0"
110+
rstest = { workspace = true }
111111
rust_decimal = { version = "1.27.0", features = ["tokio-pg"] }
112-
serde_json = "1"
112+
serde_json = { workspace = true }
113113
test-utils = { path = "../../test-utils" }
114-
thiserror = "1.0.37"
114+
thiserror = { workspace = true }
115115
tokio-postgres = "0.7.7"
116116
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
117117
nix = { version = "0.27.1", features = ["fs"] }

datafusion/execution/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ path = "src/lib.rs"
3535
[dependencies]
3636
arrow = { workspace = true }
3737
chrono = { version = "0.4", default-features = false }
38-
dashmap = "5.4.0"
39-
datafusion-common = { path = "../common", version = "32.0.0" }
40-
datafusion-expr = { path = "../expr", version = "32.0.0" }
41-
futures = "0.3"
38+
dashmap = { workspace = true }
39+
datafusion-common = { workspace = true }
40+
datafusion-expr = { workspace = true }
41+
futures = { workspace = true }
4242
hashbrown = { version = "0.14", features = ["raw"] }
43-
log = "^0.4"
44-
object_store = "0.7.0"
45-
parking_lot = "0.12"
46-
rand = "0.8"
47-
tempfile = "3"
48-
url = "2.2"
43+
log = { workspace = true }
44+
object_store = { workspace = true }
45+
parking_lot = { workspace = true }
46+
rand = { workspace = true }
47+
tempfile = { workspace = true }
48+
url = { workspace = true }

datafusion/expr/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ path = "src/lib.rs"
3838
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
3939
arrow = { workspace = true }
4040
arrow-array = { workspace = true }
41-
datafusion-common = { path = "../common", version = "32.0.0", default-features = false }
41+
datafusion-common = { workspace = true }
4242
sqlparser = { workspace = true }
4343
strum = { version = "0.25.0", features = ["derive"] }
4444
strum_macros = "0.25.0"
4545

4646
[dev-dependencies]
47-
ctor = "0.2.0"
48-
env_logger = "0.10"
47+
ctor = { workspace = true }
48+
env_logger = { workspace = true }

datafusion/optimizer/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ unicode_expressions = ["datafusion-physical-expr/unicode_expressions"]
4040

4141
[dependencies]
4242
arrow = { workspace = true }
43-
async-trait = "0.1.41"
43+
async-trait = { workspace = true }
4444
chrono = { workspace = true }
45-
datafusion-common = { path = "../common", version = "32.0.0", default-features = false }
46-
datafusion-expr = { path = "../expr", version = "32.0.0" }
45+
datafusion-common = { workspace = true }
46+
datafusion-expr = { workspace = true }
4747
datafusion-physical-expr = { path = "../physical-expr", version = "32.0.0", default-features = false }
4848
hashbrown = { version = "0.14", features = ["raw"] }
49-
itertools = "0.11"
50-
log = "^0.4"
49+
itertools = { workspace = true }
50+
log = { workspace = true }
5151
regex-syntax = "0.8.0"
5252

5353
[dev-dependencies]
54-
ctor = "0.2.0"
54+
ctor = { workspace = true }
5555
datafusion-sql = { path = "../sql", version = "32.0.0" }
5656
env_logger = "0.10.0"

datafusion/physical-expr/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ base64 = { version = "0.21", optional = true }
4949
blake2 = { version = "^0.10.2", optional = true }
5050
blake3 = { version = "1.0", optional = true }
5151
chrono = { workspace = true }
52-
datafusion-common = { path = "../common", version = "32.0.0", default-features = false }
53-
datafusion-expr = { path = "../expr", version = "32.0.0" }
52+
datafusion-common = { workspace = true }
53+
datafusion-expr = { workspace = true }
5454
half = { version = "2.1", default-features = false }
5555
hashbrown = { version = "0.14", features = ["raw"] }
5656
hex = { version = "0.4", optional = true }
57-
indexmap = "2.0.0"
57+
indexmap = { workspace = true }
5858
itertools = { version = "0.11", features = ["use_std"] }
5959
libc = "0.2.140"
60-
log = "^0.4"
60+
log = { workspace = true }
6161
md-5 = { version = "^0.10.0", optional = true }
6262
paste = "^1.0"
6363
petgraph = "0.6.2"
64-
rand = "0.8"
64+
rand = { workspace = true }
6565
regex = { version = "1.8", optional = true }
6666
sha2 = { version = "^0.10.1", optional = true }
6767
unicode-segmentation = { version = "^1.7.1", optional = true }
6868
uuid = { version = "^1.2", features = ["v4"] }
6969

7070
[dev-dependencies]
7171
criterion = "0.5"
72-
rand = "0.8"
73-
rstest = "0.18.0"
72+
rand = { workspace = true }
73+
rstest = { workspace = true }
7474

7575
[[bench]]
7676
harness = false

datafusion/physical-plan/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,26 @@ arrow = { workspace = true }
3838
arrow-array = { workspace = true }
3939
arrow-buffer = { workspace = true }
4040
arrow-schema = { workspace = true }
41-
async-trait = "0.1.41"
41+
async-trait = { workspace = true }
4242
chrono = { version = "0.4.23", default-features = false }
43-
datafusion-common = { path = "../common", version = "32.0.0", default-features = false }
44-
datafusion-execution = { path = "../execution", version = "32.0.0" }
45-
datafusion-expr = { path = "../expr", version = "32.0.0" }
46-
datafusion-physical-expr = { path = "../physical-expr", version = "32.0.0" }
47-
futures = "0.3"
43+
datafusion-common = { workspace = true }
44+
datafusion-execution = { workspace = true }
45+
datafusion-expr = { workspace = true }
46+
datafusion-physical-expr = { workspace = true }
47+
futures = { workspace = true }
4848
half = { version = "2.1", default-features = false }
4949
hashbrown = { version = "0.14", features = ["raw"] }
50-
indexmap = "2.0.0"
50+
indexmap = { workspace = true }
5151
itertools = { version = "0.11", features = ["use_std"] }
52-
log = "^0.4"
52+
log = { workspace = true }
5353
once_cell = "1.18.0"
54-
parking_lot = "0.12"
54+
parking_lot = { workspace = true }
5555
pin-project-lite = "^0.2.7"
56-
rand = "0.8"
56+
rand = { workspace = true }
5757
tokio = { version = "1.28", features = ["sync", "fs", "parking_lot"] }
5858
uuid = { version = "^1.2", features = ["v4"] }
5959

6060
[dev-dependencies]
61-
rstest = "0.18.0"
61+
rstest = { workspace = true }
6262
termtree = "0.4.1"
6363
tokio = { version = "1.28", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "parking_lot"] }

0 commit comments

Comments
 (0)