Skip to content

Commit 33adf3e

Browse files
authored
Merge pull request #1472 from BohuTANG/dev-remove-common-alloc-1470
ISSUE-1470: remove common/allocators
2 parents e89478e + 13f7cb8 commit 33adf3e

File tree

8 files changed

+1
-162
lines changed

8 files changed

+1
-162
lines changed

.github/actions-rs/grcov.yml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ ignore:
1313
- "*/exception/*"
1414
- "*/tests/*"
1515
- "*/arrow/*"
16-
- "*/allocators/*"
1716
- "*/building/*"
1817
- "*/profiling/*"
1918
- "*/tracing/*"

Cargo.lock

-71
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[workspace]
22
members = [
33
# Common
4-
"common/allocators",
54
"common/arrow",
65
"common/building",
76
"common/datablocks",

common/allocators/Cargo.toml

-32
This file was deleted.

common/allocators/src/lib.rs

-47
This file was deleted.

query/Cargo.toml

-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ path = "src/bin/datafuse-benchmark.rs"
2020
[features]
2121
default = ["simd"]
2222
simd = ["common-arrow/simd"]
23-
allocator = ["common-allocators/snmalloc-alloc"]
2423

2524
[dependencies]
2625
# Workspace dependencies
2726
common-arrow = { path = "../common/arrow" }
28-
common-allocators = { path = "../common/allocators" }
2927
common-datablocks = { path = "../common/datablocks" }
3028
common-datavalues = { path = "../common/datavalues" }
3129
common-exception = { path = "../common/exception" }

query/src/bin/datafuse-benchmark.rs

-3
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ impl Stats {
125125

126126
#[tokio::main]
127127
async fn main() -> Result<()> {
128-
// Use customize malloc.
129-
let _ = common_allocators::init();
130-
131128
// First load configs from args.
132129
let conf = Config::load_from_args();
133130
let address = format!("{}:{}", conf.host, conf.port)

query/src/bin/datafuse-query.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ use log::info;
3030

3131
#[tokio::main]
3232
async fn main() -> Result<(), Box<dyn std::error::Error>> {
33-
// Use customize malloc.
34-
let malloc = common_allocators::init();
35-
3633
// First load configs from args.
3734
let mut conf = Config::load_from_args();
3835

@@ -59,9 +56,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
5956

6057
info!("{:?}", conf);
6158
info!(
62-
"DatafuseQuery v-{}, Allocator: {}",
59+
"DatafuseQuery v-{}",
6360
*datafuse_query::configs::config::FUSE_COMMIT_VERSION,
64-
malloc
6561
);
6662

6763
let cluster = Cluster::create_global(conf.clone())?;

0 commit comments

Comments
 (0)