phil-opp commented on code in PR #8737:
URL: https://github.com/apache/arrow-rs/pull/8737#discussion_r2494546936
##########
arrow-json/src/lib.rs:
##########
@@ -261,4 +283,135 @@ mod tests {
assert_eq!(list_input, &list_output);
}
}
+
+ #[test]
+ fn test_json_roundtrip_binary() {
+ let values: [Option<&[u8]>; 3] = [
+ Some(b"Ned Flanders" as &[u8]),
+ None,
+ Some(b"Troy McClure" as &[u8]),
+ ];
+ // Binary:
+ {
+ let batch = build_array_binary::<i32>(&values);
+ assert_binary_json(&batch);
+ }
+ // LargeBinary:
+ {
+ let batch = build_array_binary::<i64>(&values);
+ assert_binary_json(&batch);
+ }
+ // FixedSizeBinary:
+ {
+ let batch = build_array_fixed_size_binary(12, &values);
+ assert_binary_json(&batch);
+ }
+ // BinaryView:
+ {
+ let batch = build_array_binary_view(&values);
+ assert_binary_json(&batch);
+ }
+ }
+
+ fn build_array_binary<O: OffsetSizeTrait>(values: &[Option<&[u8]>]) ->
RecordBatch {
+ let schema = SchemaRef::new(Schema::new(vec![Field::new(
+ "bytes",
+ GenericBinaryType::<O>::DATA_TYPE,
+ true,
+ )]));
+ let mut builder = GenericByteBuilder::<GenericBinaryType<O>>::new();
+ for value in values {
+ match value {
+ Some(v) => builder.append_value(v),
+ None => builder.append_null(),
+ }
+ }
+ let array = Arc::new(builder.finish()) as ArrayRef;
+ RecordBatch::try_new(schema, vec![array]).unwrap()
+ }
+
+ fn build_array_binary_view(values: &[Option<&[u8]>]) -> RecordBatch {
+ let schema = SchemaRef::new(Schema::new(vec![Field::new(
+ "bytes",
+ DataType::BinaryView,
+ true,
+ )]));
+ let mut builder = BinaryViewBuilder::new();
+ for value in values {
+ match value {
+ Some(v) => builder.append_value(v),
+ None => builder.append_null(),
+ }
+ }
+ let array = Arc::new(builder.finish()) as ArrayRef;
+ RecordBatch::try_new(schema, vec![array]).unwrap()
+ }
+
+ fn build_array_fixed_size_binary(byte_width: i32, values:
&[Option<&[u8]>]) -> RecordBatch {
+ let schema = SchemaRef::new(Schema::new(vec![Field::new(
+ "bytes",
+ DataType::FixedSizeBinary(byte_width),
+ true,
+ )]));
+ let mut builder = FixedSizeBinaryBuilder::new(byte_width);
+ for value in values {
+ match value {
+ Some(v) => builder.append_value(v).unwrap(),
+ None => builder.append_null(),
+ }
+ }
+ let array = Arc::new(builder.finish()) as ArrayRef;
+ RecordBatch::try_new(schema, vec![array]).unwrap()
+ }
+
+ fn assert_binary_json(batch: &RecordBatch) {
+ // encode and check JSON with explicit nulls:
+ {
+ let mut buf = Vec::new();
+ let json_value: Value = {
+ let mut writer = WriterBuilder::new()
+ .with_explicit_nulls(true)
+ .build::<_, JsonArray>(&mut buf);
+ writer.write(batch).unwrap();
+ writer.close().unwrap();
+ serde_json::from_slice(&buf).unwrap()
+ };
+
+ let json_array = json_value.as_array().unwrap();
+
+ let decoded = {
+ let mut decoder = ReaderBuilder::new(batch.schema().clone())
+ .build_decoder()
+ .unwrap();
+ decoder.serialize(json_array).unwrap();
+ decoder.flush().unwrap().unwrap()
+ };
+
+ assert_eq!(batch, &decoded);
+ }
+
+ // encode and check JSON with no explicit nulls:
+ {
+ let mut buf = Vec::new();
+ let json_value: Value = {
+ // explicit nulls are off by default, so we don't need
Review Comment:
Done in 62db9fce5
##########
arrow-json/src/lib.rs:
##########
@@ -261,4 +283,135 @@ mod tests {
assert_eq!(list_input, &list_output);
}
}
+
+ #[test]
+ fn test_json_roundtrip_binary() {
+ let values: [Option<&[u8]>; 3] = [
+ Some(b"Ned Flanders" as &[u8]),
+ None,
+ Some(b"Troy McClure" as &[u8]),
+ ];
+ // Binary:
+ {
+ let batch = build_array_binary::<i32>(&values);
+ assert_binary_json(&batch);
+ }
+ // LargeBinary:
+ {
+ let batch = build_array_binary::<i64>(&values);
+ assert_binary_json(&batch);
+ }
+ // FixedSizeBinary:
+ {
+ let batch = build_array_fixed_size_binary(12, &values);
+ assert_binary_json(&batch);
+ }
+ // BinaryView:
+ {
+ let batch = build_array_binary_view(&values);
+ assert_binary_json(&batch);
+ }
+ }
+
+ fn build_array_binary<O: OffsetSizeTrait>(values: &[Option<&[u8]>]) ->
RecordBatch {
+ let schema = SchemaRef::new(Schema::new(vec![Field::new(
+ "bytes",
+ GenericBinaryType::<O>::DATA_TYPE,
+ true,
+ )]));
+ let mut builder = GenericByteBuilder::<GenericBinaryType<O>>::new();
+ for value in values {
+ match value {
+ Some(v) => builder.append_value(v),
+ None => builder.append_null(),
+ }
+ }
+ let array = Arc::new(builder.finish()) as ArrayRef;
+ RecordBatch::try_new(schema, vec![array]).unwrap()
+ }
+
+ fn build_array_binary_view(values: &[Option<&[u8]>]) -> RecordBatch {
+ let schema = SchemaRef::new(Schema::new(vec![Field::new(
+ "bytes",
+ DataType::BinaryView,
+ true,
+ )]));
+ let mut builder = BinaryViewBuilder::new();
+ for value in values {
+ match value {
+ Some(v) => builder.append_value(v),
+ None => builder.append_null(),
+ }
+ }
+ let array = Arc::new(builder.finish()) as ArrayRef;
+ RecordBatch::try_new(schema, vec![array]).unwrap()
+ }
+
+ fn build_array_fixed_size_binary(byte_width: i32, values:
&[Option<&[u8]>]) -> RecordBatch {
+ let schema = SchemaRef::new(Schema::new(vec![Field::new(
+ "bytes",
+ DataType::FixedSizeBinary(byte_width),
+ true,
+ )]));
+ let mut builder = FixedSizeBinaryBuilder::new(byte_width);
+ for value in values {
+ match value {
+ Some(v) => builder.append_value(v).unwrap(),
+ None => builder.append_null(),
+ }
+ }
+ let array = Arc::new(builder.finish()) as ArrayRef;
+ RecordBatch::try_new(schema, vec![array]).unwrap()
+ }
+
+ fn assert_binary_json(batch: &RecordBatch) {
+ // encode and check JSON with explicit nulls:
+ {
+ let mut buf = Vec::new();
Review Comment:
Done in 62db9fce5
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
