Skip to content

Commit b2b71f6

Browse files
authored
one default array registry (#2701)
1 parent eb3ee2f commit b2b71f6

File tree

8 files changed

+15
-16
lines changed

8 files changed

+15
-16
lines changed

bench-vortex/src/clickbench.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ use vortex::TryIntoArray;
2020
use vortex::dtype::DType;
2121
use vortex::dtype::arrow::FromArrowType;
2222
use vortex::error::{VortexError, vortex_err};
23-
use vortex::file::{DEFAULT_REGISTRY, VORTEX_FILE_EXTENSION, VortexWriteOptions};
24-
use vortex::layout::{LayoutRegistry, LayoutRegistryExt};
23+
use vortex::file::{VORTEX_FILE_EXTENSION, VortexWriteOptions};
2524
use vortex::stream::ArrayStreamAdapter;
2625
use vortex_datafusion::persistent::VortexFormat;
2726

@@ -222,10 +221,7 @@ pub async fn register_vortex_files(
222221
.try_collect::<Vec<_>>()
223222
.await?;
224223

225-
let format = Arc::new(VortexFormat::new(
226-
DEFAULT_REGISTRY.clone(),
227-
Arc::new(LayoutRegistry::default()),
228-
));
224+
let format = Arc::new(VortexFormat::default());
229225
let table_path = vortex_dir
230226
.to_str()
231227
.ok_or_else(|| vortex_err!("Path is not valid UTF-8"))?;

pyvortex/src/registry.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub(crate) struct PyRegistry {
4545
impl PyRegistry {
4646
#[new]
4747
fn new() -> Self {
48-
let mut array = ArrayRegistry::default();
48+
let mut array = ArrayRegistry::canonical_only();
4949
array.register_many(DEFAULT_REGISTRY.vtables().cloned());
5050
let layout = LayoutRegistry::default();
5151
Self {

vortex-array/src/context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ use crate::vtable::VTableRef;
1717
pub type ArrayContext = VTableContext<VTableRef>;
1818
pub type ArrayRegistry = VTableRegistry<VTableRef>;
1919

20-
impl Default for ArrayRegistry {
21-
fn default() -> Self {
20+
impl ArrayRegistry {
21+
pub fn canonical_only() -> Self {
2222
let mut this = Self::empty();
2323

2424
// Register the canonical encodings

vortex-datafusion/src/persistent/format.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ impl FileFormatFactory for VortexFormatFactory {
118118
impl Default for VortexFormat {
119119
fn default() -> Self {
120120
Self::new(
121-
Arc::new(ArrayRegistry::default()),
121+
DEFAULT_REGISTRY.clone(),
122122
Arc::new(LayoutRegistry::default()),
123123
)
124124
}

vortex-file/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ mod forever_constant {
159159
/// A default registry containing the built-in Vortex encodings and layouts.
160160
pub static DEFAULT_REGISTRY: LazyLock<Arc<ArrayRegistry>> = LazyLock::new(|| {
161161
// Register the compressed encodings that Vortex ships with.
162-
let mut registry = ArrayRegistry::default();
162+
let mut registry = ArrayRegistry::canonical_only();
163163
registry.register_many([
164164
ALPEncoding.vtable(),
165165
ALPRDEncoding.vtable(),

vortex-ipc/src/iterator.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@ mod test {
166166
.collect_to_buffer()
167167
.unwrap();
168168

169-
let reader = SyncIPCReader::try_new(Cursor::new(ipc_buffer), Default::default()).unwrap();
169+
let reader =
170+
SyncIPCReader::try_new(Cursor::new(ipc_buffer), ArrayRegistry::canonical_only())
171+
.unwrap();
170172

171173
assert_eq!(reader.dtype(), array.dtype());
172174
let result = reader.read_all().unwrap().to_primitive().unwrap();

vortex-ipc/src/messages/decoder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ mod test {
168168
ipc_bytes.extend_from_slice(buf.as_ref());
169169
}
170170

171-
let mut decoder = MessageDecoder::new(ArrayRegistry::default());
171+
let mut decoder = MessageDecoder::new(ArrayRegistry::canonical_only());
172172

173173
// Since we provide all bytes up-front, we should never hit a NeedMore.
174174
let mut buffer = BytesMut::from(ipc_bytes.as_ref());

vortex-ipc/src/stream.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,10 @@ mod test {
201201
.await
202202
.unwrap();
203203

204-
let reader = AsyncIPCReader::try_new(Cursor::new(ipc_buffer), Default::default())
205-
.await
206-
.unwrap();
204+
let reader =
205+
AsyncIPCReader::try_new(Cursor::new(ipc_buffer), ArrayRegistry::canonical_only())
206+
.await
207+
.unwrap();
207208

208209
assert_eq!(reader.dtype(), array.dtype());
209210
let result = reader.read_all().await.unwrap().to_primitive().unwrap();

0 commit comments

Comments
 (0)