From 89580d42694c5b95c23bb82c3e2d192b4d188466 Mon Sep 17 00:00:00 2001 From: jiaqizho Date: Tue, 17 Mar 2026 10:31:08 +0800 Subject: [PATCH] Extract pub const NAME for all array encoding structs Add a `pub const NAME: &str` to every array encoding struct and derive `pub const ID: ArrayId` from `Self::NAME` instead of an inline string literal. This eliminates duplicated encoding name strings and gives external code a stable constant to reference when matching on encoding IDs. Signed-off-by: jiaqizho --- encodings/alp/src/alp/array.rs | 3 ++- encodings/alp/src/alp_rd/array.rs | 3 ++- encodings/bytebool/src/array.rs | 3 ++- encodings/datetime-parts/src/array.rs | 3 ++- encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs | 3 ++- encodings/fastlanes/src/bitpacking/vtable/mod.rs | 3 ++- encodings/fastlanes/src/delta/vtable/mod.rs | 3 ++- encodings/fastlanes/src/for/vtable/mod.rs | 3 ++- encodings/fastlanes/src/rle/vtable/mod.rs | 3 ++- encodings/fsst/src/array.rs | 3 ++- encodings/pco/src/array.rs | 3 ++- encodings/runend/src/array.rs | 3 ++- encodings/sequence/src/array.rs | 3 ++- encodings/sparse/src/lib.rs | 3 ++- encodings/zigzag/src/array.rs | 3 ++- encodings/zigzag/src/compute/cast.rs | 7 ++++--- encodings/zstd/src/array.rs | 3 ++- encodings/zstd/src/zstd_buffers.rs | 3 ++- vortex-array/src/arrays/bool/vtable/mod.rs | 3 ++- vortex-array/src/arrays/chunked/vtable/mod.rs | 3 ++- vortex-array/src/arrays/constant/vtable/mod.rs | 3 ++- vortex-array/src/arrays/decimal/vtable/mod.rs | 3 ++- vortex-array/src/arrays/dict/vtable/mod.rs | 3 ++- vortex-array/src/arrays/extension/vtable/mod.rs | 3 ++- vortex-array/src/arrays/filter/vtable.rs | 3 ++- vortex-array/src/arrays/fixed_size_list/vtable/mod.rs | 3 ++- vortex-array/src/arrays/list/vtable/mod.rs | 3 ++- vortex-array/src/arrays/listview/vtable/mod.rs | 3 ++- vortex-array/src/arrays/masked/vtable/mod.rs | 3 ++- vortex-array/src/arrays/null/mod.rs | 3 ++- vortex-array/src/arrays/primitive/vtable/mod.rs | 3 ++- vortex-array/src/arrays/shared/vtable.rs | 3 ++- vortex-array/src/arrays/slice/vtable.rs | 3 ++- vortex-array/src/arrays/struct_/vtable/mod.rs | 3 ++- vortex-array/src/arrays/varbin/vtable/mod.rs | 3 ++- vortex-array/src/arrays/varbinview/vtable/mod.rs | 3 ++- 36 files changed, 74 insertions(+), 38 deletions(-) diff --git a/encodings/alp/src/alp/array.rs b/encodings/alp/src/alp/array.rs index 965c1622ca8..ba9d9a3e367 100644 --- a/encodings/alp/src/alp/array.rs +++ b/encodings/alp/src/alp/array.rs @@ -273,7 +273,8 @@ pub struct ALPArray { pub struct ALP; impl ALP { - pub const ID: ArrayId = ArrayId::new_ref("vortex.alp"); + pub const NAME: &str = "vortex.alp"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } #[derive(Clone, prost::Message)] diff --git a/encodings/alp/src/alp_rd/array.rs b/encodings/alp/src/alp_rd/array.rs index df72cc189d3..7ab5468dc30 100644 --- a/encodings/alp/src/alp_rd/array.rs +++ b/encodings/alp/src/alp_rd/array.rs @@ -371,7 +371,8 @@ pub struct ALPRDArray { pub struct ALPRD; impl ALPRD { - pub const ID: ArrayId = ArrayId::new_ref("vortex.alprd"); + pub const NAME: &str = "vortex.alprd"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl ALPRDArray { diff --git a/encodings/bytebool/src/array.rs b/encodings/bytebool/src/array.rs index 4b6a0e7cb58..414e27a3d98 100644 --- a/encodings/bytebool/src/array.rs +++ b/encodings/bytebool/src/array.rs @@ -213,7 +213,8 @@ pub struct ByteBoolArray { pub struct ByteBool; impl ByteBool { - pub const ID: ArrayId = ArrayId::new_ref("vortex.bytebool"); + pub const NAME: &str = "vortex.bytebool"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl ByteBoolArray { diff --git a/encodings/datetime-parts/src/array.rs b/encodings/datetime-parts/src/array.rs index b50ff8db0a5..6142a7ab5f7 100644 --- a/encodings/datetime-parts/src/array.rs +++ b/encodings/datetime-parts/src/array.rs @@ -267,7 +267,8 @@ pub struct DateTimePartsArrayParts { pub struct DateTimeParts; impl DateTimeParts { - pub const ID: ArrayId = ArrayId::new_ref("vortex.datetimeparts"); + pub const NAME: &str = "vortex.datetimeparts"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl DateTimePartsArray { diff --git a/encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs b/encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs index b60f6516259..d30712d7b69 100644 --- a/encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs +++ b/encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs @@ -274,7 +274,8 @@ impl DecimalBytePartsArray { pub struct DecimalByteParts; impl DecimalByteParts { - pub const ID: ArrayId = ArrayId::new_ref("vortex.decimal_byte_parts"); + pub const NAME: &str = "vortex.decimal_byte_parts"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } /// Converts a DecimalBytePartsArray to its canonical DecimalArray representation. diff --git a/encodings/fastlanes/src/bitpacking/vtable/mod.rs b/encodings/fastlanes/src/bitpacking/vtable/mod.rs index c414dfa5cc0..edf273a5198 100644 --- a/encodings/fastlanes/src/bitpacking/vtable/mod.rs +++ b/encodings/fastlanes/src/bitpacking/vtable/mod.rs @@ -372,5 +372,6 @@ impl VTable for BitPacked { pub struct BitPacked; impl BitPacked { - pub const ID: ArrayId = ArrayId::new_ref("fastlanes.bitpacked"); + pub const NAME: &str = "fastlanes.bitpacked"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } diff --git a/encodings/fastlanes/src/delta/vtable/mod.rs b/encodings/fastlanes/src/delta/vtable/mod.rs index 9ebbaebe729..4cfce3837ba 100644 --- a/encodings/fastlanes/src/delta/vtable/mod.rs +++ b/encodings/fastlanes/src/delta/vtable/mod.rs @@ -201,7 +201,8 @@ impl VTable for Delta { pub struct Delta; impl Delta { - pub const ID: ArrayId = ArrayId::new_ref("fastlanes.delta"); + pub const NAME: &str = "fastlanes.delta"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } #[cfg(test)] diff --git a/encodings/fastlanes/src/for/vtable/mod.rs b/encodings/fastlanes/src/for/vtable/mod.rs index 5eb73711ae4..55f2ddc99ed 100644 --- a/encodings/fastlanes/src/for/vtable/mod.rs +++ b/encodings/fastlanes/src/for/vtable/mod.rs @@ -184,5 +184,6 @@ impl VTable for FoR { pub struct FoR; impl FoR { - pub const ID: ArrayId = ArrayId::new_ref("fastlanes.for"); + pub const NAME: &str = "fastlanes.for"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } diff --git a/encodings/fastlanes/src/rle/vtable/mod.rs b/encodings/fastlanes/src/rle/vtable/mod.rs index 0df4126cbf5..1dc57253d1f 100644 --- a/encodings/fastlanes/src/rle/vtable/mod.rs +++ b/encodings/fastlanes/src/rle/vtable/mod.rs @@ -242,7 +242,8 @@ impl VTable for RLE { pub struct RLE; impl RLE { - pub const ID: ArrayId = ArrayId::new_ref("fastlanes.rle"); + pub const NAME: &str = "fastlanes.rle"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } #[cfg(test)] diff --git a/encodings/fsst/src/array.rs b/encodings/fsst/src/array.rs index 9228b34085c..a7cf1ce1ecc 100644 --- a/encodings/fsst/src/array.rs +++ b/encodings/fsst/src/array.rs @@ -393,7 +393,8 @@ impl Debug for FSSTArray { pub struct FSST; impl FSST { - pub const ID: ArrayId = ArrayId::new_ref("vortex.fsst"); + pub const NAME: &str = "vortex.fsst"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl FSSTArray { diff --git a/encodings/pco/src/array.rs b/encodings/pco/src/array.rs index 85ba2bbe6cb..4a6eeea725e 100644 --- a/encodings/pco/src/array.rs +++ b/encodings/pco/src/array.rs @@ -312,7 +312,8 @@ pub(crate) fn vortex_err_from_pco(err: PcoError) -> VortexError { pub struct Pco; impl Pco { - pub const ID: ArrayId = ArrayId::new_ref("vortex.pco"); + pub const NAME: &str = "vortex.pco"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } #[derive(Clone, Debug)] diff --git a/encodings/runend/src/array.rs b/encodings/runend/src/array.rs index 6dd3fdc521d..e500ddf1cb1 100644 --- a/encodings/runend/src/array.rs +++ b/encodings/runend/src/array.rs @@ -226,7 +226,8 @@ pub struct RunEndArrayParts { pub struct RunEnd; impl RunEnd { - pub const ID: ArrayId = ArrayId::new_ref("vortex.runend"); + pub const NAME: &str = "vortex.runend"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl RunEndArray { diff --git a/encodings/sequence/src/array.rs b/encodings/sequence/src/array.rs index ea716ced1ea..ec9486ad208 100644 --- a/encodings/sequence/src/array.rs +++ b/encodings/sequence/src/array.rs @@ -422,7 +422,8 @@ impl ValidityVTable for Sequence { pub struct Sequence; impl Sequence { - pub const ID: ArrayId = ArrayId::new_ref("vortex.sequence"); + pub const NAME: &str = "vortex.sequence"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } #[cfg(test)] diff --git a/encodings/sparse/src/lib.rs b/encodings/sparse/src/lib.rs index 4b59797eca1..085f0e0018d 100644 --- a/encodings/sparse/src/lib.rs +++ b/encodings/sparse/src/lib.rs @@ -272,7 +272,8 @@ pub struct SparseArray { pub struct Sparse; impl Sparse { - pub const ID: ArrayId = ArrayId::new_ref("vortex.sparse"); + pub const NAME: &str = "vortex.sparse"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl SparseArray { diff --git a/encodings/zigzag/src/array.rs b/encodings/zigzag/src/array.rs index f0b7898b26c..65a738aec06 100644 --- a/encodings/zigzag/src/array.rs +++ b/encodings/zigzag/src/array.rs @@ -184,7 +184,8 @@ pub struct ZigZagArray { pub struct ZigZag; impl ZigZag { - pub const ID: ArrayId = ArrayId::new_ref("vortex.zigzag"); + pub const NAME: &str = "vortex.zigzag"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl ZigZagArray { diff --git a/encodings/zigzag/src/compute/cast.rs b/encodings/zigzag/src/compute/cast.rs index 74a8c4a5442..192b0542fee 100644 --- a/encodings/zigzag/src/compute/cast.rs +++ b/encodings/zigzag/src/compute/cast.rs @@ -37,6 +37,7 @@ mod tests { use vortex_array::dtype::Nullability; use vortex_array::dtype::PType; + use crate::ZigZag; use crate::ZigZagArray; use crate::zigzag_encode; @@ -58,7 +59,7 @@ mod tests { // Note: The result might be wrapped, so let's check the encoding ID assert_eq!( casted.encoding_id().as_ref(), - "vortex.zigzag", + ZigZag::NAME, "Cast should preserve ZigZag encoding" ); @@ -77,7 +78,7 @@ mod tests { .unwrap(); assert_eq!( casted.encoding_id().as_ref(), - "vortex.zigzag", + ZigZag::NAME, "Should remain ZigZag encoded" ); @@ -96,7 +97,7 @@ mod tests { .unwrap(); assert_eq!( casted64.encoding_id().as_ref(), - "vortex.zigzag", + ZigZag::NAME, "Should remain ZigZag encoded" ); diff --git a/encodings/zstd/src/array.rs b/encodings/zstd/src/array.rs index 9c2e133d50d..cdf3883b733 100644 --- a/encodings/zstd/src/array.rs +++ b/encodings/zstd/src/array.rs @@ -294,7 +294,8 @@ impl VTable for Zstd { pub struct Zstd; impl Zstd { - pub const ID: ArrayId = ArrayId::new_ref("vortex.zstd"); + pub const NAME: &str = "vortex.zstd"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } #[derive(Clone, Debug)] diff --git a/encodings/zstd/src/zstd_buffers.rs b/encodings/zstd/src/zstd_buffers.rs index c33403f2d64..dc5442db110 100644 --- a/encodings/zstd/src/zstd_buffers.rs +++ b/encodings/zstd/src/zstd_buffers.rs @@ -41,7 +41,8 @@ vtable!(ZstdBuffers); pub struct ZstdBuffers; impl ZstdBuffers { - pub const ID: ArrayId = ArrayId::new_ref("vortex.zstd_buffers"); + pub const NAME: &str = "vortex.zstd_buffers"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } /// An encoding that ZSTD-compresses the buffers of any wrapped array. diff --git a/vortex-array/src/arrays/bool/vtable/mod.rs b/vortex-array/src/arrays/bool/vtable/mod.rs index d439ecf0e78..40e7f582fd9 100644 --- a/vortex-array/src/arrays/bool/vtable/mod.rs +++ b/vortex-array/src/arrays/bool/vtable/mod.rs @@ -211,5 +211,6 @@ impl VTable for Bool { pub struct Bool; impl Bool { - pub const ID: ArrayId = ArrayId::new_ref("vortex.bool"); + pub const NAME: &str = "vortex.bool"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } diff --git a/vortex-array/src/arrays/chunked/vtable/mod.rs b/vortex-array/src/arrays/chunked/vtable/mod.rs index 49dd7f9f6d7..6356cf3e5d7 100644 --- a/vortex-array/src/arrays/chunked/vtable/mod.rs +++ b/vortex-array/src/arrays/chunked/vtable/mod.rs @@ -46,7 +46,8 @@ vtable!(Chunked); pub struct Chunked; impl Chunked { - pub const ID: ArrayId = ArrayId::new_ref("vortex.chunked"); + pub const NAME: &str = "vortex.chunked"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl VTable for Chunked { diff --git a/vortex-array/src/arrays/constant/vtable/mod.rs b/vortex-array/src/arrays/constant/vtable/mod.rs index d35b874193b..51f336cdf68 100644 --- a/vortex-array/src/arrays/constant/vtable/mod.rs +++ b/vortex-array/src/arrays/constant/vtable/mod.rs @@ -48,7 +48,8 @@ vtable!(Constant); pub struct Constant; impl Constant { - pub const ID: ArrayId = ArrayId::new_ref("vortex.constant"); + pub const NAME: &str = "vortex.constant"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl VTable for Constant { diff --git a/vortex-array/src/arrays/decimal/vtable/mod.rs b/vortex-array/src/arrays/decimal/vtable/mod.rs index 37b62240121..10561585dca 100644 --- a/vortex-array/src/arrays/decimal/vtable/mod.rs +++ b/vortex-array/src/arrays/decimal/vtable/mod.rs @@ -233,7 +233,8 @@ impl VTable for Decimal { pub struct Decimal; impl Decimal { - pub const ID: ArrayId = ArrayId::new_ref("vortex.decimal"); + pub const NAME: &str = "vortex.decimal"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } #[cfg(test)] diff --git a/vortex-array/src/arrays/dict/vtable/mod.rs b/vortex-array/src/arrays/dict/vtable/mod.rs index 2903967c230..9e35fd9a80b 100644 --- a/vortex-array/src/arrays/dict/vtable/mod.rs +++ b/vortex-array/src/arrays/dict/vtable/mod.rs @@ -48,7 +48,8 @@ vtable!(Dict); pub struct Dict; impl Dict { - pub const ID: ArrayId = ArrayId::new_ref("vortex.dict"); + pub const NAME: &str = "vortex.dict"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl VTable for Dict { diff --git a/vortex-array/src/arrays/extension/vtable/mod.rs b/vortex-array/src/arrays/extension/vtable/mod.rs index 243a0ef35d8..8305809da94 100644 --- a/vortex-array/src/arrays/extension/vtable/mod.rs +++ b/vortex-array/src/arrays/extension/vtable/mod.rs @@ -179,5 +179,6 @@ impl VTable for Extension { pub struct Extension; impl Extension { - pub const ID: ArrayId = ArrayId::new_ref("vortex.ext"); + pub const NAME: &str = "vortex.ext"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } diff --git a/vortex-array/src/arrays/filter/vtable.rs b/vortex-array/src/arrays/filter/vtable.rs index b7099cb7c97..d2e4f272393 100644 --- a/vortex-array/src/arrays/filter/vtable.rs +++ b/vortex-array/src/arrays/filter/vtable.rs @@ -44,7 +44,8 @@ vtable!(Filter); pub struct Filter; impl Filter { - pub const ID: ArrayId = ArrayId::new_ref("vortex.filter"); + pub const NAME: &str = "vortex.filter"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl VTable for Filter { diff --git a/vortex-array/src/arrays/fixed_size_list/vtable/mod.rs b/vortex-array/src/arrays/fixed_size_list/vtable/mod.rs index d5c6f673671..c9aa3778502 100644 --- a/vortex-array/src/arrays/fixed_size_list/vtable/mod.rs +++ b/vortex-array/src/arrays/fixed_size_list/vtable/mod.rs @@ -40,7 +40,8 @@ vtable!(FixedSizeList); pub struct FixedSizeList; impl FixedSizeList { - pub const ID: ArrayId = ArrayId::new_ref("vortex.fixed_size_list"); + pub const NAME: &str = "vortex.fixed_size_list"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl VTable for FixedSizeList { diff --git a/vortex-array/src/arrays/list/vtable/mod.rs b/vortex-array/src/arrays/list/vtable/mod.rs index 13428f3a46b..58eeedaa35b 100644 --- a/vortex-array/src/arrays/list/vtable/mod.rs +++ b/vortex-array/src/arrays/list/vtable/mod.rs @@ -231,5 +231,6 @@ impl VTable for List { pub struct List; impl List { - pub const ID: ArrayId = ArrayId::new_ref("vortex.list"); + pub const NAME: &str = "vortex.list"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } diff --git a/vortex-array/src/arrays/listview/vtable/mod.rs b/vortex-array/src/arrays/listview/vtable/mod.rs index a31edbb536f..a43e10a4915 100644 --- a/vortex-array/src/arrays/listview/vtable/mod.rs +++ b/vortex-array/src/arrays/listview/vtable/mod.rs @@ -43,7 +43,8 @@ vtable!(ListView); pub struct ListView; impl ListView { - pub const ID: ArrayId = ArrayId::new_ref("vortex.listview"); + pub const NAME: &str = "vortex.listview"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } #[derive(Clone, prost::Message)] diff --git a/vortex-array/src/arrays/masked/vtable/mod.rs b/vortex-array/src/arrays/masked/vtable/mod.rs index 4dbe1670a43..6130a40c929 100644 --- a/vortex-array/src/arrays/masked/vtable/mod.rs +++ b/vortex-array/src/arrays/masked/vtable/mod.rs @@ -44,7 +44,8 @@ vtable!(Masked); pub struct Masked; impl Masked { - pub const ID: ArrayId = ArrayId::new_ref("vortex.masked"); + pub const NAME: &str = "vortex.masked"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl VTable for Masked { diff --git a/vortex-array/src/arrays/null/mod.rs b/vortex-array/src/arrays/null/mod.rs index e2ac02f247c..610fb23e0c9 100644 --- a/vortex-array/src/arrays/null/mod.rs +++ b/vortex-array/src/arrays/null/mod.rs @@ -174,7 +174,8 @@ pub struct NullArray { pub struct Null; impl Null { - pub const ID: ArrayId = ArrayId::new_ref("vortex.null"); + pub const NAME: &str = "vortex.null"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl NullArray { diff --git a/vortex-array/src/arrays/primitive/vtable/mod.rs b/vortex-array/src/arrays/primitive/vtable/mod.rs index c48a72217b1..a1766a22e5d 100644 --- a/vortex-array/src/arrays/primitive/vtable/mod.rs +++ b/vortex-array/src/arrays/primitive/vtable/mod.rs @@ -225,5 +225,6 @@ impl VTable for Primitive { pub struct Primitive; impl Primitive { - pub const ID: ArrayId = ArrayId::new_ref("vortex.primitive"); + pub const NAME: &str = "vortex.primitive"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } diff --git a/vortex-array/src/arrays/shared/vtable.rs b/vortex-array/src/arrays/shared/vtable.rs index 5880ebae568..d0a29d27df9 100644 --- a/vortex-array/src/arrays/shared/vtable.rs +++ b/vortex-array/src/arrays/shared/vtable.rs @@ -36,7 +36,8 @@ vtable!(Shared); pub struct Shared; impl Shared { - pub const ID: ArrayId = ArrayId::new_ref("vortex.shared"); + pub const NAME: &str = "vortex.shared"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl VTable for Shared { diff --git a/vortex-array/src/arrays/slice/vtable.rs b/vortex-array/src/arrays/slice/vtable.rs index 367b5c5560c..8d4e95cf57a 100644 --- a/vortex-array/src/arrays/slice/vtable.rs +++ b/vortex-array/src/arrays/slice/vtable.rs @@ -43,7 +43,8 @@ vtable!(Slice); pub struct Slice; impl Slice { - pub const ID: ArrayId = ArrayId::new_ref("vortex.slice"); + pub const NAME: &str = "vortex.slice"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl VTable for Slice { diff --git a/vortex-array/src/arrays/struct_/vtable/mod.rs b/vortex-array/src/arrays/struct_/vtable/mod.rs index 39df6e8783f..c9b264b2d30 100644 --- a/vortex-array/src/arrays/struct_/vtable/mod.rs +++ b/vortex-array/src/arrays/struct_/vtable/mod.rs @@ -233,5 +233,6 @@ impl VTable for Struct { pub struct Struct; impl Struct { - pub const ID: ArrayId = ArrayId::new_ref("vortex.struct"); + pub const NAME: &str = "vortex.struct"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } diff --git a/vortex-array/src/arrays/varbin/vtable/mod.rs b/vortex-array/src/arrays/varbin/vtable/mod.rs index a366cd6d0c1..e3c61a11373 100644 --- a/vortex-array/src/arrays/varbin/vtable/mod.rs +++ b/vortex-array/src/arrays/varbin/vtable/mod.rs @@ -230,5 +230,6 @@ impl VTable for VarBin { pub struct VarBin; impl VarBin { - pub const ID: ArrayId = ArrayId::new_ref("vortex.varbin"); + pub const NAME: &str = "vortex.varbin"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } diff --git a/vortex-array/src/arrays/varbinview/vtable/mod.rs b/vortex-array/src/arrays/varbinview/vtable/mod.rs index 0c4decaa772..7b1c6186863 100644 --- a/vortex-array/src/arrays/varbinview/vtable/mod.rs +++ b/vortex-array/src/arrays/varbinview/vtable/mod.rs @@ -45,7 +45,8 @@ vtable!(VarBinView); pub struct VarBinView; impl VarBinView { - pub const ID: ArrayId = ArrayId::new_ref("vortex.varbinview"); + pub const NAME: &str = "vortex.varbinview"; + pub const ID: ArrayId = ArrayId::new_ref(Self::NAME); } impl VTable for VarBinView {