check struct nullability for physical GetIndexedFieldExpr

ArroyoSystems · Mar 18, 2024 · 4b9d841 · 4b9d841
1 parent ac33c34
commit 4b9d841
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/datafusion/physical-expr/src/expressions/get_indexed_field.rs b/datafusion/physical-expr/src/expressions/get_indexed_field.rs
@@ -217,9 +217,11 @@ impl PhysicalExpr for GetIndexedFieldExpr {
 
     fn nullable(&self, input_schema: &Schema) -> Result<bool> {
         let arg_dt = self.arg.data_type(input_schema)?;
-        self.schema_access(input_schema)?
-            .get_accessed_field(&arg_dt)
-            .map(|f| f.is_nullable())
+        Ok(self.arg.nullable(input_schema)?
+            || self
+                .schema_access(input_schema)?
+                .get_accessed_field(&arg_dt)
+                .map(|f| f.is_nullable())?)
     }
 
     fn evaluate(&self, batch: &RecordBatch) -> Result<ColumnarValue> {

diff --git a/datafusion/physical-plan/src/metrics/mod.rs b/datafusion/physical-plan/src/metrics/mod.rs
@@ -312,7 +312,7 @@ impl MetricsSet {
 
     pub fn clear(&mut self) {
         self.metrics.clear();
-        }
+    }
 }
 
 impl Display for MetricsSet {