Skip to content

Commit 54e60bb

Browse files
committed
Revert unrelated newline change and cleanup comments
1 parent 72d6410 commit 54e60bb

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/json/JacksonParser.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ private[sql] class SparkSQLJsonProcessingException(msg: String) extends RuntimeE
4040
class JacksonParser(
4141
schema: StructType,
4242
options: JSONOptions) extends Logging {
43+
4344
import JacksonUtils._
4445
import ParseModes._
4546
import com.fasterxml.jackson.core.JsonToken._

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3004,11 +3004,11 @@ object functions {
30043004
from_json(e, schema, options.asScala.toMap)
30053005

30063006
/**
3007-
* (Java-specific) Parses a column containing a JSON object or array string into a `StructType`
3008-
* or `ArrayType` with the specified schema. Returns `null`, in the case of an unparseable string.
3007+
* (Java-specific) Parses a column containing a JSON string into a `StructType` or `ArrayType`
3008+
* with the specified schema. Returns `null`, in the case of an unparseable string.
30093009
*
3010-
* @param e a string column containing JSON object or array data.
3011-
* @param schema the schema to use when parsing the json object or array string
3010+
* @param e a string column containing JSON data.
3011+
* @param schema the schema to use when parsing the json string
30123012
* @param options options to control how the json is parsed. accepts the same options and the
30133013
* json data source.
30143014
*

0 commit comments

Comments
 (0)