Skip to content

fix: search indexing and schema changes #7090

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.

Sign up for GitHub

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

Open
aecsocket wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: search indexing and schema changes #7090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
277278a
fix: incremental indexing uses latest db data
aecsocket Aug 10, 2026
0fc3842
dependent search fields
aecsocket Aug 10, 2026
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
2 changes: 1 addition & 1 deletion apps/labrinth/src/background_task.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ impl BackgroundTask {
}
IncrementalIndexSearch => {
crate::search::incremental::consume::run(
ro_pool,
pool,
redis_pool,
search_backend,
kafka_client,
Expand Down
4 changes: 4 additions & 0 deletions apps/labrinth/src/search/backend/elasticsearch/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,10 @@ impl Elasticsearch {
"compatible_dependency_project_ids": {
"type": "keyword"
},
"required_dependency_project_ids": {"type": "keyword"},
"optional_dependency_project_ids": {"type": "keyword"},
"embedded_dependency_project_ids": {"type": "keyword"},
"incompatible_dependency_project_ids": {"type": "keyword"},
"project_loader_fields": {
"type": "object",
"enabled": false
Expand Down
34 changes: 34 additions & 0 deletions apps/labrinth/src/search/backend/typesense/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,40 @@ impl SearchField {
optional: true,
token_separators: &["-"],
},
SearchField::RequiredDependencyProjectIds => TypesenseFieldSpec {
path: "required_dependency_project_ids",
ty: "string[]",
facet: true,
sort: false,
optional: true,
token_separators: &["-"],
},
SearchField::OptionalDependencyProjectIds => TypesenseFieldSpec {
path: "optional_dependency_project_ids",
ty: "string[]",
facet: true,
sort: false,
optional: true,
token_separators: &["-"],
},
SearchField::EmbeddedDependencyProjectIds => TypesenseFieldSpec {
path: "embedded_dependency_project_ids",
ty: "string[]",
facet: true,
sort: false,
optional: true,
token_separators: &["-"],
},
SearchField::IncompatibleDependencyProjectIds => {
TypesenseFieldSpec {
path: "incompatible_dependency_project_ids",
ty: "string[]",
facet: true,
sort: false,
optional: true,
token_separators: &["-"],
}
}
}
}
}
Expand Down
32 changes: 32 additions & 0 deletions apps/labrinth/src/search/indexing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,34 @@ async fn build_search_documents(
})
.map(|dependency| dependency.project_id.clone())
.collect::<Vec<_>>();
let required_dependency_project_ids = dependencies
.iter()
.filter(|dependency| {
dependency.dependency_type == DependencyType::Required
})
.map(|dependency| dependency.project_id.clone())
.collect::<Vec<_>>();
let optional_dependency_project_ids = dependencies
.iter()
.filter(|dependency| {
dependency.dependency_type == DependencyType::Optional
})
.map(|dependency| dependency.project_id.clone())
.collect::<Vec<_>>();
let embedded_dependency_project_ids = dependencies
.iter()
.filter(|dependency| {
dependency.dependency_type == DependencyType::Embedded
})
.map(|dependency| dependency.project_id.clone())
.collect::<Vec<_>>();
let incompatible_dependency_project_ids = dependencies
.iter()
.filter(|dependency| {
dependency.dependency_type == DependencyType::Incompatible
})
.map(|dependency| dependency.project_id.clone())
.collect::<Vec<_>>();

if let Some(versions) = versions.remove(&project.id) {
let Some(latest_version) = versions.iter().max_by(|a, b| {
Expand Down Expand Up @@ -731,6 +759,10 @@ async fn build_search_documents(
color: project.color.map(|x| x as u32),
dependency_project_ids,
compatible_dependency_project_ids,
required_dependency_project_ids,
optional_dependency_project_ids,
embedded_dependency_project_ids,
incompatible_dependency_project_ids,
dependencies,
project_loader_fields,
loader_fields,
Expand Down
28 changes: 28 additions & 0 deletions apps/labrinth/src/search/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,10 @@ pub enum SearchField {
MinecraftJavaServerPingData,
DependencyProjectIds,
CompatibleDependencyProjectIds,
RequiredDependencyProjectIds,
OptionalDependencyProjectIds,
EmbeddedDependencyProjectIds,
IncompatibleDependencyProjectIds,
}

#[derive(Debug, Error)]
Expand Down Expand Up @@ -289,6 +293,14 @@ pub struct UploadSearchProject {
#[serde(default)]
pub compatible_dependency_project_ids: Vec<String>,
#[serde(default)]
pub required_dependency_project_ids: Vec<String>,
#[serde(default)]
pub optional_dependency_project_ids: Vec<String>,
#[serde(default)]
pub embedded_dependency_project_ids: Vec<String>,
#[serde(default)]
pub incompatible_dependency_project_ids: Vec<String>,
#[serde(default)]
pub dependencies: Vec<SearchProjectDependency>,

// Hidden fields to get the Project model out of the search results.
Expand Down Expand Up @@ -387,6 +399,14 @@ pub struct ResultSearchProject {
#[serde(default)]
pub compatible_dependency_project_ids: Vec<String>,
#[serde(default)]
pub required_dependency_project_ids: Vec<String>,
#[serde(default)]
pub optional_dependency_project_ids: Vec<String>,
#[serde(default)]
pub embedded_dependency_project_ids: Vec<String>,
#[serde(default)]
pub incompatible_dependency_project_ids: Vec<String>,
#[serde(default)]
pub dependencies: Vec<SearchProjectDependency>,

// Hidden fields to get the Project model out of the search results.
Expand Down Expand Up @@ -429,6 +449,14 @@ impl From<UploadSearchProject> for ResultSearchProject {
dependency_project_ids: source.dependency_project_ids,
compatible_dependency_project_ids: source
.compatible_dependency_project_ids,
required_dependency_project_ids: source
.required_dependency_project_ids,
optional_dependency_project_ids: source
.optional_dependency_project_ids,
embedded_dependency_project_ids: source
.embedded_dependency_project_ids,
incompatible_dependency_project_ids: source
.incompatible_dependency_project_ids,
dependencies: source.dependencies,
loaders: source.loaders,
project_loader_fields: source.project_loader_fields,
Expand Down
Loading