Skip to content
This repository has been archived by the owner on Sep 18, 2023. It is now read-only.

Commit

Permalink
[NSE-4]fix columnar BHJ on new memory pool (#3)
Browse files Browse the repository at this point in the history
* fix columnar bhj

Signed-off-by: Yuan Zhou <[email protected]>

* fix

Signed-off-by: Yuan Zhou <[email protected]>
  • Loading branch information
zhouyuan authored Jan 5, 2021
1 parent 089ccf9 commit 7f5d53e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -319,6 +301,8 @@ case class ColumnarSortMergeJoinExec(
}
ColumnarCodegenContext(inputSchema, outputSchema, codeGenNode)
}
val triggerBuildSignature = getCodeGenSignature


/***********************************************************/
def getCodeGenSignature: String =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 7f5d53e

Please sign in to comment.