Skip to content

ARROW-12670: [C++] Fix extract_regex output after non-matching values #10287

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

Closed
pitrou wants to merge 1 commit into from
Closed

ARROW-12670: [C++] Fix extract_regex output after non-matching values #10287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions cpp/src/arrow/compute/kernels/scalar_string.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1635,20 +1635,15 @@ struct ExtractRegex : public ExtractRegexBase {
checked_cast<BuilderType*>(struct_builder->field_builder(i)));
}

auto visit_null = [&]() {
for (int i = 0; i < group_count; i++) {
RETURN_NOT_OK(field_builders[i]->AppendEmptyValue());
}
return struct_builder->AppendNull();
};
auto visit_null = [&]() { return struct_builder->AppendNull(); };
auto visit_value = [&](util::string_view s) {
if (Match(s)) {
for (int i = 0; i < group_count; i++) {
RETURN_NOT_OK(field_builders[i]->Append(ToStringView(found_values[i])));
}
return struct_builder->Append();
} else {
return visit_null();
return struct_builder->AppendNull();
}
};
const ArrayData& input = *batch[0].array();
Expand Down
4 changes: 4 additions & 0 deletions cpp/src/arrow/compute/kernels/scalar_string_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,10 @@ TYPED_TEST(TestStringKernels, ExtractRegex) {
"extract_regex", R"(["a1", "b2", "c3", null])", type,
R"([{"letter": "a", "digit": "1"}, {"letter": "b", "digit": "2"}, null, null])",
&options);
this->CheckUnary(
"extract_regex", R"(["a1", "c3", null, "b2"])", type,
R"([{"letter": "a", "digit": "1"}, null, null, {"letter": "b", "digit": "2"}])",
&options);
this->CheckUnary("extract_regex", R"(["a1", "b2"])", type,
R"([{"letter": "a", "digit": "1"}, {"letter": "b", "digit": "2"}])",
&options);
Expand Down