Skip to content

[SPARK-17029] make toJSON not go through rdd form but operate on dataset always #14615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robert3005 wants to merge 7 commits into from
Closed

[SPARK-17029] make toJSON not go through rdd form but operate on dataset always #14615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3c9772
make toJSON not go through rdd form but operate on dataset always
Aug 11, 2016
9cf1d55
unbound encoder is enough since we're serializing
Sep 3, 2016
078732b
revert unnecessary doc changes
Mar 17, 2017
e1cc27f
and a simple test
Mar 19, 2017
23a785f
imports
Mar 19, 2017
274be08
address comments
May 10, 2017
723ef1e
style
May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2806,7 +2806,7 @@ class Dataset[T] private[sql](
def toJSON: Dataset[String] = {
val rowSchema = this.schema
val sessionLocalTimeZone = sparkSession.sessionState.conf.sessionLocalTimeZone
val rdd: RDD[String] = queryExecution.toRdd.mapPartitions { iter =>
mapPartitions { iter =>
val writer = new CharArrayWriter()
// create the Generator without separator inserted between 2 records
val gen = new JacksonGenerator(rowSchema, writer,
Expand All @@ -2815,7 +2815,7 @@ class Dataset[T] private[sql](
new Iterator[String] {
override def hasNext: Boolean = iter.hasNext
override def next(): String = {
gen.write(iter.next())
gen.write(exprEnc.toRow(iter.next()))
gen.flush()

val json = writer.toString
Expand All @@ -2828,9 +2828,7 @@ class Dataset[T] private[sql](
json
}
}
}
import sparkSession.implicits.newStringEncoder
sparkSession.createDataset(rdd)
} (Encoders.STRING)
}

/**
Expand Down
10 changes: 10 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/json/JsonSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import org.apache.spark.SparkException
import org.apache.spark.sql.{functions => F, _}
import org.apache.spark.sql.catalyst.json.{CreateJacksonParser, JacksonParser, JSONOptions}
import org.apache.spark.sql.catalyst.util.DateTimeUtils
import org.apache.spark.sql.execution.ExternalRDD
import org.apache.spark.sql.execution.datasources.DataSource
import org.apache.spark.sql.execution.datasources.json.JsonInferSchema.compatibleType
import org.apache.spark.sql.internal.SQLConf
Expand Down Expand Up @@ -1326,6 +1327,15 @@ class JsonSuite extends QueryTest with SharedSQLContext with TestJsonData {
)
}

test("Dataset toJSON doesn't construct rdd") {
val containsRDD = spark.emptyDataFrame.toJSON.queryExecution.logical.find {
case ExternalRDD(_, _) => true
case _ => false
}

assert(containsRDD.isEmpty, "Expected logical plan of toJSON to not contain an RDD")
}

test("JSONRelation equality test") {
withTempPath(dir => {
val path = dir.getCanonicalFile.toURI.toString
Expand Down