Skip to content

Commit 39dbc3b

Browse files
xxchanxxchan
committed
Revert "format_cargo_toml"
This reverts commit da57c30.
1 parent 7cd4dc9 commit 39dbc3b

File tree

48 files changed

+537
-611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+537
-611
lines changed

‎Cargo.toml‎

Lines changed: 76 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,114 @@
11
[workspace]
22
members = [
3-
"scripts/source/prepare_ci_pubsub",
4-
"src/batch",
5-
"src/bench",
6-
"src/cmd",
7-
"src/cmd_all",
8-
"src/common",
9-
"src/common/common_service",
10-
"src/compute",
11-
"src/connector",
12-
"src/ctl",
13-
"src/expr",
14-
"src/expr/macro",
15-
"src/frontend",
16-
"src/frontend/planner_test",
17-
"src/java_binding",
18-
"src/meta",
19-
"src/object_store",
20-
"src/prost",
21-
"src/prost/helpers",
22-
"src/risedevtool",
23-
"src/rpc_client",
24-
"src/source",
25-
"src/sqlparser",
26-
"src/sqlparser/test_runner",
27-
"src/storage",
28-
"src/storage/backup",
29-
"src/storage/backup/cmd",
30-
"src/storage/compactor",
31-
"src/storage/hummock_sdk",
32-
"src/storage/hummock_test",
33-
"src/stream",
34-
"src/test_runner",
35-
"src/tests/compaction_test",
36-
"src/tests/e2e_extended_mode",
37-
"src/tests/regress",
38-
"src/tests/simulation",
39-
"src/tests/sqlsmith",
40-
"src/tests/state_cleaning_test",
41-
"src/tracing",
42-
"src/udf",
43-
"src/utils/local_stats_alloc",
44-
"src/utils/pgwire",
45-
"src/utils/runtime",
46-
"src/utils/sync-point",
47-
"src/utils/workspace-config",
48-
"src/workspace-hack"
3+
"scripts/source/prepare_ci_pubsub",
4+
"src/batch",
5+
"src/bench",
6+
"src/cmd",
7+
"src/cmd_all",
8+
"src/common",
9+
"src/common/common_service",
10+
"src/compute",
11+
"src/connector",
12+
"src/ctl",
13+
"src/expr",
14+
"src/expr/macro",
15+
"src/frontend",
16+
"src/frontend/planner_test",
17+
"src/java_binding",
18+
"src/meta",
19+
"src/object_store",
20+
"src/prost",
21+
"src/prost/helpers",
22+
"src/risedevtool",
23+
"src/rpc_client",
24+
"src/source",
25+
"src/sqlparser",
26+
"src/sqlparser/test_runner",
27+
"src/storage",
28+
"src/storage/backup",
29+
"src/storage/backup/cmd",
30+
"src/storage/compactor",
31+
"src/storage/hummock_sdk",
32+
"src/storage/hummock_test",
33+
"src/stream",
34+
"src/test_runner",
35+
"src/tests/compaction_test",
36+
"src/tests/e2e_extended_mode",
37+
"src/tests/regress",
38+
"src/tests/simulation",
39+
"src/tests/sqlsmith",
40+
"src/tests/state_cleaning_test",
41+
"src/tracing",
42+
"src/udf",
43+
"src/utils/local_stats_alloc",
44+
"src/utils/pgwire",
45+
"src/utils/runtime",
46+
"src/utils/sync-point",
47+
"src/utils/workspace-config",
48+
"src/workspace-hack",
4949
]
5050

51+
[workspace.package]
52+
version = "1.0.0-alpha"
53+
edition = "2021"
54+
homepage = "https://github.com/risingwavelabs/risingwave"
55+
keywords = ["sql", "database", "streaming"]
56+
license = "Apache-2.0"
57+
repository = "https://github.com/risingwavelabs/risingwave"
58+
5159
[workspace.dependencies]
5260
aws-config = { version = "0.51", default-features = false, features = ["rt-tokio", "native-tls"] }
53-
aws-sdk-s3 = { version = "0.21", default-features = false, features = ["rt-tokio", "native-tls"] }
54-
aws-sdk-ec2 = { version = "0.21", default-features = false, features = ["rt-tokio", "native-tls"] }
61+
aws-sdk-kinesis = { version = "0.21", default-features = false, features = ["rt-tokio", "native-tls"] }
62+
aws-sdk-s3 = { version = "0.21", default-features = false, features = ["rt-tokio","native-tls"] }
63+
aws-sdk-ec2 = { version = "0.21", default-features = false, features = ["rt-tokio","native-tls"] }
5564
aws-sdk-sqs = { version = "0.21", default-features = false, features = ["rt-tokio", "native-tls"] }
5665
aws-smithy-http = "0.51"
5766
aws-smithy-types = "0.51"
5867
aws-endpoint = "0.51"
5968
aws-types = { version = "0.51", features = ["hardcoded-credentials"] }
6069

