format

crates/rayexec_execution/src/config/session.rs

@@ -1,9 +1,9 @@
 use std::collections::HashMap;
 use std::sync::LazyLock;
 
-use crate::arrays::scalar::{OwnedScalarValue, ScalarValue};
 use rayexec_error::{RayexecError, Result};
 
+use crate::arrays::scalar::{OwnedScalarValue, ScalarValue};
 use crate::runtime::{PipelineExecutor, Runtime};
 
 /// Configuration for the session.

crates/rayexec_execution/src/database/catalog_entry.rs

@@ -1,11 +1,11 @@
 use std::fmt;
 use std::sync::Arc;
 
-use crate::arrays::field::Field;
 use rayexec_error::{OptionExt, RayexecError, Result};
 use rayexec_proto::ProtoConv;
 
 use super::DatabaseContext;
+use crate::arrays::field::Field;
 use crate::functions::aggregate::AggregateFunction;
 use crate::functions::copy::CopyToFunction;
 use crate::functions::scalar::ScalarFunction;

crates/rayexec_execution/src/database/create.rs

@@ -1,8 +1,8 @@
 //! Various create messages/structs.
-use crate::arrays::field::Field;
 use rayexec_error::{RayexecError, Result};
 use rayexec_proto::ProtoConv;
 
+use crate::arrays::field::Field;
 use crate::functions::aggregate::AggregateFunction;
 use crate::functions::copy::CopyToFunction;
 use crate::functions::scalar::ScalarFunction;

crates/rayexec_execution/src/database/mod.rs

@@ -15,10 +15,10 @@ use std::sync::Arc;
 use catalog::CatalogTx;
 use create::{CreateSchemaInfo, OnConflict};
 use memory_catalog::MemoryCatalog;
-use crate::arrays::scalar::OwnedScalarValue;
 use rayexec_error::{RayexecError, Result};
 use rayexec_proto::ProtoConv;
 
+use crate::arrays::scalar::OwnedScalarValue;
 use crate::storage::catalog_storage::CatalogStorage;
 use crate::storage::memory::MemoryTableStorage;
 use crate::storage::table_storage::TableStorage;

crates/rayexec_execution/src/datasource.rs

@@ -3,10 +3,10 @@ use std::fmt::Debug;
 use std::sync::Arc;
 
 use futures::future::BoxFuture;
-use crate::arrays::scalar::OwnedScalarValue;
 use rayexec_error::{RayexecError, Result};
 use regex::Regex;
 
+use crate::arrays::scalar::OwnedScalarValue;
 use crate::functions::copy::CopyToFunction;
 use crate::functions::table::TableFunction;
 use crate::runtime::Runtime;

crates/rayexec_execution/src/engine/result.rs

@@ -5,12 +5,12 @@ use std::task::{Context, Poll, Waker};
 use futures::future::BoxFuture;
 use futures::{Future, Stream};
 use parking_lot::Mutex;
-use crate::arrays::batch::Batch;
-use crate::arrays::field::Schema;
 use rayexec_error::{RayexecError, Result};
 use tracing::warn;
 
 use super::profiler::PlanningProfileData;
+use crate::arrays::batch::Batch;
+use crate::arrays::field::Schema;
 use crate::database::DatabaseContext;
 use crate::execution::operators::sink::{PartitionSink, SinkOperation};
 use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable};

crates/rayexec_execution/src/engine/server_state.rs

@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
 use dashmap::DashMap;
-use crate::arrays::batch::Batch;
-use crate::arrays::field::{Field, Schema};
 use rayexec_error::{not_implemented, RayexecError, Result};
 use uuid::Uuid;
 
+use crate::arrays::batch::Batch;
+use crate::arrays::field::{Field, Schema};
 use crate::config::execution::{ExecutablePlanConfig, IntermediatePlanConfig};
 use crate::config::session::SessionConfig;
 use crate::database::catalog::CatalogTx;

crates/rayexec_execution/src/engine/session.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 
 use hashbrown::HashMap;
-use crate::arrays::field::{Field, Schema};
 use rayexec_error::{OptionExt, RayexecError, Result};
 use rayexec_parser::parser;
 use rayexec_parser::statement::RawStatement;
