[SPARK-51296][SQL] Support collecting corrupt data in singleVariantColumn mode. #50517
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@gene-db @sandip-db Please take a look. Thanks! |
sandip-db
reviewed
Apr 7, 2025
| schema.length match { | ||
| case 1 => | ||
| case 2 => | ||
| val corruptRecordName = options.getOrElse( |
There was a problem hiding this comment.
nit:
Suggested change
| val corruptRecordName = options.getOrElse( | |
| val corruptRecordColumnName = options.getOrElse( |
| @@ -4007,6 +4007,7 @@ abstract class JsonSuite | |||
| "true", | |||
| """{"a": [], "b": null}""", | |||
| """{"a": 1}""", | |||
| "bad json", | |||
| @@ -396,7 +396,7 @@ object CSVOptions extends DataSourceOptions { | |||
| val EMPTY_VALUE = newOption("emptyValue") | |||
| val LINE_SEP = newOption("lineSep") | |||
| val INPUT_BUFFER_SIZE = newOption("inputBufferSize") | |||
| val COLUMN_NAME_OF_CORRUPT_RECORD = newOption("columnNameOfCorruptRecord") | |||
| val COLUMN_NAME_OF_CORRUPT_RECORD = newOption(DataSourceOptions.COLUMN_NAME_OF_CORRUPT_RECORD) | |||
There was a problem hiding this comment.
Add from_csv and csv file reader test with corrupt column and variant
gene-db
reviewed
Apr 7, 2025
| @@ -3330,7 +3330,7 @@ | |||
| }, | |||
| "INVALID_SINGLE_VARIANT_COLUMN" : { | |||
| "message" : [ | |||
| "The `singleVariantColumn` option cannot be used if there is also a user specified schema." | |||
| "User specified schema <schema> is invalid when the `singleVariantColumn` option is enabled." | |||
There was a problem hiding this comment.
Are we allowed to change existing error codes/messages?
There was a problem hiding this comment.
I guess it is okay but I'm not sure.
| options: CaseInsensitiveMap[String], | ||
| userSpecifiedSchema: Option[StructType]): Unit = { | ||
| (options.get(SINGLE_VARIANT_COLUMN), userSpecifiedSchema) match { | ||
| case (Some(col), Some(schema)) => |
sandip-db
approved these changes
Apr 7, 2025
| @@ -3330,7 +3330,7 @@ | |||
| }, | |||
| "INVALID_SINGLE_VARIANT_COLUMN" : { | |||
| "message" : [ | |||
| "The `singleVariantColumn` option cannot be used if there is also a user specified schema." | |||
| "User specified schema <schema> is invalid when the `singleVariantColumn` option is enabled." | |||
There was a problem hiding this comment.
Indicate what is allowed and how can user fix it.
HyukjinKwon
approved these changes
Apr 8, 2025
gene-db
approved these changes
Apr 8, 2025
|
@HyukjinKwon could you help merge it? Thanks! |
|
Merged to master. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Currently, if the
singleVariantColumnis specified, the schema will be a single variant column. It is then impossible to collect corrupt data, which requires the schema to contain a column for corrupt data. This PR enables collecting corrupt data insingleVariantColumnmode by relaxing the requirement thatsingleVariantColumnmust not exist together with the user-specified schema. The new requirement is that, if the user-specified schema exists, it must either be a variant field, or a variant field plus a corrupt column field. Corrupt data can be collected in the latter case.Why are the changes needed?
It allows collecting corrupt data in
singleVariantColumnmode.Does this PR introduce any user-facing change?
No.
How was this patch tested?
Unit test.
Was this patch authored or co-authored using generative AI tooling?
No.