rust/tantivy
1
0
Fork 0
mirror of https://github.com/quickwit-oss/tantivy.git synced 2025-12-23 02:29:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix clippy (#1321)

Browse Source
This commit is contained in:
PSeitz
2022-03-22 11:48:23 +08:00
committed by GitHub
parent 125707dbe0
commit f29acf5d8c
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/aggregation/bucket/histogram/histogram.rs
View File

@@ -407,10 +407,11 @@ fn intermediate_buckets_to_final_buckets_fill_gaps(
};
let fill_gaps_buckets = generate_buckets_with_opt_minmax(histogram_req, min_max);
let empty_sub_aggregation = IntermediateAggregationResults::empty_from_req(&sub_aggregation);
let empty_sub_aggregation = IntermediateAggregationResults::empty_from_req(sub_aggregation);
// Use merge_join_by to fill in gaps, since buckets are sorted
let buckets = buckets
buckets
.into_iter()
.merge_join_by(
fill_gaps_buckets.into_iter(),
@@ -433,10 +434,9 @@ fn intermediate_buckets_to_final_buckets_fill_gaps(
},
})
.map(|intermediate_bucket| {
BucketEntry::from_intermediate_and_req(intermediate_bucket, &sub_aggregation)
BucketEntry::from_intermediate_and_req(intermediate_bucket, sub_aggregation)
})
.collect_vec();
return buckets;
.collect_vec()
}
// Convert to BucketEntry
@@ -449,20 +449,15 @@ pub(crate) fn intermediate_buckets_to_final_buckets(
// With min_doc_count != 0, we may need to add buckets, so that there are no
// gaps, since intermediate result does not contain empty buckets (filtered to
// reduce serialization size).
let buckets = intermediate_buckets_to_final_buckets_fill_gaps(
buckets,
histogram_req,
sub_aggregation,
);
return buckets;
intermediate_buckets_to_final_buckets_fill_gaps(buckets, histogram_req, sub_aggregation)
} else {
let buckets = buckets
buckets
.into_iter()
.filter(|bucket| bucket.doc_count >= histogram_req.min_doc_count())
.map(|bucket| BucketEntry::from_intermediate_and_req(bucket, &sub_aggregation))
.collect_vec();
return buckets;
};
.map(|bucket| BucketEntry::from_intermediate_and_req(bucket, sub_aggregation))
.collect_vec()
}
}
/// Applies req extended_bounds/hard_bounds on the min_max value