review comments addressed

prakharjain09 · prakharjain09 · commit b82540e7fbde · 2020-11-27T19:35:57.000+05:30
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoinExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoinExec.scala
@@ -69,7 +69,7 @@ case class SortMergeJoinExec(
       val rightKeyOrdering = getKeyOrdering(rightKeys, right.outputOrdering)
       leftKeyOrdering.zip(rightKeyOrdering).map { case (lKey, rKey) =>
         // Also add expressions from right side sort order
-        val sameOrderExpressions = ExpressionSet(lKey.children ++ rKey.children) - lKey.child
+        val sameOrderExpressions = ExpressionSet(lKey.sameOrderExpressions ++ rKey.children)
         SortOrder(lKey.child, Ascending, sameOrderExpressions.toSeq)
       }
     // For left and right outer joins, the output is ordered by the streamed input's join keys.

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ case class SortMergeJoinExec(`
`69`	`69`	`val rightKeyOrdering = getKeyOrdering(rightKeys, right.outputOrdering)`
`70`	`70`	`leftKeyOrdering.zip(rightKeyOrdering).map { case (lKey, rKey) =>`
`71`	`71`	`// Also add expressions from right side sort order`
`72`		`- val sameOrderExpressions = ExpressionSet(lKey.children ++ rKey.children) - lKey.child`
	`72`	`+ val sameOrderExpressions = ExpressionSet(lKey.sameOrderExpressions ++ rKey.children)`
`73`	`73`	`SortOrder(lKey.child, Ascending, sameOrderExpressions.toSeq)`
`74`	`74`	`}`
`75`	`75`	`// For left and right outer joins, the output is ordered by the streamed input's join keys.`