From 807c161f67abe2d852c9e81949b0eb7332353711 Mon Sep 17 00:00:00 2001 From: Yuan Zhou Date: Mon, 4 Jan 2021 17:11:54 +0800 Subject: [PATCH] fix Signed-off-by: Yuan Zhou --- .../execution/ColumnarSortMergeJoinExec.scala | 18 ------------------ .../ColumnarBroadcastExchangeExec.scala | 5 +++-- 2 files changed, 3 insertions(+), 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 index d22369edd..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 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 index 91736b697..7831ea3a2 100644 --- 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]()