Skip to content

[SPARK-18224] [CORE] Optimise PartitionedPairBuffer implementation #15736

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
a-roberts wants to merge 6 commits into from
Closed

[SPARK-18224] [CORE] Optimise PartitionedPairBuffer implementation #15736

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d1411c
[SPARK-18224] [CORE] Optimise PartitionedPairBuffer implementation
a-roberts Nov 2, 2016
a3d85b6
Scalastyle for PartitionedPairBuffer
a-roberts Nov 2, 2016
af4aea3
Improve PartitionedAppendOnlyMap
a-roberts Nov 2, 2016
fc8f98e
Refactor to remove code duplication and do the .get earlier
a-roberts Nov 25, 2016
d342394
And remove extra newlines
a-roberts Nov 25, 2016
53ed170
Refactoring
a-roberts Nov 25, 2016
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
3 changes: 1 addition & 2 deletions core/src/main/scala/org/apache/spark/util/collection/PartitionedAppendOnlyMap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ private[spark] class PartitionedAppendOnlyMap[K, V]

def partitionedDestructiveSortedIterator(keyComparator: Option[Comparator[K]])
: Iterator[((Int, K), V)] = {
val comparator = keyComparator.map(partitionKeyComparator).getOrElse(partitionComparator)
destructiveSortedIterator(comparator)
destructiveSortedIterator(getComparator(keyComparator))
}

def insert(partition: Int, key: K, value: V): Unit = {
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/util/collection/PartitionedPairBuffer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ private[spark] class PartitionedPairBuffer[K, V](initialCapacity: Int = 64)
/** Iterate through the data in a given order. For this class this is not really destructive. */
override def partitionedDestructiveSortedIterator(keyComparator: Option[Comparator[K]])
: Iterator[((Int, K), V)] = {
val comparator = keyComparator.map(partitionKeyComparator).getOrElse(partitionComparator)
new Sorter(new KVArraySortDataFormat[(Int, K), AnyRef]).sort(data, 0, curSize, comparator)
new Sorter(new KVArraySortDataFormat[(Int, K),
Copy link
Member

@srowen srowen Nov 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think breaking the line here is odd. If necesasry, pull out the result of getComparator to a statement above to shorten this line, like it was before.

AnyRef]).sort(data, 0, curSize, getComparator(keyComparator))
iterator
}

Expand Down
25 changes: 25 additions & 0 deletions core/src/main/scala/org/apache/spark/util/collection/WritablePartitionedPairCollection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,31 @@ private[spark] object WritablePartitionedPairCollection {
}
}

/* Takes an optional parameter (keyComparator), use if provided
Copy link
Member

@srowen srowen Nov 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Javadoc/scaladoc starts with /** and usually you leave that alone on one line and start documentation on the next.

* and returns a comparator for the partitions
*/
def getComparator[K](keyComparator: Option[Comparator[K]]) : Comparator[(Int, K)] = {
Copy link
Member

@srowen srowen Nov 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: no space before colon

val comparator : Comparator[(Int, K)] =
Copy link
Member

@srowen srowen Nov 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comparator is now entirely redundant. The whole body is just the if statement

if (keyComparator.isEmpty) {
Copy link
Member

@srowen srowen Nov 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isDefined is probably a tiny bit more conventional (and then flip the logic here of course)

partitionComparator
Copy link
Member

@srowen srowen Nov 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be inlined now

} else {
new Comparator[(Int, K)] {
// We know we have a non-empty comparator here
val ourKeyComp = keyComparator.get
Copy link
Member

@srowen srowen Nov 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be outside the body of the anonymous class. You don't need a reference to the Option here even in the anonymous class.

override def compare(a: (Int, K), b: (Int, K)): Int = {
val partitionDiff = a._1 - b._1
Copy link
Member

@srowen srowen Nov 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm still not thrilled about the subtraction here but maybe leave it for now

if (partitionDiff != 0) {
partitionDiff
} else {
ourKeyComp.compare(a._2, b._2)
}
}
}
}
comparator
}


Copy link
Member

@srowen srowen Nov 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can delete partitionKeyComparator below now, right?

/**
* A comparator for (Int, K) pairs that orders them both by their partition ID and a key ordering.
*/
Expand Down