Enable timestampadd(timestamp_ntz) native execution in Velox backend.

backends-velox/src/test/scala/org/apache/gluten/functions/DateFunctionsValidateSuite.scala

@@ -599,12 +599,13 @@ class DateFunctionsValidateSuite extends FunctionsValidateSuite {
           checkGlutenPlan[BatchScanExecTransformer]
         }
 
-        // Ensures the fallback of unsupported function works.
+        // hour(timestamp_ntz) runs natively; output is int (no NTZ propagation).
         runQueryAndCompare("select hour(ts) from view") {
-          df =>
-            assert(collect(df.queryExecution.executedPlan) {
-              case p if p.isInstanceOf[ProjectExec] => p
-            }.nonEmpty)
+          checkGlutenPlan[ProjectExecTransformer]
+        }
+        // timestampadd(timestamp_ntz) runs natively; NTZ flows through from file scan.
+        runQueryAndCompare("select timestampadd('hour', 1, ts) from view") {
+          checkGlutenPlan[ProjectExecTransformer]
         }
     }
   }

ep/build-velox/src/get-velox.sh

@@ -25,7 +25,7 @@ RUN_SETUP_SCRIPT=ON
 ENABLE_ENHANCED_FEATURES=OFF
 
 # Developer use only for testing Velox PR.
-UPSTREAM_VELOX_PR_ID=""
+UPSTREAM_VELOX_PR_ID="17800"
 
 OS=`uname -s`
 

gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/validator/Validators.scala

@@ -270,7 +270,25 @@ object Validators {
           case p if HiveTableScanExecTransformer.isHiveTableScan(p) => true
           case _ => false
         }
-        if (isScan) {
+        def ntzOnlyFromFileScans(p: SparkPlan): Boolean = {
+          if (!p.output.exists(a => containsNTZ(a.dataType))) {
+            true
+          } else {
+            p match {
+              case _: BatchScanExec => true
+              case _: FileSourceScanExec => true
+              case q if HiveTableScanExecTransformer.isHiveTableScan(q) => true
+              case _ if p.children.isEmpty => false
+              case _ => p.children.forall(ntzOnlyFromFileScans)
+            }
+          }
+        }
+        val outputHasNTZ = plan.output.exists(a => containsNTZ(a.dataType))
+        val writeChildHasNTZ = plan.isInstanceOf[WriteFilesExec] &&
+          plan.children.exists(_.output.exists(a => containsNTZ(a.dataType)))
+        val childNTZFromFileScans = plan.children.forall(ntzOnlyFromFileScans)
+        val ntzFlowsThrough = plan.children.exists(_.output.exists(a => containsNTZ(a.dataType)))
+        if (isScan || (!writeChildHasNTZ && childNTZFromFileScans && (!outputHasNTZ || ntzFlowsThrough))) {
           return pass()
         }
       }