Skip to content
Closed
Changes from 1 commit
Commits
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
Merge remote-tracking branch 'origin/master' into SPARK-7375
Conflicts:
	sql/core/src/main/scala/org/apache/spark/sql/execution/Exchange.scala
  • Loading branch information
JoshRosen committed May 8, 2015
commit 899e1d7b23780edcf1ec489574fa21921da3b074
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ case class Exchange(
case HashPartitioning(expressions, numPartitions) =>
val keySchema = expressions.map(_.dataType).toArray
val valueSchema = child.output.map(_.dataType).toArray
val serializer = getSerializer(keySchema, valueSchema, numPartitions)
val serializer = getSerializer(keySchema, valueSchema, newOrdering.nonEmpty, numPartitions)
val part = new HashPartitioner(numPartitions)

val rdd = if (needToCopyObjectsBeforeShuffle(part, serializer)) {
Expand All @@ -193,7 +193,7 @@ case class Exchange(

case RangePartitioning(sortingExpressions, numPartitions) =>
val keySchema = child.output.map(_.dataType).toArray
val serializer = getSerializer(keySchema, null, numPartitions)
val serializer = getSerializer(keySchema, null, newOrdering.nonEmpty, numPartitions)

val childRdd = child.execute()
val part: Partitioner = {
Expand Down Expand Up @@ -226,7 +226,7 @@ case class Exchange(

case SinglePartition =>
val valueSchema = child.output.map(_.dataType).toArray
val serializer = getSerializer(null, valueSchema, 1)
val serializer = getSerializer(null, valueSchema, hasKeyOrdering = false, 1)
val partitioner = new HashPartitioner(1)

val rdd = if (needToCopyObjectsBeforeShuffle(partitioner, serializer)) {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.