Skip to content

Commit 635e90d

Browse files
committed
For review comment and suggestion
1 parent 1bf0384 commit 635e90d

File tree

1 file changed

+6
-28
lines changed

1 file changed

+6
-28
lines changed

arrow/src/compute/kernels/comparison.rs

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2318,7 +2318,7 @@ where
23182318
pub fn eq_dyn(left: &dyn Array, right: &dyn Array) -> Result<BooleanArray> {
23192319
match left.data_type() {
23202320
DataType::Dictionary(_, _) => {
2321-
typed_dict_compares!(left, right, |a, b| a == b, |a, b| !(a ^ b))
2321+
typed_dict_compares!(left, right, |a, b| a == b, |a, b| a == b)
23222322
}
23232323
_ => typed_compares!(left, right, eq_bool, eq, eq_utf8, eq_binary),
23242324
}
@@ -2343,7 +2343,7 @@ pub fn eq_dyn(left: &dyn Array, right: &dyn Array) -> Result<BooleanArray> {
23432343
pub fn neq_dyn(left: &dyn Array, right: &dyn Array) -> Result<BooleanArray> {
23442344
match left.data_type() {
23452345
DataType::Dictionary(_, _) => {
2346-
typed_dict_compares!(left, right, |a, b| a != b, |a, b| (a ^ b))
2346+
typed_dict_compares!(left, right, |a, b| a != b, |a, b| a != b)
23472347
}
23482348
_ => typed_compares!(left, right, neq_bool, neq, neq_utf8, neq_binary),
23492349
}
@@ -2367,7 +2367,7 @@ pub fn neq_dyn(left: &dyn Array, right: &dyn Array) -> Result<BooleanArray> {
23672367
pub fn lt_dyn(left: &dyn Array, right: &dyn Array) -> Result<BooleanArray> {
23682368
match left.data_type() {
23692369
DataType::Dictionary(_, _) => {
2370-
typed_dict_compares!(left, right, |a, b| a < b, |a, b| (!a) & b)
2370+
typed_dict_compares!(left, right, |a, b| a < b, |a, b| a < b)
23712371
}
23722372
_ => typed_compares!(left, right, lt_bool, lt, lt_utf8, lt_binary),
23732373
}
@@ -2391,7 +2391,7 @@ pub fn lt_dyn(left: &dyn Array, right: &dyn Array) -> Result<BooleanArray> {
23912391
pub fn lt_eq_dyn(left: &dyn Array, right: &dyn Array) -> Result<BooleanArray> {
23922392
match left.data_type() {
23932393
DataType::Dictionary(_, _) => {
2394-
typed_dict_compares!(left, right, |a, b| a <= b, |a, b| !(a & (!b)))
2394+
typed_dict_compares!(left, right, |a, b| a <= b, |a, b| a <= b)
23952395
}
23962396
_ => typed_compares!(left, right, lt_eq_bool, lt_eq, lt_eq_utf8, lt_eq_binary),
23972397
}
@@ -2414,7 +2414,7 @@ pub fn lt_eq_dyn(left: &dyn Array, right: &dyn Array) -> Result<BooleanArray> {
24142414
pub fn gt_dyn(left: &dyn Array, right: &dyn Array) -> Result<BooleanArray> {
24152415
match left.data_type() {
24162416
DataType::Dictionary(_, _) => {
2417-
typed_dict_compares!(left, right, |a, b| a > b, |a, b| a & (!b))
2417+
typed_dict_compares!(left, right, |a, b| a > b, |a, b| a > b)
24182418
}
24192419
_ => typed_compares!(left, right, gt_bool, gt, gt_utf8, gt_binary),
24202420
}
@@ -2437,7 +2437,7 @@ pub fn gt_dyn(left: &dyn Array, right: &dyn Array) -> Result<BooleanArray> {
24372437
pub fn gt_eq_dyn(left: &dyn Array, right: &dyn Array) -> Result<BooleanArray> {
24382438
match left.data_type() {
24392439
DataType::Dictionary(_, _) => {
2440-
typed_dict_compares!(left, right, |a, b| a >= b, |a, b| !((!a) & b))
2440+
typed_dict_compares!(left, right, |a, b| a >= b, |a, b| a >= b)
24412441
}
24422442
_ => typed_compares!(left, right, gt_eq_bool, gt_eq, gt_eq_utf8, gt_eq_binary),
24432443
}
@@ -4699,11 +4699,9 @@ mod tests {
46994699
let dict_array2 = DictionaryArray::try_new(&keys2, &values).unwrap();
47004700

47014701
let result = eq_dyn(&dict_array1, &dict_array2);
4702-
assert!(result.is_ok());
47034702
assert_eq!(result.unwrap(), BooleanArray::from(vec![true, false, true]));
47044703

47054704
let result = neq_dyn(&dict_array1, &dict_array2);
4706-
assert!(result.is_ok());
47074705
assert_eq!(
47084706
result.unwrap(),
47094707
BooleanArray::from(vec![false, true, false])
@@ -4722,14 +4720,12 @@ mod tests {
47224720
DictionaryArray::<UInt64Type>::try_new(&keys2, &values).unwrap();
47234721

47244722
let result = eq_dyn(&dict_array1, &dict_array2);
4725-
assert!(result.is_ok());
47264723
assert_eq!(
47274724
result.unwrap(),
47284725
BooleanArray::from(vec![false, true, false])
47294726
);
47304727

47314728
let result = neq_dyn(&dict_array1, &dict_array2);
4732-
assert!(result.is_ok());
47334729
assert_eq!(result.unwrap(), BooleanArray::from(vec![true, false, true]));
47344730
}
47354731

@@ -4748,14 +4744,12 @@ mod tests {
47484744
.collect();
47494745

47504746
let result = eq_dyn(&dict_array1, &dict_array2);
4751-
assert!(result.is_ok());
47524747
assert_eq!(
47534748
result.unwrap(),
47544749
BooleanArray::from(vec![Some(true), None, None, Some(true)])
47554750
);
47564751

47574752
let result = neq_dyn(&dict_array1, &dict_array2);
4758-
assert!(result.is_ok());
47594753
assert_eq!(
47604754
result.unwrap(),
47614755
BooleanArray::from(vec![Some(false), None, None, Some(false)])
@@ -4777,14 +4771,12 @@ mod tests {
47774771
DictionaryArray::<UInt64Type>::try_new(&keys2, &values).unwrap();
47784772

47794773
let result = eq_dyn(&dict_array1, &dict_array2);
4780-
assert!(result.is_ok());
47814774
assert_eq!(
47824775
result.unwrap(),
47834776
BooleanArray::from(vec![true, false, false])
47844777
);
47854778

47864779
let result = neq_dyn(&dict_array1, &dict_array2);
4787-
assert!(result.is_ok());
47884780
assert_eq!(result.unwrap(), BooleanArray::from(vec![false, true, true]));
47894781
}
47904782

@@ -4800,11 +4792,9 @@ mod tests {
48004792
DictionaryArray::<UInt64Type>::try_new(&keys2, &values).unwrap();
48014793

48024794
let result = eq_dyn(&dict_array1, &dict_array2);
4803-
assert!(result.is_ok());
48044795
assert_eq!(result.unwrap(), BooleanArray::from(vec![false, true, true]));
48054796

48064797
let result = neq_dyn(&dict_array1, &dict_array2);
4807-
assert!(result.is_ok());
48084798
assert_eq!(
48094799
result.unwrap(),
48104800
BooleanArray::from(vec![true, false, false])
@@ -4823,11 +4813,9 @@ mod tests {
48234813
DictionaryArray::<UInt64Type>::try_new(&keys2, &values).unwrap();
48244814

48254815
let result = eq_dyn(&dict_array1, &dict_array2);
4826-
assert!(result.is_ok());
48274816
assert_eq!(result.unwrap(), BooleanArray::from(vec![false, true, true]));
48284817

48294818
let result = neq_dyn(&dict_array1, &dict_array2);
4830-
assert!(result.is_ok());
48314819
assert_eq!(
48324820
result.unwrap(),
48334821
BooleanArray::from(vec![true, false, false])
@@ -4846,14 +4834,12 @@ mod tests {
48464834
DictionaryArray::<UInt64Type>::try_new(&keys2, &values).unwrap();
48474835

48484836
let result = eq_dyn(&dict_array1, &dict_array2);
4849-
assert!(result.is_ok());
48504837
assert_eq!(
48514838
result.unwrap(),
48524839
BooleanArray::from(vec![false, true, false])
48534840
);
48544841

48554842
let result = neq_dyn(&dict_array1, &dict_array2);
4856-
assert!(result.is_ok());
48574843
assert_eq!(result.unwrap(), BooleanArray::from(vec![true, false, true]));
48584844
}
48594845

@@ -4868,25 +4854,21 @@ mod tests {
48684854
let dict_array2 = DictionaryArray::try_new(&keys2, &values).unwrap();
48694855

48704856
let result = lt_dyn(&dict_array1, &dict_array2);
4871-
assert!(result.is_ok());
48724857
assert_eq!(
48734858
result.unwrap(),
48744859
BooleanArray::from(vec![true, false, false])
48754860
);
48764861

48774862
let result = lt_eq_dyn(&dict_array1, &dict_array2);
4878-
assert!(result.is_ok());
48794863
assert_eq!(result.unwrap(), BooleanArray::from(vec![true, false, true]));
48804864

48814865
let result = gt_dyn(&dict_array1, &dict_array2);
4882-
assert!(result.is_ok());
48834866
assert_eq!(
48844867
result.unwrap(),
48854868
BooleanArray::from(vec![false, true, false])
48864869
);
48874870

48884871
let result = gt_eq_dyn(&dict_array1, &dict_array2);
4889-
assert!(result.is_ok());
48904872
assert_eq!(result.unwrap(), BooleanArray::from(vec![false, true, true]));
48914873
}
48924874

@@ -4902,25 +4884,21 @@ mod tests {
49024884
DictionaryArray::<UInt64Type>::try_new(&keys2, &values).unwrap();
49034885

49044886
let result = lt_dyn(&dict_array1, &dict_array2);
4905-
assert!(result.is_ok());
49064887
assert_eq!(
49074888
result.unwrap(),
49084889
BooleanArray::from(vec![true, false, false])
49094890
);
49104891

49114892
let result = lt_eq_dyn(&dict_array1, &dict_array2);
4912-
assert!(result.is_ok());
49134893
assert_eq!(result.unwrap(), BooleanArray::from(vec![true, true, false]));
49144894

49154895
let result = gt_dyn(&dict_array1, &dict_array2);
4916-
assert!(result.is_ok());
49174896
assert_eq!(
49184897
result.unwrap(),
49194898
BooleanArray::from(vec![false, false, true])
49204899
);
49214900

49224901
let result = gt_eq_dyn(&dict_array1, &dict_array2);
4923-
assert!(result.is_ok());
49244902
assert_eq!(result.unwrap(), BooleanArray::from(vec![false, true, true]));
49254903
}
49264904
}

0 commit comments

Comments
 (0)