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.

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 some union of structs tests that were marked xfail #3779

Merged
merged 1 commit into from
Oct 11, 2021
Merged
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions integration_tests/src/main/python/repart_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
from marks import ignore_order, allow_non_gpu
import pyspark.sql.functions as f

nested_scalar_mark = pytest.mark.xfail(reason="https://github.com/NVIDIA/spark-rapids/issues/1459")

# 4 level nested struct
# each level has a different number of children to avoid a bug in spark < 3.1
nested_struct = StructGen([
Expand Down Expand Up @@ -59,7 +57,7 @@
['child%d' % (i + 1), gen] for i, gen in enumerate(map_gens)])

@pytest.mark.parametrize('data_gen', [pytest.param((StructGen([['child0', DecimalGen(7, 2)]]),
StructGen([['child1', IntegerGen()]])), marks=nested_scalar_mark),
StructGen([['child1', IntegerGen()]]))),
# left_struct(child0 = 4 level nested struct, child1 = Int)
# right_struct(child0 = 4 level nested struct, child1 = missing)
(StructGen([['child0', StructGen([['child0', StructGen([['child0', StructGen([['child0',
Expand Down Expand Up @@ -110,8 +108,8 @@ def test_unionAll(data_gen):

@pytest.mark.parametrize('data_gen', all_gen + map_gens + array_gens_sample +
[all_basic_struct_gen,
pytest.param(all_basic_struct_gen, marks=nested_scalar_mark),
pytest.param(StructGen([[ 'child0', DecimalGen(7, 2)]]), marks=nested_scalar_mark),
pytest.param(all_basic_struct_gen),
pytest.param(StructGen([[ 'child0', DecimalGen(7, 2)]])),
nested_struct,
StructGen([['child0', StructGen([['child0', StructGen([['child0', StructGen([['child0',
StructGen([['child0', DecimalGen(7, 2)]])]])]])]])], ['child1', IntegerGen()]]),
Expand Down