Skip to content

[SPARK-30842][SQL] Adjust abstraction structure for join operators #27595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Eric5553 wants to merge 5 commits into from
Closed

[SPARK-30842][SQL] Adjust abstraction structure for join operators #27595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be06b37
Adjust Join exec abstraction
Eric5553 Feb 15, 2020
de2198e
address comment
Eric5553 Feb 17, 2020
e9022a1
Address comments and fix PySpark test
Eric5553 Feb 21, 2020
79d2ac2
minor fix for rebase
Eric5553 Feb 21, 2020
17af74f
address comment
Eric5553 Feb 24, 2020
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
Prev Previous commit
address comment
  • Loading branch information
@Eric5553
Eric5553 committed Feb 27, 2020
commit 17af74fbf9af7d80aba5c343b7c8cb4fd36fa14b
17 changes: 13 additions & 4 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/joins/BaseJoinExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,18 @@ trait BaseJoinExec extends BinaryExecNode {
val joinCondStr = if (condition.isDefined) {
s"${condition.get}"
} else "None"
s"""
|(${ExplainUtils.getOpId(this)}) $nodeName ${ExplainUtils.getCodegenId(this)}
|${ExplainUtils.generateFieldString("Join condition", joinCondStr)}
""".stripMargin
if (leftKeys.nonEmpty || rightKeys.nonEmpty) {
s"""
|(${ExplainUtils.getOpId(this)}) $nodeName ${ExplainUtils.getCodegenId(this)}
|${ExplainUtils.generateFieldString("Left keys", leftKeys)}
|${ExplainUtils.generateFieldString("Right keys", rightKeys)}
|${ExplainUtils.generateFieldString("Join condition", joinCondStr)}
""".stripMargin
} else {
s"""
|(${ExplainUtils.getOpId(this)}) $nodeName ${ExplainUtils.getCodegenId(this)}
|${ExplainUtils.generateFieldString("Join condition", joinCondStr)}
""".stripMargin
}
}
}
12 changes: 0 additions & 12 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/joins/HashJoin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,6 @@ trait HashJoin extends BaseJoinExec {
s"$nodeName $joinType ${buildSide} ($opId)".trim
}

override def verboseStringWithOperatorId(): String = {
val joinCondStr = if (condition.isDefined) {
s"${condition.get}"
} else "None"
s"""
|(${ExplainUtils.getOpId(this)}) $nodeName ${ExplainUtils.getCodegenId(this)}
|${ExplainUtils.generateFieldString("Left keys", leftKeys)}
|${ExplainUtils.generateFieldString("Right keys", rightKeys)}
|${ExplainUtils.generateFieldString("Join condition", joinCondStr)}
""".stripMargin
}

override def output: Seq[Attribute] = {
joinType match {
case _: InnerLike =>
Expand Down
12 changes: 0 additions & 12 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoinExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,6 @@ case class SortMergeJoinExec(

override def stringArgs: Iterator[Any] = super.stringArgs.toSeq.dropRight(1).iterator

override def verboseStringWithOperatorId(): String = {
val joinCondStr = if (condition.isDefined) {
s"${condition.get}"
} else "None"
s"""
|(${ExplainUtils.getOpId(this)}) $nodeName ${ExplainUtils.getCodegenId(this)}
|${ExplainUtils.generateFieldString("Left keys", leftKeys)}
|${ExplainUtils.generateFieldString("Right keys", rightKeys)}
|${ExplainUtils.generateFieldString("Join condition", joinCondStr)}
""".stripMargin
}

override def output: Seq[Attribute] = {
joinType match {
case _: InnerLike =>
Expand Down