Skip to content

Commit 2cca3fa

Browse files
authored
chore: Remove "extern crate criterion" in benches (#20299)
## Which issue does this PR close? - Closes #20298 ## Rationale for this change This is no longer necessary with modern editions of Rust. In many cases, we also did `#[macro_use]`, so removing this cleans up the namespace of the file doing the `use`. ## What changes are included in this PR? Remove "extern crate criterion" in benchmark code, and update "use" statements as necessary. Along the way, remove a few unnecessary `extern crate arrow` and similar from the benchmark code. ## Are these changes tested? Yes, but no new tests added or needed. ## Are there any user-facing changes? No.
1 parent e4e8598 commit 2cca3fa

70 files changed

Lines changed: 25 additions & 190 deletions

Some content is hidden

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

datafusion/core/benches/aggregate_query_sql.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,9 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#[macro_use]
19-
extern crate criterion;
20-
extern crate arrow;
21-
extern crate datafusion;
22-
2318
mod data_utils;
2419

25-
use crate::criterion::Criterion;
20+
use criterion::{Criterion, criterion_group, criterion_main};
2621
use data_utils::create_table_provider;
2722
use datafusion::error::Result;
2823
use datafusion::execution::context::SessionContext;

datafusion/core/benches/csv_load.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,9 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#[macro_use]
19-
extern crate criterion;
20-
extern crate arrow;
21-
extern crate datafusion;
22-
2318
mod data_utils;
2419

25-
use crate::criterion::Criterion;
20+
use criterion::{Criterion, criterion_group, criterion_main};
2621
use datafusion::error::Result;
2722
use datafusion::execution::context::SessionContext;
2823
use datafusion::prelude::CsvReadOptions;

datafusion/core/benches/dataframe.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
extern crate arrow;
19-
#[macro_use]
20-
extern crate criterion;
21-
extern crate datafusion;
22-
2318
use arrow_schema::{DataType, Field, Schema};
24-
use criterion::Criterion;
19+
use criterion::{Criterion, criterion_group, criterion_main};
2520
use datafusion::datasource::MemTable;
2621
use datafusion::prelude::SessionContext;
2722
use datafusion_expr::col;

datafusion/core/benches/distinct_query_sql.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,9 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#[macro_use]
19-
extern crate criterion;
20-
extern crate arrow;
21-
extern crate datafusion;
22-
2318
mod data_utils;
24-
use crate::criterion::Criterion;
19+
20+
use criterion::{Criterion, criterion_group, criterion_main};
2521
use data_utils::{create_table_provider, make_data};
2622
use datafusion::execution::context::SessionContext;
2723
use datafusion::physical_plan::{ExecutionPlan, collect};

datafusion/core/benches/math_query_sql.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,13 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#[macro_use]
19-
extern crate criterion;
20-
use criterion::Criterion;
18+
use criterion::{Criterion, criterion_group, criterion_main};
2119

2220
use parking_lot::Mutex;
2321
use std::sync::Arc;
2422

2523
use tokio::runtime::Runtime;
2624

27-
extern crate arrow;
28-
extern crate datafusion;
29-
3025
use arrow::{
3126
array::{Float32Array, Float64Array},
3227
datatypes::{DataType, Field, Schema},

datafusion/core/benches/physical_plan.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#[macro_use]
19-
extern crate criterion;
20-
use criterion::{BatchSize, Criterion};
21-
extern crate arrow;
22-
extern crate datafusion;
18+
use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
2319

2420
use std::sync::Arc;
2521

datafusion/core/benches/range_and_generate_series.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,9 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#[macro_use]
19-
extern crate criterion;
20-
extern crate datafusion;
21-
2218
mod data_utils;
2319

24-
use crate::criterion::Criterion;
20+
use criterion::{Criterion, criterion_group, criterion_main};
2521
use datafusion::execution::context::SessionContext;
2622
use parking_lot::Mutex;
2723
use std::hint::black_box;

datafusion/core/benches/sort_limit_query_sql.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#[macro_use]
19-
extern crate criterion;
20-
use criterion::Criterion;
18+
use criterion::{Criterion, criterion_group, criterion_main};
2119
use datafusion::datasource::file_format::csv::CsvFormat;
2220
use datafusion::datasource::listing::{
2321
ListingOptions, ListingTable, ListingTableConfig, ListingTableUrl,
@@ -27,9 +25,6 @@ use datafusion::prelude::SessionConfig;
2725
use parking_lot::Mutex;
2826
use std::sync::Arc;
2927

30-
extern crate arrow;
31-
extern crate datafusion;
32-
3328
use arrow::datatypes::{DataType, Field, Schema};
3429

3530
use datafusion::datasource::MemTable;

datafusion/core/benches/sql_planner.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,15 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
extern crate arrow;
19-
#[macro_use]
20-
extern crate criterion;
21-
extern crate datafusion;
22-
2318
mod data_utils;
2419

25-
use crate::criterion::Criterion;
2620
use arrow::array::PrimitiveArray;
2721
use arrow::array::{ArrayRef, RecordBatch};
2822
use arrow::datatypes::ArrowNativeTypeOp;
2923
use arrow::datatypes::ArrowPrimitiveType;
3024
use arrow::datatypes::{DataType, Field, Fields, Schema};
3125
use criterion::Bencher;
26+
use criterion::{Criterion, criterion_group, criterion_main};
3227
use datafusion::datasource::MemTable;
3328
use datafusion::execution::context::SessionContext;
3429
use datafusion_common::{ScalarValue, config::Dialect};

datafusion/core/benches/window_query_sql.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,9 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#[macro_use]
19-
extern crate criterion;
20-
extern crate arrow;
21-
extern crate datafusion;
22-
2318
mod data_utils;
2419

25-
use crate::criterion::Criterion;
20+
use criterion::{Criterion, criterion_group, criterion_main};
2621
use data_utils::create_table_provider;
2722
use datafusion::error::Result;
2823
use datafusion::execution::context::SessionContext;

0 commit comments

Comments
 (0)