You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/12/16 09:58:00 UTC
[1/2] spark git commit: Revert "[HOTFIX] Compile error from commit
31b3910"
Repository: spark
Updated Branches:
refs/heads/master 554d840a9 -> 1a3d0cd9f
Revert "[HOTFIX] Compile error from commit 31b3910"
This reverts commit 840bd2e008da5b22bfa73c587ea2c57666fffc60.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/18ea11c3
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/18ea11c3
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/18ea11c3
Branch: refs/heads/master
Commit: 18ea11c3a84e5eafd81fa0fe7c09224e79c4e93f
Parents: 554d840
Author: Reynold Xin <rx...@databricks.com>
Authored: Wed Dec 16 00:57:07 2015 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Wed Dec 16 00:57:07 2015 -0800
----------------------------------------------------------------------
sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/18ea11c3/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 33b03be..b69d441 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
@@ -234,7 +234,7 @@ class DataFrame private[sql](
// For Data that has more than "_numRows" records
if (hasMoreData) {
val rowsString = if (_numRows == 1) "row" else "rows"
- sb.append(s"only showing top ${_numRows} $rowsString\n")
+ sb.append(s"only showing top $_numRows $rowsString\n")
}
sb.toString()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[2/2] spark git commit: Revert "[SPARK-12105] [SQL] add convenient
show functions"
Posted by rx...@apache.org.
Revert "[SPARK-12105] [SQL] add convenient show functions"
This reverts commit 31b391019ff6eb5a483f4b3e62fd082de7ff8416.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1a3d0cd9
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1a3d0cd9
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1a3d0cd9
Branch: refs/heads/master
Commit: 1a3d0cd9f013aee1f03b1c632c91ae0951bccbb0
Parents: 18ea11c
Author: Reynold Xin <rx...@databricks.com>
Authored: Wed Dec 16 00:57:34 2015 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Wed Dec 16 00:57:34 2015 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/sql/DataFrame.scala | 25 +++++++-------------
1 file changed, 9 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/1a3d0cd9/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 b69d441..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
@@ -161,23 +161,16 @@ class DataFrame private[sql](
}
/**
- * Compose the string representing rows for output
- */
- def showString(): String = {
- showString(20)
- }
-
- /**
* Compose the string representing rows for output
- * @param numRows Number of rows to show
+ * @param _numRows Number of rows to show
* @param truncate Whether truncate long strings and align cells right
*/
- def showString(numRows: Int, truncate: Boolean = true): String = {
- val _numRows = numRows.max(0)
+ private[sql] def showString(_numRows: Int, truncate: Boolean = true): String = {
+ val numRows = _numRows.max(0)
val sb = new StringBuilder
- val takeResult = take(_numRows + 1)
- val hasMoreData = takeResult.length > _numRows
- val data = takeResult.take(_numRows)
+ val takeResult = take(numRows + 1)
+ val hasMoreData = takeResult.length > numRows
+ val data = takeResult.take(numRows)
val numCols = schema.fieldNames.length
// For array values, replace Seq and Array with square brackets
@@ -231,10 +224,10 @@ class DataFrame private[sql](
sb.append(sep)
- // For Data that has more than "_numRows" records
+ // For Data that has more than "numRows" records
if (hasMoreData) {
- val rowsString = if (_numRows == 1) "row" else "rows"
- sb.append(s"only showing top $_numRows $rowsString\n")
+ val rowsString = if (numRows == 1) "row" else "rows"
+ sb.append(s"only showing top $numRows $rowsString\n")
}
sb.toString()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org