Skip to content

[SPARK-8464][Core][Shuffle] Consider separating aggregator and non-aggregator paths in ExternalSorter #7129

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
ilganeli wants to merge 20 commits into from
Closed

[SPARK-8464][Core][Shuffle] Consider separating aggregator and non-aggregator paths in ExternalSorter #7129

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d0024ef
[SPARK-8464] As a starting point, refactored ExternalSorter into two …
Jun 30, 2015
4a04b2a
Created a top level interface for ExternalSorter and created two subc…
Jun 30, 2015
b74ca30
Compilation fixes
Jun 30, 2015
864d603
Spacing
Jun 30, 2015
8b3aca5
Style fixes
Jun 30, 2015
72b87e5
Updated creation of ExternalSorter instances to use aggregator//no-ag…
Jun 30, 2015
083b2b6
Style
Jun 30, 2015
36db0dc
Added MIMA exclude
Jun 30, 2015
1a8dba5
Fixed error in constructor
Jul 1, 2015
7ecc28d
Fixing merge conflicts
Jul 5, 2015
61a4c8e
Fixes to MimaExcludes
Jul 8, 2015
12c11a7
Resolved merge conflict
Jul 8, 2015
1c154c4
style fix
Jul 8, 2015
5e5d5e7
Fixing merge conflict
Jul 8, 2015
8f6e327
Merge conflict
Jul 9, 2015
e5768fa
Resolved merge conflicts
Jul 16, 2015
1eca0e1
Fixed merge conflict
Jul 23, 2015
71eef54
Moved sort updates from basicOperator.scala to sort.scala
Jul 31, 2015
d2fe6b0
Import ordering and spacing/
Jul 31, 2015
bf63fce
Spacing
Jul 31, 2015
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
Import ordering and spacing/
  • Loading branch information
Ilya Ganelin committed Jul 31, 2015
commit d2fe6b045c4b89a555d98fc289f6a380f8bd2b88
7 changes: 1 addition & 6 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,10 @@ import org.apache.spark.rdd.{RDD, ShuffledRDD}
import org.apache.spark.shuffle.sort.SortShuffleManager
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.CatalystTypeConverters
import org.apache.spark.sql.catalyst.errors._
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.plans.physical._
import org.apache.spark.sql.Row
import org.apache.spark.sql.types.StructType
import org.apache.spark.util.collection.ExternalSorterNoAgg
import org.apache.spark.util.collection.unsafe.sort.PrefixComparator
import org.apache.spark.util.{CompletionIterator, MutablePair}
import org.apache.spark.util.MutablePair
import org.apache.spark.{HashPartitioner, SparkEnv}

/**
Expand Down Expand Up @@ -234,7 +230,6 @@ case class Repartition(numPartitions: Int, shuffle: Boolean, child: SparkPlan)
}
}


/**
* :: DeveloperApi ::
* Returns a table with the elements from left that are not in right using
Expand Down
19 changes: 7 additions & 12 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/sort.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@

package org.apache.spark.sql.execution

import org.apache.spark.annotation.DeveloperApi
import org.apache.spark.rdd.RDD
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.errors._
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.plans.physical.{Distribution, OrderedDistribution, UnspecifiedDistribution}
import org.apache.spark.sql.types.StructType
import org.apache.spark.util.CompletionIterator
Expand All @@ -33,16 +32,14 @@ import org.apache.spark.util.collection.ExternalSorterNoAgg


/**
* :: DeveloperApi ::
* Performs a sort on-heap.
* @param global when true performs a global sort of all partitions by shuffling the data first
* if necessary.
*/
@DeveloperApi
case class Sort(
sortOrder: Seq[SortOrder],
global: Boolean,
child: SparkPlan)
sortOrder: Seq[SortOrder],
global: Boolean,
child: SparkPlan)
extends UnaryNode {
override def requiredChildDistribution: Seq[Distribution] =
if (global) OrderedDistribution(sortOrder) :: Nil else UnspecifiedDistribution :: Nil
Expand All @@ -60,16 +57,14 @@ case class Sort(
}

/**
* :: DeveloperApi ::
* Performs a sort, spilling to disk as needed.
* @param global when true performs a global sort of all partitions by shuffling the data first
* if necessary.
*/
@DeveloperApi
case class ExternalSort(
sortOrder: Seq[SortOrder],
global: Boolean,
child: SparkPlan)
sortOrder: Seq[SortOrder],
global: Boolean,
child: SparkPlan)
extends UnaryNode {

override def requiredChildDistribution: Seq[Distribution] =
Expand Down