-
- Downloads
[SPARK-19949][SQL] unify bad record handling in CSV and JSON
## What changes were proposed in this pull request? Currently JSON and CSV have exactly the same logic about handling bad records, this PR tries to abstract it and put it in a upper level to reduce code duplication. The overall idea is, we make the JSON and CSV parser to throw a BadRecordException, then the upper level, FailureSafeParser, handles bad records according to the parse mode. Behavior changes: 1. with PERMISSIVE mode, if the number of tokens doesn't match the schema, previously CSV parser will treat it as a legal record and parse as many tokens as possible. After this PR, we treat it as an illegal record, and put the raw record string in a special column, but we still parse as many tokens as possible. 2. all logging is removed as they are not very useful in practice. ## How was this patch tested? existing tests Author: Wenchen Fan <wenchen@databricks.com> Author: hyukjinkwon <gurwls223@gmail.com> Author: Wenchen Fan <cloud0fan@gmail.com> Closes #17315 from cloud-fan/bad-record2.
Showing
- R/pkg/inst/tests/testthat/test_sparkSQL.R 2 additions, 3 deletionsR/pkg/inst/tests/testthat/test_sparkSQL.R
- sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/jsonExpressions.scala 2 additions, 2 deletions...ache/spark/sql/catalyst/expressions/jsonExpressions.scala
- sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/json/JSONOptions.scala 1 addition, 1 deletion...cala/org/apache/spark/sql/catalyst/json/JSONOptions.scala
- sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/json/JacksonParser.scala 8 additions, 114 deletions...la/org/apache/spark/sql/catalyst/json/JacksonParser.scala
- sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/FailureSafeParser.scala 80 additions, 0 deletions...rg/apache/spark/sql/catalyst/util/FailureSafeParser.scala
- sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala 19 additions, 4 deletions...src/main/scala/org/apache/spark/sql/DataFrameReader.scala
- sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVDataSource.scala 9 additions, 8 deletions...e/spark/sql/execution/datasources/csv/CSVDataSource.scala
- sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVFileFormat.scala 5 additions, 2 deletions...e/spark/sql/execution/datasources/csv/CSVFileFormat.scala
- sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVOptions.scala 1 addition, 1 deletion...ache/spark/sql/execution/datasources/csv/CSVOptions.scala
- sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/UnivocityParser.scala 62 additions, 135 deletions...spark/sql/execution/datasources/csv/UnivocityParser.scala
- sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonDataSource.scala 23 additions, 8 deletions...spark/sql/execution/datasources/json/JsonDataSource.scala
- sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonFileFormat.scala 5 additions, 2 deletions...spark/sql/execution/datasources/json/JsonFileFormat.scala
- sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVSuite.scala 1 addition, 1 deletion...apache/spark/sql/execution/datasources/csv/CSVSuite.scala
- sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/json/JsonSuite.scala 4 additions, 4 deletions...ache/spark/sql/execution/datasources/json/JsonSuite.scala
Loading
Please register or sign in to comment