lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sort issue search results by revelance (#14353)

release/v1.15
Lauris BH 2021-01-16 06:55:17 +02:00 committed by GitHub
parent 2db4733c7d
commit 0a3c3357f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/issue.go
View File

@ -1682,7 +1682,7 @@ func SearchIssueIDsByKeyword(kw string, repoIDs []int64, limit, start int) (int6
) )
var ids = make([]int64, 0, limit) var ids = make([]int64, 0, limit)
err := x.Distinct("id").Table("issue").Where(cond).Limit(limit, start).Find(&ids) err := x.Distinct("id").Table("issue").Where(cond).OrderBy("`updated_unix` DESC").Limit(limit, start).Find(&ids)
if err != nil { if err != nil {
return 0, nil, err return 0, nil, err
} }

2
models/issue_test.go
View File

@ -299,7 +299,7 @@ func TestIssue_SearchIssueIDsByKeyword(t *testing.T) {
total, ids, err = SearchIssueIDsByKeyword("for", []int64{1}, 10, 0) total, ids, err = SearchIssueIDsByKeyword("for", []int64{1}, 10, 0)
assert.NoError(t, err) assert.NoError(t, err)
assert.EqualValues(t, 5, total) assert.EqualValues(t, 5, total)
assert.EqualValues(t, []int64{1, 2, 3, 5, 11}, ids) assert.ElementsMatch(t, []int64{1, 2, 3, 5, 11}, ids)
// issue1's comment id 2 // issue1's comment id 2
total, ids, err = SearchIssueIDsByKeyword("good", []int64{1}, 10, 0) total, ids, err = SearchIssueIDsByKeyword("good", []int64{1}, 10, 0)

1
modules/indexer/issues/bleve.go
View File

@ -247,6 +247,7 @@ func (b *BleveIndexer) Search(keyword string, repoIDs []int64, limit, start int)
newMatchPhraseQuery(keyword, "Comments", issueIndexerAnalyzer), newMatchPhraseQuery(keyword, "Comments", issueIndexerAnalyzer),
)) ))
search := bleve.NewSearchRequestOptions(indexerQuery, limit, start, false) search := bleve.NewSearchRequestOptions(indexerQuery, limit, start, false)
search.SortBy([]string{"-_score"})
result, err := b.indexer.Search(search) result, err := b.indexer.Search(search)
if err != nil { if err != nil {

2
modules/indexer/issues/elastic_search.go
View File

@ -205,7 +205,7 @@ func (b *ElasticSearchIndexer) Search(keyword string, repoIDs []int64, limit, st
searchResult, err := b.client.Search(). searchResult, err := b.client.Search().
Index(b.indexerName). Index(b.indexerName).
Query(query). Query(query).
Sort("id", true). Sort("_score", false).
From(start).Size(limit). From(start).Size(limit).
Do(context.Background()) Do(context.Background())
if err != nil { if err != nil {

4
modules/indexer/issues/indexer_test.go
View File

@ -65,7 +65,7 @@ func TestBleveSearchIssues(t *testing.T) {
ids, err = SearchIssuesByKeyword([]int64{1}, "for") ids, err = SearchIssuesByKeyword([]int64{1}, "for")
assert.NoError(t, err) assert.NoError(t, err)
assert.EqualValues(t, []int64{1, 2, 3, 5, 11}, ids) assert.ElementsMatch(t, []int64{1, 2, 3, 5, 11}, ids)
ids, err = SearchIssuesByKeyword([]int64{1}, "good") ids, err = SearchIssuesByKeyword([]int64{1}, "good")
assert.NoError(t, err) assert.NoError(t, err)
@ -89,7 +89,7 @@ func TestDBSearchIssues(t *testing.T) {
ids, err = SearchIssuesByKeyword([]int64{1}, "for") ids, err = SearchIssuesByKeyword([]int64{1}, "for")
assert.NoError(t, err) assert.NoError(t, err)
assert.EqualValues(t, []int64{1, 2, 3, 5, 11}, ids) assert.ElementsMatch(t, []int64{1, 2, 3, 5, 11}, ids)
ids, err = SearchIssuesByKeyword([]int64{1}, "good") ids, err = SearchIssuesByKeyword([]int64{1}, "good")
assert.NoError(t, err) assert.NoError(t, err)