Skip to content

Commit 5c40e58

Browse files
committed
Remove benchmark allocator cfg changes
1 parent dbd05b5 commit 5c40e58

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

benchmarks/src/bin/dfbench.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ use datafusion::error::Result;
2020

2121
use clap::{Parser, Subcommand};
2222

23-
#[cfg(all(feature = "snmalloc", not(feature = "mimalloc")))]
23+
#[cfg(all(feature = "snmalloc", feature = "mimalloc"))]
24+
compile_error!(
25+
"feature \"snmalloc\" and feature \"mimalloc\" cannot be enabled at the same time"
26+
);
27+
28+
#[cfg(feature = "snmalloc")]
2429
#[global_allocator]
2530
static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;
2631

benchmarks/src/bin/imdb.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@ use clap::{Parser, Subcommand};
2121
use datafusion::error::Result;
2222
use datafusion_benchmarks::imdb;
2323

24-
#[cfg(all(feature = "snmalloc", not(feature = "mimalloc")))]
24+
#[cfg(all(feature = "snmalloc", feature = "mimalloc"))]
25+
compile_error!(
26+
"feature \"snmalloc\" and feature \"mimalloc\" cannot be enabled at the same time"
27+
);
28+
29+
#[cfg(feature = "snmalloc")]
2530
#[global_allocator]
2631
static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;
2732

0 commit comments

Comments
 (0)