Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class JSONOptions(
private val maxStringLen: Int = parameters
.get("maxStringLen")
.map(_.toInt)
.getOrElse(StreamReadConstraints.DEFAULT_MAX_STRING_LEN)
.getOrElse(SQLConf.get.getConf(SQLConf.JSON_MAX_STRING_LENGTH))
Copy link
Contributor

Choose a reason for hiding this comment

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

can we follow ParquetOptions and pass a SQLConf instance to construct JSONOptions?


def this(
parameters: Map[String, String],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5016,6 +5016,14 @@ object SQLConf {
.booleanConf
.createWithDefault(false)

val JSON_MAX_STRING_LENGTH =
buildConf("spark.sql.json.defaultMaxStringLength")
.doc("Global default maximum string length limit when reading JSON data. It will be " +
"overridden if a JSONOption maxStringLen is provided.")
.version("3.5.0")
Copy link
Member

Choose a reason for hiding this comment

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

4.1.0

Copy link
Contributor

Choose a reason for hiding this comment

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

This needs to be backported to 3.5 to fix a regression, how about 3.5.7?

.intConf
.createWithDefault(Int.MaxValue)

val VARIANT_ALLOW_DUPLICATE_KEYS =
buildConf("spark.sql.variant.allowDuplicateKeys")
.internal()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import java.time.{Duration, Instant, LocalDate, LocalDateTime, Period, ZoneId}
import java.util.Locale
import java.util.concurrent.atomic.AtomicLong

import com.fasterxml.jackson.core.JsonFactory
import com.fasterxml.jackson.core.{JsonFactory, StreamReadConstraints}
import org.apache.commons.lang3.exception.ExceptionUtils
import org.apache.hadoop.fs.{Path, PathFilter}
import org.apache.hadoop.io.SequenceFile.CompressionType
Expand Down Expand Up @@ -4096,6 +4096,49 @@ abstract class JsonSuite
Row("{null, bad json}"), Row("{[1,2,3], null}"))
)
}

test("Test JSON data source maxStringLen option") {
// Create a JSON string that is way longer than DEFAULT_MAX_STRING_LEN.
val longStringSize = StreamReadConstraints.DEFAULT_MAX_STRING_LEN * 10
Copy link
Contributor

Choose a reason for hiding this comment

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

does * 2 work?

Copy link

Choose a reason for hiding this comment

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

If * 10 works, * 2 will - it's a test, not setting what the actual new max will be.

val longString: String = "a" * longStringSize
val longStringJson = s"""{ "longString": "$longString" }"""

withTempDir { tmpDir =>
// Create a JSON file with a string that is longer than DEFAULT_MAX_STRING_LEN.
val inputPath = new File(tmpDir, "input.json").toPath
Files.write(inputPath, longStringJson.getBytes)

// With JSON_MAX_STRING_LENGTH set to Int.max, should be able to read and write
// the long string.
withSQLConf(SQLConf.JSON_MAX_STRING_LENGTH.key -> s"${Int.MaxValue}") {
val df = spark.read.schema("longString string")
.json(inputPath.toString)
assert(df.collect() === Row(longString) :: Nil)

val e = intercept[SparkException] {
spark.read.schema("longString string")
.option("maxStringLen", 10)
.option("mode", "FAILFAST")
.json(inputPath.toString)
.collect()
}
assert(e.getCause.getMessage.contains(
"Malformed records are detected in record parsing"))
}

withSQLConf(SQLConf.JSON_MAX_STRING_LENGTH.key -> s"${longStringSize - 1}") {
val e = intercept[SparkException] {
spark.read.schema("longString string")
.option("mode", "FAILFAST")
.json(inputPath.toString)
.collect()
}
assert(e.getCondition.startsWith("FAILED_READ_FILE"))
assert(e.getCause.getMessage.contains(
"Malformed records are detected in record parsing"))
}
}
}
}

class JsonV1Suite extends JsonSuite {
Expand Down