Skip to content

Commit b88954e

Browse files
committed
ArrayRef
Signed-off-by: Nicholas Gates <nick@nickgates.com>
1 parent 92fac91 commit b88954e

103 files changed

Lines changed: 134 additions & 134 deletions

File tree

Some content is hidden

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

vortex-array/src/array/vtable/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ macro_rules! vtable {
346346
impl $crate::IntoArray for [<$Base Array>] {
347347
fn into_array(self) -> $crate::ArrayRef {
348348
use $crate::aliases::vortex_error::VortexExpect;
349-
$crate::ArrayRef::from($crate::array::Array::<$VT>::try_from_data(self).vortex_expect("data is always valid"))
349+
$crate::ArrayRef::from($crate::Array::<$VT>::try_from_data(self).vortex_expect("data is always valid"))
350350
}
351351
}
352352

vortex-bench/src/conversions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use tracing::Instrument;
1818
use tracing::info;
1919
use tracing::trace;
2020
use vortex::VortexSessionDefault;
21+
use vortex::array::ArrayRef;
2122
use vortex::array::IntoArray;
2223
use vortex::array::VortexSessionExecute;
2324
use vortex::array::arrays::ChunkedArray;
@@ -31,7 +32,6 @@ use vortex::error::VortexResult;
3132
use vortex::error::vortex_err;
3233
use vortex::file::WriteOptionsSessionExt;
3334
use vortex::session::VortexSession;
34-
use vortex_array::ArrayRef;
3535

3636
use crate::CompactionStrategy;
3737
use crate::Format;

vortex-bench/src/datasets/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use anyhow::Result;
77
use async_trait::async_trait;
88
use serde::Deserialize;
99
use serde::Serialize;
10-
use vortex_array::ArrayRef;
10+
use vortex::array::ArrayRef;
1111

1212
use crate::clickbench::Flavor;
1313

vortex-bench/src/datasets/struct_list_of_ints.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use parquet::arrow::ArrowWriter;
1111
use rand::RngExt;
1212
use rand::SeedableRng;
1313
use rand::rngs::StdRng;
14+
use vortex::array::ArrayRef;
1415
use vortex::array::IntoArray;
1516
use vortex::array::arrays::ChunkedArray;
1617
use vortex::array::arrays::ListArray;
@@ -19,7 +20,6 @@ use vortex::array::arrays::StructArray;
1920
use vortex::array::arrays::listview::recursive_list_from_list_view;
2021
use vortex::array::validity::Validity;
2122
use vortex::dtype::FieldNames;
22-
use vortex_array::ArrayRef;
2323

2424
use crate::IdempotentPath;
2525
use crate::datasets::Dataset;

vortex-bench/src/datasets/taxi_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ use anyhow::Result;
77
use async_trait::async_trait;
88
use tokio::fs::File as TokioFile;
99
use tokio::io::AsyncWriteExt;
10+
use vortex::array::ArrayRef;
1011
use vortex::array::IntoArray;
1112
use vortex::array::stream::ArrayStreamExt;
1213
use vortex::file::OpenOptionsSessionExt;
1314
use vortex::file::WriteOptionsSessionExt;
14-
use vortex_array::ArrayRef;
1515

1616
use crate::CompactionStrategy;
1717
use crate::Format;

vortex-bench/src/datasets/tpch_l_comment.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ use anyhow::Result;
77
use async_trait::async_trait;
88
use futures::TryStreamExt;
99
use glob::glob;
10+
use vortex::array::ArrayRef;
1011
use vortex::array::IntoArray;
1112
use vortex::array::ToCanonical;
1213
use vortex::array::arrays::ChunkedArray;
1314
use vortex::dtype::Nullability::NonNullable;
1415
use vortex::expr::col;
1516
use vortex::expr::pack;
1617
use vortex::file::OpenOptionsSessionExt;
17-
use vortex_array::ArrayRef;
1818

1919
use crate::Format;
2020
use crate::IdempotentPath;

vortex-bench/src/downloadable_dataset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
use async_trait::async_trait;
55
use tokio::fs::File;
6+
use vortex::array::ArrayRef;
67
use vortex::array::IntoArray;
78
use vortex::array::stream::ArrayStreamExt;
89
use vortex::file::OpenOptionsSessionExt;
910
use vortex::file::WriteOptionsSessionExt;
10-
use vortex_array::ArrayRef;
1111

1212
use crate::IdempotentPath;
1313
use crate::SESSION;

vortex-bench/src/public_bi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ use tokio::process::Command as TokioCommand;
2525
use tracing::info;
2626
use tracing::trace;
2727
use url::Url;
28+
use vortex::array::ArrayRef;
2829
use vortex::array::IntoArray;
2930
use vortex::array::stream::ArrayStreamExt;
3031
use vortex::error::VortexResult;
3132
use vortex::error::vortex_err;
3233
use vortex::file::OpenOptionsSessionExt;
3334
use vortex::file::WriteOptionsSessionExt;
3435
use vortex::utils::aliases::hash_map::HashMap;
35-
use vortex_array::ArrayRef;
3636

3737
use crate::Benchmark;
3838
use crate::BenchmarkDataset;

vortex-bench/src/tpch/tpchgen.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ use tpchgen::generators::RegionGenerator;
3131
use tpchgen::generators::SupplierGenerator;
3232
use tpchgen_arrow::RecordBatchIterator;
3333
use tracing::info;
34+
use vortex::array::ArrayRef;
3435
use vortex::array::arrow::FromArrowArray;
3536
use vortex::array::stream::ArrayStreamAdapter;
3637
use vortex::dtype::DType;
3738
use vortex::dtype::arrow::FromArrowType;
3839
use vortex::error::VortexExpect;
3940
use vortex::file::WriteOptionsSessionExt;
40-
use vortex_array::ArrayRef;
4141

4242
use crate::CompactionStrategy;
4343
use crate::Format;

vortex-cuda/benches/transpose_patches.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ use criterion::Criterion;
1111
use criterion::Throughput;
1212
use futures::executor::block_on;
1313
use vortex::array::IntoArray;
14+
use vortex::array::arrays::PrimitiveArray;
15+
use vortex::array::dtype::PType;
16+
use vortex::array::patches::Patches;
1417
use vortex::buffer::Buffer;
1518
use vortex::buffer::buffer;
1619
use vortex::session::VortexSession;
17-
use vortex_array::arrays::PrimitiveArray;
18-
use vortex_array::dtype::PType;
19-
use vortex_array::patches::Patches;
2020
use vortex_array::validity::Validity;
2121
use vortex_cuda::CudaSession;
2222
use vortex_cuda::transpose_patches;

0 commit comments

Comments
 (0)