mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-06 13:02:55 +00:00
remove workspace hack from libs (#8780)
This removes workspace hack from all libs, not from any binaries. This does not change the behaviour of the hack. Running ``` cargo clean cargo build --release --bin proxy ``` Before this change took 5m16s. After this change took 3m3s. This is because this allows the build to be parallelisable much more.
This commit is contained in:
@@ -23,10 +23,30 @@ platforms = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[final-excludes]
|
[final-excludes]
|
||||||
# vm_monitor benefits from the same Cargo.lock as the rest of our artifacts, but
|
workspace-members = [
|
||||||
# it is built primarly in separate repo neondatabase/autoscaling and thus is excluded
|
# vm_monitor benefits from the same Cargo.lock as the rest of our artifacts, but
|
||||||
# from depending on workspace-hack because most of the dependencies are not used.
|
# it is built primarly in separate repo neondatabase/autoscaling and thus is excluded
|
||||||
workspace-members = ["vm_monitor"]
|
# from depending on workspace-hack because most of the dependencies are not used.
|
||||||
|
"vm_monitor",
|
||||||
|
# All of these exist in libs and are not usually built independently.
|
||||||
|
# Putting workspace hack there adds a bottleneck for cargo builds.
|
||||||
|
"compute_api",
|
||||||
|
"consumption_metrics",
|
||||||
|
"desim",
|
||||||
|
"metrics",
|
||||||
|
"pageserver_api",
|
||||||
|
"postgres_backend",
|
||||||
|
"postgres_connection",
|
||||||
|
"postgres_ffi",
|
||||||
|
"pq_proto",
|
||||||
|
"remote_storage",
|
||||||
|
"safekeeper_api",
|
||||||
|
"tenant_size_model",
|
||||||
|
"tracing-utils",
|
||||||
|
"utils",
|
||||||
|
"wal_craft",
|
||||||
|
"walproposer",
|
||||||
|
]
|
||||||
|
|
||||||
# Write out exact versions rather than a semver range. (Defaults to false.)
|
# Write out exact versions rather than a semver range. (Defaults to false.)
|
||||||
# exact-versions = true
|
# exact-versions = true
|
||||||
|
|||||||
18
Cargo.lock
generated
18
Cargo.lock
generated
@@ -1208,7 +1208,6 @@ dependencies = [
|
|||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_with",
|
"serde_with",
|
||||||
"utils",
|
"utils",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1321,7 +1320,6 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"serde_with",
|
"serde_with",
|
||||||
"utils",
|
"utils",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1670,7 +1668,6 @@ dependencies = [
|
|||||||
"smallvec",
|
"smallvec",
|
||||||
"tracing",
|
"tracing",
|
||||||
"utils",
|
"utils",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3147,7 +3144,6 @@ dependencies = [
|
|||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"rand_distr",
|
"rand_distr",
|
||||||
"twox-hash",
|
"twox-hash",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3791,7 +3787,6 @@ dependencies = [
|
|||||||
"strum_macros",
|
"strum_macros",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"utils",
|
"utils",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4193,7 +4188,6 @@ dependencies = [
|
|||||||
"tokio-rustls 0.25.0",
|
"tokio-rustls 0.25.0",
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
"tracing",
|
"tracing",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4206,7 +4200,6 @@ dependencies = [
|
|||||||
"postgres",
|
"postgres",
|
||||||
"tokio-postgres",
|
"tokio-postgres",
|
||||||
"url",
|
"url",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4229,7 +4222,6 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"utils",
|
"utils",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4267,7 +4259,6 @@ dependencies = [
|
|||||||
"thiserror",
|
"thiserror",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tracing",
|
"tracing",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4832,7 +4823,6 @@ dependencies = [
|
|||||||
"toml_edit 0.19.10",
|
"toml_edit 0.19.10",
|
||||||
"tracing",
|
"tracing",
|
||||||
"utils",
|
"utils",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -5357,7 +5347,6 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"serde_with",
|
"serde_with",
|
||||||
"utils",
|
"utils",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -6193,7 +6182,6 @@ dependencies = [
|
|||||||
"anyhow",
|
"anyhow",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -6794,7 +6782,6 @@ dependencies = [
|
|||||||
"tracing",
|
"tracing",
|
||||||
"tracing-opentelemetry",
|
"tracing-opentelemetry",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -7012,7 +6999,6 @@ dependencies = [
|
|||||||
"url",
|
"url",
|
||||||
"uuid",
|
"uuid",
|
||||||
"walkdir",
|
"walkdir",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -7091,7 +7077,6 @@ dependencies = [
|
|||||||
"postgres_ffi",
|
"postgres_ffi",
|
||||||
"regex",
|
"regex",
|
||||||
"utils",
|
"utils",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -7112,7 +7097,6 @@ dependencies = [
|
|||||||
"bindgen",
|
"bindgen",
|
||||||
"postgres_ffi",
|
"postgres_ffi",
|
||||||
"utils",
|
"utils",
|
||||||
"workspace_hack",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -7669,8 +7653,6 @@ dependencies = [
|
|||||||
"tokio",
|
"tokio",
|
||||||
"tokio-rustls 0.24.0",
|
"tokio-rustls 0.24.0",
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
"toml_datetime",
|
|
||||||
"toml_edit 0.19.10",
|
|
||||||
"tonic",
|
"tonic",
|
||||||
"tower",
|
"tower",
|
||||||
"tracing",
|
"tracing",
|
||||||
|
|||||||
@@ -14,5 +14,3 @@ regex.workspace = true
|
|||||||
|
|
||||||
utils = { path = "../utils" }
|
utils = { path = "../utils" }
|
||||||
remote_storage = { version = "0.1", path = "../remote_storage/" }
|
remote_storage = { version = "0.1", path = "../remote_storage/" }
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|||||||
@@ -6,10 +6,8 @@ license = "Apache-2.0"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
chrono.workspace = true
|
chrono = { workspace = true, features = ["serde"] }
|
||||||
rand.workspace = true
|
rand.workspace = true
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
serde_with.workspace = true
|
serde_with.workspace = true
|
||||||
utils.workspace = true
|
utils.workspace = true
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|||||||
@@ -14,5 +14,3 @@ parking_lot.workspace = true
|
|||||||
hex.workspace = true
|
hex.workspace = true
|
||||||
scopeguard.workspace = true
|
scopeguard.workspace = true
|
||||||
smallvec = { workspace = true, features = ["write"] }
|
smallvec = { workspace = true, features = ["write"] }
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ chrono.workspace = true
|
|||||||
twox-hash.workspace = true
|
twox-hash.workspace = true
|
||||||
measured.workspace = true
|
measured.workspace = true
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|
||||||
[target.'cfg(target_os = "linux")'.dependencies]
|
[target.'cfg(target_os = "linux")'.dependencies]
|
||||||
procfs.workspace = true
|
procfs.workspace = true
|
||||||
measured-process.workspace = true
|
measured-process.workspace = true
|
||||||
|
|||||||
@@ -21,11 +21,9 @@ hex.workspace = true
|
|||||||
humantime.workspace = true
|
humantime.workspace = true
|
||||||
thiserror.workspace = true
|
thiserror.workspace = true
|
||||||
humantime-serde.workspace = true
|
humantime-serde.workspace = true
|
||||||
chrono.workspace = true
|
chrono = { workspace = true, features = ["serde"] }
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
bincode.workspace = true
|
bincode.workspace = true
|
||||||
rand.workspace = true
|
rand.workspace = true
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ tokio-rustls.workspace = true
|
|||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
|
|
||||||
pq_proto.workspace = true
|
pq_proto.workspace = true
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
once_cell.workspace = true
|
once_cell.workspace = true
|
||||||
|
|||||||
@@ -11,7 +11,5 @@ postgres.workspace = true
|
|||||||
tokio-postgres.workspace = true
|
tokio-postgres.workspace = true
|
||||||
url.workspace = true
|
url.workspace = true
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
once_cell.workspace = true
|
once_cell.workspace = true
|
||||||
|
|||||||
@@ -19,8 +19,6 @@ thiserror.workspace = true
|
|||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
utils.workspace = true
|
utils.workspace = true
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
postgres.workspace = true
|
postgres.workspace = true
|
||||||
|
|||||||
@@ -14,8 +14,6 @@ postgres.workspace = true
|
|||||||
postgres_ffi.workspace = true
|
postgres_ffi.workspace = true
|
||||||
camino-tempfile.workspace = true
|
camino-tempfile.workspace = true
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
regex.workspace = true
|
regex.workspace = true
|
||||||
utils.workspace = true
|
utils.workspace = true
|
||||||
|
|||||||
@@ -11,9 +11,7 @@ itertools.workspace = true
|
|||||||
pin-project-lite.workspace = true
|
pin-project-lite.workspace = true
|
||||||
postgres-protocol.workspace = true
|
postgres-protocol.workspace = true
|
||||||
rand.workspace = true
|
rand.workspace = true
|
||||||
tokio.workspace = true
|
tokio = { workspace = true, features = ["io-util"] }
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
thiserror.workspace = true
|
thiserror.workspace = true
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ scopeguard.workspace = true
|
|||||||
metrics.workspace = true
|
metrics.workspace = true
|
||||||
utils.workspace = true
|
utils.workspace = true
|
||||||
pin-project-lite.workspace = true
|
pin-project-lite.workspace = true
|
||||||
workspace_hack.workspace = true
|
|
||||||
azure_core.workspace = true
|
azure_core.workspace = true
|
||||||
azure_identity.workspace = true
|
azure_identity.workspace = true
|
||||||
azure_storage.workspace = true
|
azure_storage.workspace = true
|
||||||
@@ -46,3 +46,4 @@ sync_wrapper = { workspace = true, features = ["futures"] }
|
|||||||
camino-tempfile.workspace = true
|
camino-tempfile.workspace = true
|
||||||
test-context.workspace = true
|
test-context.workspace = true
|
||||||
rand.workspace = true
|
rand.workspace = true
|
||||||
|
tokio = { workspace = true, features = ["test-util"] }
|
||||||
|
|||||||
@@ -9,5 +9,3 @@ serde.workspace = true
|
|||||||
serde_with.workspace = true
|
serde_with.workspace = true
|
||||||
const_format.workspace = true
|
const_format.workspace = true
|
||||||
utils.workspace = true
|
utils.workspace = true
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|||||||
@@ -9,5 +9,3 @@ license.workspace = true
|
|||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
serde_json.workspace = true
|
serde_json.workspace = true
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|||||||
@@ -14,5 +14,3 @@ tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }
|
|||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
tracing-opentelemetry.workspace = true
|
tracing-opentelemetry.workspace = true
|
||||||
tracing-subscriber.workspace = true
|
tracing-subscriber.workspace = true
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ thiserror.workspace = true
|
|||||||
tokio.workspace = true
|
tokio.workspace = true
|
||||||
tokio-tar.workspace = true
|
tokio-tar.workspace = true
|
||||||
tokio-util.workspace = true
|
tokio-util.workspace = true
|
||||||
toml_edit.workspace = true
|
toml_edit = { workspace = true, features = ["serde"] }
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
tracing-error.workspace = true
|
tracing-error.workspace = true
|
||||||
tracing-subscriber = { workspace = true, features = ["json", "registry"] }
|
tracing-subscriber = { workspace = true, features = ["json", "registry"] }
|
||||||
@@ -54,7 +54,6 @@ walkdir.workspace = true
|
|||||||
pq_proto.workspace = true
|
pq_proto.workspace = true
|
||||||
postgres_connection.workspace = true
|
postgres_connection.workspace = true
|
||||||
metrics.workspace = true
|
metrics.workspace = true
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|
||||||
const_format.workspace = true
|
const_format.workspace = true
|
||||||
|
|
||||||
@@ -71,6 +70,7 @@ criterion.workspace = true
|
|||||||
hex-literal.workspace = true
|
hex-literal.workspace = true
|
||||||
camino-tempfile.workspace = true
|
camino-tempfile.workspace = true
|
||||||
serde_assert.workspace = true
|
serde_assert.workspace = true
|
||||||
|
tokio = { workspace = true, features = ["test-util"] }
|
||||||
|
|
||||||
[[bench]]
|
[[bench]]
|
||||||
name = "benchmarks"
|
name = "benchmarks"
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ anyhow.workspace = true
|
|||||||
utils.workspace = true
|
utils.workspace = true
|
||||||
postgres_ffi.workspace = true
|
postgres_ffi.workspace = true
|
||||||
|
|
||||||
workspace_hack.workspace = true
|
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
bindgen.workspace = true
|
bindgen.workspace = true
|
||||||
|
|||||||
@@ -80,8 +80,6 @@ time = { version = "0.3", features = ["macros", "serde-well-known"] }
|
|||||||
tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "net", "process", "rt-multi-thread", "signal", "test-util"] }
|
tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "net", "process", "rt-multi-thread", "signal", "test-util"] }
|
||||||
tokio-rustls = { version = "0.24" }
|
tokio-rustls = { version = "0.24" }
|
||||||
tokio-util = { version = "0.7", features = ["codec", "compat", "io", "rt"] }
|
tokio-util = { version = "0.7", features = ["codec", "compat", "io", "rt"] }
|
||||||
toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
|
|
||||||
toml_edit = { version = "0.19", features = ["serde"] }
|
|
||||||
tonic = { version = "0.9", features = ["tls-roots"] }
|
tonic = { version = "0.9", features = ["tls-roots"] }
|
||||||
tower = { version = "0.4", default-features = false, features = ["balance", "buffer", "limit", "log", "timeout", "util"] }
|
tower = { version = "0.4", default-features = false, features = ["balance", "buffer", "limit", "log", "timeout", "util"] }
|
||||||
tracing = { version = "0.1", features = ["log"] }
|
tracing = { version = "0.1", features = ["log"] }
|
||||||
@@ -124,7 +122,6 @@ serde = { version = "1", features = ["alloc", "derive"] }
|
|||||||
syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit"] }
|
syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit"] }
|
||||||
syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
|
syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
|
||||||
time-macros = { version = "0.2", default-features = false, features = ["formatting", "parsing", "serde"] }
|
time-macros = { version = "0.2", default-features = false, features = ["formatting", "parsing", "serde"] }
|
||||||
toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
|
|
||||||
zstd = { version = "0.13" }
|
zstd = { version = "0.13" }
|
||||||
zstd-safe = { version = "7", default-features = false, features = ["arrays", "legacy", "std", "zdict_builder"] }
|
zstd-safe = { version = "7", default-features = false, features = ["arrays", "legacy", "std", "zdict_builder"] }
|
||||||
zstd-sys = { version = "2", default-features = false, features = ["legacy", "std", "zdict_builder"] }
|
zstd-sys = { version = "2", default-features = false, features = ["legacy", "std", "zdict_builder"] }
|
||||||
|
|||||||
Reference in New Issue
Block a user