Repository: spark Updated Branches: refs/heads/branch-2.1 536a21593 -> 978798880
[SPARK-18490][SQL] duplication nodename extrainfo for ShuffleExchange ## What changes were proposed in this pull request? In ShuffleExchange, the nodename's extraInfo are the same when exchangeCoordinator.isEstimated is true or false. Merge the two situation in the PR. Author: root <root@iZbp1gsnrlfzjxh82cz80vZ.(none)> Closes #15920 from windpiger/DupNodeNameShuffleExchange. (cherry picked from commit b0aa1aa1af6c513a6a881eaea96abdd2b480ef98) Signed-off-by: Sean Owen <so...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/97879888 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/97879888 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/97879888 Branch: refs/heads/branch-2.1 Commit: 978798880c0b1e6a15e8a342847e1ff4d83a5ac0 Parents: 536a215 Author: root <root@iZbp1gsnrlfzjxh82cz80vZ.(none)> Authored: Thu Nov 17 17:04:19 2016 +0000 Committer: Sean Owen <so...@cloudera.com> Committed: Thu Nov 17 17:04:38 2016 +0000 ---------------------------------------------------------------------- .../apache/spark/sql/execution/exchange/ShuffleExchange.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/97879888/sql/core/src/main/scala/org/apache/spark/sql/execution/exchange/ShuffleExchange.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/exchange/ShuffleExchange.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/exchange/ShuffleExchange.scala index 7a4a251..125a493 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/exchange/ShuffleExchange.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/exchange/ShuffleExchange.scala @@ -45,9 +45,7 @@ case class ShuffleExchange( override def nodeName: String = { val extraInfo = coordinator match { - case Some(exchangeCoordinator) if exchangeCoordinator.isEstimated => - s"(coordinator id: ${System.identityHashCode(coordinator)})" - case Some(exchangeCoordinator) if !exchangeCoordinator.isEstimated => + case Some(exchangeCoordinator) => s"(coordinator id: ${System.identityHashCode(coordinator)})" case None => "" } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
