From 3f49aab1342fd2d877749c7cce5cfa6bc8ac1fa7 Mon Sep 17 00:00:00 2001 From: Xiangrui Meng Date: Tue, 14 Oct 2014 22:41:46 -0700 Subject: [PATCH] remove StructField.toString --- .../org/apache/spark/sql/catalyst/types/dataTypes.scala | 5 ----- .../scala/org/apache/spark/sql/catalyst/util/Metadata.scala | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/types/dataTypes.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/types/dataTypes.scala index ec12f09bc6ffa..56bb980b20946 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/types/dataTypes.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/types/dataTypes.scala @@ -401,11 +401,6 @@ case class StructField( DataType.buildFormattedString(dataType, s"$prefix |", builder) } - override def toString: String = { - // Do not add metadata to be consistent with CaseClassStringParser. - s"StructField($name,$dataType,$nullable)" - } - private[sql] def jsonValue: JValue = { ("name" -> name) ~ ("type" -> dataType.jsonValue) ~ diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/Metadata.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/Metadata.scala index e16edd94fb24d..469a429eccc82 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/Metadata.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/Metadata.scala @@ -153,7 +153,7 @@ object Metadata { private def toJsonValue(obj: Any): JValue = { obj match { case map: Map[_, _] => - val fields = map.toList.map { case (k: String, v) => (k, toJsonValue(v))} + val fields = map.toList.map { case (k: String, v) => (k, toJsonValue(v)) } JObject(fields) case arr: Array[_] => val values = arr.toList.map(toJsonValue)