Skip to content
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

Enable mixed types as string in GpuJsonScan #9993

Merged
merged 8 commits into from
Jan 24, 2024
Merged

Enable mixed types as string in GpuJsonScan #9993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1fb5b61
Enable mixed types as string when reading JSON
andygrove Dec 7, 2023
795cb11
mixed type test passes
andygrove Dec 7, 2023
18dcc82
test for mixed primitive arrays
andygrove Dec 7, 2023
fce8e17
enable another test
andygrove Dec 8, 2023
21df1d0
Merge remote-tracking branch 'nvidia/branch-24.02' into mixed-types-json
andygrove Jan 23, 2024
2663511
trigger build
andygrove Jan 23, 2024
dc9d6f4
Merge remote-tracking branch 'nvidia/branch-24.02' into mixed-types-json
andygrove Jan 23, 2024
4fbc8a9
disable mixed type as string in GpuJsonToStruct
andygrove Jan 23, 2024
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
4 changes: 3 additions & 1 deletion integration_tests/src/main/python/json_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,9 @@ def test_read_invalid_json(spark_tmp_table_factory, std_input_path, read_func, f
'mixed-primitives.ndjson',
'mixed-primitives-nested.ndjson',
'simple-nested.ndjson',
pytest.param('mixed-nested.ndjson', marks=pytest.mark.xfail(reason='https://github.com/NVIDIA/spark-rapids/issues/9353'))
'mixed-nested.ndjson',
'mixed-types-in-struct.ndjson',
'mixed-primitive-arrays.ndjson',
])
@pytest.mark.parametrize('read_func', [read_json_df, read_json_sql])
@pytest.mark.parametrize('schema', [_int_schema])
Expand Down
3 changes: 3 additions & 0 deletions integration_tests/src/test/resources/mixed-primitive-arrays.ndjson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{ "var0": [1, 2, 3] }
{ "var0": [false, false, true] }
{ "var0": ["one", "two", "three"] }
2 changes: 2 additions & 0 deletions integration_tests/src/test/resources/mixed-types-in-struct.ndjson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{ "var0": [1, 2, 3] }
{ "var0": { "a": 54321} }
6 changes: 4 additions & 2 deletions sql-plugin/src/main/scala/org/apache/spark/sql/catalyst/json/rapids/GpuJsonScan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,10 @@ class JsonPartitionReader(
maxBytesPerChunk, execMetrics, HostLineBuffererFactory) {

def buildJsonOptions(parsedOptions: JSONOptions): cudf.JSONOptions = {
val builder = cudf.JSONOptions.builder().withRecoverWithNull(true)
builder.build
cudf.JSONOptions.builder()
.withRecoverWithNull(true)
.withMixedTypesAsStrings(true)
.build
}

/**
Expand Down
7 changes: 6 additions & 1 deletion sql-plugin/src/main/scala/org/apache/spark/sql/rapids/GpuJsonToStructs.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,12 @@ case class GpuJsonToStructs(
val end = combinedHost.getEndListOffset(0)
val length = end - start

val jsonOptions = cudf.JSONOptions.builder().withRecoverWithNull(true).build()
val jsonOptions = cudf.JSONOptions.builder()
.withRecoverWithNull(true)
// tracking issue for enabling mixed type as string
// https://github.com/NVIDIA/spark-rapids/issues/10253
.withMixedTypesAsStrings(false)
.build()
withResource(cudf.Table.readJSON(jsonOptions, data, start, length)) { tableWithMeta =>
val names = tableWithMeta.getColumnNames
(names, tableWithMeta.releaseTable())
Expand Down
Loading