diff --git a/Cargo.toml b/Cargo.toml index bdc2986a83bb..eb8702319da2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,114 +1,116 @@ [workspace] members = [ - "scripts/source/prepare_ci_pubsub", - "src/batch", - "src/bench", - "src/cmd", - "src/cmd_all", - "src/common", - "src/common/common_service", - "src/compute", - "src/connector", - "src/ctl", - "src/expr", - "src/expr/macro", - "src/frontend", - "src/frontend/planner_test", - "src/java_binding", - "src/meta", - "src/object_store", - "src/prost", - "src/prost/helpers", - "src/risedevtool", - "src/rpc_client", - "src/source", - "src/sqlparser", - "src/sqlparser/test_runner", - "src/storage", - "src/storage/backup", - "src/storage/backup/cmd", - "src/storage/compactor", - "src/storage/hummock_sdk", - "src/storage/hummock_test", - "src/stream", - "src/test_runner", - "src/tests/compaction_test", - "src/tests/e2e_extended_mode", - "src/tests/regress", - "src/tests/simulation", - "src/tests/sqlsmith", - "src/tests/state_cleaning_test", - "src/tracing", - "src/udf", - "src/utils/local_stats_alloc", - "src/utils/pgwire", - "src/utils/runtime", - "src/utils/sync-point", - "src/utils/workspace-config", - "src/workspace-hack", + "scripts/source/prepare_ci_pubsub", + "src/batch", + "src/bench", + "src/cmd", + "src/cmd_all", + "src/common", + "src/common/common_service", + "src/compute", + "src/connector", + "src/ctl", + "src/expr", + "src/expr/macro", + "src/frontend", + "src/frontend/planner_test", + "src/java_binding", + "src/meta", + "src/object_store", + "src/prost", + "src/prost/helpers", + "src/risedevtool", + "src/rpc_client", + "src/source", + "src/sqlparser", + "src/sqlparser/test_runner", + "src/storage", + "src/storage/backup", + "src/storage/backup/cmd", + "src/storage/compactor", + "src/storage/hummock_sdk", + "src/storage/hummock_test", + "src/stream", + "src/test_runner", + "src/tests/compaction_test", + "src/tests/e2e_extended_mode", + "src/tests/regress", + "src/tests/simulation", + "src/tests/sqlsmith", + "src/tests/state_cleaning_test", + "src/tracing", + "src/udf", + "src/utils/local_stats_alloc", + "src/utils/pgwire", + "src/utils/runtime", + "src/utils/sync-point", + "src/utils/workspace-config", + "src/workspace-hack" ] -[workspace.package] -version = "1.0.0-alpha" -edition = "2021" -homepage = "https://github.com/risingwavelabs/risingwave" -keywords = ["sql", "database", "streaming"] -license = "Apache-2.0" -repository = "https://github.com/risingwavelabs/risingwave" - [workspace.dependencies] aws-config = { version = "0.51", default-features = false, features = ["rt-tokio", "native-tls"] } -aws-sdk-kinesis = { version = "0.21", default-features = false, features = ["rt-tokio", "native-tls"] } -aws-sdk-s3 = { version = "0.21", default-features = false, features = ["rt-tokio","native-tls"] } -aws-sdk-ec2 = { version = "0.21", default-features = false, features = ["rt-tokio","native-tls"] } +aws-sdk-s3 = { version = "0.21", default-features = false, features = ["rt-tokio", "native-tls"] } +aws-sdk-ec2 = { version = "0.21", default-features = false, features = ["rt-tokio", "native-tls"] } aws-sdk-sqs = { version = "0.21", default-features = false, features = ["rt-tokio", "native-tls"] } aws-smithy-http = "0.51" aws-smithy-types = "0.51" aws-endpoint = "0.51" aws-types = { version = "0.51", features = ["hardcoded-credentials"] } -[profile.dev] -lto = 'off' +[workspace.dependencies.aws-sdk-kinesis] +version = "0.21" +default-features = false +features = ["rt-tokio", "native-tls"] -[profile.release] -debug = 1 # line tables only -lto = 'thin' +[workspace.package] +version = "1.0.0-alpha" +edition = "2021" +homepage = "https://github.com/risingwavelabs/risingwave" +keywords = ["sql", "database", "streaming"] +license = "Apache-2.0" +repository = "https://github.com/risingwavelabs/risingwave" [profile.bench] opt-level = 3 debug = false codegen-units = 1 -lto = 'thin' +lto = "thin" incremental = false debug-assertions = false overflow-checks = false rpath = false -# The profile used for CI in main branch. -# This profile inherits from the release profile, but turns on some checks and assertions for us to -# better catch bugs in CI. -[profile.ci-release] -inherits = "release" -debug-assertions = true -overflow-checks = true - # The profile used for CI in pull requests. # External dependencies are built with optimization enabled, while crates in this workspace are built # with `dev` profile and full debug info. This is a trade-off between build time and e2e test time. [profile.ci-dev] inherits = "dev" incremental = false -[profile.ci-dev.package."*"] # external dependencies + +[profile.ci-dev.package."*" ] # external dependencies opt-level = 1 -[profile.ci-dev.package."tokio"] + +[profile.ci-dev.package.await-tree] opt-level = 3 -[profile.ci-dev.package."await-tree"] + +[profile.ci-dev.package.indextree] opt-level = 3 -[profile.ci-dev.package."indextree"] + +[profile.ci-dev.package.task_stats_alloc] opt-level = 3 -[profile.ci-dev.package."task_stats_alloc"] + +[profile.ci-dev.package.tokio] opt-level = 3 +# The profile used for CI in main branch. +# This profile inherits from the release profile, but turns on some checks and assertions for us to +# better catch bugs in CI. +[profile.ci-release] +inherits = "release" +debug-assertions = true +overflow-checks = true + # The profile used for deterministic simulation tests in CI. # The simulator can only run single-threaded, so optimization is required to make the running time # reasonable. The optimization level is customized to speed up the build. @@ -117,6 +119,13 @@ inherits = "dev" opt-level = 2 incremental = false +[profile.dev] +lto = "off" + +[profile.release] +debug = 1 # line tables only +lto = "thin" + # Patch third-party crates for deterministic simulation. [patch.crates-io] quanta = { git = "https://github.com/madsim-rs/quanta.git", rev = "948bdc3" } diff --git a/scripts/source/prepare_ci_pubsub/Cargo.toml b/scripts/source/prepare_ci_pubsub/Cargo.toml index 7d7331d3c0d4..e08ca26ccff2 100644 --- a/scripts/source/prepare_ci_pubsub/Cargo.toml +++ b/scripts/source/prepare_ci_pubsub/Cargo.toml @@ -2,8 +2,8 @@ name = "prepare_ci_pubsub" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -14,12 +14,8 @@ normal = ["workspace-hack"] anyhow = "1" google-cloud-googleapis = { version = "0.6.0", features = ["pubsub"] } google-cloud-pubsub = "0.7.0" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", -] } + +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] diff --git a/src/batch/Cargo.toml b/src/batch/Cargo.toml index 5bee3b2a0be4..81d4a7390b67 100644 --- a/src/batch/Cargo.toml +++ b/src/batch/Cargo.toml @@ -39,63 +39,59 @@ risingwave_source = { path = "../source" } risingwave_storage = { path = "../storage" } serde_json = "1" thiserror = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", -] } tokio-metrics = "0.1.0" tokio-stream = "0.1" tonic = { version = "0.2", package = "madsim-tonic" } tracing = "0.1" uuid = "1" -[target.'cfg(enable_task_local_alloc)'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] + +[target.'cfg(enable_task_local_alloc)' .dependencies] task_stats_alloc = { path = "../utils/task_stats_alloc" } -[target.'cfg(not(madsim))'.dependencies] +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } +[target.'cfg(unix)' .dev-dependencies] +tikv-jemallocator = "0.5" + [dev-dependencies] criterion = { version = "0.4", features = ["async_tokio", "async"] } rand = "0.8" tempfile = "3" -[target.'cfg(unix)'.dev-dependencies] -tikv-jemallocator = "0.5" - [[bench]] -name = "filter" harness = false +name = "filter" [[bench]] -name = "nested_loop_join" harness = false +name = "nested_loop_join" [[bench]] -name = "hash_join" harness = false +name = "hash_join" [[bench]] -name = "sort" harness = false +name = "sort" [[bench]] -name = "top_n" harness = false +name = "top_n" [[bench]] -name = "hash_agg" harness = false +name = "hash_agg" [[bench]] -name = "expand" harness = false +name = "expand" [[bench]] -name = "limit" harness = false +name = "limit" diff --git a/src/bench/Cargo.toml b/src/bench/Cargo.toml index 66381379cf4d..1e5c9cb8a81a 100644 --- a/src/bench/Cargo.toml +++ b/src/bench/Cargo.toml @@ -22,37 +22,32 @@ isahc = { version = "1", default-features = false } itertools = "0.10" libc = "0.2" opentelemetry = { version = "0.17", optional = true, features = ["rt-tokio"] } -opentelemetry-jaeger = { version = "0.16", optional = true, features = [ - "rt-tokio", - "collector_client", - "isahc", - "isahc_collector_client", -] } parking_lot = "0.12" prometheus = { version = "0.13", features = ["process"] } rand = "0.8" risingwave_common = { path = "../common" } risingwave_storage = { path = "../storage" } serde = { version = "1", features = ["derive"] } -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "fs", - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", -] } tokio-stream = "0.1" toml = "0.7" tracing = "0.1" tracing-opentelemetry = { version = "0.17", optional = true } tracing-subscriber = "0.3.16" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.opentelemetry-jaeger] +version = "0.16" +optional = true +features = ["rt-tokio", "collector_client", "isahc", "isahc_collector_client"] + +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["fs", "rt", "rt-multi-thread", "sync", "macros", "time", "signal"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } -[target.'cfg(target_os = "linux")'.dependencies] +[target.'cfg(target_os = "linux")' .dependencies] nix = { version = "0.25", features = ["fs", "mman"] } [[bin]] @@ -65,4 +60,9 @@ path = "s3_bench/main.rs" [features] bpf = ["bcc", "risingwave_storage/bpf"] -trace = ["opentelemetry", "opentelemetry-jaeger", "tracing-opentelemetry", "tracing/release_max_level_trace"] +trace = [ + "opentelemetry", + "opentelemetry-jaeger", + "tracing-opentelemetry", + "tracing/release_max_level_trace" +] diff --git a/src/cmd/Cargo.toml b/src/cmd/Cargo.toml index a3eed81576da..d05223ed1af5 100644 --- a/src/cmd/Cargo.toml +++ b/src/cmd/Cargo.toml @@ -7,16 +7,16 @@ keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -[features] -static-link = ["workspace-config/enable-static-link"] -static-log-level = ["workspace-config/enable-static-log-level"] - [package.metadata.cargo-machete] ignored = ["workspace-hack", "workspace-config", "task_stats_alloc"] [package.metadata.cargo-udeps.ignore] normal = ["workspace-hack", "workspace-config", "task_stats_alloc"] +[features] +static-link = ["workspace-config/enable-static-link"] +static-log-level = ["workspace-config/enable-static-log-level"] + [dependencies] anyhow = "1" clap = { version = "4", features = ["derive"] } @@ -27,24 +27,18 @@ risingwave_ctl = { path = "../ctl" } risingwave_frontend = { path = "../frontend" } risingwave_meta = { path = "../meta" } risingwave_rt = { path = "../utils/runtime" } -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", - "tracing", -] } - workspace-config = { path = "../utils/workspace-config", optional = true } workspace-hack = { path = "../workspace-hack" } -[target.'cfg(enable_task_local_alloc)'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs", "tracing"] + +[target.'cfg(enable_task_local_alloc)' .dependencies] task_stats_alloc = { path = "../utils/task_stats_alloc" } -[target.'cfg(unix)'.dependencies] +[target.'cfg(unix)' .dependencies] tikv-jemallocator = { version = "0.5", features = ["profiling", "stats"] } [[bin]] diff --git a/src/cmd_all/Cargo.toml b/src/cmd_all/Cargo.toml index 24715f3cb465..388c96eb5eb1 100644 --- a/src/cmd_all/Cargo.toml +++ b/src/cmd_all/Cargo.toml @@ -7,16 +7,16 @@ keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -[features] -static-link = ["workspace-config/enable-static-link"] -static-log-level = ["workspace-config/enable-static-log-level"] - [package.metadata.cargo-machete] ignored = ["workspace-hack", "workspace-config", "task_stats_alloc"] [package.metadata.cargo-udeps.ignore] ignored = ["workspace-hack", "workspace-config", "task_stats_alloc"] +[features] +static-link = ["workspace-config/enable-static-link"] +static-log-level = ["workspace-config/enable-static-log-level"] + [dependencies] anyhow = "1" clap = { version = "4", features = ["derive"] } @@ -29,23 +29,19 @@ risingwave_frontend = { path = "../frontend" } risingwave_meta = { path = "../meta" } risingwave_rt = { path = "../utils/runtime" } tempfile = "3" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", -] } tracing = { version = "0.1" } workspace-config = { path = "../utils/workspace-config", optional = true } workspace-hack = { path = "../workspace-hack" } -[target.'cfg(enable_task_local_alloc)'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] + +[target.'cfg(enable_task_local_alloc)' .dependencies] task_stats_alloc = { path = "../utils/task_stats_alloc" } -[target.'cfg(unix)'.dependencies] +[target.'cfg(unix)' .dependencies] tikv-jemallocator = { version = "0.5", features = ["profiling", "stats"] } [[bin]] diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index 405fdc011f22..ee830757ebd3 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -24,10 +24,7 @@ auto_enums = "0.8" bitflags = "2" byteorder = "1" bytes = "1" -chrono = { version = "0.4", default-features = false, features = [ - "clock", - "std", -] } +chrono = { version = "0.4", default-features = false, features = ["clock", "std"] } chrono-tz = { version = "0.7", features = ["case-insensitive"] } clap = { version = "4", features = ["derive"] } comfy-table = "6" @@ -51,11 +48,6 @@ number_prefix = "0.4.0" parking_lot = "0.12" parse-display = "0.6" paste = "1" -postgres-types = { version = "0.2.5", features = [ - "derive", - "with-chrono-0_4", - "with-serde_json-1", -] } prometheus = { version = "0.13" } prost = "0.11" rand = "0.8" @@ -74,14 +66,6 @@ strum = "0.24" strum_macros = "0.24" sysinfo = { version = "0.26", default-features = false } thiserror = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", -] } toml = "0.7" tonic = { version = "0.2", package = "madsim-tonic" } tracing = "0.1" @@ -89,18 +73,30 @@ twox-hash = "1" url = "2" uuid = "1.2.2" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.postgres-types] +version = "0.2.5" +features = ["derive", "with-chrono-0_4", "with-serde_json-1"] + +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } -[target.'cfg(target_os = "linux")'.dependencies] +[target.'cfg(target_os = "linux")' .dependencies] procfs = { version = "0.12", default-features = false } libc = "0.2" -[target.'cfg(target_os = "macos")'.dependencies] -darwin-libproc = { git = "https://github.com/risingwavelabs/darwin-libproc.git", rev = "a502be24bd0971463f5bcbfe035a248d8ba503b7" } +[target.'cfg(target_os = "macos")' .dependencies] libc = "0.2.72" mach2 = "0.4" +[target.'cfg(target_os = "macos")' .dependencies.darwin-libproc] +git = "https://github.com/risingwavelabs/darwin-libproc.git" +rev = "a502be24bd0971463f5bcbfe035a248d8ba503b7" + [dev-dependencies] criterion = "0.4" more-asserts = "0.3" @@ -108,28 +104,28 @@ rand = "0.8" tempfile = "3" [[bench]] -name = "bench_encoding" harness = false +name = "bench_encoding" [[bench]] -name = "bench_row" harness = false +name = "bench_row" [[bench]] -name = "bitmap" harness = false +name = "bitmap" [[bench]] -name = "bench_hash_key_encoding" harness = false +name = "bench_hash_key_encoding" [[bench]] -name = "bench_data_chunk_encoding" harness = false +name = "bench_data_chunk_encoding" [[bench]] -name = "bench_data_chunk_compact" harness = false +name = "bench_data_chunk_compact" [[bin]] name = "example-config" diff --git a/src/common/common_service/Cargo.toml b/src/common/common_service/Cargo.toml index b2e43e386227..afee14612f44 100644 --- a/src/common/common_service/Cargo.toml +++ b/src/common/common_service/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -21,11 +21,15 @@ prometheus = { version = "0.13" } risingwave_common = { path = "../" } risingwave_pb = { path = "../../prost" } risingwave_rpc_client = { path = "../../rpc_client" } -tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] } tonic = { version = "0.2", package = "madsim-tonic" } tower = { version = "0.4", features = ["util", "load-shed"] } tower-http = { version = "0.3", features = ["add-extension", "cors"] } tracing = "0.1" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } diff --git a/src/common/proc_macro/Cargo.toml b/src/common/proc_macro/Cargo.toml index 99aeb5f33403..11e270af2c43 100644 --- a/src/common/proc_macro/Cargo.toml +++ b/src/common/proc_macro/Cargo.toml @@ -7,21 +7,21 @@ keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -[lib] -proc-macro = true - [package.metadata.cargo-machete] ignored = ["workspace-hack"] [package.metadata.cargo-udeps.ignore] normal = ["workspace-hack"] +[lib] +proc-macro = true + [dependencies] +bae = "0.1.7" proc-macro-error = "1.0" -quote = "1" proc-macro2 = { version = "1", default-features = false } +quote = "1" syn = "1" -bae = "0.1.7" -[target.'cfg(not(madsim))'.dependencies] -workspace-hack = { path = "../../workspace-hack" } \ No newline at end of file +[target.'cfg(not(madsim))' .dependencies] +workspace-hack = { path = "../../workspace-hack" } diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml index dac7dde05e0c..916a847e8984 100644 --- a/src/compute/Cargo.toml +++ b/src/compute/Cargo.toml @@ -40,27 +40,23 @@ risingwave_stream = { path = "../stream" } risingwave_tracing = { path = "../tracing" } serde = { version = "1", features = ["derive"] } serde_json = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", -] } tokio-stream = "0.1" tonic = { version = "0.2", package = "madsim-tonic" } tower = { version = "0.4", features = ["util", "load-shed"] } tracing = "0.1" uuid = "1.2.2" -[target.'cfg(target_os = "linux")'.dependencies] -tikv-jemalloc-ctl = "0.5" +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] -[target.'cfg(not(madsim))'.dependencies] +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } +[target.'cfg(target_os = "linux")' .dependencies] +tikv-jemalloc-ctl = "0.5" + [dev-dependencies] futures-async-stream = "0.2" rand = "0.8" diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml index aef2e638a820..80648d625642 100644 --- a/src/connector/Cargo.toml +++ b/src/connector/Cargo.toml @@ -15,12 +15,6 @@ normal = ["workspace-hack"] [dependencies] anyhow = "1" -apache-avro = { git = "https://github.com/risingwavelabs/avro", branch = "waruto/modify-decimal", features = [ - "snappy", - "zstandard", - "bzip", - "xz", -] } async-trait = "0.1" aws-config = { workspace = true } aws-sdk-ec2 = { workspace = true } @@ -31,10 +25,7 @@ aws-types = { workspace = true } bincode = "1" byteorder = "1" bytes = { version = "1", features = ["serde"] } -chrono = { version = "0.4", default-features = false, features = [ - "clock", - "std", -] } +chrono = { version = "0.4", default-features = false, features = ["clock", "std"] } csv = "1.2" duration-str = "0.5.0" enum-as-inner = "0.5" @@ -57,17 +48,6 @@ prometheus = { version = "0.13", features = ["process"] } prost = { version = "0.11.0", features = ["no-recursion-limit"] } prost-reflect = "0.9.2" protobuf-native = "0.2.1" -pulsar = { version = "4.2", default-features = false, features = [ - "tokio-runtime", - "telemetry", - "auth-oauth2", -] } -rdkafka = { package = "madsim-rdkafka", version = "=0.2.14-alpha", features = [ - "cmake-build", - "ssl-vendored", - "gssapi", - "zstd", -] } reqwest = { version = "0.11", features = ["json"] } risingwave_common = { path = "../common" } risingwave_expr = { path = "../expr" } @@ -81,15 +61,6 @@ serde_with = { version = "2", features = ["json"] } simd-json = "0.8" tempfile = "3" thiserror = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", -] } tokio-retry = "0.3" tokio-stream = "0.1" tokio-util = { version = "0.7", features = ["codec", "io"] } @@ -97,7 +68,28 @@ tonic = { version = "0.2", package = "madsim-tonic" } tracing = "0.1" url = "2" urlencoding = "2" -[target.'cfg(not(madsim))'.dependencies] + +[dependencies.apache-avro] +git = "https://github.com/risingwavelabs/avro" +branch = "waruto/modify-decimal" +features = ["snappy", "zstandard", "bzip", "xz"] + +[dependencies.pulsar] +version = "4.2" +default-features = false +features = ["tokio-runtime", "telemetry", "auth-oauth2"] + +[dependencies.rdkafka] +package = "madsim-rdkafka" +version = "=0.2.14-alpha" +features = ["cmake-build", "ssl-vendored", "gssapi", "zstd"] + +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } [dev-dependencies] @@ -107,5 +99,5 @@ tempfile = "3" wiremock = "0.5" [[bench]] -name = "parser" harness = false +name = "parser" diff --git a/src/ctl/Cargo.toml b/src/ctl/Cargo.toml index fa6854ad1adb..740308028378 100644 --- a/src/ctl/Cargo.toml +++ b/src/ctl/Cargo.toml @@ -34,17 +34,13 @@ risingwave_stream = { path = "../stream" } risingwave_tracing = { path = "../tracing" } serde_json = "1" size = "0.4" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", -] } tracing = "0.1" uuid = { version = "1", features = ["v4"] } -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } diff --git a/src/expr/Cargo.toml b/src/expr/Cargo.toml index 596a5c54dc11..c039e6d7424e 100644 --- a/src/expr/Cargo.toml +++ b/src/expr/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -42,10 +42,14 @@ rust_decimal = { version = "1", features = ["db-postgres", "maths"] } speedate = "0.7.0" static_assertions = "1" thiserror = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] } tracing = "0.1" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } [dev-dependencies] @@ -53,5 +57,5 @@ criterion = "0.4" serde_json = "1" [[bench]] -name = "expr" harness = false +name = "expr" diff --git a/src/expr/macro/Cargo.toml b/src/expr/macro/Cargo.toml index 524f14405393..4c61e96bd2cd 100644 --- a/src/expr/macro/Cargo.toml +++ b/src/expr/macro/Cargo.toml @@ -2,8 +2,8 @@ name = "risingwave_expr_macro" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [lib] proc-macro = true diff --git a/src/frontend/Cargo.toml b/src/frontend/Cargo.toml index d710504152e7..25fa425dab39 100644 --- a/src/frontend/Cargo.toml +++ b/src/frontend/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -65,21 +65,17 @@ sha2 = "0.10.2" smallvec = { version = "1.6.1", features = ["serde"] } tempfile = "3" thiserror = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", -] } tokio-stream = "0.1" tonic = { version = "0.2", package = "madsim-tonic" } tracing = "0.1" uuid = "1" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } [dev-dependencies] diff --git a/src/frontend/planner_test/Cargo.toml b/src/frontend/planner_test/Cargo.toml index 47ab5ffa5975..22dded89d2dc 100644 --- a/src/frontend/planner_test/Cargo.toml +++ b/src/frontend/planner_test/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -25,18 +25,14 @@ risingwave_sqlparser = { path = "../../sqlparser" } serde = { version = "1", features = ["derive"] } serde_with = "2" serde_yaml = "0.9" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", -] } walkdir = "2" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } [dev-dependencies] @@ -52,5 +48,5 @@ name = "planner-test-apply" path = "src/bin/apply.rs" [[test]] -name = "planner_test_runner" harness = false +name = "planner_test_runner" diff --git a/src/java_binding/Cargo.toml b/src/java_binding/Cargo.toml index 4e47a0121d93..53388f66eadc 100644 --- a/src/java_binding/Cargo.toml +++ b/src/java_binding/Cargo.toml @@ -22,21 +22,17 @@ risingwave_object_store = { path = "../object_store" } risingwave_pb = { path = "../prost" } risingwave_storage = { path = "../storage" } thiserror = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "fs", - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", -] } tracing = "0.1" +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["fs", "rt", "rt-multi-thread", "sync", "macros", "time", "signal"] + [lib] crate_type = ["cdylib"] [[bin]] +bench = false name = "data-chunk-payload-generator" test = false -bench = false diff --git a/src/meta/Cargo.toml b/src/meta/Cargo.toml index e1784a35fbe7..27fe5d9229e6 100644 --- a/src/meta/Cargo.toml +++ b/src/meta/Cargo.toml @@ -58,14 +58,6 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" sync-point = { path = "../utils/sync-point" } thiserror = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", -] } tokio-retry = "0.3" tokio-stream = { version = "0.1", features = ["net"] } tonic = { version = "0.2", package = "madsim-tonic" } @@ -74,7 +66,12 @@ tracing = "0.1" url = "2" uuid = { version = "1", features = ["v4"] } -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] + +[target.'cfg(not(madsim))' .dependencies] axum = "0.6" tower-http = { version = "0.3", features = ["add-extension", "cors", "fs"] } workspace-hack = { path = "../workspace-hack" } @@ -88,5 +85,5 @@ static_assertions = "1" tempfile = "3" [features] -test = [] failpoints = ["fail/failpoints"] +test = [] diff --git a/src/object_store/Cargo.toml b/src/object_store/Cargo.toml index 59544a007775..3e7516b3cf66 100644 --- a/src/object_store/Cargo.toml +++ b/src/object_store/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] async-trait = "0.1" await-tree = "0.1.1" @@ -28,10 +28,9 @@ risingwave_common = { path = "../common" } spin = "0.9" tempfile = "3" thiserror = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "fs", -] } +tokio = { version = "0.2", package = "madsim-tokio", features = ["fs"] } tracing = "0.1" + # This crate is excluded from hakari (see hakari.toml) after hdfs is introduced... # # [target.'cfg(not(madsim))'.dependencies] @@ -42,6 +41,5 @@ tracing = "0.1" # # [package.metadata.cargo-udeps.ignore] # normal = ["workspace-hack"] - # [features] # hdfs-backend = ["opendal/services-hdfs"] diff --git a/src/prost/Cargo.toml b/src/prost/Cargo.toml index 728036fc7dcf..5afa10cc7dd6 100644 --- a/src/prost/Cargo.toml +++ b/src/prost/Cargo.toml @@ -7,6 +7,12 @@ keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } +[package.metadata.cargo-machete] +ignored = ["workspace-hack"] + +[package.metadata.cargo-udeps.ignore] +normal = ["workspace-hack"] + [dependencies] enum-as-inner = "0.5" pbjson = "0.5" @@ -15,15 +21,9 @@ prost-helpers = { path = "helpers" } serde = { version = "1", features = ["derive"] } tonic = { version = "0.2.21", package = "madsim-tonic" } -[target.'cfg(not(madsim))'.dependencies] +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } [build-dependencies] pbjson-build = "0.5" tonic-build = { version = "0.2.11", package = "madsim-tonic-build" } - -[package.metadata.cargo-machete] -ignored = ["workspace-hack"] - -[package.metadata.cargo-udeps.ignore] -normal = ["workspace-hack"] diff --git a/src/prost/helpers/Cargo.toml b/src/prost/helpers/Cargo.toml index 407e885742c7..89b392f9e42e 100644 --- a/src/prost/helpers/Cargo.toml +++ b/src/prost/helpers/Cargo.toml @@ -3,6 +3,12 @@ name = "prost-helpers" version = "0.1.0" edition = "2021" +[package.metadata.cargo-machete] +ignored = ["workspace-hack"] + +[package.metadata.cargo-udeps.ignore] +normal = ["workspace-hack"] + [lib] proc-macro = true @@ -12,11 +18,5 @@ proc-macro2 = { version = "1", default-features = false } quote = "1" syn = "1" -[target.'cfg(not(madsim))'.dependencies] +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } - -[package.metadata.cargo-machete] -ignored = ["workspace-hack"] - -[package.metadata.cargo-udeps.ignore] -normal = ["workspace-hack"] diff --git a/src/risedevtool/Cargo.toml b/src/risedevtool/Cargo.toml index 89eba8b24fa6..8cda66a2cbf6 100644 --- a/src/risedevtool/Cargo.toml +++ b/src/risedevtool/Cargo.toml @@ -34,14 +34,10 @@ serde_json = "1" serde_with = "2" serde_yaml = "0.9" tempfile = "3" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs" -] } workspace-hack = { path = "../workspace-hack" } yaml-rust = "0.4" + +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] diff --git a/src/rpc_client/Cargo.toml b/src/rpc_client/Cargo.toml index 27b57c8b8e41..f263c7232954 100644 --- a/src/rpc_client/Cargo.toml +++ b/src/rpc_client/Cargo.toml @@ -25,20 +25,17 @@ risingwave_common = { path = "../common" } risingwave_hummock_sdk = { path = "../storage/hummock_sdk" } risingwave_pb = { path = "../prost" } thiserror = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", -] } tokio-retry = "0.3" tokio-stream = "0.1" tonic = { version = "0.2", package = "madsim-tonic" } tracing = "0.1" url = "2.3.1" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] + +[target.'cfg(not(madsim))' .dependencies] moka = { version = "0.10", features = ["future"] } workspace-hack = { path = "../workspace-hack" } diff --git a/src/source/Cargo.toml b/src/source/Cargo.toml index 4845d779b256..79ac2d00b98e 100644 --- a/src/source/Cargo.toml +++ b/src/source/Cargo.toml @@ -24,10 +24,14 @@ rand = "0.8" risingwave_common = { path = "../common" } risingwave_connector = { path = "../connector" } risingwave_pb = { path = "../prost" } -tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] } tracing = { version = "0.1" } -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } [dev-dependencies] @@ -36,5 +40,5 @@ criterion = { version = "0.4", features = ["async_tokio"] } tempfile = "3" [[bench]] -name = "json_parser" harness = false +name = "json_parser" diff --git a/src/sqlparser/Cargo.toml b/src/sqlparser/Cargo.toml index 95e6c508e05c..1d10fcd44df9 100644 --- a/src/sqlparser/Cargo.toml +++ b/src/sqlparser/Cargo.toml @@ -1,16 +1,25 @@ [package] name = "risingwave_sqlparser" -license = "Apache-2.0" -include = [ - "src/**/*.rs", - "Cargo.toml", -] version = { workspace = true } edition = { workspace = true } homepage = { workspace = true } +include = ["src/**/*.rs", "Cargo.toml"] keywords = { workspace = true } +license = "Apache-2.0" repository = { workspace = true } +[package.metadata.cargo-machete] +ignored = ["workspace-hack"] + +[package.metadata.cargo-udeps.ignore] +normal = ["workspace-hack"] + +[package.metadata.release] +# Instruct `cargo release` to not run `cargo publish` locally: +# https://github.com/sunng87/cargo-release/blob/master/docs/reference.md#config-fields +# See docs/releasing.md for details. +disable-publish = true + [lib] path = "src/lib.rs" @@ -18,25 +27,13 @@ path = "src/lib.rs" default = ["std"] std = [] -[package.metadata.cargo-machete] -ignored = ["workspace-hack"] - -[package.metadata.cargo-udeps.ignore] -normal = ["workspace-hack"] - [dependencies] itertools = "0.10" serde = { version = "1.0", features = ["derive"], optional = true } tracing = "0.1" -[target.'cfg(not(madsim))'.dependencies] +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } [dev-dependencies] matches = "0.1" - -[package.metadata.release] -# Instruct `cargo release` to not run `cargo publish` locally: -# https://github.com/sunng87/cargo-release/blob/master/docs/reference.md#config-fields -# See docs/releasing.md for details. -disable-publish = true diff --git a/src/sqlparser/test_runner/Cargo.toml b/src/sqlparser/test_runner/Cargo.toml index d1cd39edf1a9..1f554c50ac34 100644 --- a/src/sqlparser/test_runner/Cargo.toml +++ b/src/sqlparser/test_runner/Cargo.toml @@ -17,22 +17,18 @@ risingwave_sqlparser = { path = "../" } serde = { version = "1", features = ["derive"] } serde_with = "2" serde_yaml = "0.9" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", -] } walkdir = "2" +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] + [[bin]] name = "parser-test-apply" path = "src/bin/apply.rs" -[target.'cfg(not(madsim))'.dependencies] +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } [build-dependencies] diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 5fb06a157ae2..5e12e1c1f935 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -52,34 +52,35 @@ sync-point = { path = "../utils/sync-point" } sysinfo = { version = "0.26", default-features = false } tempfile = "3" thiserror = "1" -# tikv-client = { git = "https://github.com/tikv/client-rust", rev = "5714b2", optional = true } -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "fs", - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", -] } tokio-retry = "0.3" tracing = "0.1" xorf = "0.8.1" xxhash-rust = { version = "0.8.5", features = ["xxh32", "xxh64"] } zstd = "0.11.2" -[target.'cfg(target_os = "linux")'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["fs", "rt", "rt-multi-thread", "sync", "macros", "time", "signal"] + +[target.'cfg(not(madsim))' .dependencies] +workspace-hack = { path = "../workspace-hack" } + +[target.'cfg(target_os = "linux")' .dependencies] procfs = { version = "0.12", default-features = false } libc = "0.2" nix = { version = "0.25", features = ["fs", "mman"] } -[target.'cfg(target_os = "macos")'.dependencies] -darwin-libproc = { git = "https://github.com/risingwavelabs/darwin-libproc.git", rev = "a502be24bd0971463f5bcbfe035a248d8ba503b7" } +[target.'cfg(target_os = "linux")' .dev-dependencies] +fiemap = "0.1.1" + +[target.'cfg(target_os = "macos")' .dependencies] libc = "0.2.72" mach2 = "0.4" -[target.'cfg(not(madsim))'.dependencies] -workspace-hack = { path = "../workspace-hack" } +[target.'cfg(target_os = "macos")' .dependencies.darwin-libproc] +git = "https://github.com/risingwavelabs/darwin-libproc.git" +rev = "a502be24bd0971463f5bcbfe035a248d8ba503b7" [dev-dependencies] criterion = { version = "0.4", features = ["async_futures"] } @@ -87,42 +88,39 @@ moka = { version = "0.10", features = ["future"] } risingwave_test_runner = { path = "../test_runner" } uuid = { version = "1", features = ["v4"] } -[target.'cfg(target_os = "linux")'.dev-dependencies] -fiemap = "0.1.1" - [features] +bpf = [] +failpoints = ["fail/failpoints"] # rocksdb-local = ["rocksdb"] # tikv = ["tikv-client"] test = [] -failpoints = ["fail/failpoints"] -bpf = [] [[bench]] -name = "bench_block_iter" harness = false +name = "bench_block_iter" + # Enable debug if you want to generate flamegraph. # debug = true - [[bench]] -name = "bench_lru_cache" harness = false +name = "bench_lru_cache" [[bench]] -name = "bench_merge_iter" harness = false +name = "bench_merge_iter" [[bench]] -name = "bench_fs_operation" harness = false +name = "bench_fs_operation" [[bench]] -name = "bench_compression" harness = false +name = "bench_compression" [[bench]] -name = "bench_compactor" harness = false +name = "bench_compactor" [[bench]] -name = "bench_multi_builder" harness = false +name = "bench_multi_builder" diff --git a/src/storage/backup/cmd/Cargo.toml b/src/storage/backup/cmd/Cargo.toml index f0c033044be8..823a83175679 100644 --- a/src/storage/backup/cmd/Cargo.toml +++ b/src/storage/backup/cmd/Cargo.toml @@ -18,16 +18,11 @@ clap = { version = "4", features = ["derive"] } risingwave_backup = { path = "../../backup" } risingwave_meta = { path = "../../../meta" } risingwave_rt = { path = "../../../utils/runtime" } -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", - "tracing", -] } + +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs", "tracing"] [[bin]] name = "backup-restore" diff --git a/src/storage/compactor/Cargo.toml b/src/storage/compactor/Cargo.toml index d66648e8f316..e52dbb7406d0 100644 --- a/src/storage/compactor/Cargo.toml +++ b/src/storage/compactor/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -29,17 +29,13 @@ risingwave_rpc_client = { path = "../../rpc_client" } risingwave_storage = { path = "../../storage" } serde = { version = "1", features = ["derive"] } serde_json = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "fs", - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", -] } tonic = { version = "0.2", package = "madsim-tonic" } tracing = "0.1" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["fs", "rt", "rt-multi-thread", "sync", "macros", "time", "signal"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } diff --git a/src/storage/hummock_sdk/Cargo.toml b/src/storage/hummock_sdk/Cargo.toml index 8c7a1693a76c..beb7a7ed93c9 100644 --- a/src/storage/hummock_sdk/Cargo.toml +++ b/src/storage/hummock_sdk/Cargo.toml @@ -21,15 +21,12 @@ parking_lot = "0.12" parse-display = "0.6" risingwave_common = { path = "../../common" } risingwave_pb = { path = "../../prost" } -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", -] } tracing = "0.1" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } diff --git a/src/storage/hummock_test/Cargo.toml b/src/storage/hummock_test/Cargo.toml index bc7ff418946a..c2880d7216b8 100644 --- a/src/storage/hummock_test/Cargo.toml +++ b/src/storage/hummock_test/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -34,15 +34,12 @@ risingwave_storage = { path = "..", features = ["test"] } risingwave_tracing = { path = "../../tracing" } tokio = { version = "0.2", package = "madsim-tokio" } -[target.'cfg(not(madsim))'.dependencies] +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } [dev-dependencies] criterion = { version = "0.4", features = ["async_futures"] } -futures = { version = "0.3", default-features = false, features = [ - "alloc", - "executor", -] } +futures = { version = "0.3", default-features = false, features = ["alloc", "executor"] } risingwave_test_runner = { path = "../../test_runner" } serial_test = "0.9" sync-point = { path = "../../utils/sync-point" } @@ -53,6 +50,6 @@ sync_point = ["sync-point/sync_point"] test = [] [[bench]] -name = "bench_hummock_iter" harness = false +name = "bench_hummock_iter" required-features = ["test"] diff --git a/src/stream/Cargo.toml b/src/stream/Cargo.toml index fd75c8539620..e87acdf22320 100644 --- a/src/stream/Cargo.toml +++ b/src/stream/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -56,24 +56,20 @@ serde_json = "1" smallvec = "1" static_assertions = "1" thiserror = "1" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs", -] } tokio-metrics = "0.1.0" tokio-stream = "0.1" tonic = { version = "0.2", package = "madsim-tonic" } tracing = "0.1" -[target.'cfg(enable_task_local_alloc)'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] + +[target.'cfg(enable_task_local_alloc)' .dependencies] task_stats_alloc = { path = "../utils/task_stats_alloc" } -[target.'cfg(not(madsim))'.dependencies] +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } [dev-dependencies] @@ -83,5 +79,5 @@ risingwave_hummock_test = { path = "../storage/hummock_test", features = ["test" tracing-test = "0.2" [[bench]] -name = "hash_agg" harness = false +name = "hash_agg" diff --git a/src/test_runner/Cargo.toml b/src/test_runner/Cargo.toml index 8e9ee88194e1..76fcfa722c75 100644 --- a/src/test_runner/Cargo.toml +++ b/src/test_runner/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] diff --git a/src/tests/compaction_test/Cargo.toml b/src/tests/compaction_test/Cargo.toml index a1c5a6225915..be14e992de93 100644 --- a/src/tests/compaction_test/Cargo.toml +++ b/src/tests/compaction_test/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -33,18 +33,14 @@ risingwave_rpc_client = { path = "../../rpc_client" } risingwave_rt = { path = "../../utils/runtime" } risingwave_storage = { path = "../../storage", features = ["test"] } risingwave_tracing = { path = "../../tracing" } -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "fs", - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", -] } tracing = "0.1" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["fs", "rt", "rt-multi-thread", "sync", "macros", "time", "signal"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } [[bin]] diff --git a/src/tests/e2e_extended_mode/Cargo.toml b/src/tests/e2e_extended_mode/Cargo.toml index 80a191ac59f6..a89edc4661cf 100644 --- a/src/tests/e2e_extended_mode/Cargo.toml +++ b/src/tests/e2e_extended_mode/Cargo.toml @@ -15,15 +15,19 @@ normal = ["workspace-hack"] [dependencies] anyhow = { version = "1", features = ["backtrace"] } -chrono = { version = "0.4", features = ['serde'] } +chrono = { version = "0.4", features = ["serde"] } clap = { version = "4", features = ["derive"] } pg_interval = "0.4" -rust_decimal ={ version = "1.25", features = ["db-postgres"] } -tokio = { version = "0.2.15", package = "madsim-tokio", features = ["rt", "macros","rt-multi-thread"] } +rust_decimal = { version = "1.25", features = ["db-postgres"] } tokio-postgres = { version = "0.7", features = ["with-chrono-0_4"] } tracing = "0.1" tracing-subscriber = "0.3.16" +[dependencies.tokio] +version = "0.2.15" +package = "madsim-tokio" +features = ["rt", "macros", "rt-multi-thread"] + [[bin]] name = "risingwave_e2e_extended_mode_test" path = "src/main.rs" diff --git a/src/tests/regress/Cargo.toml b/src/tests/regress/Cargo.toml index 2a2dcda6d223..339d28b3bbad 100644 --- a/src/tests/regress/Cargo.toml +++ b/src/tests/regress/Cargo.toml @@ -18,11 +18,15 @@ anyhow = { version = "1", features = ["backtrace"] } clap = { version = "4", features = ["derive"] } path-absolutize = "3.0" similar = "2" -tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "process"] } tracing = "0.1" tracing-subscriber = "0.3.16" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "process"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } [[bin]] diff --git a/src/tests/simulation/Cargo.toml b/src/tests/simulation/Cargo.toml index f516027df7ab..21d232daa3bf 100644 --- a/src/tests/simulation/Cargo.toml +++ b/src/tests/simulation/Cargo.toml @@ -2,8 +2,8 @@ name = "risingwave_simulation" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["serde"] diff --git a/src/tests/sqlsmith/Cargo.toml b/src/tests/sqlsmith/Cargo.toml index 5239087547b2..ee549a639fc4 100644 --- a/src/tests/sqlsmith/Cargo.toml +++ b/src/tests/sqlsmith/Cargo.toml @@ -30,7 +30,7 @@ tokio-postgres = "0.7" tracing = "0.1" tracing-subscriber = "0.3.16" -[target.'cfg(not(madsim))'.dependencies] +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } [dev-dependencies] @@ -44,5 +44,5 @@ path = "src/bin/main.rs" enable_sqlsmith_unit_test = [] [[test]] -name = "test_runner" harness = false +name = "test_runner" diff --git a/src/tests/state_cleaning_test/Cargo.toml b/src/tests/state_cleaning_test/Cargo.toml index 73612dd00daf..a818c82de2b3 100644 --- a/src/tests/state_cleaning_test/Cargo.toml +++ b/src/tests/state_cleaning_test/Cargo.toml @@ -29,7 +29,7 @@ tokio-stream = { version = "0.1", features = ["fs"] } toml = "0.7" tracing = "0.1" -[target.'cfg(not(madsim))'.dependencies] +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } [[bin]] diff --git a/src/tracing/Cargo.toml b/src/tracing/Cargo.toml index dd53225edcb2..ef2a322422ef 100644 --- a/src/tracing/Cargo.toml +++ b/src/tracing/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -20,13 +20,12 @@ futures = { version = "0.3", default-features = false, features = ["alloc", "exe minitrace = "0.4" minitrace-jaeger = "0.4" rand = "0.8" -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "sync", - "macros", - "time", - "signal" -] } tracing = "0.1" -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["sync", "macros", "time", "signal"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../workspace-hack" } diff --git a/src/udf/Cargo.toml b/src/udf/Cargo.toml index a8c3ea94d526..6e6e149d59e1 100644 --- a/src/udf/Cargo.toml +++ b/src/udf/Cargo.toml @@ -2,8 +2,8 @@ name = "risingwave_udf" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] diff --git a/src/utils/local_stats_alloc/Cargo.toml b/src/utils/local_stats_alloc/Cargo.toml index 42a2118a94e7..1d13a38bf9a2 100644 --- a/src/utils/local_stats_alloc/Cargo.toml +++ b/src/utils/local_stats_alloc/Cargo.toml @@ -7,15 +7,15 @@ keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } description = "Local allocator with statistics" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[target.'cfg(not(madsim))'.dependencies] -workspace-hack = { path = "../../workspace-hack" } - -[dev-dependencies] [package.metadata.cargo-machete] ignored = ["workspace-hack"] [package.metadata.cargo-udeps.ignore] normal = ["workspace-hack"] + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[target.'cfg(not(madsim))' .dependencies] +workspace-hack = { path = "../../workspace-hack" } + +[dev-dependencies] diff --git a/src/utils/pgwire/Cargo.toml b/src/utils/pgwire/Cargo.toml index 5cc58706724a..d86d1bd7443e 100644 --- a/src/utils/pgwire/Cargo.toml +++ b/src/utils/pgwire/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -24,7 +24,7 @@ futures = { version = "0.3", default-features = false, features = ["alloc"] } itertools = "0.10" openssl = "0.10.48" pg_interval = "0.4" -postgres-types = { version = "0.2.5", features = ["derive","with-chrono-0_4"] } +postgres-types = { version = "0.2.5", features = ["derive", "with-chrono-0_4"] } regex = "1.5" risingwave_common = { path = "../../common" } risingwave_sqlparser = { path = "../../sqlparser" } @@ -33,7 +33,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "macros"] tokio-openssl = "0.6.3" tracing = "0.1" -[target.'cfg(not(madsim))'.dependencies] +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } [dev-dependencies] diff --git a/src/utils/runtime/Cargo.toml b/src/utils/runtime/Cargo.toml index 8c620e2b17c3..36f359624a12 100644 --- a/src/utils/runtime/Cargo.toml +++ b/src/utils/runtime/Cargo.toml @@ -6,8 +6,8 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -21,17 +21,16 @@ console-subscriber = "0.1.8" futures = { version = "0.3", default-features = false, features = ["alloc"] } parking_lot = { version = "0.12", features = ["deadlock_detection"] } pprof = { version = "0.11", features = ["flamegraph"] } -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", - "fs" -] } tracing = "0.1" -tracing-subscriber = { version = "0.3.16", features = ["fmt", "parking_lot", "std", "time", "local-time"] } -[target.'cfg(not(madsim))'.dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] + +[dependencies.tracing-subscriber] +version = "0.3.16" +features = ["fmt", "parking_lot", "std", "time", "local-time"] + +[target.'cfg(not(madsim))' .dependencies] workspace-hack = { path = "../../workspace-hack" } diff --git a/src/utils/sync-point/Cargo.toml b/src/utils/sync-point/Cargo.toml index 050085ab4785..8128d7a9d822 100644 --- a/src/utils/sync-point/Cargo.toml +++ b/src/utils/sync-point/Cargo.toml @@ -2,8 +2,8 @@ name = "sync-point" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] diff --git a/src/utils/task_stats_alloc/Cargo.toml b/src/utils/task_stats_alloc/Cargo.toml index a8442fc9c09d..63d7bc07fe6f 100644 --- a/src/utils/task_stats_alloc/Cargo.toml +++ b/src/utils/task_stats_alloc/Cargo.toml @@ -3,8 +3,8 @@ name = "task_stats_alloc" version = "0.1.11" edition = "2021" description = "Allocator with statistics" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [package.metadata.cargo-machete] ignored = ["workspace-hack"] @@ -12,18 +12,13 @@ ignored = ["workspace-hack"] normal = ["workspace-hack"] [dependencies] -tokio = { version = "0.2", package = "madsim-tokio", features = [ - "fs", - "rt", - "rt-multi-thread", - "sync", - "macros", - "time", - "signal", -] } -[dev-dependencies] +[dependencies.tokio] +version = "0.2" +package = "madsim-tokio" +features = ["fs", "rt", "rt-multi-thread", "sync", "macros", "time", "signal"] +[dev-dependencies] -[target.'cfg(loom)'.dependencies] -loom = {version = "0.5", features = ["futures", "checkpoint"]} +[target.'cfg(loom)' .dependencies] +loom = { version = "0.5", features = ["futures", "checkpoint"] } diff --git a/src/utils/workspace-config/Cargo.toml b/src/utils/workspace-config/Cargo.toml index 6047fa00315e..0727986ddb4d 100644 --- a/src/utils/workspace-config/Cargo.toml +++ b/src/utils/workspace-config/Cargo.toml @@ -6,18 +6,29 @@ homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } repository = { workspace = true } -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] # Use a feature flag to control enable or not, otherwise `cargo test` will compile all dependencies. enable-static-link = ["isahc", "openssl", "rdkafka"] enable-static-log-level = ["log", "tracing"] [dependencies] -isahc = { version = "1", optional = true, default-features = false, features = ["static-ssl", "static-curl"] } log = { version = "0.4", optional = true, features = ["release_max_level_info"] } openssl = { version = "0.10", optional = true, features = ["vendored"] } -rdkafka = { package = "madsim-rdkafka", version = "=0.2.14-alpha", optional = true, features = ["ssl-vendored", "gssapi-vendored"] } tracing = { version = "0.1", optional = true, features = ["release_max_level_info"] } + +[dependencies.isahc] +version = "1" +optional = true +default-features = false +features = ["static-ssl", "static-curl"] + +[dependencies.rdkafka] +package = "madsim-rdkafka" +version = "=0.2.14-alpha" +optional = true +features = ["ssl-vendored", "gssapi-vendored"] + # workspace-hack = { path = "../../workspace-hack" } # Don't add workspace-hack into this crate! diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 026c8d518dbc..89b225359005 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -1,7 +1,6 @@ # This file is generated by `cargo hakari`. # To regenerate, run: # cargo hakari generate - [package] name = "workspace-hack" version = { workspace = true } @@ -9,20 +8,19 @@ edition = { workspace = true } homepage = { workspace = true } keywords = { workspace = true } license = { workspace = true } -repository = { workspace = true } -description = "workspace-hack package, managed by hakari" # You can choose to publish this crate: see https://docs.rs/cargo-hakari/latest/cargo_hakari/publishing. publish = false +repository = { workspace = true } +description = "workspace-hack package, managed by hakari" + # The parts of the file between the BEGIN HAKARI SECTION and END HAKARI SECTION comments # are managed by hakari. - ### BEGIN HAKARI SECTION [dependencies] ahash = { version = "0.8" } anyhow = { version = "1", features = ["backtrace"] } arrayvec = { version = "0.7", default-features = false, features = ["std"] } aws-sdk-s3 = { version = "0.21", features = ["native-tls"] } -aws-smithy-client = { version = "0.51", default-features = false, features = ["native-tls", "rustls"] } aws-types = { version = "0.51", default-features = false, features = ["hardcoded-credentials"] } base64 = { version = "0.21" } bytes = { version = "1", features = ["serde"] } @@ -46,7 +44,6 @@ futures-sink = { version = "0.3" } futures-task = { version = "0.3", default-features = false, features = ["std"] } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13" } -hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12", features = ["nightly", "raw"] } hdrhistogram = { version = "7" } hyper = { version = "0.14", features = ["full"] } isahc = { version = "1", default-features = false, features = ["text-decoding"] } @@ -54,13 +51,11 @@ itertools = { version = "0.10" } lexical-core = { version = "0.8", features = ["format"] } lexical-parse-float = { version = "0.8", default-features = false, features = ["format", "std"] } lexical-parse-integer = { version = "0.8", default-features = false, features = ["format", "std"] } -lexical-util = { version = "0.8", default-features = false, features = ["format", "parse-floats", "parse-integers", "std", "write-floats", "write-integers"] } lexical-write-float = { version = "0.8", default-features = false, features = ["format", "std"] } lexical-write-integer = { version = "0.8", default-features = false, features = ["format", "std"] } libc = { version = "0.2", features = ["extra_traits"] } lock_api = { version = "0.4", default-features = false, features = ["arc_lock"] } log = { version = "0.4", default-features = false, features = ["kv_unstable", "std"] } -madsim-tokio = { version = "0.2", default-features = false, features = ["fs", "io-util", "macros", "net", "process", "rt", "rt-multi-thread", "signal", "sync", "time", "tracing"] } memchr = { version = "2" } miniz_oxide = { version = "0.6", default-features = false, features = ["with-alloc"] } multimap = { version = "0.8" } @@ -73,7 +68,6 @@ parking_lot_core = { version = "0.9", default-features = false, features = ["dea petgraph = { version = "0.6" } phf = { version = "0.11", features = ["uncased"] } phf_shared = { version = "0.11", features = ["uncased"] } -postgres-types = { version = "0.2", default-features = false, features = ["derive", "with-chrono-0_4", "with-serde_json-1"] } prometheus = { version = "0.13", features = ["process"] } prost = { version = "0.11", features = ["no-recursion-limit"] } prost-types = { version = "0.11" } @@ -93,12 +87,8 @@ smallvec = { version = "1", default-features = false, features = ["serde"] } strum = { version = "0.24", features = ["derive"] } subtle = { version = "2" } time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } -tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "net", "parking_lot", "process", "rt-multi-thread", "signal", "stats", "sync", "time", "tracing"] } -tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "4538cd6", features = ["with-chrono-0_4"] } -tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "ab251ad", features = ["fs", "net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } tonic = { version = "0.8", features = ["gzip", "tls-webpki-roots"] } -tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] } tracing = { version = "0.1", features = ["log", "release_max_level_trace"] } tracing-core = { version = "0.1" } tracing-futures = { version = "0.2" } @@ -106,8 +96,85 @@ tracing-subscriber = { version = "0.3", features = ["env-filter", "local-time", url = { version = "2", features = ["serde"] } uuid = { version = "1", features = ["fast-rng", "serde", "v4"] } zstd = { version = "0.11" } -zstd-safe = { version = "5", default-features = false, features = ["arrays", "legacy", "std", "zdict_builder"] } -zstd-sys = { version = "2", default-features = false, features = ["legacy", "std", "zdict_builder"] } + +[dependencies.aws-smithy-client] +version = "0.51" +default-features = false +features = ["native-tls", "rustls"] + +[dependencies.hashbrown-5ef9efb8ec2df382] +package = "hashbrown" +version = "0.12" +features = ["nightly", "raw"] + +[dependencies.lexical-util] +version = "0.8" +default-features = false +features = ["format", "parse-floats", "parse-integers", "std", "write-floats", "write-integers"] + +[dependencies.madsim-tokio] +version = "0.2" +default-features = false +features = [ + "fs", + "io-util", + "macros", + "net", + "process", + "rt", + "rt-multi-thread", + "signal", + "sync", + "time", + "tracing" +] + +[dependencies.postgres-types] +version = "0.2" +default-features = false +features = ["derive", "with-chrono-0_4", "with-serde_json-1"] + +[dependencies.tokio] +version = "1" +features = [ + "fs", + "io-std", + "io-util", + "macros", + "net", + "parking_lot", + "process", + "rt-multi-thread", + "signal", + "stats", + "sync", + "time", + "tracing" +] + +[dependencies.tokio-postgres] +git = "https://github.com/madsim-rs/rust-postgres.git" +rev = "4538cd6" +features = ["with-chrono-0_4"] + +[dependencies.tokio-stream] +git = "https://github.com/madsim-rs/tokio.git" +rev = "ab251ad" +features = ["fs", "net"] + +[dependencies.tower] +version = "0.4" +features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] + +[dependencies.zstd-safe] +version = "5" +default-features = false +features = ["arrays", "legacy", "std", "zdict_builder"] + +[dependencies.zstd-sys] +version = "2" +default-features = false +features = ["legacy", "std", "zdict_builder"] [build-dependencies] ahash = { version = "0.8" } @@ -115,7 +182,6 @@ anyhow = { version = "1", features = ["backtrace"] } arrayvec = { version = "0.7", default-features = false, features = ["std"] } auto_enums = { version = "0.8", features = ["futures03"] } aws-sdk-s3 = { version = "0.21", features = ["native-tls"] } -aws-smithy-client = { version = "0.51", default-features = false, features = ["native-tls", "rustls"] } aws-types = { version = "0.51", default-features = false, features = ["hardcoded-credentials"] } base64 = { version = "0.21" } bytes = { version = "1", features = ["serde"] } @@ -140,7 +206,6 @@ futures-sink = { version = "0.3" } futures-task = { version = "0.3", default-features = false, features = ["std"] } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13" } -hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12", features = ["nightly", "raw"] } hdrhistogram = { version = "7" } hyper = { version = "0.14", features = ["full"] } isahc = { version = "1", default-features = false, features = ["text-decoding"] } @@ -148,13 +213,11 @@ itertools = { version = "0.10" } lexical-core = { version = "0.8", features = ["format"] } lexical-parse-float = { version = "0.8", default-features = false, features = ["format", "std"] } lexical-parse-integer = { version = "0.8", default-features = false, features = ["format", "std"] } -lexical-util = { version = "0.8", default-features = false, features = ["format", "parse-floats", "parse-integers", "std", "write-floats", "write-integers"] } lexical-write-float = { version = "0.8", default-features = false, features = ["format", "std"] } lexical-write-integer = { version = "0.8", default-features = false, features = ["format", "std"] } libc = { version = "0.2", features = ["extra_traits"] } lock_api = { version = "0.4", default-features = false, features = ["arc_lock"] } log = { version = "0.4", default-features = false, features = ["kv_unstable", "std"] } -madsim-tokio = { version = "0.2", default-features = false, features = ["fs", "io-util", "macros", "net", "process", "rt", "rt-multi-thread", "signal", "sync", "time", "tracing"] } memchr = { version = "2" } miniz_oxide = { version = "0.6", default-features = false, features = ["with-alloc"] } multimap = { version = "0.8" } @@ -167,7 +230,6 @@ parking_lot_core = { version = "0.9", default-features = false, features = ["dea petgraph = { version = "0.6" } phf = { version = "0.11", features = ["uncased"] } phf_shared = { version = "0.11", features = ["uncased"] } -postgres-types = { version = "0.2", default-features = false, features = ["derive", "with-chrono-0_4", "with-serde_json-1"] } proc-macro2 = { version = "1", features = ["span-locations"] } prometheus = { version = "0.13", features = ["process"] } prost = { version = "0.11", features = ["no-recursion-limit"] } @@ -189,12 +251,8 @@ strum = { version = "0.24", features = ["derive"] } subtle = { version = "2" } syn = { version = "1", features = ["extra-traits", "full", "visit", "visit-mut"] } time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } -tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "net", "parking_lot", "process", "rt-multi-thread", "signal", "stats", "sync", "time", "tracing"] } -tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "4538cd6", features = ["with-chrono-0_4"] } -tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "ab251ad", features = ["fs", "net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } tonic = { version = "0.8", features = ["gzip", "tls-webpki-roots"] } -tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] } tracing = { version = "0.1", features = ["log", "release_max_level_trace"] } tracing-core = { version = "0.1" } tracing-futures = { version = "0.2" } @@ -202,7 +260,84 @@ tracing-subscriber = { version = "0.3", features = ["env-filter", "local-time", url = { version = "2", features = ["serde"] } uuid = { version = "1", features = ["fast-rng", "serde", "v4"] } zstd = { version = "0.11" } -zstd-safe = { version = "5", default-features = false, features = ["arrays", "legacy", "std", "zdict_builder"] } -zstd-sys = { version = "2", default-features = false, features = ["legacy", "std", "zdict_builder"] } + +[build-dependencies.aws-smithy-client] +version = "0.51" +default-features = false +features = ["native-tls", "rustls"] + +[build-dependencies.hashbrown-5ef9efb8ec2df382] +package = "hashbrown" +version = "0.12" +features = ["nightly", "raw"] + +[build-dependencies.lexical-util] +version = "0.8" +default-features = false +features = ["format", "parse-floats", "parse-integers", "std", "write-floats", "write-integers"] + +[build-dependencies.madsim-tokio] +version = "0.2" +default-features = false +features = [ + "fs", + "io-util", + "macros", + "net", + "process", + "rt", + "rt-multi-thread", + "signal", + "sync", + "time", + "tracing" +] + +[build-dependencies.postgres-types] +version = "0.2" +default-features = false +features = ["derive", "with-chrono-0_4", "with-serde_json-1"] + +[build-dependencies.tokio] +version = "1" +features = [ + "fs", + "io-std", + "io-util", + "macros", + "net", + "parking_lot", + "process", + "rt-multi-thread", + "signal", + "stats", + "sync", + "time", + "tracing" +] + +[build-dependencies.tokio-postgres] +git = "https://github.com/madsim-rs/rust-postgres.git" +rev = "4538cd6" +features = ["with-chrono-0_4"] + +[build-dependencies.tokio-stream] +git = "https://github.com/madsim-rs/tokio.git" +rev = "ab251ad" +features = ["fs", "net"] + +[build-dependencies.tower] +version = "0.4" +features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] + +[build-dependencies.zstd-safe] +version = "5" +default-features = false +features = ["arrays", "legacy", "std", "zdict_builder"] + +[build-dependencies.zstd-sys] +version = "2" +default-features = false +features = ["legacy", "std", "zdict_builder"] ### END HAKARI SECTION