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 (#1927)

Browse Source
This commit is contained in:
PSeitz
2023-03-13 10:12:02 +08:00
committed by GitHub
parent 064518156f
commit 61cfd8dc57
8 changed files with 756 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/aggregation.rs
View File

@@ -204,7 +204,7 @@ fn main() -> tantivy::Result<()> {
let agg_req: Aggregations = vec![(
"group_by_stock".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "stock".to_string(),
ranges: vec![
@@ -234,7 +234,7 @@ fn main() -> tantivy::Result<()> {
)]
.into_iter()
.collect(),
}),
})),
)]
.into_iter()
.collect();

18
src/aggregation/agg_req.rs
View File

@@ -16,14 +16,14 @@
//! let agg_req1: Aggregations = vec![
//! (
//! "range".to_string(),
//! Aggregation::Bucket(BucketAggregation {
//! Aggregation::Bucket(Box::new(BucketAggregation {
//! bucket_agg: BucketAggregationType::Range(RangeAggregation{
//! field: "score".to_string(),
//! ranges: vec![(3f64..7f64).into(), (7f64..20f64).into()],
//! keyed: false,
//! }),
//! sub_aggregation: Default::default(),
//! }),
//! })),
//! ),
//! ]
//! .into_iter()
@@ -143,7 +143,7 @@ pub fn get_fast_field_names(aggs: &Aggregations) -> HashSet<String> {
#[serde(untagged)]
pub enum Aggregation {
/// Bucket aggregation, see [`BucketAggregation`] for details.
Bucket(BucketAggregation),
Bucket(Box<BucketAggregation>),
/// Metric aggregation, see [`MetricAggregation`] for details.
Metric(MetricAggregation),
}
@@ -301,7 +301,7 @@ mod tests {
fn serialize_to_json_test() {
let agg_req1: Aggregations = vec![(
"range".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score".to_string(),
ranges: vec![
@@ -313,7 +313,7 @@ mod tests {
keyed: true,
}),
sub_aggregation: Default::default(),
}),
})),
)]
.into_iter()
.collect();
@@ -351,7 +351,7 @@ mod tests {
let agg_req2: Aggregations = vec![
(
"range".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score2".to_string(),
ranges: vec![
@@ -363,7 +363,7 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
),
(
"metric".to_string(),
@@ -377,7 +377,7 @@ mod tests {
let agg_req1: Aggregations = vec![(
"range".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score".to_string(),
ranges: vec![
@@ -389,7 +389,7 @@ mod tests {
..Default::default()
}),
sub_aggregation: agg_req2,
}),
})),
)]
.into_iter()
.collect();

99
src/aggregation/agg_tests.rs
View File