@@ -11,6 +10,7 @@ use super::profiler::PlanningProfileData;
 use super::result::{new_results_sinks, ExecutionResult, ResultErrorSink, ResultStream};
 use super::verifier::QueryVerifier;
 use super::DataSourceRegistry;
+use crate::arrays::field::{Field, Schema};
 use crate::config::execution::{ExecutablePlanConfig, IntermediatePlanConfig};
 use crate::config::session::SessionConfig;
 use crate::database::catalog::CatalogTx;

crates/rayexec_execution/src/execution/computed_batch.rs

@@ -1,8 +1,9 @@
 use std::collections::VecDeque;
 
-use crate::arrays::batch::Batch;
 use rayexec_error::Result;
 
+use crate::arrays::batch::Batch;
+
 /// Computed batch results from an operator.
 #[derive(Debug, PartialEq)]
 pub enum ComputedBatches {

crates/rayexec_execution/src/execution/executable/pipeline.rs

@@ -2,11 +2,11 @@ use std::fmt;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 
-use crate::arrays::batch::Batch;
 use rayexec_error::{RayexecError, Result};
 use tracing::trace;
 
 use super::profiler::OperatorProfileData;
+use crate::arrays::batch::Batch;
 use crate::execution::computed_batch::ComputedBatches;
 use crate::execution::operators::{
     ExecutableOperator,

crates/rayexec_execution/src/execution/intermediate/planner/plan_describe.rs

@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
-use crate::arrays::array::Array;
-use crate::arrays::batch::Batch;
 use rayexec_error::{RayexecError, Result};
 
 use super::{InProgressPipeline, IntermediatePipelineBuildState, PipelineIdGen};
+use crate::arrays::array::Array;
+use crate::arrays::batch::Batch;
 use crate::execution::intermediate::pipeline::{IntermediateOperator, PipelineSource};
 use crate::execution::operators::values::PhysicalValues;
 use crate::execution::operators::PhysicalOperator;

crates/rayexec_execution/src/execution/intermediate/planner/plan_explain.rs

@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
-use crate::arrays::array::Array;
-use crate::arrays::batch::Batch;
 use rayexec_error::{not_implemented, RayexecError, Result};
 use tracing::error;
 
 use super::{InProgressPipeline, IntermediatePipelineBuildState, Materializations, PipelineIdGen};
+use crate::arrays::array::Array;
+use crate::arrays::batch::Batch;
 use crate::execution::intermediate::pipeline::{IntermediateOperator, PipelineSource};
 use crate::execution::operators::values::PhysicalValues;
 use crate::execution::operators::PhysicalOperator;

crates/rayexec_execution/src/execution/intermediate/planner/plan_scan.rs

@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
-use crate::arrays::array::Array;
-use crate::arrays::batch::Batch;
 use rayexec_error::{not_implemented, RayexecError, Result, ResultExt};
 
 use super::{InProgressPipeline, IntermediatePipelineBuildState, PipelineIdGen};
+use crate::arrays::array::Array;
+use crate::arrays::batch::Batch;
 use crate::execution::intermediate::pipeline::{IntermediateOperator, PipelineSource};
 use crate::execution::operators::scan::PhysicalScan;
 use crate::execution::operators::table_function::PhysicalTableFunction;

crates/rayexec_execution/src/execution/intermediate/planner/plan_show_var.rs

@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
-use crate::arrays::array::Array;
-use crate::arrays::batch::Batch;
 use rayexec_error::{RayexecError, Result};
 
 use super::{InProgressPipeline, IntermediatePipelineBuildState, PipelineIdGen};
+use crate::arrays::array::Array;
+use crate::arrays::batch::Batch;
 use crate::execution::intermediate::pipeline::{IntermediateOperator, PipelineSource};
 use crate::execution::operators::values::PhysicalValues;
 use crate::execution::operators::PhysicalOperator;

crates/rayexec_execution/src/execution/operators/analyze.rs

@@ -1,6 +1,5 @@
 use std::task::Context;
 
-use crate::arrays::batch::Batch;
 use rayexec_error::Result;
 
 use super::{
@@ -12,6 +11,7 @@ use super::{
     PollPull,
     PollPush,
 };
+use crate::arrays::batch::Batch;
 use crate::database::DatabaseContext;
 use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable};
 

crates/rayexec_execution/src/execution/operators/batch_resizer.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 use std::task::{Context, Waker};
 
-use crate::arrays::batch::Batch;
 use rayexec_error::Result;
 
 use super::util::resizer::{BatchResizer, DEFAULT_TARGET_BATCH_SIZE};
@@ -15,6 +14,7 @@ use super::{
     PollPull,
     PollPush,
 };
+use crate::arrays::batch::Batch;
 use crate::database::DatabaseContext;
 use crate::execution::computed_batch::ComputedBatches;
 use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable};

crates/rayexec_execution/src/execution/operators/copy_to.rs

@@ -1,9 +1,9 @@
-use crate::arrays::field::Schema;
 use rayexec_error::{OptionExt, Result};
 use rayexec_io::location::FileLocation;
 use rayexec_proto::ProtoConv;
 
 use super::sink::{PartitionSink, SinkOperation, SinkOperator};
+use crate::arrays::field::Schema;
 use crate::database::DatabaseContext;
 use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable};
 use crate::functions::copy::CopyToFunction;

