Skip to content

Commit 5772404

Browse files
committed
minimize changes, also there is no point in quoting empty strings if null value is also set to empty string
1 parent ad3a11d commit 5772404

File tree

1 file changed

+2
-6
lines changed
  • sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv

1 file changed

+2
-6
lines changed

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVOptions.scala

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class CSVOptions(
173173
writerSettings.setIgnoreLeadingWhitespaces(ignoreLeadingWhiteSpaceFlagInWrite)
174174
writerSettings.setIgnoreTrailingWhitespaces(ignoreTrailingWhiteSpaceFlagInWrite)
175175
writerSettings.setNullValue(nullValue)
176-
if (quote == '\u0000') {
176+
if (nullValue == "" || quote == '\u0000') {
177177
writerSettings.setEmptyValue(nullValue)
178178
} else {
179179
writerSettings.setEmptyValue(s"${quote}${quote}")
@@ -198,11 +198,7 @@ class CSVOptions(
198198
settings.setInputBufferSize(inputBufferSize)
199199
settings.setMaxColumns(maxColumns)
200200
settings.setNullValue(nullValue)
201-
if (quote == '\u0000') {
202-
settings.setEmptyValue(null)
203-
} else {
204-
settings.setEmptyValue("")
205-
}
201+
settings.setEmptyValue("")
206202
settings.setMaxCharsPerColumn(maxCharsPerColumn)
207203
settings.setUnescapedQuoteHandling(UnescapedQuoteHandling.STOP_AT_DELIMITER)
208204
settings

0 commit comments

Comments
 (0)