@@ -208,36 +208,36 @@ fn test_aggregation_level1() -> crate::Result<()> {
("average".to_string(), get_avg_req("score")),
(
"range".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score".to_string(),
ranges: vec![(3f64..7f64).into(), (7f64..20f64).into()],
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
),
(
"rangef64".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score_f64".to_string(),
ranges: vec![(3f64..7f64).into(), (7f64..20f64).into()],
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
),
(
"rangei64".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score_i64".to_string(),
ranges: vec![(3f64..7f64).into(), (7f64..20f64).into()],
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
),
]
.into_iter()
@@ -308,13 +308,13 @@ fn test_aggregation_level2(
("average_in_range".to_string(), get_avg_req("score")),
(
"term_agg".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "text".to_string(),
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
),
]
.into_iter()
@@ -382,7 +382,7 @@ fn test_aggregation_level2(
("average".to_string(), get_avg_req("score")),
(
"range".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score".to_string(),
ranges: vec![
@@ -393,11 +393,11 @@ fn test_aggregation_level2(
..Default::default()
}),
sub_aggregation: sub_agg_req.clone(),
}),
})),
),
(
"rangef64".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score_f64".to_string(),
ranges: vec![
@@ -408,11 +408,11 @@ fn test_aggregation_level2(
..Default::default()
}),
sub_aggregation: sub_agg_req.clone(),
}),
})),
),
(
"rangei64".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score_i64".to_string(),
ranges: vec![
@@ -423,7 +423,7 @@ fn test_aggregation_level2(
..Default::default()
}),
sub_aggregation: sub_agg_req,
}),
})),
),
]
.into_iter()
@@ -824,13 +824,16 @@ mod bench {
b.iter(|| {
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "text_few_terms".to_string(),
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -860,13 +863,16 @@ mod bench {
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "text_many_terms".to_string(),
..Default::default()
}),
sub_aggregation: sub_agg_req,
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -887,13 +893,16 @@ mod bench {
b.iter(|| {
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "text_many_terms".to_string(),
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -914,7 +923,8 @@ mod bench {
b.iter(|| {
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "text_many_terms".to_string(),
order: Some(CustomOrder {
@@ -924,7 +934,9 @@ mod bench {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -945,7 +957,8 @@ mod bench {
b.iter(|| {
let agg_req_1: Aggregations = vec![(
"rangef64".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score_f64".to_string(),
ranges: vec![
@@ -959,7 +972,9 @@ mod bench {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -989,7 +1004,8 @@ mod bench {
let agg_req_1: Aggregations = vec![(
"rangef64".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score_f64".to_string(),
ranges: vec![
@@ -1003,7 +1019,9 @@ mod bench {
..Default::default()
}),
sub_aggregation: sub_agg_req,
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1029,7 +1047,8 @@ mod bench {
b.iter(|| {
let agg_req_1: Aggregations = vec![(
"rangef64".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 100f64,
@@ -1040,13 +1059,14 @@ mod bench {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
let collector = AggregationCollector::from_aggs(agg_req_1, None);
let searcher = reader.searcher();
searcher.search(&AllQuery, &collector).unwrap()
});
@@ -1070,14 +1090,17 @@ mod bench {
let agg_req_1: Aggregations = vec![(
"rangef64".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 100f64, // 1000 buckets
..Default::default()
}),
sub_aggregation: sub_agg_req,
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1098,14 +1121,17 @@ mod bench {
b.iter(|| {
let agg_req_1: Aggregations = vec![(
"rangef64".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 100f64, // 1000 buckets
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1148,7 +1174,8 @@ mod bench {
),
(
"rangef64".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score_f64".to_string(),
ranges: vec![
@@ -1159,7 +1186,9 @@ mod bench {
..Default::default()
}),
sub_aggregation: sub_agg_req_1,
}),
}
.into(),
),
),
]
.into_iter()

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

@@ -525,7 +525,7 @@ mod tests {
let agg_req: Aggregations = vec![(
"my_interval".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 3.5,
@@ -533,7 +533,7 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
)]
.into_iter()
.collect();
@@ -551,7 +551,7 @@ mod tests {
// With offset
let agg_req: Aggregations = vec![(
"my_interval".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 3.5,
@@ -559,7 +559,7 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
)]
.into_iter()
.collect();
@@ -600,14 +600,14 @@ mod tests {
let agg_req: Aggregations = vec![(
"my_interval".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
)]
.into_iter()
.collect();
@@ -635,14 +635,14 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
)]
.into_iter()
.collect();
@@ -668,14 +668,14 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
)]
.into_iter()
.collect();
@@ -708,7 +708,7 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
@@ -716,7 +716,7 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
)]
.into_iter()
.collect();
@@ -746,7 +746,7 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
@@ -757,7 +757,7 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
)]
.into_iter()
.collect();
@@ -778,7 +778,7 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
@@ -786,7 +786,7 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
)]
.into_iter()
.collect();
@@ -809,7 +809,7 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(Box::new(BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
@@ -818,7 +818,7 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
})),
)]
.into_iter()
.collect();
@@ -853,7 +853,8 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
@@ -864,7 +865,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -884,7 +887,8 @@ mod tests {
//
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
@@ -899,7 +903,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -918,7 +924,8 @@ mod tests {
// Invalid request
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
@@ -933,7 +940,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -963,14 +972,17 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1011,7 +1023,8 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
@@ -1022,7 +1035,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1039,7 +1054,8 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
@@ -1051,7 +1067,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1068,7 +1086,8 @@ mod tests {
// hard_bounds will not extend the result
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
@@ -1079,7 +1098,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1114,7 +1135,8 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 1.0,
@@ -1125,7 +1147,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: agg_req,
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1175,14 +1199,17 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 100000.0,
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1213,14 +1240,17 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "date".to_string(),
interval: 86400000000.0, // one day in microseconds
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1261,14 +1291,17 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 0.0,
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1286,7 +1319,8 @@ mod tests {
let agg_req: Aggregations = vec![(
"histogram".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Histogram(HistogramAggregation {
field: "score_f64".to_string(),
interval: 50.0,
@@ -1294,7 +1328,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();

42
src/aggregation/bucket/range.rs
View File

@@ -475,14 +475,17 @@ mod tests {
let agg_req: Aggregations = vec![(
"range".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "fraction_f64".to_string(),
ranges: vec![(0f64..0.1f64).into(), (0.1f64..0.2f64).into()],
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -516,14 +519,17 @@ mod tests {
let agg_req: Aggregations = vec![(
"range".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "fraction_f64".to_string(),
ranges: vec![(0f64..0.1f64).into(), (0.1f64..0.2f64).into()],
..Default::default()
}),
sub_aggregation: sub_agg_req,
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -548,14 +554,17 @@ mod tests {
let agg_req: Aggregations = vec![(
"range".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "fraction_f64".to_string(),
ranges: vec![(0f64..0.1f64).into(), (0.1f64..0.2f64).into()],
keyed: true,
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -585,7 +594,8 @@ mod tests {
let agg_req: Aggregations = vec![(
"range".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "fraction_f64".to_string(),
ranges: vec![
@@ -603,7 +613,9 @@ mod tests {
keyed: false,
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -642,7 +654,8 @@ mod tests {
let agg_req: Aggregations = vec![(
"date_ranges".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "date".to_string(),
ranges: vec![
@@ -660,7 +673,9 @@ mod tests {
keyed: false,
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -704,7 +719,8 @@ mod tests {
let agg_req: Aggregations = vec![(
"range".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "fraction_f64".to_string(),
ranges: vec![RangeAggregationRange {
@@ -715,7 +731,9 @@ mod tests {
keyed: true,
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();

161
src/aggregation/bucket/term_agg.rs
View File

@@ -559,13 +559,16 @@ mod tests {
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -581,7 +584,8 @@ mod tests {
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
size: Some(2),
@@ -589,7 +593,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -608,7 +614,8 @@ mod tests {
// test min_doc_count
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
size: Some(2),
@@ -616,7 +623,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -676,7 +685,8 @@ mod tests {
// sub agg desc
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
order: Some(CustomOrder {
@@ -686,7 +696,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: sub_agg.clone(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -711,7 +723,8 @@ mod tests {
let agg_req: Aggregations = vec![
(
"my_scores1".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "score".to_string(),
order: Some(CustomOrder {
@@ -721,11 +734,14 @@ mod tests {
..Default::default()
}),
sub_aggregation: sub_agg.clone(),
}),
}
.into(),
),
),
(
"my_scores2".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "score_f64".to_string(),
order: Some(CustomOrder {
@@ -735,11 +751,14 @@ mod tests {
..Default::default()
}),
sub_aggregation: sub_agg.clone(),
}),
}
.into(),
),
),
(
"my_scores3".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "score_i64".to_string(),
order: Some(CustomOrder {
@@ -749,7 +768,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: sub_agg,
}),
}
.into(),
),
),
]
.into_iter()
@@ -850,7 +871,8 @@ mod tests {
// sub agg desc
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
order: Some(CustomOrder {
@@ -860,7 +882,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: sub_agg.clone(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -883,7 +907,8 @@ mod tests {
// sub agg asc
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
order: Some(CustomOrder {
@@ -893,7 +918,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: sub_agg.clone(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -917,7 +944,8 @@ mod tests {
// sub agg multi value asc
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
order: Some(CustomOrder {
@@ -927,7 +955,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: sub_agg.clone(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -951,7 +981,8 @@ mod tests {
// sub agg invalid request
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
order: Some(CustomOrder {
@@ -961,7 +992,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: sub_agg,
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -998,7 +1031,8 @@ mod tests {
// key asc
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
order: Some(CustomOrder {
@@ -1008,7 +1042,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1025,7 +1061,8 @@ mod tests {
// key desc and size cut_off
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
order: Some(CustomOrder {
@@ -1036,7 +1073,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1056,7 +1095,8 @@ mod tests {
// key asc and segment_size cut_off
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
order: Some(CustomOrder {
@@ -1068,7 +1108,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1086,7 +1128,8 @@ mod tests {
// key desc
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
order: Some(CustomOrder {
@@ -1096,7 +1139,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1113,7 +1158,8 @@ mod tests {
// key desc, size cut_off
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
order: Some(CustomOrder {
@@ -1124,7 +1170,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1143,7 +1191,8 @@ mod tests {
// key desc, segment_size cut_off
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
order: Some(CustomOrder {
@@ -1155,7 +1204,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1184,14 +1235,17 @@ mod tests {
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
min_doc_count: Some(0),
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1224,7 +1278,8 @@ mod tests {
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
size: Some(2),
@@ -1232,7 +1287,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1254,7 +1311,8 @@ mod tests {
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
size: Some(2),
@@ -1263,7 +1321,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1316,14 +1376,17 @@ mod tests {
let agg_req: Aggregations = vec![(
"my_texts".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "text_id".to_string(),
min_doc_count: Some(0),
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1344,7 +1407,8 @@ mod tests {
fn test_json_format() -> crate::Result<()> {
let agg_req: Aggregations = vec![(
"term_agg_test".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
size: Some(2),
@@ -1356,7 +1420,9 @@ mod tests {
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();
@@ -1391,14 +1457,17 @@ mod tests {
// test alias shard_size, split_size
let agg_req: Aggregations = vec![(
"term_agg_test".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "string_id".to_string(),
split_size: Some(2),
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();

7
src/aggregation/metric/stats.rs
View File

@@ -380,7 +380,8 @@ mod tests {
),
(
"range".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Range(RangeAggregation {
field: "score".to_string(),
ranges: vec![
@@ -397,7 +398,9 @@ mod tests {
)),
))
.collect(),
}),
}
.into(),
),
),
]
.into_iter()

11
src/aggregation/mod.rs
View File

@@ -130,14 +130,14 @@
//! let agg_req_1: Aggregations = vec![
//! (
//! "range".to_string(),
//! Aggregation::Bucket(BucketAggregation {
//! Aggregation::Bucket(Box::new(BucketAggregation {
//! bucket_agg: BucketAggregationType::Range(RangeAggregation{
//! field: "score".to_string(),
//! ranges: vec![(3f64..7f64).into(), (7f64..20f64).into()],
//! keyed: false,
//! }),
//! sub_aggregation: sub_agg_req_1.clone(),
//! }),
//! })),
//! ),
//! ]
//! .into_iter()
@@ -614,13 +614,16 @@ mod tests {
let searcher = reader.searcher();
let agg: Aggregations = vec![(
"jsonagg".to_string(),
Aggregation::Bucket(BucketAggregation {
Aggregation::Bucket(
BucketAggregation {
bucket_agg: BucketAggregationType::Terms(TermsAggregation {
field: "json.color".to_string(),
..Default::default()
}),
sub_aggregation: Default::default(),
}),
}
.into(),
),
)]
.into_iter()
.collect();