Skip to content

armgit / xerj

Public Imported from GitHub
0

AI search engine and MCP server for bots and agents. One Rust binary indexes code, docs, logs, JSONL/CSV and PDFs for BM25 full-text, vector and hybrid search, code search without grep, agent memory and RAG. Elasticsearch-compatible API; Corpus Hub serves hundreds of reference memory corpora.

style: clippy 1.97.0 pass — CI toolchain parity

xerj-orgaadb47ca85ac
diff --git a/engine/crates/xerj-api/src/es_compat.rs b/engine/crates/xerj-api/src/es_compat.rs
index 7ed9e13a1..9df15f771 100644
--- a/engine/crates/xerj-api/src/es_compat.rs
+++ b/engine/crates/xerj-api/src/es_compat.rs
@@ -6652,7 +6652,7 @@ pub async fn search(
let mut kept: Vec<(String, xerj_query::executor::Hit)> = Vec::new();
let mut inserted: std::collections::HashSet<String> =
std::collections::HashSet::new();
- for (_k, &idx) in first_by_key.iter() {
+ for &idx in first_by_key.values() {
let (idx_name, h) = &merged_hits[idx];
let kk = key_of(&h.source);
if inserted.insert(kk.clone()) {
@@ -9533,7 +9533,7 @@ pub async fn search(
"searches": [{
"query": [{
"type": "MatchQuery",
- "description": format!("{:?}", &search_req.query).chars().take(80).collect::<String>(),
+ "description": format!("{:?}", search_req.query).chars().take(80).collect::<String>(),
"time_in_nanos": took_ms * 1_000_000u64,
"breakdown": {
"initialize": 0u64,
diff --git a/engine/crates/xerj-autoindex/src/dataset.rs b/engine/crates/xerj-autoindex/src/dataset.rs
index 55dc27568..eb865455e 100644
--- a/engine/crates/xerj-autoindex/src/dataset.rs
+++ b/engine/crates/xerj-autoindex/src/dataset.rs
@@ -185,7 +185,7 @@ fn assign_slugs(clusters: &mut [Cluster], rels: &[String]) {
for &i in &order {
by_base.entry(bases[i].clone()).or_default().push(i);
}
- for (_, idxs) in by_base.iter() {
+ for idxs in by_base.values() {
if idxs.len() < 2 {
continue;
}
diff --git a/engine/crates/xerj-autoindex/src/sniff.rs b/engine/crates/xerj-autoindex/src/sniff.rs
index 759b3a5bb..6309afe29 100644
--- a/engine/crates/xerj-autoindex/src/sniff.rs
+++ b/engine/crates/xerj-autoindex/src/sniff.rs
@@ -351,7 +351,7 @@ fn sniff_csv_dialect(nonblank: &[&str]) -> Option<CsvDialect> {
}
let sample: Vec<&str> = nonblank.iter().take(64).copied().collect();
let mut best: Option<(u8, usize)> = None; // (delim, field count)
- for delim in [b',', b';', b'\t', b'|'] {
+ for delim in *b",;\t|" {
let counts: Vec<usize> = sample
.iter()
.map(|l| split_quoted(l, delim).len())
diff --git a/engine/crates/xerj-engine/src/aggs.rs b/engine/crates/xerj-engine/src/aggs.rs
index c7aa1d03e..8485dfe2e 100644
--- a/engine/crates/xerj-engine/src/aggs.rs
+++ b/engine/crates/xerj-engine/src/aggs.rs
@@ -1080,10 +1080,9 @@ fn tokenize_script(s: &str, params: &HashMap<String, f64>) -> Option<Vec<Tok>> {
if let Some(rest) = ident.strip_prefix("params.") {
let v = *params.get(rest)?;
toks.push(Tok::Num(v));
- } else if let Some(v) = params.get(ident) {
- toks.push(Tok::Num(*v));
} else {
- return None;
+ let v = *params.get(ident)?;
+ toks.push(Tok::Num(v));
}
continue;
}
diff --git a/engine/crates/xerj-engine/src/index.rs b/engine/crates/xerj-engine/src/index.rs
index d91727c21..c0f179352 100644
--- a/engine/crates/xerj-engine/src/index.rs
+++ b/engine/crates/xerj-engine/src/index.rs
@@ -13779,10 +13779,8 @@ fn peel_nested_knn_query(
}
let (inner, mut pre, mut post) = if let Some((i, _)) = nested_from_must {
walk(&must[i])?
- } else if let Some(i) = nested_from_should {
- walk(&should[i])?
} else {
- return None;
+ walk(&should[nested_from_should?])?
};
// Siblings in must → post-filters.
for (i, c) in must.iter().enumerate() {
@@ -15240,11 +15238,7 @@ fn doc_matches_query(q: &QueryNode, source: &Value) -> bool {
doc_matches_query(query, source)
}
- QueryNode::Boosting {
- positive,
- negative: _,
- ..
- } => {
+ QueryNode::Boosting { positive, .. } => {
// A doc must match the positive query to be returned.
doc_matches_query(positive, source)
// (score penalty for matching negative is handled in scoring, not filtering)
@@ -19108,35 +19102,26 @@ fn query_node_to_fts(
// project (Term/Range/etc. all project to None, so classic
// filters keep taking the doc-scan path as before).
for sub in must.iter().chain(filter.iter()) {
- if let Some(fq) = query_node_to_fts(sub, text_fields, exact_fields) {
- bool_q = bool_q.must(fq);
- projected_any = true;
- } else {
- return None;
- }
+ let fq = query_node_to_fts(sub, text_fields, exact_fields)?;
+ bool_q = bool_q.must(fq);
+ projected_any = true;
}
for sub in should {
- if let Some(fq) = query_node_to_fts(sub, text_fields, exact_fields) {
- bool_q = bool_q.should(fq);
- projected_any = true;
- } else {
- // A `should` clause that can't be projected to FTS (e.g.
- // MatchPhrase over indexed phrases) must NOT be silently
- // dropped — dropping it makes the bool LESS permissive and
- // loses docs that match only via that clause. Fall back to
- // the stored-doc scan, which handles every child shape.
- return None;
- }
+ // A `should` clause that can't be projected to FTS (e.g.
+ // MatchPhrase over indexed phrases) must NOT be silently
+ // dropped — dropping it makes the bool LESS permissive and
+ // loses docs that match only via that clause. Fall back to
+ // the stored-doc scan, which handles every child shape.
+ let fq = query_node_to_fts(sub, text_fields, exact_fields)?;
+ bool_q = bool_q.should(fq);
+ projected_any = true;
}
// `must_not` children that don't project are similar: dropping
// a must_not relaxes the filter, which is wrong.
for sub in must_not {
- if let Some(fq) = query_node_to_fts(sub, text_fields, exact_fields) {
- bool_q = bool_q.must_not(fq);
- projected_any = true;
- } else {
- return None;
- }
+ let fq = query_node_to_fts(sub, text_fields, exact_fields)?;
+ bool_q = bool_q.must_not(fq);
+ projected_any = true;
}
if !projected_any {
return None;
diff --git a/engine/crates/xerj-engine/src/memtable.rs b/engine/crates/xerj-engine/src/memtable.rs
index fb9b1a579..4cde205c3 100644
--- a/engine/crates/xerj-engine/src/memtable.rs
+++ b/engine/crates/xerj-engine/src/memtable.rs
@@ -2692,13 +2692,12 @@ impl FtsMemtable {
return None;
}
cols.push(Col::Kw(col, value.as_str()));
- } else if let Some(col) = self.doc_values.numeric.get(field.as_str()) {
+ } else {
// Numeric term predicate: exact f64 equality (the
// predicate value was lowered to its string form).
+ let col = self.doc_values.numeric.get(field.as_str())?;
let needle = value.parse::<f64>().ok()?;
cols.push(Col::NumEq(col, needle));
- } else {
- return None;
}
}
MemBoolPred::Range {
@@ -2807,11 +2806,10 @@ impl FtsMemtable {
return None;
}
cols.push(Col::Kw(col, value.as_str()));
- } else if let Some(col) = self.doc_values.numeric.get(field.as_str()) {
+ } else {
+ let col = self.doc_values.numeric.get(field.as_str())?;
let needle = value.parse::<f64>().ok()?;
cols.push(Col::NumEq(col, needle));
- } else {
- return None;
}
}
MemBoolPred::Range {
diff --git a/engine/crates/xerj-server/src/main.rs b/engine/crates/xerj-server/src/main.rs
index 2002b7537..f042f581a 100644
--- a/engine/crates/xerj-server/src/main.rs
+++ b/engine/crates/xerj-server/src/main.rs
@@ -251,7 +251,7 @@ fn ensure_admin_key(cfg: &mut Config) -> Result<()> {
println!("╔══════════════════════════════════════════════════╗");
println!("║ First-run: admin API key auto-generated ║");
println!("║ ║");
- println!("║ {:<48} ║", &key);
+ println!("║ {:<48} ║", key);
println!("║ ║");
println!("║ Keep this secret. Written to: ║");
println!("║ {:<48} ║", format!("{}/admin.key", cfg.server.data_dir));