spark git commit: [SPARK-12298][SQL] Fix infinite loop in DataFrame.sortWithinPartitions

2015-12-11 Thread yhuai 
Repository: spark
Updated Branches:
  refs/heads/branch-1.6 c2f20469d -> 03d801587


[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.

Author: Ankur Dave 

Closes #10271 from ankurdave/SPARK-12298.

(cherry picked from commit 1e799d617a28cd0eaa8f22d103ea8248c4655ae5)
Signed-off-by: Yin Huai 


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/03d80158
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/03d80158
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/03d80158

Branch: refs/heads/branch-1.6
Commit: 03d801587936fe92d4e7541711f1f41965e64956
Parents: c2f2046
Author: Ankur Dave 
Authored: Fri Dec 11 19:07:48 2015 -0800
Committer: Yin Huai 
Committed: Fri Dec 11 19:08:03 2015 -0800

--
 sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala | 2 +-
 .../src/test/scala/org/apache/spark/sql/DataFrameSuite.scala | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/03d80158/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
--
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala 
b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
index 1acfe84..cc8b70b 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
@@ -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(_)) : _*)
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/spark/blob/03d80158/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
--
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala 
b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
index 1763eb5..854dec0 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
@@ -1083,8 +1083,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


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: [SPARK-12298][SQL] Fix infinite loop in DataFrame.sortWithinPartitions

2015-12-11 Thread yhuai 
Repository: spark
Updated Branches:
  refs/heads/master a0ff6d16e -> 1e799d617


[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.

Author: Ankur Dave 

Closes #10271 from ankurdave/SPARK-12298.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1e799d61
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1e799d61
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1e799d61

Branch: refs/heads/master
Commit: 1e799d617a28cd0eaa8f22d103ea8248c4655ae5
Parents: a0ff6d1
Author: Ankur Dave 
Authored: Fri Dec 11 19:07:48 2015 -0800
Committer: Yin Huai 
Committed: Fri Dec 11 19:07:48 2015 -0800

--
 sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala | 2 +-
 .../src/test/scala/org/apache/spark/sql/DataFrameSuite.scala | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/1e799d61/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
--
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala 
b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
index da180a2..497bd48 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
@@ -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(_)) : _*)
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/spark/blob/1e799d61/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
--
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala 
b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
index 5353fef..c0bbf73 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
@@ -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


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org