61-
[workspace.dependencies.aws-sdk-kinesis]
62-
version = "0.21"
63-
default-features = false
64-
features = ["rt-tokio", "native-tls"]
70+
[profile.dev]
71+
lto = 'off'
6572

66-
[workspace.package]
67-
version = "1.0.0-alpha"
68-
edition = "2021"
69-
homepage = "https://github.com/risingwavelabs/risingwave"
70-
keywords = ["sql", "database", "streaming"]
71-
license = "Apache-2.0"
72-
repository = "https://github.com/risingwavelabs/risingwave"
73+
[profile.release]
74+
debug = 1 # line tables only
75+
lto = 'thin'
7376

7477
[profile.bench]
7578
opt-level = 3
7679
debug = false
7780
codegen-units = 1
78-
lto = "thin"
81+
lto = 'thin'
7982
incremental = false
8083
debug-assertions = false
8184
overflow-checks = false
8285
rpath = false
8386

87+
# The profile used for CI in main branch.
88+
# This profile inherits from the release profile, but turns on some checks and assertions for us to
89+
# better catch bugs in CI.
90+
[profile.ci-release]
91+
inherits = "release"
92+
debug-assertions = true
93+
overflow-checks = true
94+
8495
# The profile used for CI in pull requests.
8596
# External dependencies are built with optimization enabled, while crates in this workspace are built
8697
# with `dev` profile and full debug info. This is a trade-off between build time and e2e test time.
8798
[profile.ci-dev]
8899
inherits = "dev"
89100
incremental = false
90-
91-
[profile.ci-dev.package."*" ] # external dependencies
101+
[profile.ci-dev.package."*"] # external dependencies
92102
opt-level = 1
93-
94-
[profile.ci-dev.package.await-tree]
103+
[profile.ci-dev.package."tokio"]
95104
opt-level = 3
96-
97-
[profile.ci-dev.package.indextree]
105+
[profile.ci-dev.package."await-tree"]
98106
opt-level = 3
99-
100-
[profile.ci-dev.package.task_stats_alloc]
107+
[profile.ci-dev.package."indextree"]
101108
opt-level = 3
102-
103-
[profile.ci-dev.package.tokio]
109+
[profile.ci-dev.package."task_stats_alloc"]
104110
opt-level = 3
105111

106-
# The profile used for CI in main branch.
107-
# This profile inherits from the release profile, but turns on some checks and assertions for us to
108-
# better catch bugs in CI.
109-
[profile.ci-release]
110-
inherits = "release"
111-
debug-assertions = true
112-
overflow-checks = true
113-
114112
# The profile used for deterministic simulation tests in CI.
115113
# The simulator can only run single-threaded, so optimization is required to make the running time
116114
# reasonable. The optimization level is customized to speed up the build.
@@ -119,13 +117,6 @@ inherits = "dev"
119117
opt-level = 2
120118
incremental = false
121119

122-
[profile.dev]
123-
lto = "off"
124-
125-
[profile.release]
126-
debug = 1 # line tables only
127-
lto = "thin"
128-
129120
# Patch third-party crates for deterministic simulation.
130121
[patch.crates-io]
131122
quanta = { git = "https://github.com/madsim-rs/quanta.git", rev = "948bdc3" }

‎scripts/source/prepare_ci_pubsub/Cargo.toml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
name = "prepare_ci_pubsub"
33
version = "0.1.0"
44
edition = "2021"
5-
65
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
6+
77
[package.metadata.cargo-machete]
88
ignored = ["workspace-hack"]
99

@@ -14,8 +14,12 @@ normal = ["workspace-hack"]
1414
anyhow = "1"
1515
google-cloud-googleapis = { version = "0.6.0", features = ["pubsub"] }
1616
google-cloud-pubsub = "0.7.0"
17-
18-
[dependencies.tokio]
19-
version = "0.2"
20-
package = "madsim-tokio"
21-
features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"]
17+
tokio = { version = "0.2", package = "madsim-tokio", features = [
18+
"rt",
19+
"rt-multi-thread",
20+
"sync",
21+
"macros",
22+
"time",
23+
"signal",
24+
"fs",
25+
] }

‎src/batch/Cargo.toml‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,59 +39,63 @@ risingwave_source = { path = "../source" }
3939
risingwave_storage = { path = "../storage" }
4040
serde_json = "1"
4141
thiserror = "1"
42+
tokio = { version = "0.2", package = "madsim-tokio", features = [
43+
"rt",
44+
"rt-multi-thread",
45+
"sync",
46+
"macros",
47+
"time",
48+
"signal",
49+
"fs",
50+
] }
4251
tokio-metrics = "0.1.0"
4352
tokio-stream = "0.1"
4453
tonic = { version = "0.2", package = "madsim-tonic" }
4554
tracing = "0.1"
4655
uuid = "1"
4756

