Skip to content

Commit b19f0dd

Browse files
committed
fix clippy
1 parent b4acfcf commit b19f0dd

2 files changed

Lines changed: 18 additions & 17 deletions

File tree

src/aggregation/bucket/range.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -559,12 +559,12 @@ mod tests {
559559
};
560560

561561
pub fn build_test_buckets(
562-
ranges: Vec<RangeAggregationRange>,
562+
ranges: &[RangeAggregationRange],
563563
field_type: ColumnType,
564564
) -> Vec<SegmentRangeAndBucketEntry> {
565565
let req = RangeAggregation {
566566
field: "dummy".to_string(),
567-
ranges,
567+
ranges: ranges.to_vec(),
568568
..Default::default()
569569
};
570570
extend_validate_ranges(&req.ranges, &field_type)
@@ -841,8 +841,8 @@ mod tests {
841841

842842
#[test]
843843
fn bucket_test_extend_range_hole() {
844-
let buckets = vec![(10f64..20f64).into(), (30f64..40f64).into()];
845-
let parent_buckets = vec![build_test_buckets(buckets, ColumnType::F64)];
844+
let buckets = [(10f64..20f64).into(), (30f64..40f64).into()];
845+
let parent_buckets = [build_test_buckets(&buckets, ColumnType::F64)];
846846

847847
let buckets = parent_buckets[0].clone();
848848
assert_eq!(buckets[0].range.start, u64::MIN);
@@ -860,12 +860,12 @@ mod tests {
860860
fn bucket_test_range_conversion_special_case() {
861861
// the monotonic conversion between f64 and u64, does not map f64::MIN.to_u64() ==
862862
// u64::MIN, but the into trait converts f64::MIN/MAX to None
863-
let buckets = vec![
863+
let buckets = [
864864
(f64::MIN..10f64).into(),
865865
(10f64..20f64).into(),
866866
(20f64..f64::MAX).into(),
867867
];
868-
let parent_buckets = vec![build_test_buckets(buckets, ColumnType::F64)];
868+
let parent_buckets = [build_test_buckets(&buckets, ColumnType::F64)];
869869

870870
let buckets = parent_buckets[0].clone();
871871
assert_eq!(buckets[0].range.start, u64::MIN);
@@ -879,17 +879,17 @@ mod tests {
879879

880880
#[test]
881881
fn bucket_range_test_negative_vals() {
882-
let buckets = vec![(-10f64..-1f64).into()];
883-
let parent_buckets = vec![build_test_buckets(buckets, ColumnType::F64)];
882+
let buckets = [(-10f64..-1f64).into()];
883+
let parent_buckets = [build_test_buckets(&buckets, ColumnType::F64)];
884884

885885
let buckets = parent_buckets[0].clone();
886886
assert_eq!(&buckets[0].bucket.key.to_string(), "*--10");
887887
assert_eq!(&buckets[buckets.len() - 1].bucket.key.to_string(), "-1-*");
888888
}
889889
#[test]
890890
fn bucket_range_test_positive_vals() {
891-
let buckets = vec![(0f64..10f64).into()];
892-
let parent_buckets = vec![build_test_buckets(buckets, ColumnType::F64)];
891+
let buckets = [(0f64..10f64).into()];
892+
let parent_buckets = [build_test_buckets(&buckets, ColumnType::F64)];
893893

894894
let buckets = parent_buckets[0].clone();
895895
assert_eq!(&buckets[0].bucket.key.to_string(), "*-0");
@@ -898,8 +898,8 @@ mod tests {
898898

899899
#[test]
900900
fn range_binary_search_test_u64() {
901-
let check_ranges = |ranges: Vec<RangeAggregationRange>| {
902-
let parent_buckets = vec![build_test_buckets(ranges, ColumnType::U64)];
901+
let check_ranges = |ranges: &[RangeAggregationRange]| {
902+
let parent_buckets = [build_test_buckets(ranges, ColumnType::U64)];
903903
let search = |val: u64| get_bucket_pos(val, &parent_buckets[0]);
904904

905905
assert_eq!(search(u64::MIN), 0);
@@ -913,7 +913,7 @@ mod tests {
913913
};
914914

915915
let ranges = vec![(10.0..100.0).into()];
916-
check_ranges(ranges);
916+
check_ranges(&ranges);
917917

918918
let ranges = vec![
919919
RangeAggregationRange {
@@ -923,7 +923,7 @@ mod tests {
923923
},
924924
(10.0..100.0).into(),
925925
];
926-
check_ranges(ranges);
926+
check_ranges(&ranges);
927927

928928
let ranges = vec![
929929
RangeAggregationRange {
@@ -938,14 +938,14 @@ mod tests {
938938
from: Some(100.0),
939939
},
940940
];
941-
check_ranges(ranges);
941+
check_ranges(&ranges);
942942
}
943943

944944
#[test]
945945
fn range_binary_search_test_f64() {
946-
let ranges = vec![(10.0..100.0).into()];
946+
let ranges = [(10.0..100.0).into()];
947947

948-
let parent_buckets = vec![build_test_buckets(ranges, ColumnType::F64)];
948+
let parent_buckets = [build_test_buckets(&ranges, ColumnType::F64)];
949949
let search = |val: u64| get_bucket_pos(val, &parent_buckets[0]);
950950

951951
assert_eq!(search(u64::MIN), 0);

src/aggregation/metric/cardinality.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ impl CouponCache {
171171
let uninitialized_coupon = Coupon::from_hash(0);
172172
let mut coupon_map: Vec<Coupon> =
173173
vec![uninitialized_coupon; highest_term_ord as usize + 1];
174+
174175
for (term_ord, coupon) in term_ords.into_iter().zip(coupons) {
175176
coupon_map[term_ord as usize] = coupon;
176177
}

0 commit comments

Comments
 (0)