[NSE-15]fix unexpected exception (#16)

* fix unexpected exception Signed-off-by: Yuan Zhou <[email protected]> * do not early close sorter Signed-off-by: Yuan Zhou <[email protected]>
oap-project · Jan 8, 2021 · ec28760 · ec28760
1 parent fde3007
commit ec28760
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/src/main/scala/com/intel/oap/expression/ColumnarSortMergeJoin.scala b/core/src/main/scala/com/intel/oap/expression/ColumnarSortMergeJoin.scala
@@ -233,6 +233,10 @@ object ColumnarSortMergeJoin extends Logging {
     val lkeyProjectOrdinalList = new ListBuffer[Int]()
     val lkeyFieldList: List[Field] = leftKeys.toList.zipWithIndex.map {
       case (expr, i) => {
+        //TODO(): fix this workaround
+        if (expr.isInstanceOf[AttributeReference] && expr.asInstanceOf[AttributeReference].name == "none") {
+          return
+        }
         val (nativeNode, returnType) = ConverterUtils.getColumnarFuncNode(expr)
         if (s"${nativeNode.toProtobuf}".contains("none#")) {
           throw new UnsupportedOperationException(

diff --git a/core/src/main/scala/com/intel/oap/expression/ColumnarSorter.scala b/core/src/main/scala/com/intel/oap/expression/ColumnarSorter.scala
@@ -157,7 +157,8 @@ class ColumnarSorter(
           has_next = sort_iterator.hasNext()
 
         if (has_next == false) {
-          close()
+          //TODO(): should try to close sorter
+          //close()
         }
 
         return has_next