diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock index 7f96e812fea..e9f85941f92 100644 --- a/quickwit/Cargo.lock +++ b/quickwit/Cargo.lock @@ -870,20 +870,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom 0.2.12", - "instant", - "pin-project-lite", - "rand 0.8.5", - "tokio", -] - [[package]] name = "backon" version = "0.4.3" @@ -2537,28 +2523,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "google-cloud-auth" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb6624c70caf330298b84a9ad1537ee7a5de788a5b9a06a3bbe206260943011" -dependencies = [ - "async-trait", - "base64 0.21.7", - "google-cloud-metadata", - "google-cloud-token", - "home", - "jsonwebtoken 8.3.0", - "reqwest", - "serde", - "serde_json", - "thiserror", - "time", - "tokio", - "tracing", - "urlencoding", -] - [[package]] name = "google-cloud-auth" version = "0.12.0" @@ -2581,34 +2545,6 @@ dependencies = [ "urlencoding", ] -[[package]] -name = "google-cloud-default" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2248865004b6e699fddb1b562cf7dadcdd006408aa6e50e1c61dd6f3b12dc02b" -dependencies = [ - "async-trait", - "google-cloud-auth 0.10.0", - "google-cloud-gax 0.14.2", - "google-cloud-pubsub 0.15.0", -] - -[[package]] -name = "google-cloud-gax" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d08f4e75d0170d154414651d573ae01a928f9da0d62391bb6762007f5410443e" -dependencies = [ - "google-cloud-token", - "http 0.2.12", - "thiserror", - "tokio", - "tokio-retry", - "tonic", - "tower", - "tracing", -] - [[package]] name = "google-cloud-gax" version = "0.15.0" @@ -2625,17 +2561,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "google-cloud-googleapis" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d905d01fe815c6894b309b18a1ba152371e2e2ba7fcc81f4d22e48865b3014c" -dependencies = [ - "prost", - "prost-types", - "tonic", -] - [[package]] name = "google-cloud-googleapis" version = "0.10.0" @@ -2658,24 +2583,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "google-cloud-pubsub" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30dc010fd45992c6af011a506ce83186cc4aad8bdb449713cf003849cd29f464" -dependencies = [ - "async-channel", - "async-stream", - "google-cloud-gax 0.14.2", - "google-cloud-googleapis 0.9.0", - "google-cloud-token", - "prost-types", - "thiserror", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "google-cloud-pubsub" version = "0.18.0" @@ -2684,9 +2591,9 @@ checksum = "095b104502b6e1abbad9b9768af944b9202e032dbc7f0947d3c30d4191761071" dependencies = [ "async-channel", "async-stream", - "google-cloud-auth 0.12.0", - "google-cloud-gax 0.15.0", - "google-cloud-googleapis 0.10.0", + "google-cloud-auth", + "google-cloud-gax", + "google-cloud-googleapis", "google-cloud-token", "prost-types", "thiserror", @@ -5474,7 +5381,6 @@ dependencies = [ name = "quickwit-aws" version = "0.8.0" dependencies = [ - "async-trait", "aws-config", "aws-sdk-kinesis", "aws-sdk-s3", @@ -5484,12 +5390,8 @@ dependencies = [ "futures", "hyper 0.14.28", "hyper-rustls 0.24.2", - "once_cell", "quickwit-common", - "rand 0.8.5", "tokio", - "tower", - "tracing", ] [[package]] @@ -5497,8 +5399,6 @@ name = "quickwit-cli" version = "0.8.0" dependencies = [ "anyhow", - "async-trait", - "bytes", "bytesize", "chrono", "clap", @@ -5519,7 +5419,6 @@ dependencies = [ "quickwit-cluster", "quickwit-common", "quickwit-config", - "quickwit-directories", "quickwit-doc-mapper", "quickwit-index-management", "quickwit-indexing", @@ -5531,7 +5430,6 @@ dependencies = [ "quickwit-serve", "quickwit-storage", "quickwit-telemetry", - "regex", "reqwest", "serde_json", "tabled", @@ -5542,9 +5440,7 @@ dependencies = [ "tikv-jemallocator", "time", "tokio", - "tokio-util", "toml", - "tonic", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -5568,14 +5464,11 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "tempfile", - "thiserror", "time", "tokio", "tokio-stream", "tonic", "tracing", - "ulid", "utoipa", ] @@ -5588,7 +5481,6 @@ dependencies = [ "heck", "prettyplease 0.2.17", "proc-macro2", - "prost", "prost-build", "quote", "serde", @@ -5606,13 +5498,11 @@ dependencies = [ "dyn-clone", "futures", "http 0.2.12", - "hyper 0.14.28", "mockall", "prost", "quickwit-actors", "quickwit-codegen", "quickwit-common", - "quickwit-macros", "quickwit-proto", "serde", "thiserror", @@ -5647,7 +5537,6 @@ dependencies = [ "pnet", "prometheus", "proptest", - "quickwit-macros", "rand 0.8.5", "regex", "serde", @@ -5702,16 +5591,12 @@ version = "0.8.0" dependencies = [ "anyhow", "async-trait", - "dyn-clone", "fnv", "futures", - "http 0.2.12", - "hyper 0.14.28", "itertools 0.12.1", "mockall", "once_cell", "proptest", - "prost", "quickwit-actors", "quickwit-cluster", "quickwit-common", @@ -5720,15 +5605,11 @@ dependencies = [ "quickwit-ingest", "quickwit-metastore", "quickwit-proto", - "quickwit-storage", "rand 0.8.5", "serde", "serde_json", - "thiserror", "time", "tokio", - "tokio-stream", - "tonic", "tower", "tracing", "ulid", @@ -5754,16 +5635,12 @@ version = "0.8.0" dependencies = [ "anyhow", "async-trait", - "futures", - "once_cell", "postcard", "quickwit-common", "quickwit-storage", "serde", - "serde_json", "tantivy", "tempfile", - "thiserror", "time", "tokio", "tracing", @@ -5782,14 +5659,11 @@ dependencies = [ "indexmap 2.1.0", "itertools 0.12.1", "matches", - "mockall", "nom", "once_cell", - "proptest", "quickwit-common", "quickwit-datetime", "quickwit-macros", - "quickwit-proto", "quickwit-query", "regex", "serde", @@ -5809,30 +5683,18 @@ name = "quickwit-index-management" version = "0.8.0" dependencies = [ "anyhow", - "async-trait", "futures", "futures-util", "itertools 0.12.1", - "mockall", "quickwit-common", "quickwit-config", - "quickwit-directories", - "quickwit-doc-mapper", "quickwit-indexing", "quickwit-metastore", "quickwit-proto", "quickwit-storage", - "rand 0.8.5", - "serde", - "serde_json", - "serde_yaml", - "tantivy", - "tempfile", "thiserror", "time", "tokio", - "tokio-stream", - "tokio-util", "tracing", ] @@ -5844,10 +5706,7 @@ dependencies = [ "arc-swap", "async-compression", "async-trait", - "aws-config", "aws-sdk-kinesis", - "aws-smithy-client", - "backoff", "bytes", "bytesize", "criterion", @@ -5855,11 +5714,10 @@ dependencies = [ "flume", "fnv", "futures", - "google-cloud-auth 0.12.0", - "google-cloud-default", - "google-cloud-gax 0.15.0", - "google-cloud-googleapis 0.10.0", - "google-cloud-pubsub 0.18.0", + "google-cloud-auth", + "google-cloud-gax", + "google-cloud-googleapis", + "google-cloud-pubsub", "itertools 0.12.1", "libz-sys", "mockall", @@ -5893,12 +5751,10 @@ dependencies = [ "thiserror", "time", "tokio", - "tokio-stream", "tracing", "ulid", "utoipa", "vrl", - "zstd 0.13.1", ] [[package]] @@ -5911,10 +5767,8 @@ dependencies = [ "bytesize", "dyn-clone", "fail", - "flume", "futures", "http 0.2.12", - "hyper 0.14.28", "itertools 0.12.1", "mockall", "mrecordlog", @@ -5945,30 +5799,21 @@ name = "quickwit-integration-tests" version = "0.8.0" dependencies = [ "anyhow", - "bytes", - "chitchat", "futures-util", "hyper 0.14.28", "itertools 0.12.1", "quickwit-actors", - "quickwit-cluster", "quickwit-common", "quickwit-config", - "quickwit-indexing", - "quickwit-janitor", "quickwit-metastore", "quickwit-proto", "quickwit-rest-client", - "quickwit-search", "quickwit-serve", "quickwit-storage", - "rand 0.8.5", "reqwest", - "serde", "serde_json", "tempfile", "tokio", - "tokio-stream", "tonic", "tracing", ] @@ -5977,9 +5822,7 @@ dependencies = [ name = "quickwit-jaeger" version = "0.8.0" dependencies = [ - "anyhow", "async-trait", - "base64 0.22.0", "itertools 0.12.1", "once_cell", "prost", @@ -6013,16 +5856,13 @@ version = "0.8.0" dependencies = [ "anyhow", "async-trait", - "chrono", "futures", "itertools 0.12.1", "mockall", "once_cell", "quickwit-actors", - "quickwit-cluster", "quickwit-common", "quickwit-config", - "quickwit-directories", "quickwit-doc-mapper", "quickwit-index-management", "quickwit-indexing", @@ -6038,9 +5878,7 @@ dependencies = [ "thiserror", "time", "tokio", - "tokio-stream", "tracing", - "ulid", "utoipa", ] @@ -6062,15 +5900,12 @@ dependencies = [ "quickwit-cluster", "quickwit-common", "quickwit-config", - "quickwit-directories", - "quickwit-doc-mapper", "quickwit-index-management", "quickwit-indexing", "quickwit-ingest", "quickwit-janitor", "quickwit-metastore", "quickwit-proto", - "quickwit-rest-client", "quickwit-search", "quickwit-serve", "quickwit-storage", @@ -6147,7 +5982,6 @@ dependencies = [ "hex", "once_cell", "prost", - "quickwit-actors", "quickwit-common", "quickwit-config", "quickwit-ingest", @@ -6175,7 +6009,6 @@ dependencies = [ "futures", "glob", "http 0.2.12", - "hyper 0.14.28", "mockall", "opentelemetry", "prost", @@ -6206,7 +6039,6 @@ dependencies = [ "anyhow", "base64 0.22.0", "criterion", - "fnv", "hex", "lindera-core", "lindera-dictionary", @@ -6221,7 +6053,6 @@ dependencies = [ "tantivy", "thiserror", "time", - "tracing", "whichlang", ] @@ -6229,9 +6060,7 @@ dependencies = [ name = "quickwit-rest-client" version = "0.8.0" dependencies = [ - "anyhow", "bytes", - "quickwit-actors", "quickwit-cluster", "quickwit-common", "quickwit-config", @@ -6259,16 +6088,12 @@ dependencies = [ "base64 0.22.0", "bytes", "bytesize", - "chitchat", "fnv", "futures", "http 0.2.12", - "hyper 0.14.28", "itertools 0.12.1", - "lru", "mockall", "once_cell", - "opentelemetry", "postcard", "proptest", "prost", @@ -6285,16 +6110,12 @@ dependencies = [ "rayon", "serde", "serde_json", - "serde_with 3.7.0", "tantivy", - "tempfile", "thiserror", "tokio", "tokio-stream", - "tokio-util", "tower", "tracing", - "tracing-opentelemetry", "ttl_cache", "typetag", "ulid", @@ -6333,7 +6154,6 @@ dependencies = [ "quickwit-common", "quickwit-config", "quickwit-control-plane", - "quickwit-directories", "quickwit-doc-mapper", "quickwit-index-management", "quickwit-indexing", @@ -6347,7 +6167,6 @@ dependencies = [ "quickwit-search", "quickwit-storage", "quickwit-telemetry", - "rand 0.8.5", "regex", "rust-embed", "serde", @@ -6355,7 +6174,6 @@ dependencies = [ "serde_qs 0.12.0", "serde_with 3.7.0", "tempfile", - "termcolor", "thiserror", "time", "tokio", @@ -6364,7 +6182,6 @@ dependencies = [ "tower", "tower-http", "tracing", - "tracing-opentelemetry", "utoipa", "warp", "zstd 0.13.1", @@ -6381,7 +6198,6 @@ dependencies = [ "aws-sdk-s3", "aws-smithy-client", "aws-smithy-http", - "aws-smithy-types", "azure_core", "azure_storage", "azure_storage_blobs", diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index 94cfc139cc6..42e5dfaa2ef 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -85,7 +85,6 @@ assert-json-diff = "2" async-compression = { version = "0.4", features = ["tokio", "gzip"] } async-speed-limit = "0.4" async-trait = "0.1" -backoff = { version = "0.4", features = ["tokio"] } base64 = "0.22" bytes = { version = "1", features = ["serde"] } bytesize = { version = "1.3.0", features = ["serde"] } @@ -113,7 +112,6 @@ flate2 = "1.0" futures = "0.3" futures-util = { version = "0.3.25", default-features = false } google-cloud-auth = "0.12.0" -google-cloud-default = { version = "0.3.0", features = ["pubsub"] } google-cloud-gax = "0.15.0" google-cloud-googleapis = { version = "0.10.0", features = ["pubsub"] } google-cloud-pubsub = "0.18.0" @@ -123,7 +121,6 @@ home = "0.5.4" hostname = "0.3" http = "0.2.9" http-serde = "1.1.2" -humansize = "2.1.3" humantime = "2.1.0" hyper = { version = "0.14", features = [ "client", @@ -227,7 +224,6 @@ syn = { version = "2.0.11", features = ["extra-traits", "full", "parsing"] } sync_wrapper = "0.1.2" tabled = { version = "0.14", features = ["color"] } tempfile = "3" -termcolor = "1" thiserror = "1" thousands = "0.2.0" tikv-jemalloc-ctl = "0.5" @@ -280,7 +276,6 @@ aws-sdk-s3 = "0.28.0" aws-smithy-async = "0.55.0" aws-smithy-client = "0.55.0" aws-smithy-http = "0.55.0" -aws-smithy-types = "0.55.0" aws-types = "0.55.0" azure_core = { version = "0.13.0", features = ["enable_reqwest_rustls"] } diff --git a/quickwit/quickwit-aws/Cargo.toml b/quickwit/quickwit-aws/Cargo.toml index 80626831b0d..ad4680b8a66 100644 --- a/quickwit/quickwit-aws/Cargo.toml +++ b/quickwit/quickwit-aws/Cargo.toml @@ -18,15 +18,10 @@ aws-smithy-async = { workspace = true } aws-smithy-client = { workspace = true } aws-types = { workspace = true } -async-trait = { workspace = true } futures = { workspace = true } hyper = { workspace = true } hyper-rustls = { workspace = true } -once_cell = { workspace = true } -rand = { workspace = true } tokio = { workspace = true } -tower = { workspace = true } -tracing = { workspace = true } quickwit-common = { workspace = true } diff --git a/quickwit/quickwit-cli/Cargo.toml b/quickwit/quickwit-cli/Cargo.toml index 43e517805d1..d5c2b3f6acc 100644 --- a/quickwit/quickwit-cli/Cargo.toml +++ b/quickwit/quickwit-cli/Cargo.toml @@ -22,8 +22,6 @@ path = "src/generate_markdown.rs" [dependencies] anyhow = { workspace = true } -async-trait = { workspace = true } -bytes = { workspace = true } bytesize = { workspace = true } chrono = { workspace = true } clap = { workspace = true } @@ -39,7 +37,6 @@ once_cell = { workspace = true } openssl-probe = { workspace = true, optional = true } opentelemetry = { workspace = true } opentelemetry-otlp = { workspace = true } -regex = { workspace = true } reqwest = { workspace = true } serde_json = { workspace = true } tabled = { workspace = true } @@ -50,9 +47,7 @@ tikv-jemalloc-ctl = { workspace = true, optional = true } tikv-jemallocator = { workspace = true, optional = true } time = { workspace = true } tokio = { workspace = true } -tokio-util = { workspace = true } toml = { workspace = true } -tonic = { workspace = true } tracing = { workspace = true } tracing-opentelemetry = { workspace = true } tracing-subscriber = { workspace = true } @@ -61,7 +56,6 @@ quickwit-actors = { workspace = true } quickwit-cluster = { workspace = true } quickwit-common = { workspace = true } quickwit-config = { workspace = true } -quickwit-directories = { workspace = true } quickwit-doc-mapper = { workspace = true } quickwit-index-management = { workspace = true } quickwit-indexing = { workspace = true } @@ -126,3 +120,7 @@ release-macos-feature-vendored-set = [ "quickwit-metastore/postgres", "quickwit-doc-mapper/multilang", ] + +[package.metadata.cargo-machete] +# used to enable the `multilang` feature +ignored = ["quickwit-doc-mapper"] diff --git a/quickwit/quickwit-cluster/Cargo.toml b/quickwit/quickwit-cluster/Cargo.toml index 27998ece714..211ae541078 100644 --- a/quickwit/quickwit-cluster/Cargo.toml +++ b/quickwit/quickwit-cluster/Cargo.toml @@ -22,13 +22,11 @@ pin-project = { workspace = true } rand = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -thiserror = { workspace = true } time = { workspace = true } tokio = { workspace = true } tokio-stream = { workspace = true } tonic = { workspace = true } tracing = { workspace = true } -ulid = { workspace = true } utoipa = { workspace = true } quickwit-common = { workspace = true } @@ -40,8 +38,11 @@ testsuite = [] [dev-dependencies] rand = { workspace = true } -tempfile = { workspace = true } chitchat = { workspace = true, features = ["testsuite"] } quickwit-common = { workspace = true, features = ["testsuite"] } quickwit-proto = { workspace = true, features = ["testsuite"] } + +[package.metadata.cargo-machete] +# used inside code generated by utoipa +ignored = ["serde_json"] diff --git a/quickwit/quickwit-codegen/Cargo.toml b/quickwit/quickwit-codegen/Cargo.toml index e5db16a9fc8..3063293e0ac 100644 --- a/quickwit/quickwit-codegen/Cargo.toml +++ b/quickwit/quickwit-codegen/Cargo.toml @@ -15,7 +15,6 @@ anyhow = { workspace = true } heck = { workspace = true } prettyplease = { workspace = true } proc-macro2 = { workspace = true } -prost = { workspace = true } prost-build = { workspace = true } quote = { workspace = true } syn = { workspace = true } diff --git a/quickwit/quickwit-codegen/example/Cargo.toml b/quickwit/quickwit-codegen/example/Cargo.toml index 50b183aff0a..4e8189b80f0 100644 --- a/quickwit/quickwit-codegen/example/Cargo.toml +++ b/quickwit/quickwit-codegen/example/Cargo.toml @@ -17,7 +17,6 @@ bytesize = { workspace = true } dyn-clone = { workspace = true } futures = { workspace = true } http = { workspace = true } -hyper = { workspace = true } prost = { workspace = true } serde = { workspace = true } thiserror = { workspace = true } @@ -29,7 +28,6 @@ utoipa = { workspace = true } quickwit-actors = { workspace = true } quickwit-common = { workspace = true } -quickwit-macros = { workspace = true } quickwit-proto ={ workspace = true } [dev-dependencies] diff --git a/quickwit/quickwit-common/Cargo.toml b/quickwit/quickwit-common/Cargo.toml index b9c9b59f568..b18b3f3a814 100644 --- a/quickwit/quickwit-common/Cargo.toml +++ b/quickwit/quickwit-common/Cargo.toml @@ -49,5 +49,4 @@ named_tasks = ["tokio/tracing"] [dev-dependencies] serde_json = { workspace = true } tempfile = { workspace = true } -quickwit-macros = { workspace = true } proptest = { workspace = true } diff --git a/quickwit/quickwit-control-plane/Cargo.toml b/quickwit/quickwit-control-plane/Cargo.toml index 0a749ed2091..4d4e7c07fe1 100644 --- a/quickwit/quickwit-control-plane/Cargo.toml +++ b/quickwit/quickwit-control-plane/Cargo.toml @@ -13,23 +13,16 @@ license.workspace = true [dependencies] anyhow = { workspace = true } async-trait = { workspace = true } -dyn-clone = { workspace = true } fnv = { workspace = true } futures = { workspace = true } -http = { workspace = true } -hyper = { workspace = true } itertools = { workspace = true } mockall = { workspace = true, optional = true } once_cell = { workspace = true } -prost = { workspace = true } rand = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -thiserror = { workspace = true } time = { workspace = true } tokio = { workspace = true } -tokio-stream = { workspace = true } -tonic = { workspace = true } tower = { workspace = true } tracing = { workspace = true } ulid = { workspace = true } @@ -55,7 +48,6 @@ quickwit-config = { workspace = true, features = ["testsuite"] } quickwit-indexing = { workspace = true } quickwit-metastore = { workspace = true, features = ["testsuite"] } quickwit-proto = { workspace = true, features = ["testsuite"] } -quickwit-storage = { workspace = true, features = ["testsuite"] } [features] testsuite = ["mockall"] diff --git a/quickwit/quickwit-directories/Cargo.toml b/quickwit/quickwit-directories/Cargo.toml index da0861cad3c..48036c82df8 100644 --- a/quickwit/quickwit-directories/Cargo.toml +++ b/quickwit/quickwit-directories/Cargo.toml @@ -13,13 +13,9 @@ license.workspace = true [dependencies] anyhow = { workspace = true } async-trait = { workspace = true } -futures = { workspace = true } -once_cell = { workspace = true } postcard = { workspace = true } serde = { workspace = true } -serde_json = { workspace = true } tantivy = { workspace = true } -thiserror = { workspace = true } time = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } diff --git a/quickwit/quickwit-doc-mapper/Cargo.toml b/quickwit/quickwit-doc-mapper/Cargo.toml index 3904edcb637..cbc3cba567a 100644 --- a/quickwit/quickwit-doc-mapper/Cargo.toml +++ b/quickwit/quickwit-doc-mapper/Cargo.toml @@ -18,7 +18,6 @@ fnv = { workspace = true } hex = { workspace = true } indexmap = { workspace = true } itertools = { workspace = true } -mockall = { workspace = true, optional = true } nom = { workspace = true } once_cell = { workspace = true } regex = { workspace = true } @@ -39,11 +38,9 @@ quickwit-query = { workspace = true } [dev-dependencies] criterion = { workspace = true } matches = { workspace = true } -proptest = { workspace = true } serde_yaml = { workspace = true } time = { workspace = true } -quickwit-proto = { workspace = true } quickwit-query = { workspace = true, features = ["multilang"] } [features] diff --git a/quickwit/quickwit-index-management/Cargo.toml b/quickwit/quickwit-index-management/Cargo.toml index c0284663c2e..2db7d062f12 100644 --- a/quickwit/quickwit-index-management/Cargo.toml +++ b/quickwit/quickwit-index-management/Cargo.toml @@ -12,34 +12,22 @@ license.workspace = true [dependencies] anyhow = { workspace = true } -async-trait = { workspace = true } futures = { workspace = true } futures-util = { workspace = true } itertools = { workspace = true } -rand = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -tantivy = { workspace = true } -tempfile = { workspace = true } thiserror = { workspace = true } time = { workspace = true } tokio = { workspace = true } -tokio-stream = { workspace = true } -tokio-util = { workspace = true } tracing = { workspace = true } quickwit-common = { workspace = true } quickwit-config = { workspace = true } -quickwit-directories = { workspace = true } -quickwit-doc-mapper = { workspace = true } quickwit-indexing = { workspace = true } quickwit-metastore = { workspace = true } quickwit-proto = { workspace = true } quickwit-storage = { workspace = true } [dev-dependencies] -mockall = { workspace = true } -serde_yaml = { workspace = true } quickwit-common = { workspace = true, features = ["testsuite"] } quickwit-metastore = { workspace = true, features = ["testsuite"] } diff --git a/quickwit/quickwit-indexing/Cargo.toml b/quickwit/quickwit-indexing/Cargo.toml index de7e24b448f..eccfb4f1aa5 100644 --- a/quickwit/quickwit-indexing/Cargo.toml +++ b/quickwit/quickwit-indexing/Cargo.toml @@ -11,15 +11,12 @@ authors.workspace = true license.workspace = true [dependencies] -aws-config = { workspace = true, optional = true } aws-sdk-kinesis = { workspace = true, optional = true } -aws-smithy-client = { workspace = true, optional = true } anyhow = { workspace = true } arc-swap = { workspace = true } async-compression = { workspace = true } async-trait = { workspace = true } -backoff = { workspace = true, optional = true } bytes = { workspace = true } bytesize = { workspace = true } fail = { workspace = true } @@ -27,7 +24,6 @@ flume = { workspace = true } fnv = { workspace = true } futures = { workspace = true } google-cloud-auth = { workspace = true, optional = true } -google-cloud-default = { workspace = true, optional = true } google-cloud-gax = { workspace = true, optional = true } google-cloud-googleapis = { workspace = true, optional = true } google-cloud-pubsub = { workspace = true, optional = true } @@ -46,12 +42,10 @@ tempfile = { workspace = true } thiserror = { workspace = true } time = { workspace = true } tokio = { workspace = true } -tokio-stream = { workspace = true } tracing = { workspace = true } ulid = { workspace = true } utoipa = { workspace = true } vrl = { workspace = true, optional = true } -zstd = { workspace = true } quickwit-actors = { workspace = true } quickwit-aws = { workspace = true } @@ -69,17 +63,14 @@ quickwit-storage = { workspace = true } [features] gcp-pubsub = [ "dep:google-cloud-auth", - "dep:google-cloud-default", "dep:google-cloud-gax", "dep:google-cloud-googleapis", "dep:google-cloud-pubsub", ] gcp-pubsub-emulator-tests = [] -kafka = ["rdkafka", "backoff"] +kafka = ["rdkafka"] kafka-broker-tests = [] kinesis = [ - "aws-config", - "aws-smithy-client", "aws-sdk-kinesis", "quickwit-aws/kinesis", ] @@ -97,6 +88,9 @@ testsuite = [ "quickwit-actors/testsuite", "quickwit-cluster/testsuite", "quickwit-common/testsuite", + "quickwit-config/testsuite", + "quickwit-proto/testsuite", + "quickwit-storage/testsuite" ] vrl = ["dep:vrl", "quickwit-config/vrl"] @@ -129,3 +123,7 @@ required-features = ["fail/failpoints"] [[bench]] name = "doc_process_vrl_bench" harness = false + +[package.metadata.cargo-machete] +# used to vendor/static build native dependancies +ignored = ["libz-sys", "openssl"] diff --git a/quickwit/quickwit-indexing/benches/doc_process_vrl_bench.rs b/quickwit/quickwit-indexing/benches/doc_process_vrl_bench.rs index 68b77d125ad..a7cf15cc48e 100644 --- a/quickwit/quickwit-indexing/benches/doc_process_vrl_bench.rs +++ b/quickwit/quickwit-indexing/benches/doc_process_vrl_bench.rs @@ -32,11 +32,7 @@ macro_rules! bench_func { |docs| async { let (mailbox, handle, universe) = $func; mailbox - .send_message(RawDocBatch { - docs, - checkpoint_delta: checkpoint_delta.clone(), - force_commit: false, - }) + .send_message(RawDocBatch::new(docs, checkpoint_delta.clone(), false)) .await .unwrap(); diff --git a/quickwit/quickwit-ingest/Cargo.toml b/quickwit/quickwit-ingest/Cargo.toml index b9126f5a15a..a343859280c 100644 --- a/quickwit/quickwit-ingest/Cargo.toml +++ b/quickwit/quickwit-ingest/Cargo.toml @@ -17,10 +17,8 @@ bytes = { workspace = true } bytesize = { workspace = true } dyn-clone = { workspace = true } fail = { workspace = true, optional = true } -flume = { workspace = true } futures = { workspace = true } http = { workspace = true } -hyper = { workspace = true } mockall = { workspace = true, optional = true } mrecordlog = { workspace = true } once_cell = { workspace = true } diff --git a/quickwit/quickwit-integration-tests/Cargo.toml b/quickwit/quickwit-integration-tests/Cargo.toml index cb4b1e4f453..f853b2ca0f0 100644 --- a/quickwit/quickwit-integration-tests/Cargo.toml +++ b/quickwit/quickwit-integration-tests/Cargo.toml @@ -14,30 +14,21 @@ license.workspace = true [dev-dependencies] anyhow = { workspace = true } -bytes = { workspace = true } -chitchat = { workspace = true } futures-util = { workspace = true } hyper = { workspace = true } itertools = { workspace = true } -rand = { workspace = true } reqwest = { workspace = true } -serde = { workspace = true } serde_json = { workspace = true } tempfile = { workspace = true } tokio = { workspace = true } -tokio-stream = { workspace = true } tonic = { workspace = true } tracing = { workspace = true } quickwit-actors = { workspace = true, features = ["testsuite"] } -quickwit-cluster = { workspace = true, features = ["testsuite"] } quickwit-common = { workspace = true, features = ["testsuite"] } quickwit-config = { workspace = true, features = ["testsuite"] } -quickwit-indexing = { workspace = true, features = ["testsuite"] } -quickwit-janitor = { workspace = true, features = ["testsuite"] } quickwit-metastore = { workspace = true, features = ["testsuite"] } quickwit-proto = { workspace = true } quickwit-rest-client = { workspace = true } -quickwit-search = { workspace = true, features = ["testsuite"] } quickwit-serve = { workspace = true } quickwit-storage = { workspace = true, features = ["testsuite"] } diff --git a/quickwit/quickwit-jaeger/Cargo.toml b/quickwit/quickwit-jaeger/Cargo.toml index 3f3b8d401eb..62695f2c7ae 100644 --- a/quickwit/quickwit-jaeger/Cargo.toml +++ b/quickwit/quickwit-jaeger/Cargo.toml @@ -11,9 +11,7 @@ authors.workspace = true license.workspace = true [dependencies] -anyhow = { workspace = true } async-trait = { workspace = true } -base64 = { workspace = true } itertools = { workspace = true } once_cell = { workspace = true } prost = { workspace = true } @@ -45,6 +43,7 @@ quickwit-indexing = { workspace = true, features = ["testsuite"] } quickwit-ingest = { workspace = true } quickwit-metastore = { workspace = true, features = ["testsuite"] } quickwit-opentelemetry = { workspace = true, features = ["testsuite"] } +quickwit-proto = { workspace = true, features = ["testsuite"] } quickwit-search = { workspace = true, features = ["testsuite"] } quickwit-storage = { workspace = true, features = ["testsuite"] } diff --git a/quickwit/quickwit-janitor/Cargo.toml b/quickwit/quickwit-janitor/Cargo.toml index 345ff435cc0..8d4cad3beb9 100644 --- a/quickwit/quickwit-janitor/Cargo.toml +++ b/quickwit/quickwit-janitor/Cargo.toml @@ -13,7 +13,6 @@ license.workspace = true [dependencies] anyhow = { workspace = true } async-trait = { workspace = true } -chrono = { workspace = true } futures = { workspace = true } itertools = { workspace = true } once_cell = { workspace = true } @@ -23,16 +22,12 @@ tantivy = { workspace = true } thiserror = { workspace = true } time = { workspace = true } tokio = { workspace = true } -tokio-stream = { workspace = true } tracing = { workspace = true } -ulid = { workspace = true } utoipa = { workspace = true } quickwit-actors = { workspace = true } -quickwit-cluster = { workspace = true } quickwit-common = { workspace = true } quickwit-config = { workspace = true } -quickwit-directories = { workspace = true } quickwit-doc-mapper = { workspace = true } quickwit-index-management = { workspace = true } quickwit-indexing = { workspace = true } diff --git a/quickwit/quickwit-lambda/Cargo.toml b/quickwit/quickwit-lambda/Cargo.toml index 9abb75ac44c..ab4edbd23f0 100644 --- a/quickwit/quickwit-lambda/Cargo.toml +++ b/quickwit/quickwit-lambda/Cargo.toml @@ -46,15 +46,12 @@ quickwit-cli = { workspace = true } quickwit-cluster = { workspace = true } quickwit-common = { workspace = true } quickwit-config = { workspace = true } -quickwit-directories = { workspace = true } -quickwit-doc-mapper = { workspace = true } quickwit-index-management = { workspace = true } quickwit-indexing = { workspace = true } quickwit-ingest = { workspace = true } quickwit-janitor = { workspace = true } quickwit-metastore = { workspace = true } quickwit-proto = { workspace = true } -quickwit-rest-client = { workspace = true } quickwit-search = { workspace = true } quickwit-serve = { workspace = true } quickwit-storage = { workspace = true } diff --git a/quickwit/quickwit-opentelemetry/Cargo.toml b/quickwit/quickwit-opentelemetry/Cargo.toml index 013ec92125c..4564d9cbec3 100644 --- a/quickwit/quickwit-opentelemetry/Cargo.toml +++ b/quickwit/quickwit-opentelemetry/Cargo.toml @@ -24,7 +24,6 @@ tokio = { workspace = true } tonic = { workspace = true } tracing = { workspace = true } -quickwit-actors = { workspace = true } quickwit-common = { workspace = true } quickwit-config = { workspace = true } quickwit-ingest = { workspace = true } @@ -33,7 +32,6 @@ quickwit-proto = { workspace = true } [dev-dependencies] time = { workspace = true } -quickwit-actors = { workspace = true, features = ["testsuite"] } quickwit-common = { workspace = true, features = ["testsuite"] } quickwit-metastore = { workspace = true, features = ["testsuite"] } diff --git a/quickwit/quickwit-proto/Cargo.toml b/quickwit/quickwit-proto/Cargo.toml index 8793d08cf41..41138728332 100644 --- a/quickwit/quickwit-proto/Cargo.toml +++ b/quickwit/quickwit-proto/Cargo.toml @@ -18,7 +18,6 @@ bytestring = { workspace = true } dyn-clone = { workspace = true } futures = { workspace = true, optional = true } http = { workspace = true } -hyper = { workspace = true } mockall = { workspace = true, optional = true } opentelemetry = { workspace = true } prost = { workspace = true } diff --git a/quickwit/quickwit-query/Cargo.toml b/quickwit/quickwit-query/Cargo.toml index d27d9b5ecea..e1229da8e8b 100644 --- a/quickwit/quickwit-query/Cargo.toml +++ b/quickwit/quickwit-query/Cargo.toml @@ -13,7 +13,6 @@ license.workspace = true [dependencies] anyhow = { workspace = true } base64 = { workspace = true } -fnv = { workspace = true } hex = { workspace = true } lindera-core = { workspace = true, optional = true } lindera-dictionary = { workspace = true, optional = true } @@ -24,7 +23,6 @@ serde_json = { workspace = true } serde_with = { workspace = true } tantivy = { workspace = true } thiserror = { workspace = true } -tracing = { workspace = true } whichlang = { workspace = true, optional = true } quickwit-common = { workspace = true } diff --git a/quickwit/quickwit-rest-client/Cargo.toml b/quickwit/quickwit-rest-client/Cargo.toml index 0a766e563df..eb98e85f4d1 100644 --- a/quickwit/quickwit-rest-client/Cargo.toml +++ b/quickwit/quickwit-rest-client/Cargo.toml @@ -11,7 +11,6 @@ authors.workspace = true license.workspace = true [dependencies] -anyhow = { workspace = true } bytes = { workspace = true } reqwest = { workspace = true } serde = { workspace = true } @@ -32,7 +31,6 @@ quickwit-serve = { workspace = true } [dev-dependencies] wiremock = { workspace = true } -quickwit-actors = { workspace = true, features = ["testsuite"] } quickwit-config = { workspace = true, features = ["testsuite"] } quickwit-indexing = { workspace = true, features = ["testsuite"] } quickwit-metastore = { workspace = true, features = ["testsuite"] } diff --git a/quickwit/quickwit-search/Cargo.toml b/quickwit/quickwit-search/Cargo.toml index 58515c218a2..a1ced46e1fd 100644 --- a/quickwit/quickwit-search/Cargo.toml +++ b/quickwit/quickwit-search/Cargo.toml @@ -19,26 +19,20 @@ bytesize = { workspace = true } fnv = { workspace = true } futures = { workspace = true } http = { workspace = true } -hyper = { workspace = true } itertools = { workspace = true } -lru = { workspace = true } mockall = { workspace = true } once_cell = { workspace = true } -opentelemetry = { workspace = true } postcard = { workspace = true } prost = { workspace = true } rayon = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -serde_with = { workspace = true } tantivy = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } tokio-stream = { workspace = true } -tokio-util = { workspace = true } tower = { workspace = true } tracing = { workspace = true } -tracing-opentelemetry = { workspace = true } ttl_cache = { workspace = true } ulid = { workspace = true } utoipa = { workspace = true } @@ -55,10 +49,8 @@ quickwit-storage = { workspace = true } [dev-dependencies] assert-json-diff = { workspace = true } -chitchat = { workspace = true } proptest = { workspace = true } serde_json = { workspace = true } -tempfile = { workspace = true } typetag = { workspace = true } quickwit-indexing = { workspace = true, features = ["testsuite"] } diff --git a/quickwit/quickwit-serve/Cargo.toml b/quickwit/quickwit-serve/Cargo.toml index 96364fa9361..bdf6430e3ed 100644 --- a/quickwit/quickwit-serve/Cargo.toml +++ b/quickwit/quickwit-serve/Cargo.toml @@ -38,14 +38,12 @@ serde = { workspace = true } serde_json = { workspace = true } serde_qs = { workspace = true } serde_with = { workspace = true } -termcolor = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } tokio-stream = { workspace = true } tower = { workspace = true } tower-http = { workspace = true } tracing = { workspace = true } -tracing-opentelemetry = { workspace = true } utoipa = { workspace = true } warp = { workspace = true } zstd = { workspace = true } @@ -55,7 +53,6 @@ quickwit-cluster = { workspace = true } quickwit-common = { workspace = true } quickwit-config = { workspace = true } quickwit-control-plane = { workspace = true } -quickwit-directories = { workspace = true } quickwit-doc-mapper = { workspace = true } quickwit-index-management = { workspace = true } quickwit-indexing = { workspace = true } @@ -77,7 +74,6 @@ time = { workspace = true } assert-json-diff = { workspace = true } itertools = { workspace = true } mockall = { workspace = true } -rand = { workspace = true } tempfile = { workspace = true } tokio = { workspace = true } tonic = { workspace = true } diff --git a/quickwit/quickwit-storage/Cargo.toml b/quickwit/quickwit-storage/Cargo.toml index 9acad2f3422..6ef487d3f6c 100644 --- a/quickwit/quickwit-storage/Cargo.toml +++ b/quickwit/quickwit-storage/Cargo.toml @@ -40,7 +40,6 @@ aws-config = { workspace = true } aws-credential-types = { workspace = true } aws-sdk-s3 = { workspace = true } aws-smithy-http = { workspace = true } -aws-smithy-types = { workspace = true } azure_core = { workspace = true, optional = true } azure_storage = { workspace = true, optional = true } diff --git a/quickwit/quickwit-telemetry/Cargo.toml b/quickwit/quickwit-telemetry/Cargo.toml index 2fbb7c744a9..66b17efa809 100644 --- a/quickwit/quickwit-telemetry/Cargo.toml +++ b/quickwit/quickwit-telemetry/Cargo.toml @@ -28,3 +28,7 @@ encoding_rs = { workspace = true } [dev-dependencies] serde_json = { workspace = true } + +[package.metadata.cargo-machete] +# see above +ignored = ["encoding_rs"]