Skip to content

Commit

Permalink
Fix clippy and small adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
@rdettai
rdettai committed Dec 17, 2024
1 parent 67bdf57 commit 749f03b
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 40 deletions.
3 changes: 1 addition & 2 deletions quickwit/quickwit-common/src/path_hasher.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ const SEPARATOR: &[u8] = &[255];
/// in a tree.
///
/// Its purpose is to:
/// - propose a secondary hash space if intermediate object paths should be indexed
/// - work around the lack of Clone in the fnv Hasher
/// - enforce a 0 byte separator between segments
/// - enforce a 1 byte separator between segments
#[derive(Default)]
pub struct PathHasher {
hasher: fnv::FnvHasher,
Expand Down
1 change: 0 additions & 1 deletion quickwit/quickwit-doc-mapper/src/doc_mapper/field_presence.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ impl SubfieldsPopulator {
}
}

#[inline]
fn populate_field_presence_for_json_obj<'a, I, V>(
&mut self,
path_hasher: PathHasher,
Expand Down
57 changes: 22 additions & 35 deletions quickwit/quickwit-doc-mapper/src/query_builder.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ pub(crate) fn build_query(
// This cannot fail. The error type is Infallible.
let _: Result<(), Infallible> = exists_query_fields.visit(query_ast);

let mut fast_field_names = HashSet::new();
let mut fast_fields = HashSet::new();
let range_query_fast_fields =
range_query_fields
.range_query_field_names
Expand All @@ -113,8 +113,8 @@ pub(crate) fn build_query(
name,
with_subfields: false,
});
fast_field_names.extend(range_query_fast_fields);
fast_field_names.extend(exists_query_fields.fields.into_iter());
fast_fields.extend(range_query_fast_fields);
fast_fields.extend(exists_query_fields.fields);