crates/rayexec_execution/src/execution/operators/create_schema.rs

@@ -4,7 +4,6 @@ use std::task::{Context, Poll};
 
 use futures::future::BoxFuture;
 use futures::FutureExt;
-use crate::arrays::batch::Batch;
 use rayexec_error::{OptionExt, RayexecError, Result};
 use rayexec_proto::ProtoConv;
 
@@ -18,6 +17,7 @@ use super::{
     PollPull,
     PollPush,
 };
+use crate::arrays::batch::Batch;
 use crate::database::catalog::CatalogTx;
 use crate::database::create::CreateSchemaInfo;
 use crate::database::DatabaseContext;

crates/rayexec_execution/src/execution/operators/create_table.rs

@@ -1,12 +1,12 @@
 use std::fmt;
 
 use futures::future::BoxFuture;
-use crate::arrays::batch::Batch;
 use rayexec_error::{OptionExt, RayexecError, Result};
 use rayexec_proto::ProtoConv;
 
 use super::sink::{PartitionSink, SinkOperation, SinkOperator};
 use super::util::barrier::PartitionBarrier;
+use crate::arrays::batch::Batch;
 use crate::database::catalog::CatalogTx;
 use crate::database::create::CreateTableInfo;
 use crate::database::DatabaseContext;

crates/rayexec_execution/src/execution/operators/create_view.rs

@@ -4,7 +4,6 @@ use std::task::{Context, Poll};
 
 use futures::future::BoxFuture;
 use futures::FutureExt;
-use crate::arrays::batch::Batch;
 use rayexec_error::{RayexecError, Result};
 
 use super::{
@@ -17,6 +16,7 @@ use super::{
     PollPull,
     PollPush,
 };
+use crate::arrays::batch::Batch;
 use crate::database::catalog::CatalogTx;
 use crate::database::create::CreateViewInfo;
 use crate::database::DatabaseContext;

crates/rayexec_execution/src/execution/operators/drop.rs

@@ -4,7 +4,6 @@ use std::task::{Context, Poll};
 
 use futures::future::BoxFuture;
 use futures::FutureExt;
-use crate::arrays::batch::Batch;
 use rayexec_error::{OptionExt, RayexecError, Result};
 use rayexec_proto::ProtoConv;
 
@@ -18,6 +17,7 @@ use super::{
     PollPull,
     PollPush,
 };
+use crate::arrays::batch::Batch;
 use crate::database::catalog::CatalogTx;
 use crate::database::drop::DropInfo;
 use crate::database::DatabaseContext;

crates/rayexec_execution/src/execution/operators/empty.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 use std::task::Context;
 
-use crate::arrays::batch::Batch;
 use rayexec_error::{RayexecError, Result};
 
 use super::{
@@ -13,6 +12,7 @@ use super::{
     PollPull,
     PollPush,
 };
+use crate::arrays::batch::Batch;
 use crate::database::DatabaseContext;
 use crate::execution::operators::InputOutputStates;
 use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable};

crates/rayexec_execution/src/execution/operators/filter.rs

@@ -1,9 +1,9 @@
 use std::sync::Arc;
 
-use crate::arrays::batch::Batch;
 use rayexec_error::{OptionExt, Result};
 
 use super::simple::{SimpleOperator, StatelessOperation};
+use crate::arrays::batch::Batch;
 use crate::database::DatabaseContext;
 use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable};
 use crate::expr::physical::PhysicalScalarExpression;

