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
Next Next commit
Address comments and fix PySpark test
  • Loading branch information
@Eric5553
Eric5553 committed Feb 27, 2020
commit e9022a108bdca888b6bad358c25645473d8a98b8
6 changes: 2 additions & 4 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,7 @@ abstract class SparkStrategies extends QueryPlanner[SparkPlan] {

def createCartesianProduct() = {
if (joinType.isInstanceOf[InnerLike]) {
Some(Seq(joins.CartesianProductExec(
planLater(left), planLater(right), condition)))
Some(Seq(joins.CartesianProductExec(planLater(left), planLater(right), condition)))
} else {
None
}
Expand Down Expand Up @@ -368,8 +367,7 @@ abstract class SparkStrategies extends QueryPlanner[SparkPlan] {

def createCartesianProduct() = {
if (joinType.isInstanceOf[InnerLike]) {
Some(Seq(joins.CartesianProductExec(
planLater(left), planLater(right), condition)))
Some(Seq(joins.CartesianProductExec(planLater(left), planLater(right), condition)))
} else {
None
}
Expand Down
2 changes: 2 additions & 0 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 @@ -27,6 +27,8 @@ import org.apache.spark.sql.execution.{BinaryExecNode, ExplainUtils}
trait BaseJoinExec extends BinaryExecNode {
def joinType: JoinType
def condition: Option[Expression]
def leftKeys: Seq[Expression]
def rightKeys: Seq[Expression]

override def simpleStringWithNodeId(): String = {
val opId = ExplainUtils.getOpId(this)
Expand Down
3 changes: 3 additions & 0 deletions ...ore/src/main/scala/org/apache/spark/sql/execution/joins/BroadcastNestedLoopJoinExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ case class BroadcastNestedLoopJoinExec(
joinType: JoinType,
condition: Option[Expression]) extends BaseJoinExec {

override def leftKeys: Seq[Expression] = Nil
override def rightKeys: Seq[Expression] = Nil

override lazy val metrics = Map(
"numOutputRows" -> SQLMetrics.createMetric(sparkContext, "number of output rows"))

Expand Down
3 changes: 3 additions & 0 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/joins/CartesianProductExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ case class CartesianProductExec(
left: SparkPlan,
right: SparkPlan,
condition: Option[Expression]) extends BaseJoinExec {

override def joinType: JoinType = Inner
override def leftKeys: Seq[Expression] = Nil
override def rightKeys: Seq[Expression] = Nil

override def output: Seq[Attribute] = left.output ++ right.output

Expand Down
2 changes: 0 additions & 2 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 @@ -27,8 +27,6 @@ import org.apache.spark.sql.execution.metric.SQLMetric
import org.apache.spark.sql.types.{IntegralType, LongType}

trait HashJoin extends BaseJoinExec {
def leftKeys: Seq[Expression]
def rightKeys: Seq[Expression]
def buildSide: BuildSide

override def simpleStringWithNodeId(): String = {
Expand Down