Skip to content

[SPARK-56200][CORE] Remove jackson JSON nesting depth limitation #55004

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

Open
lsm1 wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −4
Open

[SPARK-56200][CORE] Remove jackson JSON nesting depth limitation #55004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions core/src/main/scala/org/apache/spark/util/JsonProtocol.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import java.util.{Properties, UUID}
import scala.collection.Map
import scala.jdk.CollectionConverters._

import com.fasterxml.jackson.core.{JsonGenerator, StreamReadConstraints}
import com.fasterxml.jackson.core.{JsonGenerator, StreamReadConstraints, StreamWriteConstraints}
import com.fasterxml.jackson.databind.JsonNode
import org.json4s.jackson.JsonMethods.compact

Expand Down Expand Up @@ -67,8 +67,17 @@ private[spark] object JsonProtocol extends JsonUtils {
// TODO: Remove this file and put JSON serialization into each individual class.

// SPARK-49872: Remove jackson JSON string length limitation.
// Remove jackson JSON nesting depth limitation.
mapper.getFactory.setStreamReadConstraints(
StreamReadConstraints.builder().maxStringLength(Int.MaxValue).build()
StreamReadConstraints.builder()
.maxStringLength(Int.MaxValue)
.maxNestingDepth(Int.MaxValue)
.build()
)
mapper.getFactory.setStreamWriteConstraints(
StreamWriteConstraints.builder()
.maxNestingDepth(Int.MaxValue)
.build()
)

private[util]
Expand Down Expand Up @@ -965,7 +974,7 @@ private[spark] object JsonProtocol extends JsonUtils {
case other =>
val otherClass = Utils.classForName(other)
if (classOf[SparkListenerEvent].isAssignableFrom(otherClass)) {
mapper.readValue(json.toString, otherClass)
mapper.readValue(mapper.writeValueAsString(json), otherClass)
.asInstanceOf[SparkListenerEvent]
} else {
throw new SparkException(s"Unknown event type: $other")
Expand Down Expand Up @@ -1610,7 +1619,7 @@ private[spark] object JsonProtocol extends JsonUtils {
def resourcesMapFromJson(json: JsonNode): Map[String, ResourceInformation] = {
assert(json.isObject, s"expected object, got ${json.getNodeType}")
json.properties.asScala.map { field =>
val resourceInfo = ResourceInformation.parseJson(field.getValue.toString)
val resourceInfo = ResourceInformation.parseJson(mapper.writeValueAsString(field.getValue))
(field.getKey, resourceInfo)
}.toMap
}
Expand Down