Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix long queries at /q #1223

Merged
merged 1 commit into from
Feb 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions server/bleep/src/query/compiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ use crate::query::{
planner,
};

const MAX_CASE_PERMUTATION_LEN: usize = 5;

type DynQuery = Box<dyn tantivy::query::Query>;

enum Extraction<'a> {
Expand Down Expand Up @@ -106,12 +108,20 @@ impl Compiler {
let mut token_stream = tokenizer.token_stream(&text);
let tokens = std::iter::from_fn(move || {
token_stream.next().map(|tok| CompactString::new(&tok.text))
});
})
.collect::<Vec<_>>();

let terms = if query.is_case_sensitive() {
tokens.map(|s| str_to_query(*field, &s)).collect::<Vec<_>>()
// We skip case insensitive matching if a token
let terms = if query.is_case_sensitive()
|| tokens.iter().any(|t| t.len() > MAX_CASE_PERMUTATION_LEN)
{
tokens
.into_iter()
.map(|s| str_to_query(*field, &s))
.collect::<Vec<_>>()
} else {
tokens
.into_iter()
.map(|s| {
let terms = case_permutations(&s)
.map(|s| str_to_query(*field, &s))
Expand Down Expand Up @@ -253,9 +263,8 @@ pub fn case_permutations(s: &str) -> impl Iterator<Item = CompactString> {
.map(|c| c.to_ascii_lowercase())
.collect::<SmallVec<[char; 3]>>();

// Make sure not to overflow. The end condition is a mask with the highest bit set, and we use
// `u32` masks.
debug_assert!(chars.len() <= 5);
// A string that is too long leads to an exponential explosion here, growing with 2^n.
debug_assert!(chars.len() <= MAX_CASE_PERMUTATION_LEN);

let num_chars = chars.len();

Expand Down
Loading