Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Don't zero memory when reading a buffer #208

Merged
merged 1 commit into from
Apr 5, 2024
Merged

Fix: Don't zero memory when reading a buffer #208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions vortex-array/src/serde/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
use std::io;
use std::io::{Cursor, ErrorKind, Read, Write};

use arrow_buffer::buffer::{Buffer, MutableBuffer};
use arrow_buffer::buffer::Buffer;
use arrow_buffer::BooleanBuffer;
use flatbuffers::root;
use itertools::Itertools;
pub use view::*;
use vortex_error::{vortex_err, VortexResult};
use vortex_flatbuffers::{FlatBufferToBytes, ReadFlatBuffer};
use vortex_schema::DTypeSerdeContext;
use vortex_schema::{DType, IntWidth, Nullability, Signedness};

use crate::array::bool::BoolArray;
use crate::array::composite::COMPOSITE_EXTENSIONS;
use crate::array::{Array, ArrayRef};
use crate::compute::ArrayCompute;
use crate::encoding::{find_encoding, EncodingId, ENCODINGS};
use crate::ptype::PType;
use crate::scalar::{Scalar, ScalarReader, ScalarWriter};
Expand All @@ -22,12 +26,6 @@ pub mod data;
mod ptype;
pub mod view;

pub use view::*;
use vortex_flatbuffers::{FlatBufferToBytes, ReadFlatBuffer};

use crate::array::bool::BoolArray;
use crate::compute::ArrayCompute;

pub trait ArraySerde {
fn write(&self, ctx: &mut WriteCtx) -> VortexResult<()>;

Expand Down Expand Up @@ -187,9 +185,9 @@ impl<'a> ReadCtx<'a> {
) -> VortexResult<(usize, Buffer)> {
let logical_len = self.read_usize()?;
let buffer_len = byte_len(logical_len);
let mut buffer = MutableBuffer::from_len_zeroed(buffer_len);
self.r.read_exact(&mut buffer)?;
Ok((logical_len, buffer.into()))
let mut buf = Vec::with_capacity(buffer_len);
self.r.take(buffer_len as u64).read_to_end(&mut buf)?;
Ok((logical_len, Buffer::from_vec(buf)))
}

pub fn read_nbytes<const N: usize>(&mut self) -> VortexResult<[u8; N]> {
Expand Down