Skip to content

Commit 228bf14

Browse files
authored
chore: switch to new arcref crate (#3242)
1 parent 813b966 commit 228bf14

File tree

39 files changed

+47
-160
lines changed

39 files changed

+47
-160
lines changed

Cargo.lock

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ version = "0.32.0"
5454
[workspace.dependencies]
5555
anyhow = "1.0.95"
5656
arbitrary = "1.3.2"
57+
arcref = "0.2.0"
5758
arrayref = "0.3.7"
5859
arrow = { version = "55", default-features = false }
5960
arrow-arith = "55"

pyvortex/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ doctest = false # TODO(ngates): why?
2323
name = "pyvortex"
2424

2525
[dependencies]
26+
arcref = { workspace = true }
2627
arrow = { workspace = true, features = ["pyarrow"] }
2728
futures = { workspace = true }
2829
itertools = { workspace = true }

pyvortex/src/arrays/py/array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use std::sync::Arc;
22

3+
use arcref::ArcRef;
34
use pyo3::exceptions::{PyTypeError, PyValueError};
45
use pyo3::prelude::*;
56
use pyo3::{Bound, FromPyObject, Py, PyAny, PyResult};
6-
use vortex::arcref::ArcRef;
77
use vortex::dtype::DType;
88
use vortex::error::{VortexError, VortexResult};
99
use vortex::mask::Mask;

pyvortex/src/registry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use std::sync::{Arc, RwLock};
22

3+
use arcref::ArcRef;
34
use itertools::Itertools;
45
use pyo3::prelude::*;
56
use pyo3::{Bound, PyResult, Python};
67
use vortex::ArrayRegistry;
7-
use vortex::arcref::ArcRef;
88
use vortex::error::VortexExpect;
99
use vortex::file::DEFAULT_REGISTRY;
1010
use vortex::layout::{LayoutRegistry, LayoutRegistryExt};

vortex-array/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ workspace = true
1818

1919
[dependencies]
2020
arbitrary = { workspace = true, optional = true }
21+
arcref = { workspace = true }
2122
arrow-arith = { workspace = true }
2223
arrow-array = { workspace = true }
2324
arrow-buffer = { workspace = true }

vortex-array/src/arcref.rs

Lines changed: 0 additions & 128 deletions
This file was deleted.

vortex-array/src/arrow/array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use std::fmt::Debug;
22

3+
use arcref::ArcRef;
34
use arrow_array::ArrayRef as ArrowArrayRef;
45
use vortex_dtype::arrow::FromArrowType;
56
use vortex_dtype::{DType, Nullability};
67
use vortex_error::{VortexResult, vortex_bail};
78
use vortex_mask::Mask;
89
use vortex_scalar::Scalar;
910

10-
use crate::arcref::ArcRef;
1111
use crate::stats::StatsSetRef;
1212
use crate::vtable::{ComputeVTable, EncodingVTable, VTableRef};
1313
use crate::{

vortex-array/src/arrow/compute/to_arrow/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ mod varbin;
55
use std::any::Any;
66
use std::sync::LazyLock;
77

8+
use arcref::ArcRef;
89
use arrow_array::ArrayRef as ArrowArrayRef;
910
use arrow_schema::DataType;
1011
use vortex_dtype::DType;
1112
use vortex_dtype::arrow::FromArrowType;
1213
use vortex_error::{VortexError, VortexExpect, VortexResult, vortex_bail, vortex_err};
1314

14-
use crate::arcref::ArcRef;
1515
use crate::arrow::array::ArrowArray;
1616
use crate::compute::{ComputeFn, ComputeFnVTable, InvocationArgs, Kernel, Options, Output};
1717
use crate::{Array, Encoding};

vortex-array/src/compute/between.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use std::any::Any;
22
use std::sync::LazyLock;
33

4+
use arcref::ArcRef;
45
use vortex_dtype::DType;
56
use vortex_error::{VortexError, VortexExpect, VortexResult, vortex_bail, vortex_err};
67
use vortex_scalar::Scalar;
78

8-
use crate::arcref::ArcRef;
99
use crate::arrays::ConstantArray;
1010
use crate::compute::{
1111
BooleanOperator, ComputeFn, ComputeFnVTable, InvocationArgs, Kernel, Operator, Options, Output,

0 commit comments

Comments
 (0)