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

Jump to bottom

Support ORC write Map column #3821

Merged
merged 14 commits into from
Nov 2, 2021
Merged

Support ORC write Map column #3821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3cdd87e
Support ORC write Map column
Oct 14, 2021
c35a997
ci failed, try to test
Oct 15, 2021
d1f7da8
CI failed, try to test
Oct 18, 2021
bf87567
Revert "CI failed, try to test"
Oct 18, 2021
ce8a7d6
CI failed, try to test
Oct 18, 2021
ced52d9
Test
Oct 18, 2021
3c9a602
Only for test
Oct 19, 2021
578e95a
Merge branch-21.12
Oct 19, 2021
4fc6ff9
Update doc
Oct 19, 2021
2d838ff
Test
Oct 19, 2021
05112bd
Add comment
Oct 20, 2021
6c034db
Merge branch 'branch-21.12' into orc-write-map
Nov 2, 2021
ddc3129
Revert "Test"
Nov 2, 2021
83cf14f
Merge branch 'branch-21.12' into orc-write-map
Nov 2, 2021
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
2 changes: 1 addition & 1 deletion docs/supported_ops.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17306,7 +17306,7 @@ dates or timestamps, or for a lack of type coercion support.
<td><b>NS</b></td>
<td> </td>
<td><em>PS<br/>max child DECIMAL precision of 18;<br/>UTC is only supported TZ for child TIMESTAMP;<br/>unsupported child types BINARY, MAP, UDT</em></td>
<td><b>NS</b></td>
<td><em>PS<br/>max child DECIMAL precision of 18;<br/>UTC is only supported TZ for child TIMESTAMP;<br/>unsupported child types BINARY, MAP, UDT</em></td>
<td><em>PS<br/>max child DECIMAL precision of 18;<br/>UTC is only supported TZ for child TIMESTAMP;<br/>unsupported child types BINARY, MAP, UDT</em></td>
<td><b>NS</b></td>
</tr>
Expand Down
6 changes: 6 additions & 0 deletions integration_tests/src/main/python/orc_write_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,15 @@
ArrayGen(ArrayGen(string_gen, max_length=10), max_length=10),
ArrayGen(StructGen([['child0', byte_gen], ['child1', string_gen], ['child2', float_gen]]))]

orc_write_basic_map_gens = [simple_string_to_string_map_gen] + [MapGen(f(nullable=False), f()) for f in [
BooleanGen, ByteGen, ShortGen, IntegerGen, LongGen, FloatGen, DoubleGen,
lambda nullable=True: TimestampGen(start=datetime(1900, 1, 1, tzinfo=timezone.utc), nullable=nullable),
lambda nullable=True: DateGen(start=date(1590, 1, 1), nullable=nullable)]]

orc_write_gens_list = [orc_write_basic_gens,
orc_write_struct_gens_sample,
orc_write_array_gens_sample,
orc_write_basic_map_gens,
revans2 marked this conversation as resolved.
Show resolved Hide resolved
pytest.param([date_gen], marks=pytest.mark.xfail(reason='https://github.com/NVIDIA/spark-rapids/issues/139')),
pytest.param([timestamp_gen], marks=pytest.mark.xfail(reason='https://github.com/NVIDIA/spark-rapids/issues/140'))]

Expand Down
3 changes: 2 additions & 1 deletion sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuOverrides.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,8 @@ object GpuOverrides extends Logging {
cudfRead = (TypeSig.commonCudfTypes + TypeSig.ARRAY + TypeSig.DECIMAL_64 +
TypeSig.STRUCT + TypeSig.MAP).nested(),
cudfWrite = (TypeSig.commonCudfTypes + TypeSig.ARRAY +
TypeSig.STRUCT + TypeSig.DECIMAL_64).nested(),
// Note Map is not put into nested, now CUDF only support single level map
TypeSig.STRUCT + TypeSig.DECIMAL_64).nested() + TypeSig.MAP,
sparkSig = (TypeSig.atomics + TypeSig.STRUCT + TypeSig.ARRAY + TypeSig.MAP +
TypeSig.UDT).nested())))

Expand Down