[SPARK-7294] ADD BETWEEN

Author: 云峤

sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala

@@ -175,6 +175,7 @@ class DataFrame private[sql](
    * @param numRows Number of rows to show
    */
   private[sql] def showString(numRows: Int): String = {
+    val sb = new StringBuilder
     val data = take(numRows)
     val numCols = schema.fieldNames.length
 
@@ -194,12 +195,34 @@ class DataFrame private[sql](
       }
     }
 
-    // Pad the cells
-    rows.map { row =>
-      row.zipWithIndex.map { case (cell, i) =>
-        String.format(s"%-${colWidths(i)}s", cell)
-      }.mkString(" ")
-    }.mkString("\n")
+    // Create SeparateLine
+    val sep:String = {
+      "+" + colWidths.map {
+        size =>
+          val columnSep = new Array[Char](size)
+          for (i <- 0 until size)
+            columnSep(i) = '-'
+          String.valueOf(columnSep)
+      }.mkString("+") + "+\n"
+    }
+
+    sb.append(sep)
+
+    // append column names
+    sb.append("|").append(rows.head.zipWithIndex.map { case (cell, i) =>
+        String.format(s"%${colWidths(i)}s", cell)
+      }.mkString("|")).append("|\n")
+
+    // append data
+    sb.append(rows.tail.map { row =>
+      "|" + row.zipWithIndex.map { case (cell, i) =>
+        String.format(s"%${colWidths(i)}s", cell)
+      }.mkString("|") + "|"
+    }.mkString("\n")).append("\n")
+
+    sb.append(sep)
+
+    sb.toString()
   }
 
   override def toString: String = {

sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala

@@ -592,10 +592,10 @@ class DataFrameSuite extends QueryTest {
     checkAnswer(df.select(df("key")), testData.select('key).collect().toSeq)
   }
 
-  ignore("show") {
+  test("show") {
     // This test case is intended ignored, but to make sure it compiles correctly
     testData.select($"*").show()
-    testData.select($"*").show(1000)
+    //testData.select($"*").show(1000)
   }
 
   test("createDataFrame(RDD[Row], StructType) should convert UDTs (SPARK-6672)") {