Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions arrow-buffer/src/buffer/mutable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,13 @@ impl MutableBuffer {

/// Clear all existing data from this buffer.
pub fn clear(&mut self) {
self.len = 0
self.len = 0;
#[cfg(feature = "pool")]
{
if let Some(reservation) = self.reservation.lock().unwrap().as_mut() {
reservation.resize(self.len);
}
}
}

/// Returns the data stored in this buffer as a slice.
Expand Down Expand Up @@ -1371,7 +1377,7 @@ mod tests {
assert_eq!(pool.used(), 40);

// Truncate to zero
buffer.truncate(0);
buffer.clear();
assert_eq!(buffer.len(), 0);
assert_eq!(pool.used(), 0);
}
Expand Down
2 changes: 1 addition & 1 deletion arrow-json/src/reader/value_iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ impl<R: BufRead> Iterator for ValueIter<R> {
}

loop {
self.line_buf.truncate(0);
self.line_buf.clear();
match self.reader.read_line(&mut self.line_buf) {
Ok(0) => {
// read_line returns 0 when stream reached EOF
Expand Down
4 changes: 2 additions & 2 deletions parquet/tests/geospatial.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,8 @@ mod test {

for i in 0..reader.num_row_groups() {
let row_group = reader.get_row_group(i).unwrap();
values.truncate(0);
def_levels.truncate(0);
values.clear();
def_levels.clear();

let mut row_group_out = writer.next_row_group().unwrap();

Expand Down
Loading