Skip to content

Commit 6f3127d

Browse files
committed
style: cargo fmt
1 parent e32eb31 commit 6f3127d

File tree

1 file changed

+29
-34
lines changed
  • datafusion/physical-expr/src/expressions

1 file changed

+29
-34
lines changed

datafusion/physical-expr/src/expressions/binary.rs

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub struct BinaryExpr {
5454
right: Arc<dyn PhysicalExpr>,
5555
/// Specifies whether an error is returned on overflow or not
5656
fail_on_overflow: bool,
57-
/// Only used when evaluating literal regex expressions. Example regex expression: c1 ~ '^a'
57+
/// Only used when evaluating literal regex expressions. Example regex expression: c1 ~ '^a'
5858
/// It's helpful saving time of compiling literal pattern string for each execution.
5959
precompiled_regexp: Option<regex::Regex>,
6060
}
@@ -102,37 +102,32 @@ impl BinaryExpr {
102102
&self.op
103103
}
104104

105-
/// Get pre-compiled regexp
106-
fn precompile_regexp_pattern(op: &Operator, lit: &Arc<dyn PhysicalExpr>) -> Option<regex::Regex> {
105+
/// Get pre-compiled regexp
106+
fn precompile_regexp_pattern(
107+
op: &Operator,
108+
lit: &Arc<dyn PhysicalExpr>,
109+
) -> Option<regex::Regex> {
107110
match op {
108-
Operator::RegexMatch |
109-
Operator::RegexNotMatch |
110-
Operator::RegexIMatch |
111-
Operator::RegexNotIMatch => {
112-
lit
111+
Operator::RegexMatch
112+
| Operator::RegexNotMatch
113+
| Operator::RegexIMatch
114+
| Operator::RegexNotIMatch => lit
113115
.as_any()
114116
.downcast_ref::<Literal>()
115-
.and_then(|pattern| {
116-
match pattern.value() {
117-
ScalarValue::Utf8(pattern)|
118-
ScalarValue::LargeUtf8(pattern)=> {
119-
pattern
120-
.as_ref()
121-
.and_then(|p| {
122-
let string_value = match op {
123-
Operator::RegexIMatch|
124-
Operator::RegexNotIMatch => {
117+
.and_then(|pattern| match pattern.value() {
118+
ScalarValue::Utf8(pattern) | ScalarValue::LargeUtf8(pattern) => {
119+
pattern.as_ref().and_then(|p| {
120+
let string_value = match op {
121+
Operator::RegexIMatch | Operator::RegexNotIMatch => {
125122
vec!["(?i)", p.as_str()].join("")
126-
},
127-
_ => p.clone(),
128-
};
129-
Some(regex::Regex::new(string_value.as_str()).unwrap())
130-
})
131-
},
132-
_ => None
123+
}
124+
_ => p.clone(),
125+
};
126+
Some(regex::Regex::new(string_value.as_str()).unwrap())
127+
})
133128
}
134-
})
135-
},
129+
_ => None,
130+
}),
136131
_ => None,
137132
}
138133
}
@@ -4191,13 +4186,13 @@ mod tests {
41914186

41924187
macro_rules! test_regex_match_scalar {
41934188
(
4194-
$A_ARRAY:ident,
4195-
$A_TYPE:expr,
4196-
$A_VEC:expr,
4197-
$B_SCALAR:expr,
4198-
$OP:expr,
4199-
$C_ARRAY:ident,
4200-
$C_TYPE:expr,
4189+
$A_ARRAY:ident,
4190+
$A_TYPE:expr,
4191+
$A_VEC:expr,
4192+
$B_SCALAR:expr,
4193+
$OP:expr,
4194+
$C_ARRAY:ident,
4195+
$C_TYPE:expr,
42014196
$VEC:expr,
42024197
) => {{
42034198
let schema = Schema::new(vec![

0 commit comments

Comments
 (0)