Repository: spark Updated Branches: refs/heads/master 2471c0bf7 -> 132e7fca1
[MINOR] [SQL] remove unused code in Exchange Author: Daoyuan Wang <daoyuan.w...@intel.com> Closes #7234 from adrian-wang/exchangeclean and squashes the following commits: b093ec9 [Daoyuan Wang] remove unused code Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/132e7fca Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/132e7fca Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/132e7fca Branch: refs/heads/master Commit: 132e7fca129be8f00ba429a51bcef60abb2eed6d Parents: 2471c0b Author: Daoyuan Wang <daoyuan.w...@intel.com> Authored: Mon Jul 6 15:54:43 2015 -0700 Committer: Josh Rosen <joshro...@databricks.com> Committed: Mon Jul 6 15:54:43 2015 -0700 ---------------------------------------------------------------------- .../org/apache/spark/sql/execution/Exchange.scala | 14 -------------- 1 file changed, 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/132e7fca/sql/core/src/main/scala/org/apache/spark/sql/execution/Exchange.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/Exchange.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/Exchange.scala index edc64a0..e054c1d 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/Exchange.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/Exchange.scala @@ -117,20 +117,6 @@ case class Exchange( } } - private val keyOrdering = { - if (newOrdering.nonEmpty) { - val key = newPartitioning.keyExpressions - val boundOrdering = newOrdering.map { o => - val ordinal = key.indexOf(o.child) - if (ordinal == -1) sys.error(s"Invalid ordering on $o requested for $newPartitioning") - o.copy(child = BoundReference(ordinal, o.child.dataType, o.child.nullable)) - } - new RowOrdering(boundOrdering) - } else { - null // Ordering will not be used - } - } - @transient private lazy val sparkConf = child.sqlContext.sparkContext.getConf private def getSerializer( --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org