From 7f5d53e80c18d1b4dd64d6434e301fb34ebc839e Mon Sep 17 00:00:00 2001
From: Yuan <yuan.zhou@intel.com>
Date: Tue, 5 Jan 2021 10:11:48 +0800
Subject: [PATCH] [NSE-4]fix columnar BHJ on new memory pool (#3)

* fix columnar bhj

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

* fix

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
---
 .../execution/ColumnarSortMergeJoinExec.scala | 20 ++-----------------
 .../expression/ColumnarSortMergeJoin.scala    |  1 +
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/core/src/main/scala/com/intel/oap/execution/ColumnarSortMergeJoinExec.scala b/core/src/main/scala/com/intel/oap/execution/ColumnarSortMergeJoinExec.scala
index 0d7f65ef5..ddaffb742 100644
--- a/core/src/main/scala/com/intel/oap/execution/ColumnarSortMergeJoinExec.scala
+++ b/core/src/main/scala/com/intel/oap/execution/ColumnarSortMergeJoinExec.scala
@@ -85,24 +85,6 @@ case class ColumnarSortMergeJoinExec(
   val prepareTime = longMetric("prepareTime")
   val totaltime_sortmegejoin = longMetric("totaltime_sortmergejoin")
   val resultSchema = this.schema
-  try {
-    ColumnarSortMergeJoin.precheck(
-      leftKeys,
-      rightKeys,
-      resultSchema,
-      joinType,
-      condition,
-      left,
-      right,
-      joinTime,
-      prepareTime,
-      totaltime_sortmegejoin,
-      numOutputRows,
-      sparkConf)
-  } catch {
-    case e: Throwable =>
-      throw e
-  }
 
   override def supportsColumnar = true
 
@@ -319,6 +301,8 @@ case class ColumnarSortMergeJoinExec(
     }
     ColumnarCodegenContext(inputSchema, outputSchema, codeGenNode)
   }
+  val triggerBuildSignature = getCodeGenSignature
+
 
   /***********************************************************/
   def getCodeGenSignature: String =
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 ab7de2911..7447e4b2c 100644
--- a/core/src/main/scala/com/intel/oap/expression/ColumnarSortMergeJoin.scala
+++ b/core/src/main/scala/com/intel/oap/expression/ColumnarSortMergeJoin.scala
@@ -257,6 +257,7 @@ object ColumnarSortMergeJoin extends Logging {
       case (expr, i) => {
         val (nativeNode, returnType) = ConverterUtils.getColumnarFuncNode(expr)
         if (s"${nativeNode.toProtobuf}".contains("fnNode")) {
+          throw new UnsupportedOperationException(s"join key with expression is not supported.")
           rkeyProjectOrdinalList += i
           Field.nullable(s"${expr}", returnType)
         } else {