scovich commented on code in PR #8189:
URL: https://github.com/apache/arrow-rs/pull/8189#discussion_r2289127203
##########
parquet-variant/src/builder.rs:
##########
@@ -306,93 +296,80 @@ impl ValueBuilder {
self.0.len()
}
- fn new_object<'a>(
- &'a mut self,
- metadata_builder: &'a mut MetadataBuilder,
- ) -> ObjectBuilder<'a> {
- let parent_state = ParentState::variant(self, metadata_builder);
- let validate_unique_fields = false;
- ObjectBuilder::new(parent_state, validate_unique_fields)
- }
-
- fn new_list<'a>(&'a mut self, metadata_builder: &'a mut MetadataBuilder)
-> ListBuilder<'a> {
- let parent_state = ParentState::variant(self, metadata_builder);
- let validate_unique_fields = false;
- ListBuilder::new(parent_state, validate_unique_fields)
- }
-
/// Appends a variant to the builder.
///
/// # Panics
///
/// This method will panic if the variant contains duplicate field names
in objects
/// when validation is enabled. For a fallible version, use
[`ValueBuilder::try_append_variant`]
- fn append_variant<'m, 'd>(
- &mut self,
- variant: Variant<'m, 'd>,
- metadata_builder: &mut MetadataBuilder,
- ) {
+ fn append_variant(mut state: ParentState<'_>, variant: Variant<'_, '_>) {
+ let builder = state.value_builder();
match variant {
- Variant::Null => self.append_null(),
- Variant::BooleanTrue => self.append_bool(true),
- Variant::BooleanFalse => self.append_bool(false),
- Variant::Int8(v) => self.append_int8(v),
- Variant::Int16(v) => self.append_int16(v),
- Variant::Int32(v) => self.append_int32(v),
- Variant::Int64(v) => self.append_int64(v),
- Variant::Date(v) => self.append_date(v),
- Variant::TimestampMicros(v) => self.append_timestamp_micros(v),
- Variant::TimestampNtzMicros(v) =>
self.append_timestamp_ntz_micros(v),
- Variant::TimestampNanos(v) => self.append_timestamp_nanos(v),
- Variant::TimestampNtzNanos(v) =>
self.append_timestamp_ntz_nanos(v),
- Variant::Decimal4(decimal4) => self.append_decimal4(decimal4),
- Variant::Decimal8(decimal8) => self.append_decimal8(decimal8),
- Variant::Decimal16(decimal16) => self.append_decimal16(decimal16),
- Variant::Float(v) => self.append_float(v),
- Variant::Double(v) => self.append_double(v),
- Variant::Binary(v) => self.append_binary(v),
- Variant::String(s) => self.append_string(s),
- Variant::ShortString(s) => self.append_short_string(s),
- Variant::Uuid(v) => self.append_uuid(v),
- Variant::Object(obj) => self.append_object(metadata_builder, obj),
- Variant::List(list) => self.append_list(metadata_builder, list),
- Variant::Time(v) => self.append_time_micros(v),
+ Variant::Null => builder.append_null(),
+ Variant::BooleanTrue => builder.append_bool(true),
+ Variant::BooleanFalse => builder.append_bool(false),
+ Variant::Int8(v) => builder.append_int8(v),
+ Variant::Int16(v) => builder.append_int16(v),
+ Variant::Int32(v) => builder.append_int32(v),
+ Variant::Int64(v) => builder.append_int64(v),
+ Variant::Date(v) => builder.append_date(v),
+ Variant::Time(v) => builder.append_time_micros(v),
+ Variant::TimestampMicros(v) => builder.append_timestamp_micros(v),
+ Variant::TimestampNtzMicros(v) =>
builder.append_timestamp_ntz_micros(v),
+ Variant::TimestampNanos(v) => builder.append_timestamp_nanos(v),
+ Variant::TimestampNtzNanos(v) =>
builder.append_timestamp_ntz_nanos(v),
+ Variant::Decimal4(decimal4) => builder.append_decimal4(decimal4),
+ Variant::Decimal8(decimal8) => builder.append_decimal8(decimal8),
+ Variant::Decimal16(decimal16) =>
builder.append_decimal16(decimal16),
+ Variant::Float(v) => builder.append_float(v),
+ Variant::Double(v) => builder.append_double(v),
+ Variant::Binary(v) => builder.append_binary(v),
+ Variant::String(s) => builder.append_string(s),
+ Variant::ShortString(s) => builder.append_short_string(s),
+ Variant::Uuid(v) => builder.append_uuid(v),
+ Variant::Object(obj) => return Self::append_object(state, obj),
+ Variant::List(list) => return Self::append_list(state, list),
}
+ state.finish();
}
- /// Appends a variant to the builder
- fn try_append_variant<'m, 'd>(
- &mut self,
- variant: Variant<'m, 'd>,
- metadata_builder: &mut MetadataBuilder,
+ /// Tries to append a variant to the provided [`ParentState`] instance.
+ ///
+ /// The attempt fails if the variant contains duplicate field names in
objects when validation
+ /// is enabled.
+ pub fn try_append_variant(
+ mut state: ParentState<'_>,
+ variant: Variant<'_, '_>,
) -> Result<(), ArrowError> {
+ let builder = state.value_builder();
match variant {
- Variant::Null => self.append_null(),
- Variant::BooleanTrue => self.append_bool(true),
- Variant::BooleanFalse => self.append_bool(false),
- Variant::Int8(v) => self.append_int8(v),
- Variant::Int16(v) => self.append_int16(v),
- Variant::Int32(v) => self.append_int32(v),
- Variant::Int64(v) => self.append_int64(v),
- Variant::Date(v) => self.append_date(v),
- Variant::TimestampMicros(v) => self.append_timestamp_micros(v),
- Variant::TimestampNtzMicros(v) =>
self.append_timestamp_ntz_micros(v),
- Variant::TimestampNanos(v) => self.append_timestamp_nanos(v),
- Variant::TimestampNtzNanos(v) =>
self.append_timestamp_ntz_nanos(v),
- Variant::Decimal4(decimal4) => self.append_decimal4(decimal4),
- Variant::Decimal8(decimal8) => self.append_decimal8(decimal8),
- Variant::Decimal16(decimal16) => self.append_decimal16(decimal16),
- Variant::Float(v) => self.append_float(v),
- Variant::Double(v) => self.append_double(v),
- Variant::Binary(v) => self.append_binary(v),
- Variant::Uuid(v) => self.append_uuid(v),
Review Comment:
FYI I moved Uuid below ShortString to match `append_variant` above
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@arrow.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
