From 25a7302ec64f99ec2bdbe4a47cda00f615c7fbf7 Mon Sep 17 00:00:00 2001 From: Yuan Zhou Date: Thu, 7 Jan 2021 05:01:28 +0800 Subject: [PATCH 1/2] fix unexpected exception Signed-off-by: Yuan Zhou --- .../com/intel/oap/expression/ColumnarSortMergeJoin.scala | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/src/main/scala/com/intel/oap/expression/ColumnarSortMergeJoin.scala b/core/src/main/scala/com/intel/oap/expression/ColumnarSortMergeJoin.scala index 7447e4b2c..b01dd688b 100644 --- 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( From c684367ce593a81c097eb852b72cd9fcd7f032c9 Mon Sep 17 00:00:00 2001 From: Yuan Zhou Date: Thu, 7 Jan 2021 23:05:05 +0800 Subject: [PATCH 2/2] do not early close sorter Signed-off-by: Yuan Zhou --- .../main/scala/com/intel/oap/expression/ColumnarSorter.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/scala/com/intel/oap/expression/ColumnarSorter.scala b/core/src/main/scala/com/intel/oap/expression/ColumnarSorter.scala index a0ecd638f..0fe9b0389 100644 --- 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