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

[NSE-4]fix columnar BHJ on new memory pool #3

Merged
merged 2 commits into from
Jan 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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