Skip to content

Commit 5ddd409

Browse files
joseph-isaacsa10y
authored andcommitted
chore: apply imports_granularity = "Item" everywhere expect bench-vortex (#5521)
requires some non-auto changes to to `bench-vortex` --------- Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>
1 parent 5ad5366 commit 5ddd409

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

vortex-array/src/arrays/struct_/vtable/reduce.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ use crate::IntoArray;
1616
use crate::arrays::ExprArray;
1717
use crate::arrays::StructArray;
1818
use crate::expr::Expression;
19-
use crate::expr::analysis::immediate_access::annotate_scope_access;
2019
use crate::expr::col;
2120
use crate::expr::root;
2221
use crate::expr::session::ExprSession;
2322
use crate::expr::transform::ExprOptimizer;
2423
use crate::expr::transform::PartitionedExpr;
24+
use crate::expr::transform::immediate_access::annotate_scope_access;
2525
use crate::expr::transform::partition;
2626
use crate::expr::transform::replace;
2727
use crate::expr::transform::replace_root_fields;

vortex-array/src/compute/zip.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use super::cast;
1919
use crate::Array;
2020
use crate::ArrayRef;
2121
use crate::builders::ArrayBuilder;
22+
use crate::builders::VarBinViewBuilder;
2223
use crate::builders::builder_with_capacity;
2324
use crate::compute::ComputeFn;
2425
use crate::compute::Kernel;
@@ -260,7 +261,7 @@ mod tests {
260261
use crate::builders::ArrayBuilder;
261262
use crate::builders::BufferGrowthStrategy;
262263
use crate::builders::VarBinViewBuilder;
263-
use crate::compute::zip;
264+
use crate::compute::zip::VarBinViewBuilder;
264265

265266
#[test]
266267
fn test_zip_basic() {

vortex-array/src/expr/analysis/immediate_access.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ use vortex_error::VortexExpect;
77
use vortex_utils::aliases::hash_set::HashSet;
88

99
use crate::expr::Expression;
10-
use crate::expr::analysis::AnnotationFn;
11-
use crate::expr::analysis::Annotations;
12-
use crate::expr::descendent_annotations;
1310
use crate::expr::exprs::get_item::GetItem;
1411
use crate::expr::exprs::root::Root;
1512
use crate::expr::exprs::select::Select;
13+
use crate::expr::transform::annotations::AnnotationFn;
14+
use crate::expr::transform::annotations::Annotations;
15+
use crate::expr::transform::annotations::descendent_annotations;
1616

1717
pub type FieldAccesses<'a> = Annotations<'a, FieldName>;
1818

vortex-datafusion/src/convert/exprs.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ mod tests {
305305

306306
use arrow_schema::DataType;
307307
use arrow_schema::Field;
308+
use arrow_schema::Fields;
308309
use arrow_schema::Schema;
309310
use arrow_schema::SchemaBuilder;
310311
use arrow_schema::SchemaRef;
@@ -329,13 +330,14 @@ mod tests {
329330
use datafusion_physical_expr::PhysicalExpr;
330331
use datafusion_physical_expr::create_physical_expr;
331332
use datafusion_physical_expr::planner::logical2physical;
332-
use datafusion_physical_expr::{PhysicalExpr, create_physical_expr};
333333
use datafusion_physical_plan::expressions as df_expr;
334334
use datafusion_physical_plan::filter_pushdown::PushedDown;
335335
use insta::assert_snapshot;
336336
use rstest::rstest;
337+
use vortex::VortexSessionDefault;
337338
use vortex::expr::Expression;
338339
use vortex::expr::Operator;
340+
use vortex::session::VortexSession;
339341

340342
use super::*;
341343
use crate::VortexSource;

0 commit comments

Comments
 (0)