viirya commented on code in PR #5235:
URL: https://github.com/apache/arrow-rs/pull/5235#discussion_r1435361674
##########
arrow-string/src/regexp.rs:
##########
@@ -216,15 +215,14 @@ pub fn regexp_match<OffsetSize: OffsetSizeTrait>(
(Some(value), Some(pattern)) => {
let existing_pattern = patterns.get(&pattern);
let re = match existing_pattern {
- Some(re) => re.clone(),
+ Some(re) => re,
None => {
let re = Regex::new(pattern.as_str()).map_err(|e| {
ArrowError::ComputeError(format!(
"Regular expression did not compile: {e:?}"
))
})?;
- patterns.insert(pattern, re.clone());
- re
+ patterns.entry(pattern).or_insert(re)
Review Comment:
Hmm, then we need to use `or_insert_with` like
```rust
let re = patterns.entry(pattern).or_insert_with(|| {
Regex::new(pattern.as_str()).map_err(|e| {
ArrowError::ComputeError(format!(
"Regular expression did not compile: {e:?}"
))
}?)
});
```
But `or_insert_with` cannot propagate the error out of the function.
Tried with `Result<Regex, ArrowError>` as value type with the `patterns`
HashMap, but then it doesn't work because `the `?` operator cannot be applied
to type `&mut Result<regex::Regex, arrow_schema::ArrowError>` too.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@arrow.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
