address review comments

apache · Jun 11, 2024 · f028425 · f028425
1 parent 8ce4344
commit f028425
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/.github/workflows/spark_sql_test_ansi.yml b/.github/workflows/spark_sql_test_ansi.yml
@@ -24,12 +24,10 @@ concurrency:
 on:
   push:
     paths-ignore:
-      - "doc/**"
       - "docs/**"
       - "**.md"
   pull_request:
     paths-ignore:
-      - "doc/**"
       - "docs/**"
       - "**.md"
   # manual trigger

diff --git a/common/src/main/java/org/apache/comet/parquet/TypeUtil.java b/common/src/main/java/org/apache/comet/parquet/TypeUtil.java
@@ -170,7 +170,7 @@ && isUnsignedIntTypeMatched(logicalTypeAnnotation, 64)) {
         break;
       case INT96:
         if (sparkType == TimestampNTZType$.MODULE$) {
-          if (isSpark40Plus()) return;
+          if (isSpark40Plus()) return; // Spark 4.0+ supports Timestamp NTZ with INT96
           convertErrorForTimestampNTZ(typeName.name());
         } else if (sparkType == DataTypes.TimestampType) {
           return;

diff --git a/spark/src/main/spark-3.2/org/apache/comet/shims/CometExprShim.scala b/spark/src/main/spark-3.2/org/apache/comet/shims/CometExprShim.scala
@@ -33,11 +33,8 @@ trait CometExprShim {
         (unhex.child, Literal(false))
     }
 
-    protected def isTimestampNTZType(dt: DataType): Boolean = dt match {
-        // `TimestampNTZType` is private
-        case dt if dt.typeName == "timestamp_ntz" => true
-        case _ => false
-    }
+    protected def isTimestampNTZType(dt: DataType): Boolean =
+        dt.typeName == "timestamp_ntz" => true // `TimestampNTZType` is private
 
     protected def evalMode(c: Cast): CometEvalMode.Value = CometEvalMode.fromBoolean(c.ansiEnabled)
 }

diff --git a/spark/src/main/spark-3.3/org/apache/comet/shims/CometExprShim.scala b/spark/src/main/spark-3.3/org/apache/comet/shims/CometExprShim.scala
@@ -33,11 +33,8 @@ trait CometExprShim {
         (unhex.child, Literal(false))
     }
 
-    protected def isTimestampNTZType(dt: DataType): Boolean = dt match {
-        // `TimestampNTZType` is private
-        case dt if dt.typeName == "timestamp_ntz" => true
-        case _ => false
-    }
+    protected def isTimestampNTZType(dt: DataType): Boolean =
+        dt.typeName == "timestamp_ntz" => true // `TimestampNTZType` is private
 
     protected def evalMode(c: Cast): CometEvalMode.Value = CometEvalMode.fromBoolean(c.ansiEnabled)
 }