Skip to content

[SPARK-29444] Add configuration to support JacksonGenrator to keep fields with null values #26098

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
jackylee-ch wants to merge 6 commits into from
Closed

[SPARK-29444] Add configuration to support JacksonGenrator to keep fields with null values #26098

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b90344
Add configuration to support JacksonGenrator to keep fields with null…
Oct 12, 2019
4f3c83f
[SPARK-29444] add spark jira id in test
Oct 13, 2019
143b9e7
[SPARK-29444] Fix suite tests
Oct 13, 2019
f57bea2
[SPARK-29444] add a suite test for struct inner null
Oct 16, 2019
eb123bf
[SPARK-29444] change config from structIgnoreNull to ignoreNullFields
Oct 16, 2019
f8aea25
[SPARK-29444] add SQLConf to JSONOptions
Oct 17, 2019
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
Prev Previous commit
Next Next commit
[SPARK-29444] Fix suite tests
  • Loading branch information
stczwd committed Oct 13, 2019
commit 143b9e7b29d712ea2a440a2b2414071ef6a5824a
3 changes: 2 additions & 1 deletion sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/json/JacksonGeneratorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ class JacksonGeneratorSuite extends SparkFunSuite {
assert(writer.toString === """{"a":1}""")
}

test("SPARK-29444: initial with StructType and write out an empty row with allowStructIncludeNull=true") {
test("SPARK-29444: initial with StructType and write out an empty row " +
"with allowStructIncludeNull=true") {
val dataType = StructType(StructField("a", IntegerType) :: Nil)
val input = InternalRow(null)
val writer = new CharArrayWriter()
Expand Down
5 changes: 1 addition & 4 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonFileFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,8 @@ class JsonFileFormat extends TextBasedFileFormat with DataSourceRegister {
options: Map[String, String],
dataSchema: StructType): OutputWriterFactory = {
val conf = job.getConfiguration
val optionsFromConf =
Map("structIngoreNull" ->
sparkSession.sessionState.conf.jsonGeneratorStructIngoreNull.toString)
val parsedOptions = new JSONOptions(
optionsFromConf ++ options,
options,
sparkSession.sessionState.conf.sessionLocalTimeZone,
sparkSession.sessionState.conf.columnNameOfCorruptRecord)
parsedOptions.compressionCodec.foreach { codec =>
Expand Down