fix window

Signed-off-by: Yuan Zhou <[email protected]>
zhouyuan · Sep 5, 2022 · 32dfc62 · 32dfc62
1 parent f5f5aab
commit 32dfc62
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/native-sql-engine/core/src/main/scala/com/intel/oap/execution/ColumnarWindowExec.scala b/native-sql-engine/core/src/main/scala/com/intel/oap/execution/ColumnarWindowExec.scala
@@ -245,8 +245,7 @@ case class ColumnarWindowExec(windowExpression: Seq[NamedExpression],
             val attr = ConverterUtils.getAttrFromExpr(orderSpec.head.child, true)
             TreeBuilder.makeFunction(row_number_func,
               List(TreeBuilder.makeField(
-                    Field.nullable(attr.name,
-                      CodeGeneration.getResultType(attr.dataType)))).toList.asJava,
+                    ConverterUtils.createArrowField(attr))).toList.asJava,
              NoneType.NONE_TYPE 
             )
           case (n, f) =>
@@ -255,8 +254,7 @@ case class ColumnarWindowExec(windowExpression: Seq[NamedExpression],
               .flatMap {
                 case a: AttributeReference =>
                   Some(TreeBuilder.makeField(
-                    Field.nullable(a.name,
-                      CodeGeneration.getResultType(a.dataType))))
+                    ConverterUtils.createArrowField(a)))
                 case c: Cast if c.child.isInstanceOf[AttributeReference] =>
                   Some(TreeBuilder.makeField(
                     Field.nullable(c.child.asInstanceOf[AttributeReference].name,
@@ -281,8 +279,7 @@ case class ColumnarWindowExec(windowExpression: Seq[NamedExpression],
 
         val gPartitionSpec = TreeBuilder.makeFunction("partitionSpec",
           groupingExpressions.map(e => TreeBuilder.makeField(
-            Field.nullable(e.name,
-              CodeGeneration.getResultType(e.dataType)))).toList.asJava,
+            ConverterUtils.createArrowField(e))).toList.asJava,
           NoneType.NONE_TYPE)
         // Workaround:
         // Gandiva doesn't support serializing Struct type so far. Use a fake Binary type instead.