From fc5770124eadeb8cf4a14f7c3a7854363b3cdfba Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Thu, 8 Oct 2026 18:23:57 +0200 Subject: [PATCH] Fix clippy warnings (#3165) * Fix clippy warnings --- src/aggregation/bucket/histogram/histogram.rs | 6 ++++-- src/aggregation/bucket/range.rs | 6 ++++-- sstable/src/streamer.rs | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/aggregation/bucket/histogram/histogram.rs b/src/aggregation/bucket/histogram/histogram.rs index fb59cb398..11ecc8083 100644 --- a/src/aggregation/bucket/histogram/histogram.rs +++ b/src/aggregation/bucket/histogram/histogram.rs @@ -759,9 +759,11 @@ pub(crate) fn build_segment_histogram_collector( children: Vec, ) -> crate::Result> { // Computed sources may change cardinality between blocks. - let source_contains_multivalues = req_data.accessor.as_column().map_or(true, |column| { + let source_contains_multivalues = if let Some(column) = req_data.accessor.as_column() { column.index.get_cardinality().is_multivalue() - }); + } else { + true + }; if source_contains_multivalues { build_histogram_collector_with_cardinality::(agg_data, req_data, children) } else { diff --git a/src/aggregation/bucket/range.rs b/src/aggregation/bucket/range.rs index aa359b09f..30935f075 100644 --- a/src/aggregation/bucket/range.rs +++ b/src/aggregation/bucket/range.rs @@ -353,9 +353,11 @@ pub(crate) fn build_segment_range_collector( children: Vec, ) -> crate::Result> { // Computed sources may change cardinality between blocks. - let source_contains_multivalues = req_data.accessor.as_column().map_or(true, |column| { + let source_contains_multivalues = if let Some(column) = req_data.accessor.as_column() { column.index.get_cardinality().is_multivalue() - }); + } else { + true + }; if source_contains_multivalues { build_range_collector_with_cardinality::(agg_data, req_data, children) } else { diff --git a/sstable/src/streamer.rs b/sstable/src/streamer.rs index f239f51b6..5c476f6cf 100644 --- a/sstable/src/streamer.rs +++ b/sstable/src/streamer.rs @@ -361,7 +361,7 @@ where // we could check always_match_at == Some(0), but this actually gets // inlined into `true` with AlwaysMatch, which is even faster self.automaton - .will_always_match(&self.states.first().unwrap()), + .will_always_match(self.states.first().unwrap()), self.upper_bound == Bound::Unbounded, ) { (true, true) => self.advance_always_match::(),