From 09ec3577e029fe7f55f9debc16f6d416298e8565 Mon Sep 17 00:00:00 2001
From: linfeng <lilinfeng0310@gmail.com>
Date: Mon, 17 Aug 2026 23:55:09 +0800
Subject: [PATCH] Fix nullable struct field null propagatio

---
 .../src/get_indexed_field.rs                  | 54 +++++++++++++++++--
 .../org/apache/auron/AuronQuerySuite.scala    | 12 +++++
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/native-engine/datafusion-ext-exprs/src/get_indexed_field.rs b/native-engine/datafusion-ext-exprs/src/get_indexed_field.rs
index 33ba456bc..0b0b0544d 100644
--- a/native-engine/datafusion-ext-exprs/src/get_indexed_field.rs
+++ b/native-engine/datafusion-ext-exprs/src/get_indexed_field.rs
@@ -21,7 +21,7 @@ use std::{
     sync::Arc,
 };
 
-use arrow::{array::*, compute::*, datatypes::*, record_batch::RecordBatch};
+use arrow::{array::*, buffer::NullBuffer, compute::*, datatypes::*, record_batch::RecordBatch};
 use datafusion::{
     common::{
         Result, ScalarValue,
@@ -124,7 +124,13 @@ impl PhysicalExpr for GetIndexedFieldExpr {
             }
             (DataType::Struct(_), ScalarValue::Int32(Some(k))) => {
                 let as_struct_array = as_struct_array(&array)?;
-                let taken = as_struct_array.column(*k as usize).clone();
+                let child = as_struct_array.column(*k as usize);
+                let taken = if as_struct_array.null_count() == 0 {
+                    child.clone()
+                } else {
+                    let nulls = NullBuffer::union(as_struct_array.nulls(), child.nulls());
+                    make_array(child.to_data().into_builder().nulls(nulls).build()?)
+                };
                 if array_is_scalar {
                     return Ok(ColumnarValue::Scalar(ScalarValue::try_from_array(
                         &taken, 0,
@@ -189,7 +195,7 @@ fn get_indexed_field(data_type: &DataType, key: &ScalarValue) -> Result<Arc<Fiel
 mod test {
     use std::sync::Arc;
 
-    use arrow::{array::*, datatypes::*, record_batch::RecordBatch};
+    use arrow::{array::*, buffer::NullBuffer, datatypes::*, record_batch::RecordBatch};
     use datafusion::{
         assert_batches_eq,
         physical_plan::{PhysicalExpr, expressions::Column},
@@ -247,4 +253,46 @@ mod test {
         assert_batches_eq!(expected, &[output_batch]);
         Ok(())
     }
+
+    #[test]
+    fn struct_field_propagates_parent_nulls() -> Result<(), Box<dyn std::error::Error>> {
+        let child: ArrayRef = Arc::new(Int32Array::from(vec![Some(10), Some(20), None, None]));
+        let fields = Fields::from(vec![Field::new("child", DataType::Int32, true)]);
+        let struct_array: ArrayRef = Arc::new(StructArray::new(
+            fields.clone(),
+            vec![child.clone()],
+            Some(NullBuffer::from(vec![true, false, true, false])),
+        ));
+        let input_batch =
+            RecordBatch::try_from_iter_with_nullable(vec![("struct", struct_array, true)])?;
+        let get_indexed = Arc::new(GetIndexedFieldExpr::new(
+            Arc::new(Column::new("struct", 0)),
+            ScalarValue::from(0_i32),
+        ));
+
+        let output = get_indexed.evaluate(&input_batch)?.into_array(0)?;
+        assert_eq!(
+            output.as_primitive::<Int32Type>(),
+            &Int32Array::from(vec![Some(10), None, None, None])
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn struct_field_without_parent_nulls_reuses_child() -> Result<(), Box<dyn std::error::Error>> {
+        let child: ArrayRef = Arc::new(Int32Array::from(vec![Some(10), None]));
+        let fields = Fields::from(vec![Field::new("child", DataType::Int32, true)]);
+        let struct_array: ArrayRef = Arc::new(StructArray::new(fields, vec![child.clone()], None));
+        let input_batch =
+            RecordBatch::try_from_iter_with_nullable(vec![("struct", struct_array, true)])?;
+        let get_indexed = Arc::new(GetIndexedFieldExpr::new(
+            Arc::new(Column::new("struct", 0)),
+            ScalarValue::from(0_i32),
+        ));
+        let output = get_indexed.evaluate(&input_batch)?.into_array(0)?;
+        assert!(Arc::ptr_eq(&output, &child));
+
+        Ok(())
+    }
 }
diff --git a/spark-extension-shims-spark/src/test/scala/org/apache/auron/AuronQuerySuite.scala b/spark-extension-shims-spark/src/test/scala/org/apache/auron/AuronQuerySuite.scala
index e080baaa6..953750e4c 100644
--- a/spark-extension-shims-spark/src/test/scala/org/apache/auron/AuronQuerySuite.scala
+++ b/spark-extension-shims-spark/src/test/scala/org/apache/auron/AuronQuerySuite.scala
@@ -541,6 +541,18 @@ class AuronQuerySuite extends AuronQueryTest with BaseAuronSQLSuite with AuronSQ
     }
   }
 
+  test("get field from nullable struct propagates parent null") {
+    withTable("t_nullable_struct") {
+      sql("""
+            |create table t_nullable_struct using parquet as
+            |select id, case when id = 1 then named_struct('child', 10) end as s
+            |from range(1, 3, 1, 1)
+            |""".stripMargin)
+
+      checkSparkAnswerAndOperator("select s.child from t_nullable_struct order by id")
+    }
+  }
+
   test("cast map to string") {
     if (AuronTestUtils.isSparkV31OrGreater) {
       withTable("t_map") {