From 27bd24402e294c4c5a21606a9e41434bb647f558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Thu, 3 Dec 2015 14:50:59 +0100 Subject: [PATCH 1/3] SPARK-12105 - SPARK-SQL add convenient show functions --- .../main/scala/org/apache/spark/sql/DataFrame.scala | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 497bd4826677..35f9735b5f9a 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 @@ -17,7 +17,7 @@ package org.apache.spark.sql -import java.io.CharArrayWriter +import java.io.{OutputStreamWriter, Writer, OutputStream, CharArrayWriter} import java.util.Properties import scala.language.implicitConversions @@ -165,7 +165,7 @@ class DataFrame private[sql]( * @param _numRows Number of rows to show * @param truncate Whether truncate long strings and align cells right */ - private[sql] def showString(_numRows: Int, truncate: Boolean = true): String = { + def showString(_numRows: Int, truncate: Boolean = true): String = { val numRows = _numRows.max(0) val sb = new StringBuilder val takeResult = take(numRows + 1) @@ -394,6 +394,15 @@ class DataFrame private[sql]( def show(numRows: Int, truncate: Boolean): Unit = println(showString(numRows, truncate)) // scalastyle:on println + def show(numRows: Int, truncate: Boolean, outputStream: OutputStream): Unit = { + val writer = new OutputStreamWriter(outputStream, "UTF-8") + writer.write(showString(numRows, truncate)) + } + + def show(numRows: Int, truncate: Boolean, writer: Writer): Unit = { + writer.write(showString(numRows, truncate)) + } + /** * Returns a [[DataFrameNaFunctions]] for working with missing data. * {{{ From 381dfd04a02c4e5c6c9bae610ca28ed968b23bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Fri, 11 Dec 2015 22:47:41 +0100 Subject: [PATCH 2/3] SPARK-12105 - Remove clunky functions and add showString() alias function --- .../scala/org/apache/spark/sql/DataFrame.scala | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) 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 35f9735b5f9a..0d11569a111e 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 @@ -160,6 +160,13 @@ class DataFrame private[sql]( } } + /** + * Alias on showString for user convenience + */ + def showString(): String = { + showString(20, true); + } + /** * Compose the string representing rows for output * @param _numRows Number of rows to show @@ -394,15 +401,6 @@ class DataFrame private[sql]( def show(numRows: Int, truncate: Boolean): Unit = println(showString(numRows, truncate)) // scalastyle:on println - def show(numRows: Int, truncate: Boolean, outputStream: OutputStream): Unit = { - val writer = new OutputStreamWriter(outputStream, "UTF-8") - writer.write(showString(numRows, truncate)) - } - - def show(numRows: Int, truncate: Boolean, writer: Writer): Unit = { - writer.write(showString(numRows, truncate)) - } - /** * Returns a [[DataFrameNaFunctions]] for working with missing data. * {{{ From 694e94fc322b9ca7830a957f111b38700fae998f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Tue, 15 Dec 2015 08:23:07 +0100 Subject: [PATCH 3/3] SPARK-12105 - Cleanup import, copy comment, and use truncate default value --- .../src/main/scala/org/apache/spark/sql/DataFrame.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 0d11569a111e..e11018fd15cf 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 @@ -17,7 +17,7 @@ package org.apache.spark.sql -import java.io.{OutputStreamWriter, Writer, OutputStream, CharArrayWriter} +import java.io.CharArrayWriter import java.util.Properties import scala.language.implicitConversions @@ -161,10 +161,10 @@ class DataFrame private[sql]( } /** - * Alias on showString for user convenience + * Compose the string representing rows for output */ def showString(): String = { - showString(20, true); + showString(20); } /**