aboutsummaryrefslogtreecommitdiff
path: root/sql/core
diff options
context:
space:
mode:
authorDavies Liu <davies@databricks.com>2015-02-11 12:13:16 -0800
committerReynold Xin <rxin@databricks.com>2015-02-11 12:13:16 -0800
commitb694eb9c2fefeaa33891d3e61f9bea369bc09984 (patch)
tree0618924c6564e41ab27676415e79467216d4832f /sql/core
parent1ac099e3e00ddb01af8e6e3a84c70f8363f04b5c (diff)
downloadspark-b694eb9c2fefeaa33891d3e61f9bea369bc09984.tar.gz
spark-b694eb9c2fefeaa33891d3e61f9bea369bc09984.tar.bz2
spark-b694eb9c2fefeaa33891d3e61f9bea369bc09984.zip
[SPARK-5677] [SPARK-5734] [SQL] [PySpark] Python DataFrame API remaining tasks
1. DataFrame.renameColumn 2. DataFrame.show() and _repr_ 3. Use simpleString() rather than jsonValue in DataFrame.dtypes 4. createDataFrame from local Python data, including pandas.DataFrame Author: Davies Liu <davies@databricks.com> Closes #4528 from davies/df3 and squashes the following commits: 014acea [Davies Liu] fix typo 6ba526e [Davies Liu] fix tests 46f5f95 [Davies Liu] address comments 6cbc154 [Davies Liu] dataframe.show() and improve dtypes 6f94f25 [Davies Liu] create DataFrame from local Python data
Diffstat (limited to 'sql/core')
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/DataFrameImpl.scala15
1 files changed, 11 insertions, 4 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameImpl.scala
index 9638ce0865..41da4424ae 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameImpl.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameImpl.scala
@@ -126,7 +126,10 @@ private[sql] class DataFrameImpl protected[sql](
logicalPlan.isInstanceOf[LocalRelation]
}
- override def show(): Unit = {
+ /**
+ * Internal API for Python
+ */
+ private[sql] def showString(): String = {
val data = take(20)
val numCols = schema.fieldNames.length
@@ -146,12 +149,16 @@ private[sql] class DataFrameImpl protected[sql](
}
}
- // Pad the cells and print them
- println(rows.map { row =>
+ // Pad the cells
+ rows.map { row =>
row.zipWithIndex.map { case (cell, i) =>
String.format(s"%-${colWidths(i)}s", cell)
}.mkString(" ")
- }.mkString("\n"))
+ }.mkString("\n")
+ }
+
+ override def show(): Unit = {
+ println(showString)
}
override def join(right: DataFrame): DataFrame = {