Skip to content

Commit 4f96660

Browse files
committed
feat(query): fix domain error
1 parent 887948c commit 4f96660

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

src/query/expression/src/register.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3993,7 +3993,7 @@ fn erase_calc_domain_generic_1_arg<I1: ArgType, O: ArgType>(
39933993
func: impl Fn(&I1::Domain) -> Option<O::Domain>,
39943994
) -> impl Fn(&[Domain], &GenericMap) -> Option<Domain> {
39953995
move |args, _generics| {
3996-
let arg1 = I1::try_downcast_domain(&args[0])?;
3996+
let arg1 = I1::try_downcast_domain(&args[0]).unwrap();
39973997
func(&arg1).map(O::upcast_domain)
39983998
}
39993999
}
@@ -4002,8 +4002,8 @@ fn erase_calc_domain_generic_2_arg<I1: ArgType, I2: ArgType, O: ArgType>(
40024002
func: impl Fn(&I1::Domain, &I2::Domain) -> Option<O::Domain>,
40034003
) -> impl Fn(&[Domain], &GenericMap) -> Option<Domain> {
40044004
move |args, _generics| {
4005-
let arg1 = I1::try_downcast_domain(&args[0])?;
4006-
let arg2 = I2::try_downcast_domain(&args[1])?;
4005+
let arg1 = I1::try_downcast_domain(&args[0]).unwrap();
4006+
let arg2 = I2::try_downcast_domain(&args[1]).unwrap();
40074007
func(&arg1, &arg2).map(O::upcast_domain)
40084008
}
40094009
}
@@ -4012,9 +4012,9 @@ fn erase_calc_domain_generic_3_arg<I1: ArgType, I2: ArgType, I3: ArgType, O: Arg
40124012
func: impl Fn(&I1::Domain, &I2::Domain, &I3::Domain) -> Option<O::Domain>,
40134013
) -> impl Fn(&[Domain], &GenericMap) -> Option<Domain> {
40144014
move |args, _generics| {
4015-
let arg1 = I1::try_downcast_domain(&args[0])?;
4016-
let arg2 = I2::try_downcast_domain(&args[1])?;
4017-
let arg3 = I3::try_downcast_domain(&args[2])?;
4015+
let arg1 = I1::try_downcast_domain(&args[0]).unwrap();
4016+
let arg2 = I2::try_downcast_domain(&args[1]).unwrap();
4017+
let arg3 = I3::try_downcast_domain(&args[2]).unwrap();
40184018
func(&arg1, &arg2, &arg3).map(O::upcast_domain)
40194019
}
40204020
}
@@ -4029,9 +4029,9 @@ fn erase_calc_domain_generic_4_arg<
40294029
func: impl Fn(&I1::Domain, &I2::Domain, &I3::Domain, &I4::Domain) -> Option<O::Domain>,
40304030
) -> impl Fn(&[Domain], &GenericMap) -> Option<Domain> {
40314031
move |args, _generics| {
4032-
let arg1 = I1::try_downcast_domain(&args[0])?;
4033-
let arg2 = I2::try_downcast_domain(&args[1])?;
4034-
let arg3 = I3::try_downcast_domain(&args[2])?;
4032+
let arg1 = I1::try_downcast_domain(&args[0]).unwrap();
4033+
let arg2 = I2::try_downcast_domain(&args[1]).unwrap();
4034+
let arg3 = I3::try_downcast_domain(&args[2]).unwrap();
40354035
let arg4 = I4::try_downcast_domain(&args[3]).unwrap();
40364036
func(&arg1, &arg2, &arg3, &arg4).map(O::upcast_domain)
40374037
}
@@ -4048,9 +4048,9 @@ fn erase_calc_domain_generic_5_arg<
40484048
func: impl Fn(&I1::Domain, &I2::Domain, &I3::Domain, &I4::Domain, &I5::Domain) -> Option<O::Domain>,
40494049
) -> impl Fn(&[Domain], &GenericMap) -> Option<Domain> {
40504050
move |args, _generics| {
4051-
let arg1 = I1::try_downcast_domain(&args[0])?;
4052-
let arg2 = I2::try_downcast_domain(&args[1])?;
4053-
let arg3 = I3::try_downcast_domain(&args[2])?;
4051+
let arg1 = I1::try_downcast_domain(&args[0]).unwrap();
4052+
let arg2 = I2::try_downcast_domain(&args[1]).unwrap();
4053+
let arg3 = I3::try_downcast_domain(&args[2]).unwrap();
40544054
let arg4 = I4::try_downcast_domain(&args[3]).unwrap();
40554055
let arg5 = I5::try_downcast_domain(&args[4]).unwrap();
40564056
func(&arg1, &arg2, &arg3, &arg4, &arg5).map(O::upcast_domain)

src/query/functions-v2/src/scalars/boolean.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@ pub fn register(registry: &mut FunctionRegistry) {
126126
FunctionProperty::default(),
127127
|lhs, rhs| {
128128
if !lhs.has_null && !rhs.has_null {
129-
let bools = match ( &lhs.value, &rhs.value) {
129+
let bools = match (&lhs.value, &rhs.value) {
130130
(Some(a), Some(b)) => Some(Box::new(BooleanDomain {
131131
has_false: a.has_false || b.has_false,
132132
has_true: a.has_true && b.has_true,
133133
})),
134-
_ => None,
134+
_ => return None,
135135
};
136136
return Some(NullableDomain::<BooleanType> {
137137
has_null: false,
@@ -157,12 +157,12 @@ pub fn register(registry: &mut FunctionRegistry) {
157157
FunctionProperty::default(),
158158
|lhs, rhs| {
159159
if !lhs.has_null && !rhs.has_null {
160-
let bools = match (&lhs.value, &rhs.value) {
160+
let bools = match (&lhs.value, &rhs.value) {
161161
(Some(a), Some(b)) => Some(Box::new(BooleanDomain {
162162
has_false: a.has_false && b.has_false,
163163
has_true: a.has_true || b.has_true,
164164
})),
165-
_ => None,
165+
_ => return None,
166166
};
167167
return Some(NullableDomain::<BooleanType> {
168168
has_null: false,

0 commit comments

Comments
 (0)