Skip to content

[SPARK-43263][BUILD] Upgrade FasterXML jackson to 2.15.0 #40933

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
bjornjorgensen wants to merge 11 commits into from
Closed

[SPARK-43263][BUILD] Upgrade FasterXML jackson to 2.15.0 #40933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e4546a7
./dev/test-dependencies.sh --replace-manifest -U
bjornjorgensen Apr 24, 2023
c7faa1a
Merge branch 'master' into test_jacon
bjornjorgensen Apr 25, 2023
3ae38dc
1 try
bjornjorgensen Apr 25, 2023
9636d1b
Use StreamReadConstraints.builder()
bjornjorgensen Apr 25, 2023
d7337a0
remove )
bjornjorgensen Apr 25, 2023
30483ec
./dev/scalafmt
bjornjorgensen Apr 26, 2023
7eedaf5
StreamReadConstraints to import
bjornjorgensen Apr 26, 2023
b20b920
fix imports
bjornjorgensen Apr 26, 2023
91da9d0
revers scalafmt
bjornjorgensen Apr 27, 2023
0216921
remove extra spaces
bjornjorgensen Apr 27, 2023
b1ef90c
add space
bjornjorgensen Apr 27, 2023
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
16 changes: 8 additions & 8 deletions dev/deps/spark-deps-hadoop-3-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@ httpcore/4.4.16//httpcore-4.4.16.jar
ini4j/0.5.4//ini4j-0.5.4.jar
istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar
ivy/2.5.1//ivy-2.5.1.jar
jackson-annotations/2.14.2//jackson-annotations-2.14.2.jar
jackson-core/2.14.2//jackson-core-2.14.2.jar
jackson-databind/2.14.2//jackson-databind-2.14.2.jar
jackson-dataformat-cbor/2.14.2//jackson-dataformat-cbor-2.14.2.jar
jackson-dataformat-yaml/2.14.2//jackson-dataformat-yaml-2.14.2.jar
jackson-datatype-jsr310/2.14.2//jackson-datatype-jsr310-2.14.2.jar
jackson-module-scala_2.12/2.14.2//jackson-module-scala_2.12-2.14.2.jar
jackson-annotations/2.15.0//jackson-annotations-2.15.0.jar
jackson-core/2.15.0//jackson-core-2.15.0.jar
jackson-databind/2.15.0//jackson-databind-2.15.0.jar
jackson-dataformat-cbor/2.15.0//jackson-dataformat-cbor-2.15.0.jar
jackson-dataformat-yaml/2.15.0//jackson-dataformat-yaml-2.15.0.jar
jackson-datatype-jsr310/2.15.0//jackson-datatype-jsr310-2.15.0.jar
jackson-module-scala_2.12/2.15.0//jackson-module-scala_2.12-2.15.0.jar
jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar
jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
jakarta.servlet-api/4.0.3//jakarta.servlet-api-4.0.3.jar
Expand Down Expand Up @@ -233,7 +233,7 @@ scala-xml_2.12/2.1.0//scala-xml_2.12-2.1.0.jar
shims/0.9.39//shims-0.9.39.jar
slf4j-api/2.0.7//slf4j-api-2.0.7.jar
snakeyaml-engine/2.6//snakeyaml-engine-2.6.jar
snakeyaml/1.33//snakeyaml-1.33.jar
snakeyaml/2.0//snakeyaml-2.0.jar
snappy-java/1.1.9.1//snappy-java-1.1.9.1.jar
spire-macros_2.12/0.17.0//spire-macros_2.12-0.17.0.jar
spire-platform_2.12/0.17.0//spire-platform_2.12-0.17.0.jar
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@
<scalafmt.validateOnly>true</scalafmt.validateOnly>
<scalafmt.changedOnly>true</scalafmt.changedOnly>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<fasterxml.jackson.version>2.14.2</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.14.2</fasterxml.jackson.databind.version>
<fasterxml.jackson.version>2.15.0</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.15.0</fasterxml.jackson.databind.version>
<snappy.version>1.1.9.1</snappy.version>
<netlib.ludovic.dev.version>3.0.3</netlib.ludovic.dev.version>
<commons-codec.version>1.15</commons-codec.version>
Expand Down
25 changes: 24 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/json/JSONOptions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import java.nio.charset.{Charset, StandardCharsets}
import java.time.ZoneId
import java.util.Locale

import com.fasterxml.jackson.core.{JsonFactory, JsonFactoryBuilder}
import com.fasterxml.jackson.core.{JsonFactory, JsonFactoryBuilder, StreamReadConstraints}
import com.fasterxml.jackson.core.json.JsonReadFeature

import org.apache.spark.internal.Logging
Expand All @@ -43,6 +43,21 @@ private[sql] class JSONOptions(

import JSONOptions._

private val maxNestingDepth: Int = parameters
Copy link
Member

@pjfanning pjfanning Apr 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't make any changes yet - but @LuciferYang, are there are guidelines about to handle cases where the parameter values are not convertible to ints (.toInt fails) and where the values evaluate to negative values (which will cause an IllegalArgumentException when setting up StreamReadConstraints

Copy link
Member

@srowen srowen Apr 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is fine. It's a niche set of configs that very few would set. If they set a bad value, a raw error is even OK.

.get("maxNestingDepth")
.map(_.toInt)
.getOrElse(StreamReadConstraints.DEFAULT_MAX_DEPTH)

private val maxNumLen: Int = parameters
.get("maxNumLen")
.map(_.toInt)
.getOrElse(StreamReadConstraints.DEFAULT_MAX_NUM_LEN)

private val maxStringLen: Int = parameters
.get("maxStringLen")
.map(_.toInt)
.getOrElse(StreamReadConstraints.DEFAULT_MAX_STRING_LEN)

def this(
parameters: Map[String, String],
defaultTimeZoneId: String,
Expand Down Expand Up @@ -176,6 +191,13 @@ private[sql] class JSONOptions(

/** Build a Jackson [[JsonFactory]] using JSON options. */
def buildJsonFactory(): JsonFactory = {
val streamReadConstraints = StreamReadConstraints
.builder()
.maxNestingDepth(maxNestingDepth)
.maxNumberLength(maxNumLen)
.maxStringLength(maxStringLen)
.build()

new JsonFactoryBuilder()
.configure(JsonReadFeature.ALLOW_JAVA_COMMENTS, allowComments)
.configure(JsonReadFeature.ALLOW_UNQUOTED_FIELD_NAMES, allowUnquotedFieldNames)
Expand All @@ -186,6 +208,7 @@ private[sql] class JSONOptions(
JsonReadFeature.ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER,
allowBackslashEscapingAnyCharacter)
.configure(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS, allowUnquotedControlChars)
.streamReadConstraints(streamReadConstraints)
.build()
}
}
Expand Down