crates/rayexec_execution/src/execution/operators/hash_aggregate/chunk.rs

@@ -1,10 +1,10 @@
-use crate::arrays::array::Array;
-use crate::arrays::executor::physical_type::PhysicalType;
-use crate::arrays::executor::scalar::concat;
 use rayexec_error::Result;
 
 use super::hash_table::GroupAddress;
 use super::AggregateStates;
+use crate::arrays::array::Array;
+use crate::arrays::executor::physical_type::PhysicalType;
+use crate::arrays::executor::scalar::concat;
 use crate::execution::operators::util::resizer::DEFAULT_TARGET_BATCH_SIZE;
 use crate::functions::aggregate::ChunkGroupAddressIter;
 

crates/rayexec_execution/src/execution/operators/hash_aggregate/compare.rs

@@ -1,5 +1,9 @@
 use std::collections::BTreeSet;
 
+use rayexec_error::{not_implemented, Result};
+
+use super::chunk::GroupChunk;
+use super::hash_table::GroupAddress;
 use crate::arrays::array::Array;
 use crate::arrays::executor::physical_type::{
     PhysicalBinary,
@@ -26,10 +30,6 @@ use crate::arrays::executor::physical_type::{
 use crate::arrays::executor::scalar::{can_skip_validity_check, check_validity};
 use crate::arrays::selection::{self, SelectionVector};
 use crate::arrays::storage::AddressableStorage;
-use rayexec_error::{not_implemented, Result};
-
-use super::chunk::GroupChunk;
-use super::hash_table::GroupAddress;
 
 pub fn group_values_eq(
     inputs: &[Array],

crates/rayexec_execution/src/execution/operators/hash_aggregate/distinct.rs

@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
-use crate::arrays::array::Array;
-use crate::arrays::executor::scalar::HashExecutor;
-use crate::arrays::selection::SelectionVector;
 use rayexec_error::Result;
 
 use super::hash_table::HashTable;
+use crate::arrays::array::Array;
+use crate::arrays::executor::scalar::HashExecutor;
+use crate::arrays::selection::SelectionVector;
 use crate::execution::operators::hash_aggregate::hash_table::GroupAddress;
 use crate::functions::aggregate::states::{AggregateGroupStates, OpaqueStatesMut};
 use crate::functions::aggregate::ChunkGroupAddressIter;

crates/rayexec_execution/src/execution/operators/hash_aggregate/drain.rs

@@ -1,7 +1,7 @@
-use crate::arrays::batch::Batch;
 use rayexec_error::Result;
 
 use super::hash_table::HashTable;
+use crate::arrays::batch::Batch;
 
 /// Drains a hash table.
 ///

crates/rayexec_execution/src/execution/operators/hash_aggregate/hash_table.rs

@@ -1,15 +1,15 @@
 use std::collections::BTreeSet;
 use std::sync::Arc;
 
-use crate::arrays::array::Array;
-use crate::arrays::selection::SelectionVector;
 use rayexec_error::{RayexecError, Result};
 
 use super::chunk::GroupChunk;
 use super::compare::group_values_eq;
 use super::drain::HashTableDrain;
 use super::entry::EntryKey;
 use super::Aggregate;
+use crate::arrays::array::Array;
+use crate::arrays::selection::SelectionVector;
 
 const LOAD_FACTOR: f64 = 0.7;
 
@@ -479,10 +479,9 @@ const fn is_power_of_2(v: usize) -> bool {
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use crate::arrays::bitmap::Bitmap;
     use crate::arrays::datatype::DataType;
-
-    use super::*;
     use crate::expr;
     use crate::functions::aggregate::builtin::sum::Sum;
     use crate::functions::aggregate::{AggregateFunction, PlannedAggregateFunction};