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

remove len field from MapBuilder #2520

Merged
merged 1 commit into from
Aug 19, 2022
Merged

remove len field from MapBuilder #2520

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
10 changes: 3 additions & 7 deletions arrow/src/array/builder/map_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ pub struct MapBuilder<K: ArrayBuilder, V: ArrayBuilder> {
field_names: MapFieldNames,
key_builder: K,
value_builder: V,
len: i32,
}

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -82,7 +81,6 @@ impl<K: ArrayBuilder, V: ArrayBuilder> MapBuilder<K, V> {
field_names: field_names.unwrap_or_default(),
key_builder,
value_builder,
len,
}
}

Expand All @@ -108,13 +106,11 @@ impl<K: ArrayBuilder, V: ArrayBuilder> MapBuilder<K, V> {
}
self.offsets_builder.append(self.key_builder.len() as i32);
self.null_buffer_builder.append(is_valid);
self.len += 1;
Ok(())
}

pub fn finish(&mut self) -> MapArray {
let len = self.len();
self.len = 0;

// Build the keys
let keys_arr = self
Expand Down Expand Up @@ -146,7 +142,7 @@ impl<K: ArrayBuilder, V: ArrayBuilder> MapBuilder<K, V> {

let offset_buffer = self.offsets_builder.finish();
let null_bit_buffer = self.null_buffer_builder.finish();
self.offsets_builder.append(self.len);
self.offsets_builder.append(0);
let map_field = Box::new(Field::new(
self.field_names.entry.as_str(),
struct_array.data_type().clone(),
Expand All @@ -166,11 +162,11 @@ impl<K: ArrayBuilder, V: ArrayBuilder> MapBuilder<K, V> {

impl<K: ArrayBuilder, V: ArrayBuilder> ArrayBuilder for MapBuilder<K, V> {
fn len(&self) -> usize {
self.len as usize
self.null_buffer_builder.len()
}

fn is_empty(&self) -> bool {
self.len == 0
self.len() == 0
}

fn finish(&mut self) -> ArrayRef {
Expand Down