mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-27 20:26:09 +01:00
1e76a824bc
Fix #24662. Replace #24822 and #25708 (although it has been merged) ## Background In the past, Gitea supported issue searching with a keyword and conditions in a less efficient way. It worked by searching for issues with the keyword and obtaining limited IDs (as it is heavy to get all) on the indexer (bleve/elasticsearch/meilisearch), and then querying with conditions on the database to find a subset of the found IDs. This is why the results could be incomplete. To solve this issue, we need to store all fields that could be used as conditions in the indexer and support both keyword and additional conditions when searching with the indexer. ## Major changes - Redefine `IndexerData` to include all fields that could be used as filter conditions. - Refactor `Search(ctx context.Context, kw string, repoIDs []int64, limit, start int, state string)` to `Search(ctx context.Context, options *SearchOptions)`, so it supports more conditions now. - Change the data type stored in `issueIndexerQueue`. Use `IndexerMetadata` instead of `IndexerData` in case the data has been updated while it is in the queue. This also reduces the storage size of the queue. - Enhance searching with Bleve/Elasticsearch/Meilisearch, make them fully support `SearchOptions`. Also, update the data versions. - Keep most logic of database indexer, but remove `issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is the entry point to search issues. - Start a Meilisearch instance to test it in unit tests. - Add unit tests with almost full coverage to test Bleve/Elasticsearch/Meilisearch indexer. --------- Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
54 lines
1.4 KiB
Go
54 lines
1.4 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package bleve
|
|
|
|
import (
|
|
"github.com/blevesearch/bleve/v2"
|
|
"github.com/blevesearch/bleve/v2/search/query"
|
|
)
|
|
|
|
// NumericEqualityQuery generates a numeric equality query for the given value and field
|
|
func NumericEqualityQuery(value int64, field string) *query.NumericRangeQuery {
|
|
f := float64(value)
|
|
tru := true
|
|
q := bleve.NewNumericRangeInclusiveQuery(&f, &f, &tru, &tru)
|
|
q.SetField(field)
|
|
return q
|
|
}
|
|
|
|
// MatchPhraseQuery generates a match phrase query for the given phrase, field and analyzer
|
|
func MatchPhraseQuery(matchPhrase, field, analyzer string) *query.MatchPhraseQuery {
|
|
q := bleve.NewMatchPhraseQuery(matchPhrase)
|
|
q.FieldVal = field
|
|
q.Analyzer = analyzer
|
|
return q
|
|
}
|
|
|
|
// BoolFieldQuery generates a bool field query for the given value and field
|
|
func BoolFieldQuery(value bool, field string) *query.BoolFieldQuery {
|
|
q := bleve.NewBoolFieldQuery(value)
|
|
q.SetField(field)
|
|
return q
|
|
}
|
|
|
|
func NumericRangeInclusiveQuery(min, max *int64, field string) *query.NumericRangeQuery {
|
|
var minF, maxF *float64
|
|
var minI, maxI *bool
|
|
if min != nil {
|
|
minF = new(float64)
|
|
*minF = float64(*min)
|
|
minI = new(bool)
|
|
*minI = true
|
|
}
|
|
if max != nil {
|
|
maxF = new(float64)
|
|
*maxF = float64(*max)
|
|
maxI = new(bool)
|
|
*maxI = true
|
|
}
|
|
q := bleve.NewNumericRangeInclusiveQuery(minF, maxF, minI, maxI)
|
|
q.SetField(field)
|
|
return q
|
|
}
|