fix

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
oap-project · Jan 4, 2021 · 807c161 · 807c161
1 parent b7542d7
commit 807c161
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 20 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
@@ -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
 

diff --git a/core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala b/core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala
@@ -113,8 +113,9 @@ class ColumnarBroadcastExchangeExec(mode: BroadcastMode, child: SparkPlan)
         hashRelationKernel.build(
           hash_relation_schema,
           Lists.newArrayList(hash_relation_expr),
-          true
-          )
+          null,
+          true,
+          SparkMemoryUtils.globalMemoryPool())
         val iter = ConverterUtils.convertFromNetty(output, input)
         var numRows: Long = 0
         val _input = new ArrayBuffer[ColumnarBatch]()