48-
[dependencies.tokio]
49-
version = "0.2"
50-
package = "madsim-tokio"
51-
features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"]
52-
53-
[target.'cfg(enable_task_local_alloc)' .dependencies]
57+
[target.'cfg(enable_task_local_alloc)'.dependencies]
5458
task_stats_alloc = { path = "../utils/task_stats_alloc" }
5559

56-
[target.'cfg(not(madsim))' .dependencies]
60+
[target.'cfg(not(madsim))'.dependencies]
5761
workspace-hack = { path = "../workspace-hack" }
5862

59-
[target.'cfg(unix)' .dev-dependencies]
60-
tikv-jemallocator = "0.5"
61-
6263
[dev-dependencies]
6364
criterion = { version = "0.4", features = ["async_tokio", "async"] }
6465
rand = "0.8"
6566
tempfile = "3"
6667

68+
[target.'cfg(unix)'.dev-dependencies]
69+
tikv-jemallocator = "0.5"
70+
6771
[[bench]]
68-
harness = false
6972
name = "filter"
73+
harness = false
7074

7175
[[bench]]
72-
harness = false
7376
name = "nested_loop_join"
77+
harness = false
7478

7579
[[bench]]
76-
harness = false
7780
name = "hash_join"
81+
harness = false
7882

7983
[[bench]]
80-
harness = false
8184
name = "sort"
85+
harness = false
8286

8387
[[bench]]
84-
harness = false
8588
name = "top_n"
89+
harness = false
8690

8791
[[bench]]
88-
harness = false
8992
name = "hash_agg"
93+
harness = false
9094

9195
[[bench]]
92-
harness = false
9396
name = "expand"
97+
harness = false
9498

9599
[[bench]]
96-
harness = false
97100
name = "limit"
101+
harness = false

‎src/bench/Cargo.toml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,37 @@ isahc = { version = "1", default-features = false }
2222
itertools = "0.10"
2323
libc = "0.2"
2424
opentelemetry = { version = "0.17", optional = true, features = ["rt-tokio"] }
25+
opentelemetry-jaeger = { version = "0.16", optional = true, features = [
26+
"rt-tokio",
27+
"collector_client",
28+
"isahc",
29+
"isahc_collector_client",
30+
] }
2531
parking_lot = "0.12"
2632
prometheus = { version = "0.13", features = ["process"] }
2733
rand = "0.8"
2834
risingwave_common = { path = "../common" }
2935
risingwave_storage = { path = "../storage" }
3036
serde = { version = "1", features = ["derive"] }
37+
tokio = { version = "0.2", package = "madsim-tokio", features = [
38+
"fs",
39+
"rt",
40+
"rt-multi-thread",
41+
"sync",
42+
"macros",
43+
"time",
44+
"signal",
45+
] }
3146
tokio-stream = "0.1"
3247
toml = "0.7"
3348
tracing = "0.1"
3449
tracing-opentelemetry = { version = "0.17", optional = true }
3550
tracing-subscriber = "0.3.16"
3651

37-
[dependencies.opentelemetry-jaeger]
38-
version = "0.16"
39-
optional = true
40-
features = ["rt-tokio", "collector_client", "isahc", "isahc_collector_client"]
41-
42-
[dependencies.tokio]
43-
version = "0.2"
44-
package = "madsim-tokio"
45-
features = ["fs", "rt", "rt-multi-thread", "sync", "macros", "time", "signal"]
46-
47-
[target.'cfg(not(madsim))' .dependencies]
52+
[target.'cfg(not(madsim))'.dependencies]
4853
workspace-hack = { path = "../workspace-hack" }
4954

50-
[target.'cfg(target_os = "linux")' .dependencies]
55+
[target.'cfg(target_os = "linux")'.dependencies]
5156
nix = { version = "0.25", features = ["fs", "mman"] }
5257

5358
[[bin]]
@@ -60,9 +65,4 @@ path = "s3_bench/main.rs"
6065

6166
[features]
6267
bpf = ["bcc", "risingwave_storage/bpf"]
63-
trace = [
64-
"opentelemetry",
65-
"opentelemetry-jaeger",
66-
"tracing-opentelemetry",
67-
"tracing/release_max_level_trace"
68-
]
68+
trace = ["opentelemetry", "opentelemetry-jaeger", "tracing-opentelemetry", "tracing/release_max_level_trace"]

0 commit comments

Comments
 (0)