handle null value as sepcial case in struct display

apache · Jul 23, 2021 · da79ba9 · da79ba9
1 parent 119c013
commit da79ba9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/arrow/src/util/display.rs b/arrow/src/util/display.rs
@@ -214,14 +214,19 @@ fn append_struct_field_string(
     target.push('"');
     target.push_str(name);
     target.push_str("\": ");
-    match field_col.data_type() {
-        DataType::Utf8 | DataType::LargeUtf8 => {
-            target.push('"');
-            target.push_str(array_value_to_string(field_col, row)?.as_str());
-            target.push('"');
-        }
-        _ => {
-            target.push_str(array_value_to_string(field_col, row)?.as_str());
+
+    if field_col.is_null(row) {
+        target.push_str("null");
+    } else {
+        match field_col.data_type() {
+            DataType::Utf8 | DataType::LargeUtf8 => {
+                target.push('"');
+                target.push_str(array_value_to_string(field_col, row)?.as_str());
+                target.push('"');
+            }
+            _ => {
+                target.push_str(array_value_to_string(field_col, row)?.as_str());
+            }
         }
     }
 

diff --git a/arrow/src/util/pretty.rs b/arrow/src/util/pretty.rs
@@ -106,9 +106,9 @@ mod tests {
     use crate::{
         array::{
             self, new_null_array, Array, Date32Array, Date64Array, PrimitiveBuilder,
-            StringBuilder, StringDictionaryBuilder, Time32MillisecondArray,
-            Time32SecondArray, Time64MicrosecondArray, Time64NanosecondArray,
-            TimestampMicrosecondArray, TimestampMillisecondArray,
+            StringArray, StringBuilder, StringDictionaryBuilder, StructArray,
+            Time32MillisecondArray, Time32SecondArray, Time64MicrosecondArray,
+            Time64NanosecondArray, TimestampMicrosecondArray, TimestampMillisecondArray,
             TimestampNanosecondArray, TimestampSecondArray,
         },
         datatypes::{DataType, Field, Int32Type, Schema},