Skip to content

[SPARK-12298][SQL] Fix infinite loop in DataFrame.sortWithinPartitions #10271

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
ankurdave wants to merge 1 commit into from
Closed

[SPARK-12298][SQL] Fix infinite loop in DataFrame.sortWithinPartitions #10271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
[SPARK-12298][SQL] Fix infinite loop in DataFrame.sortWithinPartitions 
Modifies the String overload to call the Column overload and ensures
this is called in a test.
  • Loading branch information
@ankurdave
ankurdave committed Dec 12, 2015
commit d9f8c258803aba0e676b798ce5085b52d69f70f7
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ class DataFrame private[sql](
*/
@scala.annotation.varargs
def sortWithinPartitions(sortCol: String, sortCols: String*): DataFrame = {
sortWithinPartitions(sortCol, sortCols : _*)
sortWithinPartitions((sortCol +: sortCols).map(Column(_)) : _*)
}

/**
Expand Down
4 changes: 2 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,8 +1090,8 @@ class DataFrameSuite extends QueryTest with SharedSQLContext {
}

// Distribute into one partition and order by. This partition should contain all the values.
val df6 = data.repartition(1, $"a").sortWithinPartitions($"b".asc)
// Walk each partition and verify that it is sorted descending and not globally sorted.
val df6 = data.repartition(1, $"a").sortWithinPartitions("b")
// Walk each partition and verify that it is sorted ascending and not globally sorted.
df6.rdd.foreachPartition { p =>
var previousValue: Int = -1
var allSequential: Boolean = true
Expand Down