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

Fix infinite loop in test_str_to_map_expr_random_delimiters #10016

Merged
merged 1 commit into from
Dec 12, 2023
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
24 changes: 19 additions & 5 deletions integration_tests/src/main/python/map_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,27 @@ def test_str_to_map_expr_fixed_delimiters():


def test_str_to_map_expr_random_delimiters():
class UniqueStringGen(StringGen):
"""Generate unique strings"""
def __init__(self, pattern, nullable):
super().__init__(pattern=pattern, nullable=nullable)
self.previous_values = set()

def start(self, rand):
super().start(rand)
self.previous_values = set()

def gen(self, force_no_nulls=False):
v = super().gen(force_no_nulls=force_no_nulls)
while v in self.previous_values:
v = super().gen(force_no_nulls=force_no_nulls)
self.previous_values.add(v)
return v
data_gen = [('a', StringGen(pattern='[0-9a-z:,]{0,100}', nullable=True)
.with_special_pattern('[abc]:.{0,20},[abc]:.{0,20}', weight=100))]
delim_gen = StringGen(pattern='[0-9a-z :,]', nullable=False)
(pair_delim, keyval_delim) = ('', '')
while pair_delim == keyval_delim:
(pair_delim, keyval_delim) = with_cpu_session(
lambda spark: gen_scalars_for_sql(delim_gen, 2, force_no_nulls=True))
delim_gen = UniqueStringGen(pattern='[0-9a-z :,]', nullable=False)
(pair_delim, keyval_delim) = with_cpu_session(
lambda spark: gen_scalars_for_sql(delim_gen, 2, force_no_nulls=True))
assert_gpu_and_cpu_are_equal_collect(
lambda spark: gen_df(spark, data_gen).selectExpr(
'str_to_map(a) as m1',
Expand Down