bug fix

parquet/src/arrow/array_reader/byte_view_array.rs

@@ -33,9 +33,6 @@ use arrow_data::ByteView;
 use arrow_schema::DataType as ArrowType;
 use bytes::Bytes;
 use std::any::Any;
-// use std::collections::hash_map::Entry;
-// use std::collections::HashMap;
-use std::sync::Arc;
 
 /// Returns an [`ArrayReader`] that decodes the provided byte array column to view types.
 pub fn make_byte_view_array_reader(
@@ -130,14 +127,11 @@ impl ArrayReader for ByteViewArrayReader {
 
 /// A [`ColumnValueDecoder`] for variable length byte arrays
 struct ByteViewArrayColumnValueDecoder {
-    dict: Option<Arc<ViewBuffer>>,
+    dict: Option<ViewBuffer>,
     decoder: Option<ByteViewArrayDecoder>,
     validate_utf8: bool,
 }
 
-// pub(crate) static DICT_CACHE: LazyLock<Mutex<HashMap<usize, Arc<ViewBuffer>>>> =
-//     LazyLock::new(|| Mutex::new(HashMap::new()));
-
 impl ColumnValueDecoder for ByteViewArrayColumnValueDecoder {
     type Buffer = ViewBuffer;
 
@@ -150,7 +144,6 @@ impl ColumnValueDecoder for ByteViewArrayColumnValueDecoder {
         }
     }
 
-    #[inline(never)]
     fn set_dict(
         &mut self,
         buf: Bytes,
@@ -177,38 +170,11 @@ impl ColumnValueDecoder for ByteViewArrayColumnValueDecoder {
         );
         decoder.read(&mut buffer, usize::MAX)?;
 
-        let dict = Arc::new(buffer);
-        self.dict = Some(dict);
-
-        // let buf_id = buf.as_ptr() as usize;
-
-        // let mut cache = DICT_CACHE.lock().unwrap();
-
-        // match cache.entry(buf_id) {
-        //     Entry::Vacant(v) => {
-        //         let mut buffer = ViewBuffer::with_capacity(num_values as usize, 1);
-        //         let mut decoder = ByteViewArrayDecoderPlain::new(
-        //             buf,
-        //             num_values as usize,
-        //             Some(num_values as usize),
-        //             self.validate_utf8,
-        //         );
-        //         decoder.read(&mut buffer, usize::MAX)?;
-
-        //         let dict = Arc::new(buffer);
-        //         v.insert(dict.clone());
-        //         self.dict = Some(dict);
-        //     }
-        //     Entry::Occupied(e) => {
-        //         // Remove and take ownership of the existing dictionary
-        //         self.dict = Some(e.remove());
-        //         // self.dict = Some(e.get().clone());
-        //     }
-        // }
+        self.dict = Some(buffer);
+
         Ok(())
     }
 
-    #[inline(never)]
     fn set_data(
         &mut self,
         encoding: Encoding,
@@ -226,24 +192,22 @@ impl ColumnValueDecoder for ByteViewArrayColumnValueDecoder {
         Ok(())
     }
 
-    #[inline(never)]
     fn read(&mut self, out: &mut Self::Buffer, num_values: usize) -> Result<usize> {
         let decoder = self
             .decoder
             .as_mut()
             .ok_or_else(|| general_err!("no decoder set"))?;
 
-        decoder.read(out, num_values, self.dict.as_ref().map(|b| b.as_ref()))
+        decoder.read(out, num_values, self.dict.as_ref())
     }
 
-    #[inline(never)]
     fn skip_values(&mut self, num_values: usize) -> Result<usize> {
         let decoder = self
             .decoder
             .as_mut()
             .ok_or_else(|| general_err!("no decoder set"))?;
 
-        decoder.skip(num_values, self.dict.as_ref().map(|b| b.as_ref()))
+        decoder.skip(num_values, self.dict.as_ref())
     }
 }
 
@@ -293,7 +257,6 @@ impl ByteViewArrayDecoder {
     }
 
     /// Read up to `len` values to `out` with the optional dictionary
-    #[inline(never)]
     pub fn read(
         &mut self,
         out: &mut ViewBuffer,
@@ -357,11 +320,11 @@ impl ByteViewArrayDecoderPlain {
         }
     }
 
-    #[inline(never)]
     pub fn read(&mut self, output: &mut ViewBuffer, len: usize) -> Result<usize> {
+        // let block_id = output.append_block(self.buf.clone());
         let need_to_create_new_buffer = {
             if let Some(last_buffer) = output.buffers.last() {
-                last_buffer.ptr_eq(&self.buf)
+                !last_buffer.ptr_eq(&self.buf)
             } else {
                 true
             }
@@ -485,7 +448,6 @@ impl ByteViewArrayDecoderDictionary {
     /// Assumptions / Optimization
     /// This function checks if dict.buffers() are the last buffers in `output`, and if so
     /// reuses the dictionary page buffers directly without copying data
-    #[inline(never)]
     fn read(&mut self, output: &mut ViewBuffer, dict: &ViewBuffer, len: usize) -> Result<usize> {
         if dict.is_empty() || len == 0 {
             return Ok(0);