diff --git a/Cargo.lock b/Cargo.lock index 29b03a71f3be65675d919f76daa96060f3344aa0..375440efc77d95d8278046b5b8a987f497710101 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -572,12 +572,8 @@ name = "conduit" version = "0.4.1" dependencies = [ "clap", - "conduit_admin", - "conduit_api", "conduit_core", - "conduit_database", "conduit_router", - "conduit_service", "console-subscriber", "hardened_malloc-rs", "log", @@ -655,16 +651,11 @@ dependencies = [ name = "conduit_core" version = "0.4.1" dependencies = [ - "async-trait", "axum 0.7.5", "axum-server", - "base64 0.22.1", "bytes", - "clap", - "cyborgtime", "either", "figment", - "futures-util", "hardened_malloc-rs", "http 1.1.0", "http-body-util", @@ -674,7 +665,6 @@ dependencies = [ "itertools 0.13.0", "libloading", "log", - "lru-cache", "nix", "parking_lot", "rand", @@ -688,8 +678,6 @@ dependencies = [ "serde", "serde_json", "serde_regex", - "serde_yaml", - "sha-1", "thiserror", "thread_local", "tikv-jemalloc-ctl", @@ -708,7 +696,6 @@ version = "0.4.1" dependencies = [ "chrono", "conduit_core", - "futures-util", "log", "lru-cache", "parking_lot", @@ -716,9 +703,6 @@ dependencies = [ "rusqlite", "rust-rocksdb-uwu", "thread_local", - "tikv-jemalloc-ctl", - "tikv-jemalloc-sys", - "tikv-jemallocator", "tokio", "tracing", "zstd", @@ -764,13 +748,11 @@ dependencies = [ "async-trait", "base64 0.22.1", "bytes", - "clap", "conduit_core", "conduit_database", "cyborgtime", "futures-util", "hickory-resolver", - "hmac", "http 1.1.0", "image", "ipaddress", @@ -786,21 +768,14 @@ dependencies = [ "ruma", "ruma-identifiers-validation", "rusqlite", - "rust-rocksdb-uwu", "serde", "serde_json", "serde_yaml", - "sha-1", "sha2", "thread_local", - "tikv-jemalloc-ctl", - "tikv-jemalloc-sys", - "tikv-jemallocator", "tokio", "tracing", - "tracing-subscriber", "url", - "webpage", "zstd", ] diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index 988a810b67631d5467f75ef239710cce37c948d2..a0c8a060f8bb2fcc2f7e414579a28847bb97aea0 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -71,16 +71,11 @@ perf_measurements = [] sentry_telemetry = [] [dependencies] -async-trait.workspace = true axum-server.workspace = true axum.workspace = true -base64.workspace = true bytes.workspace = true -clap.workspace = true -cyborgtime.workspace = true either.workspace = true figment.workspace = true -futures-util.workspace = true http-body-util.workspace = true http.workspace = true image.workspace = true @@ -89,7 +84,6 @@ ipaddress.workspace = true itertools.workspace = true libloading.workspace = true log.workspace = true -lru-cache.workspace = true parking_lot.optional = true parking_lot.workspace = true rand.workspace = true @@ -105,8 +99,6 @@ sanitize-filename.workspace = true serde_json.workspace = true serde_regex.workspace = true serde.workspace = true -serde_yaml.workspace = true -sha-1.workspace = true thiserror.workspace = true thread_local.optional = true thread_local.workspace = true diff --git a/src/database/Cargo.toml b/src/database/Cargo.toml index ea013298eb907cd26e0b45813e31c208be4d59dc..e23d2d7b8cd39f47c6123ed8f06e538454d1950c 100644 --- a/src/database/Cargo.toml +++ b/src/database/Cargo.toml @@ -41,14 +41,8 @@ rocksdb = [ "dep:rust-rocksdb", ] jemalloc = [ - "dep:tikv-jemalloc-sys", - "dep:tikv-jemalloc-ctl", - "dep:tikv-jemallocator", "rust-rocksdb/jemalloc", ] -jemalloc_prof = [ - "tikv-jemalloc-sys/profiling", -] io_uring = [ "rust-rocksdb/io-uring", ] @@ -59,7 +53,6 @@ zstd_compression = [ [dependencies] chrono.workspace = true conduit-core.workspace = true -futures-util.workspace = true log.workspace = true lru-cache.workspace = true parking_lot.optional = true @@ -71,12 +64,6 @@ rust-rocksdb.optional = true rust-rocksdb.workspace = true thread_local.optional = true thread_local.workspace = true -tikv-jemallocator.optional = true -tikv-jemallocator.workspace = true -tikv-jemalloc-ctl.optional = true -tikv-jemalloc-ctl.workspace = true -tikv-jemalloc-sys.optional = true -tikv-jemalloc-sys.workspace = true tokio.workspace = true tracing.workspace = true zstd.optional = true diff --git a/src/main/Cargo.toml b/src/main/Cargo.toml index 22c6b2ac3a419dbc0a4773cc58c82f7e4f42785a..06c8c6978aa8aa7af528ffb42b44145f6deb2d9f 100644 --- a/src/main/Cargo.toml +++ b/src/main/Cargo.toml @@ -69,10 +69,6 @@ perf_measurements = [ [dependencies] conduit-router.workspace = true -conduit-admin.workspace = true -conduit-api.workspace = true -conduit-service.workspace = true -conduit-database.workspace = true conduit-core.workspace = true tokio.workspace = true diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index f2990a4646e037a124174347901f944da63f252a..e41891251bf96f99f8abdbbff95cc477ecfa5ce0 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -18,11 +18,7 @@ crate-type = [ [features] default = [ - "rocksdb", - "io_uring", - "jemalloc", "gzip_compression", - "zstd_compression", "brotli_compression", "release_max_log_level", ] @@ -39,21 +35,6 @@ sqlite = [ "dep:parking_lot", "dep:thread_local", ] -rocksdb = [ - "dep:rust-rocksdb", -] -jemalloc = [ - "dep:tikv-jemalloc-sys", - "dep:tikv-jemalloc-ctl", - "dep:tikv-jemallocator", - "rust-rocksdb/jemalloc", -] -io_uring = [ - "rust-rocksdb/io-uring", -] -zstd_compression = [ - "rust-rocksdb/zstd", -] gzip_compression = [ "reqwest/gzip", ] @@ -69,13 +50,11 @@ argon2.workspace = true async-trait.workspace = true base64.workspace = true bytes.workspace = true -clap.workspace = true conduit-core.workspace = true conduit-database.workspace = true cyborgtime.workspace = true futures-util.workspace = true hickory-resolver.workspace = true -hmac.workspace = true http.workspace = true image.workspace = true ipaddress.workspace = true @@ -93,27 +72,16 @@ ruma-identifiers-validation.workspace = true ruma.workspace = true rusqlite.optional = true rusqlite.workspace = true -rust-rocksdb.optional = true -rust-rocksdb.workspace = true serde_json.workspace = true serde.workspace = true serde_yaml.workspace = true -sha-1.workspace = true sha2.optional = true sha2.workspace = true thread_local.optional = true thread_local.workspace = true -tikv-jemallocator.optional = true -tikv-jemallocator.workspace = true -tikv-jemalloc-ctl.optional = true -tikv-jemalloc-ctl.workspace = true -tikv-jemalloc-sys.optional = true -tikv-jemalloc-sys.workspace = true tokio.workspace = true -tracing-subscriber.workspace = true tracing.workspace = true url.workspace = true -webpage.workspace = true zstd.optional = true zstd.workspace = true