Skip to content

[Variant] VariantBuilder with VariantMetadata instead of MetadataBuilder #7915

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

Closed
wants to merge 3 commits into from
Closed

[Variant] VariantBuilder with VariantMetadata instead of MetadataBuilder #7915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f5133a
[Variant] Make MetadataBuilder a trait that VariantMetadata can imple…
scovich Jul 11, 2025
0fddd42
Add the actual ReadOnlyMetadataBuilder
scovich Jul 11, 2025
b1d8c53
clippy + fmt
scovich Jul 11, 2025
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
66 changes: 35 additions & 31 deletions parquet-variant-json/src/from_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
//! Module for parsing JSON strings as Variant

use arrow_schema::ArrowError;
use parquet_variant::{ListBuilder, ObjectBuilder, Variant, VariantBuilder, VariantBuilderExt};
use parquet_variant::{
ListBuilder, MetadataBuilder, ObjectBuilder, Variant, VariantBuilder, VariantBuilderExt,
};
use serde_json::{Number, Value};

/// Converts a JSON string to Variant using [`VariantBuilder`]. The resulting `value` and `metadata`
Expand Down Expand Up @@ -99,23 +101,23 @@ fn variant_from_number<'m, 'v>(n: &Number) -> Result<Variant<'m, 'v>, ArrowError
}
}

