Backport patches to 1.4 branch (#997)

* disable unit tests on spark32 (#962) Signed-off-by: Yuan Zhou <[email protected]> * [NSE-987] fix string date (#988) * fix string date Signed-off-by: Yuan Zhou <[email protected]> * disable codegen on STRING Date Signed-off-by: Yuan Zhou <[email protected]> * Revert "fix string date" This reverts commit 1a9fa29.
oap-project · Jun 28, 2022 · ae48a64 · ae48a64
1 parent 256b637
commit ae48a64
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/native-sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarUnaryOperator.scala b/native-sql-engine/core/src/main/scala/com/intel/oap/expression/ColumnarUnaryOperator.scala
@@ -218,6 +218,14 @@ class ColumnarYear(child: Expression, original: Expression)
     }
   }
 
+  override def supportColumnarCodegen(args: java.lang.Object): Boolean = {
+    if (child.dataType == StringType) {
+      //STRING Date type is not supported in codegen
+      return false
+    }
+    true && child.asInstanceOf[ColumnarExpression].supportColumnarCodegen(args)
+  }
+
   override def doColumnarCodeGen(args: java.lang.Object): (TreeNode, ArrowType) = {
     val (child_node, childType): (TreeNode, ArrowType) =
       child.asInstanceOf[ColumnarExpression].doColumnarCodeGen(args)

diff --git a/pom.xml b/pom.xml
@@ -59,6 +59,7 @@
         <spark.version>${spark321.version}</spark.version>
         <scala.version>2.12.15</scala.version>
         <jackson.version>2.12.0</jackson.version>
+        <maven.test.skip>true</maven.test.skip>
       </properties>
     </profile>
     <profile>