less

Signed-off-by: Robert Kruszewski <github@robertk.io>

Author: robert3005

vortex-array/src/builders/dict/bytes.rs

@@ -135,7 +135,7 @@ impl<Code: UnsignedPType> BytesDictBuilder<Code> {
         &mut self,
         var_bin: ArrayView<VarBin>,
         ctx: &mut ExecutionCtx,
-    ) -> VortexResult<ArrayRef> {
+    ) -> VortexResult<PrimitiveArray> {
         let mut local_lookup = self.lookup.take().vortex_expect("Must have a lookup dict");
         let mut codes: BufferMut<Code> = BufferMut::with_capacity(var_bin.len());
 
@@ -205,14 +205,14 @@ impl<Code: UnsignedPType> BytesDictBuilder<Code> {
         // Restore lookup dictionary back into the struct
         self.lookup = Some(local_lookup);
 
-        Ok(PrimitiveArray::new(codes, Validity::NonNullable).into_array())
+        Ok(PrimitiveArray::new(codes, Validity::NonNullable))
     }
 
     fn encode_varbinview(
         &mut self,
         var_bin_view: ArrayView<VarBinView>,
         ctx: &mut ExecutionCtx,
-    ) -> VortexResult<ArrayRef> {
+    ) -> VortexResult<PrimitiveArray> {
         let mut local_lookup = self.lookup.take().vortex_expect("Must have a lookup dict");
         let mut codes: BufferMut<Code> = BufferMut::with_capacity(var_bin_view.len());
 
@@ -286,12 +286,12 @@ impl<Code: UnsignedPType> BytesDictBuilder<Code> {
         // Restore lookup dictionary back into the struct
         self.lookup = Some(local_lookup);
 
-        Ok(PrimitiveArray::new(codes, Validity::NonNullable).into_array())
+        Ok(PrimitiveArray::new(codes, Validity::NonNullable))
     }
 }
 
 impl<Code: UnsignedPType> DictEncoder for BytesDictBuilder<Code> {
-    fn encode(&mut self, array: &ArrayRef, ctx: &mut ExecutionCtx) -> VortexResult<ArrayRef> {
+    fn encode(&mut self, array: &ArrayRef, ctx: &mut ExecutionCtx) -> VortexResult<PrimitiveArray> {
         debug_assert_eq!(
             &self.dtype,
             array.dtype(),

vortex-array/src/builders/dict/mod.rs

@@ -35,7 +35,7 @@ pub const UNCONSTRAINED: DictConstraints = DictConstraints {
 
 pub trait DictEncoder: Send {
     /// Assign dictionary codes to the given input array.
-    fn encode(&mut self, array: &ArrayRef, ctx: &mut ExecutionCtx) -> VortexResult<ArrayRef>;
+    fn encode(&mut self, array: &ArrayRef, ctx: &mut ExecutionCtx) -> VortexResult<PrimitiveArray>;
 
     /// Clear the encoder state to make it ready for a new round of decoding.
     fn reset(&mut self) -> ArrayRef;
@@ -68,8 +68,7 @@ pub fn dict_encode_with_constraints(
     ctx: &mut ExecutionCtx,
 ) -> VortexResult<DictArray> {
     let mut encoder = dict_encoder(array, constraints);
-    let encoded = encoder.encode(array, ctx)?;
-    let codes = encoded.execute::<PrimitiveArray>(ctx)?.narrow()?;
+    let codes = encoder.encode(array, ctx)?.narrow()?;
     // SAFETY: The encoding process will produce a value set of codes and values
     // All values in the dictionary are guaranteed to be referenced by at least one code
     // since we build the dictionary from the codes we observe during encoding

vortex-array/src/builders/dict/primitive.rs

@@ -118,7 +118,7 @@ where
     NativeValue<T>: Hash + Eq,
     Code: UnsignedPType,
 {
-    fn encode(&mut self, array: &ArrayRef, ctx: &mut ExecutionCtx) -> VortexResult<ArrayRef> {
+    fn encode(&mut self, array: &ArrayRef, ctx: &mut ExecutionCtx) -> VortexResult<PrimitiveArray> {
         let mut codes = BufferMut::<Code>::with_capacity(array.len());
 
         let prim = array.clone().execute::<PrimitiveArray>(ctx)?;
@@ -167,7 +167,7 @@ where
             }
         }
 
-        Ok(PrimitiveArray::new(codes, Validity::NonNullable).into_array())
+        Ok(PrimitiveArray::new(codes, Validity::NonNullable))
     }
 
     fn reset(&mut self) -> ArrayRef {

vortex-layout/src/layouts/dict/writer.rs

@@ -20,6 +20,7 @@ use futures::stream::once;
 use futures::try_join;
 use vortex_array::ArrayContext;
 use vortex_array::ArrayRef;
+use vortex_array::IntoArray;
 use vortex_array::LEGACY_SESSION;
 use vortex_array::VortexSessionExecute;
 use vortex_array::arrays::Dict;
@@ -558,7 +559,9 @@ fn encode_chunk(
     mut encoder: Box<dyn DictEncoder>,
     chunk: &ArrayRef,
 ) -> VortexResult<EncodingState> {
-    let encoded = encoder.encode(chunk, &mut LEGACY_SESSION.create_execution_ctx())?;
+    let encoded = encoder
+        .encode(chunk, &mut LEGACY_SESSION.create_execution_ctx())?
+        .into_array();
     match remainder(chunk, encoded.len())? {
         None => Ok(EncodingState::Continue((encoder, encoded))),
         Some(unencoded) => Ok(EncodingState::Done((encoder.reset(), encoded, unencoded))),