cargo fmt

Author: andygrove

native/shuffle/benches/row_columnar.rs

@@ -22,11 +22,11 @@
 //! list, and map types.
 
 use arrow::datatypes::{DataType as ArrowDataType, Field, Fields};
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use datafusion_comet_shuffle::spark_unsafe::row::{
     process_sorted_row_partition, SparkUnsafeObject, SparkUnsafeRow,
 };
 use datafusion_comet_shuffle::CompressionCodec;
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use std::sync::Arc;
 use tempfile::Builder;
 

native/shuffle/benches/shuffle_writer.rs

@@ -19,9 +19,6 @@ use arrow::array::builder::{Date32Builder, Decimal128Builder, Int32Builder};
 use arrow::array::{builder::StringBuilder, Array, Int32Array, RecordBatch};
 use arrow::datatypes::{DataType, Field, Schema};
 use arrow::row::{RowConverter, SortField};
-use datafusion_comet_shuffle::{
-    CometPartitioning, CompressionCodec, ShuffleBlockWriter, ShuffleWriterExec,
-};
 use criterion::{criterion_group, criterion_main, Criterion};
 use datafusion::datasource::memory::MemorySourceConfig;
 use datafusion::datasource::source::DataSourceExec;
@@ -32,6 +29,9 @@ use datafusion::{
     physical_plan::{common::collect, ExecutionPlan},
     prelude::SessionContext,
 };
+use datafusion_comet_shuffle::{
+    CometPartitioning, CompressionCodec, ShuffleBlockWriter, ShuffleWriterExec,
+};
 use itertools::Itertools;
 use std::io::Cursor;
 use std::sync::Arc;

native/shuffle/src/codec.rs

@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use datafusion_comet_jni_bridge::errors::{CometError, CometResult};
 use arrow::array::RecordBatch;
 use arrow::datatypes::Schema;
 use arrow::ipc::reader::StreamReader;
@@ -25,6 +24,7 @@ use crc32fast::Hasher;
 use datafusion::common::DataFusionError;
 use datafusion::error::Result;
 use datafusion::physical_plan::metrics::Time;
+use datafusion_comet_jni_bridge::errors::{CometError, CometResult};
 use simd_adler32::Adler32;
 use std::io::{Cursor, Seek, SeekFrom, Write};
 

native/shuffle/src/partitioners/multi_partition.rs

@@ -22,14 +22,14 @@ use crate::partitioners::partitioned_batch_iterator::{
 use crate::partitioners::ShufflePartitioner;
 use crate::writers::{BufBatchWriter, PartitionWriter};
 use crate::{comet_partitioning, CometPartitioning, CompressionCodec, ShuffleBlockWriter};
-use datafusion_comet_common::tracing::{with_trace, with_trace_async};
 use arrow::array::{ArrayRef, RecordBatch};
 use arrow::datatypes::SchemaRef;
 use datafusion::common::utils::proxy::VecAllocExt;
 use datafusion::common::DataFusionError;
 use datafusion::execution::memory_pool::{MemoryConsumer, MemoryReservation};
 use datafusion::execution::runtime_env::RuntimeEnv;
 use datafusion::physical_plan::metrics::Time;
+use datafusion_comet_common::tracing::{with_trace, with_trace_async};
 use datafusion_comet_spark_expr::murmur3::create_murmur3_hashes;
 use itertools::Itertools;
 use std::fmt;

native/shuffle/src/shuffle_writer.rs

@@ -22,7 +22,6 @@ use crate::partitioners::{
     MultiPartitionShuffleRepartitioner, ShufflePartitioner, SinglePartitionShufflePartitioner,
 };
 use crate::{CometPartitioning, CompressionCodec};
-use datafusion_comet_common::tracing::with_trace_async;
 use async_trait::async_trait;
 use datafusion::common::exec_datafusion_err;
 use datafusion::physical_expr::{EquivalenceProperties, Partitioning};
@@ -39,6 +38,7 @@ use datafusion::{
         Statistics,
     },
 };
+use datafusion_comet_common::tracing::with_trace_async;
 use futures::{StreamExt, TryFutureExt, TryStreamExt};
 use std::{
     any::Any,

native/shuffle/src/spark_unsafe/list.rs

@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use datafusion_comet_jni_bridge::errors::CometError;
 use crate::spark_unsafe::{
     map::append_map_elements,
     row::{
@@ -32,6 +31,7 @@ use arrow::array::{
     MapBuilder,
 };
 use arrow::datatypes::{DataType, TimeUnit};
+use datafusion_comet_jni_bridge::errors::CometError;
 
 /// Generates bulk append methods for primitive types in SparkUnsafeArray.
 ///

native/shuffle/src/spark_unsafe/map.rs

@@ -15,10 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use datafusion_comet_jni_bridge::errors::CometError;
 use crate::spark_unsafe::list::{append_to_builder, SparkUnsafeArray};
 use arrow::array::builder::{ArrayBuilder, MapBuilder, MapFieldNames};
 use arrow::datatypes::{DataType, FieldRef};
+use datafusion_comet_jni_bridge::errors::CometError;
 
 pub struct SparkUnsafeMap {
     pub(crate) keys: SparkUnsafeArray,

native/shuffle/src/spark_unsafe/row.rs

@@ -17,8 +17,6 @@
 
 //! Utils for supporting native sort-based columnar shuffle.
 
-use datafusion_comet_jni_bridge::errors::CometError;
-use datafusion_comet_common::bytes_to_i128;
 use crate::codec::{Checksum, ShuffleBlockWriter};
 use crate::spark_unsafe::{
     list::{append_list_element, SparkUnsafeArray},
@@ -38,6 +36,8 @@ use arrow::compute::cast;
 use arrow::datatypes::{DataType, Field, Schema, TimeUnit};
 use arrow::error::ArrowError;
 use datafusion::physical_plan::metrics::Time;
+use datafusion_comet_common::bytes_to_i128;
+use datafusion_comet_jni_bridge::errors::CometError;
 use jni::sys::{jint, jlong};
 use std::{
     fs::OpenOptions,