Skip to content

[SPARK-40705][SQL] Handle case of using mutable array when converting Row to JSON for Scala 2.13 #38154

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
Amraneze wants to merge 2 commits into from
Closed

[SPARK-40705][SQL] Handle case of using mutable array when converting Row to JSON for Scala 2.13 #38154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7075138
[SPARK-40705] Handle case of using mutable array when converting Row …
Amraneze Oct 7, 2022
eb2eb95
[SPARK-40705] revert changes related to Scalafmt
Amraneze Oct 8, 2022
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
2 changes: 2 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/Row.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,8 @@ trait Row extends Serializable {
case (i: CalendarInterval, _) => JString(i.toString)
case (a: Array[_], ArrayType(elementType, _)) =>
iteratorToJsonArray(a.iterator, elementType)
case (a: mutable.ArraySeq[_], ArrayType(elementType, _)) =>
iteratorToJsonArray(a.iterator, elementType)
case (s: Seq[_], ArrayType(elementType, _)) =>
iteratorToJsonArray(s.iterator, elementType)
case (m: Map[String @unchecked, _], MapType(StringType, valueType, _)) =>
Expand Down
11 changes: 11 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/RowTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@

package org.apache.spark.sql

import scala.collection.mutable.ArraySeq

import org.json4s.JsonAST.{JArray, JObject, JString}
import org.scalatest.funspec.AnyFunSpec
import org.scalatest.matchers.must.Matchers
import org.scalatest.matchers.should.Matchers._
Expand Down Expand Up @@ -91,6 +94,14 @@ class RowTest extends AnyFunSpec with Matchers {
it("getAs() on type extending AnyVal does not throw exception when value is null") {
sampleRowWithoutCol3.getAs[String](sampleRowWithoutCol3.fieldIndex("col1")) shouldBe null
}

it("json should convert a mutable array to JSON") {
val schema = new StructType().add(StructField("list", ArrayType(StringType)))
val values = ArraySeq("1", "2", "3")
val row = new GenericRowWithSchema(Array(values), schema)
val expectedList = JArray(JString("1") :: JString("2") :: JString("3") :: Nil)
row.jsonValue shouldBe new JObject(("list", expectedList) :: Nil)
}
}

describe("row equals") {
Expand Down