fn append_json<'m, 'v>(
fn append_json<'m, 'v, M: MetadataBuilder>(
json: &'v Value,
builder: &mut impl VariantBuilderExt<'m, 'v>,
builder: &mut impl VariantBuilderExt<'m, 'v, M>,
) -> Result<(), ArrowError> {
match json {
Value::Null => builder.append_value(Variant::Null),
Value::Bool(b) => builder.append_value(*b),
Value::Null => builder.append_value(Variant::Null)?,
Value::Bool(b) => builder.append_value(*b)?,
Value::Number(n) => {
builder.append_value(variant_from_number(n)?);
builder.append_value(variant_from_number(n)?)?;
}
Value::String(s) => builder.append_value(s.as_str()),
Value::String(s) => builder.append_value(s.as_str())?,
Value::Array(arr) => {
let mut list_builder = builder.new_list();
for val in arr {
append_json(val, &mut list_builder)?;
}
list_builder.finish();
list_builder.finish()?;
}
Value::Object(obj) => {
let mut obj_builder = builder.new_object();
Expand All @@ -132,21 +134,23 @@ fn append_json<'m, 'v>(
Ok(())
}

struct ObjectFieldBuilder<'o, 'v, 's> {
struct ObjectFieldBuilder<'o, 'v, 's, M: MetadataBuilder> {
key: &'s str,
builder: &'o mut ObjectBuilder<'v>,
builder: &'o mut ObjectBuilder<'v, M>,
}

impl<'m, 'v> VariantBuilderExt<'m, 'v> for ObjectFieldBuilder<'_, '_, '_> {
fn append_value(&mut self, value: impl Into<Variant<'m, 'v>>) {
self.builder.insert(self.key, value);
impl<'m, 'v, M: MetadataBuilder> VariantBuilderExt<'m, 'v, M>
for ObjectFieldBuilder<'_, 'v, '_, M>
{
fn append_value(&mut self, value: impl Into<Variant<'m, 'v>>) -> Result<(), ArrowError> {
self.builder.insert(self.key, value)
}

fn new_list(&mut self) -> ListBuilder {
fn new_list(&mut self) -> ListBuilder<M> {
self.builder.new_list(self.key)
}

fn new_object(&mut self) -> ObjectBuilder {
fn new_object(&mut self) -> ObjectBuilder<M> {
self.builder.new_object(self.key)
}
}
Expand Down Expand Up @@ -472,7 +476,7 @@ mod test {
list_builder.append_value(Variant::Int8(127));
list_builder.append_value(Variant::Int16(128));
list_builder.append_value(Variant::Int32(-32767431));
list_builder.finish();
list_builder.finish()?;
let (metadata, value) = variant_builder.finish();
let variant = Variant::try_new(&metadata, &value)?;

Expand All @@ -488,11 +492,11 @@ mod test {
let mut variant_builder = VariantBuilder::new();
let mut list_builder = variant_builder.new_list();
let mut object_builder_inner = list_builder.new_object();
object_builder_inner.insert("age", Variant::Int8(32));
object_builder_inner.insert("age", Variant::Int8(32))?;
object_builder_inner.finish().unwrap();
list_builder.append_value(Variant::Int16(128));
list_builder.append_value(Variant::BooleanFalse);
list_builder.finish();
list_builder.finish()?;
let (metadata, value) = variant_builder.finish();
let variant = Variant::try_new(&metadata, &value)?;

Expand All @@ -512,7 +516,7 @@ mod test {
list_builder.append_value(Variant::Int8(1));
}
list_builder.append_value(Variant::BooleanTrue);
list_builder.finish();
list_builder.finish()?;
let (metadata, value) = variant_builder.finish();
let variant = Variant::try_new(&metadata, &value)?;

Expand All @@ -533,9 +537,9 @@ mod test {
for _ in 0..255 {
list_builder_inner.append_value(Variant::Null);
}
list_builder_inner.finish();
list_builder_inner.finish()?;
}
list_builder.finish();
list_builder.finish()?;
let (metadata, value) = variant_builder.finish();
let variant = Variant::try_new(&metadata, &value)?;
let intermediate = format!("[{}]", vec!["null"; 255].join(", "));
Expand All @@ -551,8 +555,8 @@ mod test {
fn test_json_to_variant_object_simple() -> Result<(), ArrowError> {
let mut variant_builder = VariantBuilder::new();
let mut object_builder = variant_builder.new_object();
object_builder.insert("a", Variant::Int8(3));
object_builder.insert("b", Variant::Int8(2));
object_builder.insert("a", Variant::Int8(3))?;
object_builder.insert("b", Variant::Int8(2))?;
object_builder.finish().unwrap();
let (metadata, value) = variant_builder.finish();
let variant = Variant::try_new(&metadata, &value)?;
Expand All @@ -570,14 +574,14 @@ mod test {
let mut inner_list_builder = object_builder.new_list("booleans");
inner_list_builder.append_value(Variant::BooleanTrue);
inner_list_builder.append_value(Variant::BooleanFalse);
inner_list_builder.finish();
object_builder.insert("null", Variant::Null);
inner_list_builder.finish()?;
object_builder.insert("null", Variant::Null)?;
let mut inner_list_builder = object_builder.new_list("numbers");
inner_list_builder.append_value(Variant::Int8(4));
inner_list_builder.append_value(Variant::Double(-3e0));
inner_list_builder.append_value(Variant::Double(1001e-3));
inner_list_builder.finish();
object_builder.finish().unwrap();
inner_list_builder.finish()?;
object_builder.finish()?;
let (metadata, value) = variant_builder.finish();
let variant = Variant::try_new(&metadata, &value)?;
JsonToVariantTest {
Expand Down Expand Up @@ -641,7 +645,7 @@ mod test {
for i in 0..=127 {
list_builder.append_value(Variant::Int8(i));
}
list_builder.finish();
list_builder.finish().unwrap();
});
inner_object_builder.finish().unwrap();
});
Expand All @@ -667,9 +671,9 @@ mod test {
assert_eq!(output_string, "{\"a\":1,\"爱\":\"अ\"}");
let mut variant_builder = VariantBuilder::new();
let mut object_builder = variant_builder.new_object();
object_builder.insert("a", Variant::Int8(1));
object_builder.insert("爱", Variant::ShortString(ShortString::try_new("अ")?));
object_builder.finish().unwrap();
object_builder.insert("a", Variant::Int8(1))?;
object_builder.insert("爱", Variant::ShortString(ShortString::try_new("अ")?))?;
object_builder.finish()?;
let (metadata, value) = variant_builder.finish();
let variant = Variant::try_new(&metadata, &value)?;

Expand Down
48 changes: 24 additions & 24 deletions parquet-variant-json/src/to_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,11 +860,11 @@ mod tests {

{
let mut obj = builder.new_object();
obj.insert("name", "Alice");
obj.insert("age", 30i32);
obj.insert("active", true);
obj.insert("score", 95.5f64);
obj.finish().unwrap();
obj.insert("name", "Alice")?;
obj.insert("age", 30i32)?;
obj.insert("active", true)?;
obj.insert("score", 95.5f64)?;
obj.finish()?;
}

let (metadata, value) = builder.finish();
Expand Down Expand Up @@ -917,10 +917,10 @@ mod tests {

{
let mut obj = builder.new_object();
obj.insert("message", "Hello \"World\"\nWith\tTabs");
obj.insert("path", "C:\\Users\\Alice\\Documents");
obj.insert("unicode", "😀 Smiley");
obj.finish().unwrap();
obj.insert("message", "Hello \"World\"\nWith\tTabs")?;
obj.insert("path", "C:\\Users\\Alice\\Documents")?;
obj.insert("unicode", "😀 Smiley")?;
obj.finish()?;
}

let (metadata, value) = builder.finish();
Expand Down Expand Up @@ -952,7 +952,7 @@ mod tests {
list.append_value(3i32);
list.append_value(4i32);
list.append_value(5i32);
list.finish();
list.finish()?;
}

let (metadata, value) = builder.finish();
Expand All @@ -977,7 +977,7 @@ mod tests {

{
let list = builder.new_list();
list.finish();
list.finish()?;
}

let (metadata, value) = builder.finish();
Expand All @@ -1004,7 +1004,7 @@ mod tests {
list.append_value(true);
list.append_value(()); // null
list.append_value(std::f64::consts::PI);
list.finish();
list.finish()?;
}

let (metadata, value) = builder.finish();
Expand Down Expand Up @@ -1032,10 +1032,10 @@ mod tests {
{
let mut obj = builder.new_object();
// Add fields in non-alphabetical order
obj.insert("zebra", "last");
obj.insert("alpha", "first");
obj.insert("beta", "second");
obj.finish().unwrap();
obj.insert("zebra", "last")?;
obj.insert("alpha", "first")?;
obj.insert("beta", "second")?;
obj.finish()?;
}

let (metadata, value) = builder.finish();
Expand Down Expand Up @@ -1068,7 +1068,7 @@ mod tests {
list.append_value(false);
list.append_value(()); // null
list.append_value(100i64);
list.finish();
list.finish()?;
}

let (metadata, value) = builder.finish();
Expand Down Expand Up @@ -1097,13 +1097,13 @@ mod tests {

{
let mut obj = builder.new_object();
obj.insert("string_field", "test_string");
obj.insert("int_field", 123i32);
obj.insert("bool_field", true);
obj.insert("float_field", 2.71f64);
obj.insert("null_field", ());
obj.insert("long_field", 999i64);
obj.finish().unwrap();
obj.insert("string_field", "test_string")?;
obj.insert("int_field", 123i32)?;
obj.insert("bool_field", true)?;
obj.insert("float_field", 2.71f64)?;
obj.insert("null_field", ())?;
obj.insert("long_field", 999i64)?;
obj.finish()?;
}

let (metadata, value) = builder.finish();
Expand Down
Loading
Loading