let query = query_ast.build_tantivy_query(
&schema,
Expand All @@ -141,7 +141,7 @@ pub(crate) fn build_query(
term_dict_fields: term_set_query_fields,
terms_grouped_by_field,
term_ranges_grouped_by_field,
fast_fields: fast_field_names,
fast_fields,
..WarmupInfo::default()
};

Expand Down Expand Up @@ -441,7 +441,7 @@ mod test {
"foo:bar",
Vec::new(),
TestExpectation::Ok(
r#"TermQuery(Term(field=13, type=Json, path=foo, type=Str, "bar"))"#,
r#"TermQuery(Term(field=16, type=Json, path=foo, type=Str, "bar"))"#,
),
);
check_build_query_dynamic_mode(
Expand Down Expand Up @@ -481,7 +481,7 @@ mod test {
check_build_query_static_mode(
"title:bar",
Vec::new(),
TestExpectation::Ok(r#"TermQuery(Term(field=0, type=Str, "bar"))"#),
TestExpectation::Ok(r#"TermQuery(Term(field=1, type=Str, "bar"))"#),
);
check_build_query_static_mode(
"bar",
Expand Down Expand Up @@ -596,7 +596,7 @@ mod test {
check_build_query_static_mode(
"json_text:*",
Vec::new(),
TestExpectation::Ok("TermQuery(Term(field=0, type=U64"),
TestExpectation::Ok("TermSetQuery"),
);
check_build_query_static_mode(
"json_fast:*",
Expand All @@ -611,21 +611,8 @@ mod test {
check_build_query_static_mode(
"server:*",
Vec::new(),
TestExpectation::Ok("?????????????????"),
);

// V currently working V
// check_build_query_static_mode(
// "server:*",
// Vec::new(),
// TestExpectation::Err("invalid query: field does not exist: `server`"),
// );
// check_build_query_dynamic_mode(
// "server:*",
// Vec::new(),
// // dynamic_mapping is set to TEXT here, this would be an ExistsQuery if it was FAST
// TestExpectation::Ok("TermQuery(Term(field=0, type=U64"),
// );
TestExpectation::Ok("BooleanQuery { subqueries: [(Should, TermQuery(Term"),
);
}

#[test]
Expand Down Expand Up @@ -680,16 +667,16 @@ mod test {
"ip:[127.0.0.1 TO 127.1.1.1]",
Vec::new(),
TestExpectation::Ok(
"RangeQuery { bounds: BoundsRange { lower_bound: Included(Term(field=6, \
type=IpAddr, ::ffff:127.0.0.1)), upper_bound: Included(Term(field=6, \
"RangeQuery { bounds: BoundsRange { lower_bound: Included(Term(field=7, \
type=IpAddr, ::ffff:127.0.0.1)), upper_bound: Included(Term(field=7, \
type=IpAddr, ::ffff:127.1.1.1)) } }",
),
);
check_build_query_static_mode(
"ip:>127.0.0.1",
Vec::new(),
TestExpectation::Ok(
"RangeQuery { bounds: BoundsRange { lower_bound: Excluded(Term(field=6, \
"RangeQuery { bounds: BoundsRange { lower_bound: Excluded(Term(field=7, \
type=IpAddr, ::ffff:127.0.0.1)), upper_bound: Unbounded } }",
),
);
Expand All @@ -701,14 +688,14 @@ mod test {
"f64_fast:[7.7 TO 77.7]",
Vec::new(),
TestExpectation::Ok(
r#"RangeQuery { bounds: BoundsRange { lower_bound: Included(Term(field=12, type=F64, 7.7)), upper_bound: Included(Term(field=12, type=F64, 77.7)) } }"#,
r#"RangeQuery { bounds: BoundsRange { lower_bound: Included(Term(field=13, type=F64, 7.7)), upper_bound: Included(Term(field=13, type=F64, 77.7)) } }"#,
),
);
check_build_query_static_mode(
"f64_fast:>7",
Vec::new(),
TestExpectation::Ok(
r#"RangeQuery { bounds: BoundsRange { lower_bound: Excluded(Term(field=12, type=F64, 7.0)), upper_bound: Unbounded } }"#,
r#"RangeQuery { bounds: BoundsRange { lower_bound: Excluded(Term(field=13, type=F64, 7.0)), upper_bound: Unbounded } }"#,
),
);
}
Expand All @@ -718,12 +705,12 @@ mod test {
check_build_query_static_mode(
"i64_fast:[-7 TO 77]",
Vec::new(),
TestExpectation::Ok(r#"field=11"#),
TestExpectation::Ok(r#"field=12"#),
);
check_build_query_static_mode(
"i64_fast:>7",
Vec::new(),
TestExpectation::Ok(r#"field=11"#),
TestExpectation::Ok(r#"field=12"#),
);
}

Expand All @@ -732,12 +719,12 @@ mod test {
check_build_query_static_mode(
"u64_fast:[7 TO 77]",
Vec::new(),
TestExpectation::Ok(r#"field=10,"#),
TestExpectation::Ok(r#"field=11,"#),
);
check_build_query_static_mode(
"u64_fast:>7",
Vec::new(),
TestExpectation::Ok(r#"field=10,"#),
TestExpectation::Ok(r#"field=11,"#),
);
}

Expand All @@ -747,8 +734,8 @@ mod test {
"ips:[127.0.0.1 TO 127.1.1.1]",
Vec::new(),
TestExpectation::Ok(
"RangeQuery { bounds: BoundsRange { lower_bound: Included(Term(field=7, \
type=IpAddr, ::ffff:127.0.0.1)), upper_bound: Included(Term(field=7, \
"RangeQuery { bounds: BoundsRange { lower_bound: Included(Term(field=8, \
type=IpAddr, ::ffff:127.0.0.1)), upper_bound: Included(Term(field=8, \
type=IpAddr, ::ffff:127.1.1.1)) } }",
),
);
Expand Down Expand Up @@ -792,7 +779,7 @@ mod test {
assert_eq!(warmup_info.term_dict_fields.len(), 1);
assert!(warmup_info
.term_dict_fields
.contains(&tantivy::schema::Field::from_field_id(1)));
.contains(&tantivy::schema::Field::from_field_id(2)));

let (_, warmup_info) = build_query(
&query_without_set,
Expand Down Expand Up @@ -842,7 +829,7 @@ mod test {
extractor2.term_ranges_to_warm_up
);

let field = tantivy::schema::Field::from_field_id(0);
let field = tantivy::schema::Field::from_field_id(1);
let mut expected_inner = std::collections::HashMap::new();
expected_inner.insert(
TermRange {
Expand Down
2 changes: 1 addition & 1 deletion quickwit/quickwit-query/src/query_ast/field_presence.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl FieldPresenceQuery {
// if `self.field` was not found, it might still be an `object` field
if fields.is_empty() || fields[0].1.name() == DYNAMIC_FIELD_NAME {
for (field, entry) in find_subfields(&self.field, schema) {
fields.push((field, entry, &""));
fields.push((field, entry, ""));
}
}
fields
Expand Down
1 change: 0 additions & 1 deletion quickwit/quickwit-query/src/query_ast/utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ pub fn find_subfields<'a>(
let prefix = format!("{}.", path);
schema
.fields()
.into_iter()
.filter(|(_, field_entry)| field_entry.name().starts_with(&prefix))
.collect()
}
Expand Down

0 comments on commit 749f03b

Please sign in to comment.